X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_response_object.c;h=e345cfe1c39ec1b76487b1d6d0f0c2977ca21eb2;hp=bb2f0cebbe011ab4ebaaecb055d78393903d668e;hb=653bb2f74eabb04af4e711fbc8d3d51e606649f7;hpb=89572c25844ea2a641a6bef11b2cd1e1be699282

diff --git a/http_response_object.c b/http_response_object.c
index bb2f0ce..e345cfe 100644
--- a/http_response_object.c
+++ b/http_response_object.c
@@ -38,7 +38,11 @@
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
-#define GET_STATIC_PROP(n) *GET_STATIC_PROP_EX(http_response_object_ce, n)
+#define USE_STATIC_PROP()		USE_STATIC_PROP_EX(http_response_object_ce)
+#define GET_STATIC_PROP(n)		*GET_STATIC_PROP_EX(http_response_object_ce, n)
+#define SET_STATIC_PROP(n, v)	SET_STATIC_PROP_EX(http_response_object_ce, n, v)
+#define SET_STATIC_PROP_STRING(n, s, d) SET_STATIC_PROP_STRING_EX(http_response_object_ce, n, s, d)
+#define SET_STATIC_PROP_STRINGL(n, s, l, d) SET_STATIC_PROP_STRINGL_EX(http_response_object_ce, n, s, l, d)
 
 #define HTTP_BEGIN_ARGS(method, req_args) 		HTTP_BEGIN_ARGS_EX(HttpResponse, method, 0, req_args)
 #define HTTP_EMPTY_ARGS(method, ret_ref)		HTTP_EMPTY_ARGS_EX(HttpResponse, method, ret_ref)
@@ -160,19 +164,19 @@ static inline void _http_response_object_declare_default_properties(TSRMLS_D)
 {
 	zend_class_entry *ce = http_response_object_ce;
 
-	DCL_STATIC_PROP(PRIVATE, long, sent, 0);
+	DCL_STATIC_PROP(PRIVATE, bool, sent, 0);
+	DCL_STATIC_PROP(PRIVATE, bool, catch, 0);
 	DCL_STATIC_PROP(PRIVATE, long, mode, -1);
-	DCL_STATIC_PROP(PRIVATE, long, catch, 0);
-	DCL_STATIC_PROP(PROTECTED, long, cache, 0);
-	DCL_STATIC_PROP(PROTECTED, long, gzip, 0);
+	DCL_STATIC_PROP(PROTECTED, bool, cache, 0);
+	DCL_STATIC_PROP(PROTECTED, bool, gzip, 0);
 	DCL_STATIC_PROP(PROTECTED, long, stream, 0);
-	DCL_STATIC_PROP(PROTECTED, string, file, "");
-	DCL_STATIC_PROP(PROTECTED, string, data, "");
-	DCL_STATIC_PROP(PROTECTED, string, eTag, "");
+	DCL_STATIC_PROP_N(PROTECTED, file);
+	DCL_STATIC_PROP_N(PROTECTED, data);
+	DCL_STATIC_PROP_N(PROTECTED, eTag);
 	DCL_STATIC_PROP(PROTECTED, long, lastModified, 0);
-	DCL_STATIC_PROP(PROTECTED, string, cacheControl, HTTP_DEFAULT_CACHECONTROL);
-	DCL_STATIC_PROP(PROTECTED, string, contentType, INI_STR("default_content_type"));
-	DCL_STATIC_PROP(PROTECTED, string, contentDisposition, "");
+	DCL_STATIC_PROP_N(PROTECTED, cacheControl);
+	DCL_STATIC_PROP_N(PROTECTED, contentType);
+	DCL_STATIC_PROP_N(PROTECTED, contentDisposition);
 	DCL_STATIC_PROP(PROTECTED, long, bufferSize, HTTP_SENDBUF_SIZE);
 	DCL_STATIC_PROP(PROTECTED, double, throttleDelay, 0.0);
 }
@@ -197,7 +201,7 @@ PHP_METHOD(HttpResponse, setCache)
 		RETURN_FALSE;
 	}
 
-	ZVAL_LONG(GET_STATIC_PROP(cache), do_cache);
+	ZVAL_BOOL(GET_STATIC_PROP(cache), do_cache);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -228,7 +232,7 @@ PHP_METHOD(HttpResponse, setGzip)
 		RETURN_FALSE;
 	}
 
-	ZVAL_LONG(GET_STATIC_PROP(gzip), do_gzip);
+	ZVAL_BOOL(GET_STATIC_PROP(gzip), do_gzip);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -249,7 +253,7 @@ PHP_METHOD(HttpResponse, getGzip)
 
 /* {{{ proto bool HttpResponse::setCacheControl(string control[, long max_age = 0])
  *
- * Set a custom cache-control header, usually being "private" or "public"; 
+ * 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.
  */
 PHP_METHOD(HttpResponse, setCacheControl)
@@ -268,8 +272,9 @@ PHP_METHOD(HttpResponse, setCacheControl)
 		http_error_ex(E_WARNING, HTTP_E_PARAM, "Cache-Control '%s' doesn't match public, private or no-cache", ccontrol);
 		RETURN_FALSE;
 	} else {
+		USE_STATIC_PROP();
 		spprintf(&cctl, 0, HTTP_CACHECONTROL_TEMPLATE, ccontrol, max_age);
-		ZVAL_STRING_FREE(GET_STATIC_PROP(cacheControl), cctl, 0);
+		SET_STATIC_PROP_STRING(cacheControl, cctl, 0);
 		RETURN_TRUE;
 	}
 }
@@ -308,7 +313,8 @@ PHP_METHOD(HttpResponse, setContentType)
 		RETURN_FALSE;
 	}
 
-	ZVAL_STRINGL_FREE(GET_STATIC_PROP(contentType), ctype, ctype_len, 1);
+	USE_STATIC_PROP();
+	SET_STATIC_PROP_STRINGL(contentType, ctype, ctype_len, 1);
 	RETURN_TRUE;
 }
 /* }}} */
@@ -347,7 +353,7 @@ 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;
 }
 /* }}} */
@@ -380,7 +386,8 @@ 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;
 }
 /* }}} */
@@ -458,15 +465,15 @@ PHP_METHOD(HttpResponse, getBufferSize)
  */
 PHP_METHOD(HttpResponse, setData)
 {
-	zval *the_data, *data;
+	zval *the_data, **data;
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &the_data)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &the_data)) {
 		RETURN_FALSE;
 	}
-
 	convert_to_string_ex(&the_data);
-	data = GET_STATIC_PROP(data);
-	ZVAL_STRINGL_FREE(data, Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), 1);
+
+	USE_STATIC_PROP();
+	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);
 	RETURN_TRUE;
@@ -501,6 +508,7 @@ PHP_METHOD(HttpResponse, setStream)
 		RETURN_FALSE;
 	}
 
+	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));
@@ -531,12 +539,13 @@ PHP_METHOD(HttpResponse, setFile)
 {
 	zval *the_file;
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &the_file)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &the_file)) {
 		RETURN_FALSE;
 	}
 
 	convert_to_string_ex(&the_file);
-	ZVAL_STRINGL_FREE(GET_STATIC_PROP(file), Z_STRVAL_P(the_file), Z_STRLEN_P(the_file), 1);
+	USE_STATIC_PROP();
+	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);
 
@@ -576,12 +585,14 @@ PHP_METHOD(HttpResponse, send)
 		/* 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);
+	} else {
+		php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC);
 	}
 
 	/* caching */
@@ -594,7 +605,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));
 	}
 
@@ -604,7 +615,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"));
+			}
 		}
 	}
 
@@ -613,7 +631,7 @@ PHP_METHOD(HttpResponse, send)
 		zval *cd = GET_STATIC_PROP(contentDisposition);
 		if (Z_STRLEN_P(cd)) {
 			char *cds;
-			
+
 			spprintf(&cds, 0, "Content-Disposition: %s", Z_STRVAL_P(cd));
 			http_send_header(cds);
 			efree(cds);