X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_response_object.c;h=6490238b2e966cbbfad9fb4ee4f0e44ddf818d3d;hp=aee8612c182f63866b667df88da979aa6435fb6a;hb=f2d1bcbb220370bc25bcd3a7272dd20da57b3058;hpb=3f9e9e90fecd011647139f2dc32ec616904b32b5

diff --git a/http_response_object.c b/http_response_object.c
index aee8612..6490238 100644
--- a/http_response_object.c
+++ b/http_response_object.c
@@ -109,6 +109,8 @@ HTTP_BEGIN_ARGS(send, 0)
 	HTTP_ARG_VAL(clean_ob, 0)
 HTTP_END_ARGS;
 
+HTTP_EMPTY_ARGS(capture, 0);
+
 #define http_response_object_declare_default_properties() _http_response_object_declare_default_properties(TSRMLS_C)
 static inline void _http_response_object_declare_default_properties(TSRMLS_D);
 
@@ -149,6 +151,7 @@ zend_function_entry http_response_object_fe[] = {
 	HTTP_RESPONSE_ME(getStream, ZEND_ACC_PUBLIC)
 
 	HTTP_RESPONSE_ME(send, ZEND_ACC_PUBLIC)
+	HTTP_RESPONSE_ME(capture, ZEND_ACC_PUBLIC)
 
 	{NULL, NULL, NULL}
 };
@@ -179,11 +182,13 @@ static inline void _http_response_object_declare_default_properties(TSRMLS_D)
 	DCL_STATIC_PROP_N(PROTECTED, contentDisposition);
 	DCL_STATIC_PROP(PROTECTED, long, bufferSize, HTTP_SENDBUF_SIZE);
 	DCL_STATIC_PROP(PROTECTED, double, throttleDelay, 0.0);
+
+	DCL_STATIC_PROP(PUBLIC, string, dummy, "EMPTY");
 }
 
 /* ### USERLAND ### */
 
-/* {{{ proto bool HttpResponse::setCache(bool cache)
+/* {{{ proto static bool HttpResponse::setCache(bool cache)
  *
  * Whether it sould be attempted to cache the entitity.
  * This will result in necessary caching headers and checks of clients
@@ -206,7 +211,7 @@ PHP_METHOD(HttpResponse, setCache)
 }
 /* }}} */
 
-/* {{{ proto bool HttpResponse::getCache()
+/* {{{ proto static bool HttpResponse::getCache()
  *
  * Get current caching setting.
  */
@@ -220,7 +225,7 @@ PHP_METHOD(HttpResponse, getCache)
 }
 /* }}}*/
 
-/* {{{ proto bool HttpResponse::setGzip(bool gzip)
+/* {{{ proto static bool HttpResponse::setGzip(bool gzip)
  *
  * Enable on-thy-fly gzipping of the sent entity. NOT IMPLEMENTED YET.
  */
@@ -237,7 +242,7 @@ PHP_METHOD(HttpResponse, setGzip)
 }
 /* }}} */
 
-/* {{{ proto bool HttpResponse::getGzip()
+/* {{{ proto static bool HttpResponse::getGzip()
  *
  * Get current gzipping setting.
  */
@@ -251,7 +256,7 @@ PHP_METHOD(HttpResponse, getGzip)
 }
 /* }}} */
 
-/* {{{ proto bool HttpResponse::setCacheControl(string control[, long max_age = 0])
+/* {{{ proto static bool HttpResponse::setCacheControl(string control[, long max_age = 0])
  *
  * Set a custom cache-control header, usually being "private" or "public";
  * The max_age parameter controls how long the cache entry is valid on the client side.
@@ -280,7 +285,7 @@ PHP_METHOD(HttpResponse, setCacheControl)
 }
 /* }}} */
 
-/* {{{ proto string HttpResponse::getCacheControl()
+/* {{{ proto static string HttpResponse::getCacheControl()
  *
  * Get current Cache-Control header setting.
  */
@@ -295,7 +300,7 @@ PHP_METHOD(HttpResponse, getCacheControl)
 }
 /* }}} */
 
-/* {{{ proto bool HttpResponse::setContentType(string content_type)
+/* {{{ proto static bool HttpResponse::setContentType(string content_type)
  *
  * Set the content-type of the sent entity.
  */
@@ -319,7 +324,7 @@ PHP_METHOD(HttpResponse, setContentType)
 }
 /* }}} */
 
-/* {{{ proto string HttpResponse::getContentType()
+/* {{{ proto static string HttpResponse::getContentType()
  *
  * Get current Content-Type header setting.
  */
@@ -334,7 +339,7 @@ PHP_METHOD(HttpResponse, getContentType)
 }
 /* }}} */
 
-/* {{{ proto bool HttpResponse::setContentDisposition(string filename[, bool inline = false])
+/* {{{ proto static bool HttpResponse::setContentDisposition(string filename[, bool inline = false])
  *
  * Set the Content-Disposition of the sent entity.  This setting aims to suggest
  * the receiveing user agent how to handle the sent entity;  usually the client
@@ -353,12 +358,12 @@ PHP_METHOD(HttpResponse, setContentDisposition)
 	}
 
 	spprintf(&cd, 0, HTTP_CONTENTDISPOSITION_TEMPLATE, send_inline ? "inline" : "attachment", file);
-	ZVAL_STRING_FREE(GET_STATIC_PROP(contentDisposition), cd, 0);
+	SET_STATIC_PROP_STRING(contentDisposition, cd, 0);
 	RETURN_TRUE;
 }
 /* }}} */
 
-/* {{{ proto string HttpResponse::getContentDisposition()
+/* {{{ proto static string HttpResponse::getContentDisposition()
  *
  * Get current Content-Disposition setting.
  */
@@ -373,7 +378,7 @@ PHP_METHOD(HttpResponse, getContentDisposition)
 }
 /* }}} */
 
-/* {{{ proto bool HttpResponse::setETag(string etag)
+/* {{{ proto static bool HttpResponse::setETag(string etag)
  *
  * Set a custom ETag.  Use this only if you know what you're doing.
  */
@@ -386,12 +391,13 @@ PHP_METHOD(HttpResponse, setETag)
 		RETURN_FALSE;
 	}
 
-	ZVAL_STRINGL_FREE(GET_STATIC_PROP(eTag), etag, etag_len, 1);
+	USE_STATIC_PROP();
+	SET_STATIC_PROP_STRINGL(eTag, etag, etag_len, 1);
 	RETURN_TRUE;
 }
 /* }}} */
 
-/* {{{ proto string HttpResponse::getETag()
+/* {{{ proto static string HttpResponse::getETag()
  *
  * Get the previously set custom ETag.
  */
@@ -406,7 +412,7 @@ PHP_METHOD(HttpResponse, getETag)
 }
 /* }}} */
 
-/* {{{ proto void HttpResponse::setThrottleDelay(double seconds)
+/* {{{ proto static void HttpResponse::setThrottleDelay(double seconds)
  *
  */
 PHP_METHOD(HttpResponse, setThrottleDelay)
@@ -419,7 +425,7 @@ PHP_METHOD(HttpResponse, setThrottleDelay)
 }
 /* }}} */
 
-/* {{{ proto double HttpResponse::getThrottleDelay()
+/* {{{ proto static double HttpResponse::getThrottleDelay()
  *
  */
 PHP_METHOD(HttpResponse, getThrottleDelay)
@@ -432,7 +438,7 @@ PHP_METHOD(HttpResponse, getThrottleDelay)
 }
 /* }}} */
 
-/* {{{ proto void HttpResponse::setBufferSize(long bytes)
+/* {{{ proto static void HttpResponse::setBufferSize(long bytes)
  *
  */
 PHP_METHOD(HttpResponse, setBufferSize)
@@ -445,7 +451,7 @@ PHP_METHOD(HttpResponse, setBufferSize)
 }
 /* }}} */
 
-/* {{{ proto long HttpResponse::getBufferSize()
+/* {{{ proto static long HttpResponse::getBufferSize()
  *
  */
 PHP_METHOD(HttpResponse, getBufferSize)
@@ -458,7 +464,7 @@ PHP_METHOD(HttpResponse, getBufferSize)
 }
 /* }}} */
 
-/* {{{ proto bool HttpResponse::setData(string data)
+/* {{{ proto static bool HttpResponse::setData(string data)
  *
  * Set the data to be sent.
  */
@@ -475,11 +481,15 @@ PHP_METHOD(HttpResponse, setData)
 	SET_STATIC_PROP(data, the_data);
 	ZVAL_LONG(GET_STATIC_PROP(lastModified), http_last_modified(the_data, SEND_DATA));
 	ZVAL_LONG(GET_STATIC_PROP(mode), SEND_DATA);
+	if (!Z_STRLEN_P(GET_STATIC_PROP(eTag))) {
+		SET_STATIC_PROP_STRING(eTag, http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA), 0);
+	}
+
 	RETURN_TRUE;
 }
 /* }}} */
 
