- fix capture mode (again)

[m6w6/ext-http] / http_response_object.c

diff --git a/http_response_object.c b/http_response_object.c
index 0fb12486612fe9f07f860008f8ef3042d4667552..b25da77f70620ba1664f661d1bc43c482deb0e51 100644 (file)
--- a/http_response_object.c
+++ b/http_response_object.c
@@ -21,7 +21,10 @@
 #endif
 #include "php.h"
 
-#ifdef ZEND_ENGINE_2
+#include "missing.h"
+
+/* broken static properties in PHP 5.0 */
+#if defined(ZEND_ENGINE_2) && !defined(WONKY)
 
 #include "SAPI.h"
 #include "php_ini.h"
@@ -34,8 +37,6 @@
 #include "php_http_send_api.h"
 #include "php_http_cache_api.h"
 
-#include "missing.h"
-
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
 #define GET_STATIC_PROP(n)                     *GET_STATIC_PROP_EX(http_response_object_ce, n)
@@ -142,8 +143,6 @@ HTTP_EMPTY_ARGS(getRequestBody, 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);
 
-HashTable http_response_statics;
-
 zend_class_entry *http_response_object_ce;
 zend_function_entry http_response_object_fe[] = {
 
@@ -335,7 +334,7 @@ PHP_METHOD(HttpResponse, getCache)
 
 /* {{{ proto static bool HttpResponse::setGzip(bool gzip)
  *
- * Enable on-thy-fly gzipping of the sent entity. NOT IMPLEMENTED YET.
+ * Enable on-thy-fly gzipping of the sent entity.
  */
 PHP_METHOD(HttpResponse, setGzip)
 {
@@ -777,7 +776,6 @@ PHP_METHOD(HttpResponse, send)
 
                MAKE_STD_ZVAL(the_data);
                php_ob_get_buffer(the_data TSRMLS_CC);
-
                SET_STATIC_PROP(data, the_data);
                ZVAL_LONG(GET_STATIC_PROP(mode), SEND_DATA);
 
@@ -786,6 +784,7 @@ PHP_METHOD(HttpResponse, send)
                        UPD_STATIC_PROP(string, eTag, etag);
                        efree(etag);
                }
+               zval_ptr_dtor(&the_data);
 
                clean_ob = 1;
        }
@@ -879,7 +878,7 @@ PHP_METHOD(HttpResponse, send)
                        case SEND_DATA:
                        {
                                zval *zdata = GET_STATIC_PROP(data);
-                               RETURN_SUCCESS(http_send_data(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata)));
+                               RETURN_SUCCESS(http_send_data_ex(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata), 1));
                        }
 
                        case SEND_RSRC:
@@ -888,12 +887,12 @@ PHP_METHOD(HttpResponse, send)
                                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));
+                               RETURN_SUCCESS(http_send_stream_ex(the_real_stream, 0, 1));
                        }
 
                        default:
                        {
-                               RETURN_SUCCESS(http_send_file(Z_STRVAL_P(GET_STATIC_PROP(file))));
+                               RETURN_SUCCESS(http_send_file_ex(Z_STRVAL_P(GET_STATIC_PROP(file)), 1));
                        }
                }
        }
@@ -919,19 +918,19 @@ 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);
 
-#if (PHP_MAJOR_VERSION > 5) || (PHP_MINOR_VERSION > 0)
+#ifndef WONKY
        /* register shutdown function --
                messing around with ob and headers only works in PHP-5.1 or greater */
        {
@@ -953,7 +952,7 @@ PHP_METHOD(HttpResponse, capture)
 }
 /* }}} */
 
-#endif /* ZEND_ENGINE_2 */
+#endif /* ZEND_ENGINE_2 && !WONKY */
 
 /*
  * Local variables: