X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_response_object.c;h=5e588eae0ef4010ebb953adfb0864f3dfef379e5;hp=1c5ec4214c076c9f9ba9cba44cf3a459fa815007;hb=cdbe702a66e68d97885d5305278246c2630c9f10;hpb=04403e78125a72f38fcd145a8dc0809e348e39d3

diff --git a/http_response_object.c b/http_response_object.c
index 1c5ec42..5e588ea 100644
--- a/http_response_object.c
+++ b/http_response_object.c
@@ -62,7 +62,7 @@ HTTP_BEGIN_ARGS(setETag, 1)
 	HTTP_ARG_VAL(etag, 0)
 HTTP_END_ARGS;
 
-HTTP_EMTPY_ARGS(getLastModified, 0);
+HTTP_EMPTY_ARGS(getLastModified, 0);
 HTTP_BEGIN_ARGS(setLastModified, 1)
 	HTTP_ARG_VAL(timestamp, 0)
 HTTP_END_ARGS;
@@ -773,19 +773,19 @@ PHP_METHOD(HttpResponse, send)
 
 	/* capture mode */
 	if (Z_BVAL_P(GET_STATIC_PROP(catch))) {
-		zval *the_data;
+		zval the_data;
 
-		MAKE_STD_ZVAL(the_data);
-		php_ob_get_buffer(the_data TSRMLS_CC);
-
-		SET_STATIC_PROP(data, the_data);
+		INIT_PZVAL(&the_data);
+		php_ob_get_buffer(&the_data TSRMLS_CC);
+		SET_STATIC_PROP(data, &the_data);
 		ZVAL_LONG(GET_STATIC_PROP(mode), SEND_DATA);
 
 		if (!Z_STRLEN_P(GET_STATIC_PROP(eTag))) {
-			char *etag = http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA);
+			char *etag = http_etag(Z_STRVAL(the_data), Z_STRLEN(the_data), SEND_DATA);
 			UPD_STATIC_PROP(string, eTag, etag);
 			efree(etag);
 		}
+		zval_dtor(&the_data);
 
 		clean_ob = 1;
 	}
@@ -811,11 +811,11 @@ PHP_METHOD(HttpResponse, send)
 					zval **data;
 
 					FOREACH_VAL(*value, data) {
-						http_send_header_ex(name, strlen(name), Z_STRVAL_PP(data), Z_STRLEN_PP(data), first);
+						http_send_header_ex(name, strlen(name), Z_STRVAL_PP(data), Z_STRLEN_PP(data), first, NULL);
 						first = 0;
 					}
 				} else {
-					http_send_header_ex(name, strlen(name), Z_STRVAL_PP(value), Z_STRLEN_PP(value), 1);
+					http_send_header_ex(name, strlen(name), Z_STRVAL_PP(value), Z_STRLEN_PP(value), 1, NULL);
 				}
 				name = NULL;
 			}
@@ -862,7 +862,7 @@ PHP_METHOD(HttpResponse, send)
 	{
 		zval *cd = GET_STATIC_PROP(contentDisposition);
 		if (Z_STRLEN_P(cd)) {
-			http_send_header_ex("Content-Disposition", lenof("Content-Disposition"), Z_STRVAL_P(cd), Z_STRLEN_P(cd), 1);
+			http_send_header_ex("Content-Disposition", lenof("Content-Disposition"), Z_STRVAL_P(cd), Z_STRLEN_P(cd), 1, NULL);
 		}
 	}
 
@@ -919,14 +919,14 @@ PHP_METHOD(HttpResponse, send)
  */
 PHP_METHOD(HttpResponse, capture)
 {
-	zval *do_catch;
+	zval do_catch;
 
 	NO_ARGS;
 
-	MAKE_STD_ZVAL(do_catch);
-	ZVAL_LONG(do_catch, 1);
+	INIT_PZVAL(&do_catch);
+	ZVAL_LONG(&do_catch, 1);
 
-	SET_STATIC_PROP(catch, do_catch);
+	SET_STATIC_PROP(catch, &do_catch);
 
 	php_end_ob_buffers(0 TSRMLS_CC);
 	php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC);