X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_response_object.c;h=d85d36613485d0a66a7af8e2e077fd2494ec73b4;hp=666040b9aaf44f485562fa432630ce23680afb73;hb=6cb8b71e819cbeef5bc5383a64452a36f56de17f;hpb=83c0f4ae82791064502054f389b18f27b9a338dd

diff --git a/http_response_object.c b/http_response_object.c
index 666040b..d85d366 100644
--- 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,7 +143,9 @@ 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);
 
+#if BROKEN_STATICS
 HashTable http_response_statics;
+#endif
 
 zend_class_entry *http_response_object_ce;
 zend_function_entry http_response_object_fe[] = {
@@ -879,7 +882,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 +891,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));
 			}
 		}
 	}