-/* {{{ proto string HttpResponse::getData()
+/* {{{ proto static string HttpResponse::getData()
  *
  * Get the previously set data to be sent.
  */
@@ -494,7 +504,7 @@ PHP_METHOD(HttpResponse, getData)
 }
 /* }}} */
 
-/* {{{ proto bool HttpResponse::setStream(resource stream)
+/* {{{ proto static bool HttpResponse::setStream(resource stream)
  *
  * Set the resource to be sent.
  */
@@ -506,17 +516,22 @@ PHP_METHOD(HttpResponse, setStream)
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &the_stream)) {
 		RETURN_FALSE;
 	}
+	zend_list_addref(Z_LVAL_P(the_stream));
+	php_stream_from_zval(the_real_stream, &the_stream);
 
 	USE_STATIC_PROP();
-	php_stream_from_zval(the_real_stream, &the_stream);
 	ZVAL_LONG(GET_STATIC_PROP(stream), Z_LVAL_P(the_stream));
 	ZVAL_LONG(GET_STATIC_PROP(lastModified), http_last_modified(the_real_stream, SEND_RSRC));
 	ZVAL_LONG(GET_STATIC_PROP(mode), SEND_RSRC);
+	if (!Z_STRLEN_P(GET_STATIC_PROP(eTag))) {
+		SET_STATIC_PROP_STRING(eTag, http_etag(the_real_stream, 0, SEND_RSRC), 0);
+	}
+
 	RETURN_TRUE;
 }
 /* }}} */
 
-/* {{{ proto resource HttpResponse::getStream()
+/* {{{ proto static resource HttpResponse::getStream()
  *
  * Get the previously set resource to be sent.
  */
@@ -530,7 +545,7 @@ PHP_METHOD(HttpResponse, getStream)
 }
 /* }}} */
 
-/* {{{ proto bool HttpResponse::setFile(string file)
+/* {{{ proto static bool HttpResponse::setFile(string file)
  *
  * Set the file to be sent.
  */
@@ -547,12 +562,15 @@ PHP_METHOD(HttpResponse, setFile)
 	SET_STATIC_PROP(file, the_file);
 	ZVAL_LONG(GET_STATIC_PROP(lastModified), http_last_modified(the_file, -1));
 	ZVAL_LONG(GET_STATIC_PROP(mode), -1);
+	if (!Z_STRLEN_P(GET_STATIC_PROP(eTag))) {
+		SET_STATIC_PROP_STRING(eTag, http_etag(the_file, 0, -1), 0);
+	}
 
 	RETURN_TRUE;
 }
 /* }}} */
 
-/* {{{ proto string HttpResponse::getFile()
+/* {{{ proto static string HttpResponse::getFile()
  *
  * Get the previously set file to be sent.
  */
@@ -567,29 +585,73 @@ PHP_METHOD(HttpResponse, getFile)
 }
 /* }}} */
 
-/* {{{ proto bool HttpResponse::send([bool clean_ob = true])
+/* {{{ proto static bool HttpResponse::send([bool clean_ob = true])
  *
  * Finally send the entity.
+ *
+ * Example:
+ * <pre>
+ * <?php
+ * HttpResponse::setCache(true);
+ * HttpResponse::setContentType('application/pdf');
+ * HttpResponse::setContentDisposition("$user.pdf", false);
+ * HttpResponse::setFile('sheet.pdf');
+ * HttpResponse::send();
+ * ?>
+ * </pre>
  */
 PHP_METHOD(HttpResponse, send)
 {
-	zval *do_cache, *do_gzip;
+	zval *do_cache, *do_gzip, *sent;
 	zend_bool clean_ob = 1;
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &clean_ob)) {
 		RETURN_FALSE;
 	}
+	if (SG(headers_sent)) {
+		http_error(E_WARNING, HTTP_E_HEADER, "Cannot send HttpResponse, headers have already been sent");
+		RETURN_FALSE;
+	}
+
+	sent = GET_STATIC_PROP(sent);
+	if (Z_LVAL_P(sent)) {
+		http_error(E_WARNING, HTTP_E_UNKOWN, "Cannot send HttpResponse, response has already been sent");
+		RETURN_FALSE;
+	} else {
+		Z_LVAL_P(sent) = 1;
+	}
+
+	/* capture mode */
+	if (Z_LVAL_P(GET_STATIC_PROP(catch))) {
+		zval the_data;
+
+		INIT_PZVAL(&the_data);
+		php_ob_get_buffer(&the_data TSRMLS_CC);
+
+		USE_STATIC_PROP();
+		SET_STATIC_PROP(data, &the_data);
+		ZVAL_LONG(GET_STATIC_PROP(mode), SEND_DATA);
+
+		if (!Z_STRLEN_P(GET_STATIC_PROP(eTag))) {
+			SET_STATIC_PROP_STRING(eTag, http_etag(Z_STRVAL(the_data), Z_STRLEN(the_data), SEND_DATA), 0);
+		}
+		zval_dtor(&the_data);
+
+		clean_ob = 1;
+	}
 
 	if (clean_ob) {
 		/* interrupt on-the-fly etag generation */
 		HTTP_G(etag).started = 0;
 		/* discard previous output buffers */
-		//php_end_ob_buffers(0 TSRMLS_CC);
+		php_end_ob_buffers(0 TSRMLS_CC);
 	}
 
 	/* gzip */
 	if (Z_LVAL_P(GET_STATIC_PROP(gzip))) {
-		php_start_ob_buffer_named("ob_gzhandler", 0, 1 TSRMLS_CC);
+		php_start_ob_buffer_named("ob_gzhandler", 0, 0 TSRMLS_CC);
+	} else {
+		php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC);
 	}
 
 	/* caching */
@@ -602,7 +664,7 @@ PHP_METHOD(HttpResponse, send)
 		lmod = GET_STATIC_PROP(lastModified);
 		cctl = GET_STATIC_PROP(cacheControl);
 
-		http_cache_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag),Z_STRVAL_P(cctl), Z_STRLEN_P(cctl));
+		http_cache_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag), Z_STRVAL_P(cctl), Z_STRLEN_P(cctl));
 		http_cache_last_modified(Z_LVAL_P(lmod), Z_LVAL_P(lmod) ? Z_LVAL_P(lmod) : time(NULL), Z_STRVAL_P(cctl), Z_STRLEN_P(cctl));
 	}
 
@@ -612,7 +674,14 @@ PHP_METHOD(HttpResponse, send)
 		if (Z_STRLEN_P(ctype)) {
 			http_send_content_type(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype));
 		} else {
-			http_send_content_type("application/x-octetstream", lenof("application/x-octetstream"));
+			char *ctypes = INI_STR("default_mimetype");
+			size_t ctlen = ctypes ? strlen(ctypes) : 0;
+
+			if (ctlen) {
+				http_send_content_type(ctypes, ctlen);
+			} else {
+				http_send_content_type("application/x-octetstream", lenof("application/x-octetstream"));
+			}
 		}
 	}
 
@@ -648,6 +717,7 @@ PHP_METHOD(HttpResponse, send)
 			{
 				php_stream *the_real_stream;
 				zval *the_stream = GET_STATIC_PROP(stream);
+				the_stream->type = IS_RESOURCE;
 				php_stream_from_zval(the_real_stream, &the_stream);
 				RETURN_SUCCESS(http_send_stream(the_real_stream));
 			}
@@ -661,6 +731,52 @@ PHP_METHOD(HttpResponse, send)
 }
 /* }}} */
 
+/* {{{ proto static void HttpResponse::capture()
+ *
+ * Capture script output.
+ *
+ * Example:
+ * <pre>
+ * <?php
+ * HttpResponse::setCache(true);
+ * HttpResponse::capture();
+ * // script follows
+ * ?>
+ * </pre>
+ */
+PHP_METHOD(HttpResponse, capture)
+{
+	zval do_catch;
+
+	NO_ARGS;
+
+	INIT_PZVAL(&do_catch);
+	ZVAL_LONG(&do_catch, 1);
+	USE_STATIC_PROP();
+	SET_STATIC_PROP(catch, &do_catch);
+
+	php_end_ob_buffers(0 TSRMLS_CC);
+	php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC);
+
+	/* register shutdown function */
+	{
+		zval func, retval, arg, *argp[1];
+
+		INIT_PZVAL(&arg);
+		INIT_PZVAL(&func);
+		INIT_PZVAL(&retval);
+		ZVAL_STRINGL(&func, "register_shutdown_function", lenof("register_shutdown_function"), 0);
+
+		array_init(&arg);
+		add_next_index_stringl(&arg, "HttpResponse", lenof("HttpResponse"), 1);
+		add_next_index_stringl(&arg, "send", lenof("send"), 1);
+		argp[0] = &arg;
+		call_user_function(EG(function_table), NULL, &func, &retval, 1, argp TSRMLS_CC);
+		zval_dtor(&arg);
+	}
+}
+/* }}} */
+
 #endif /* ZEND_ENGINE_2 */
 
 /*