From: Felipe Pena <felipe@php.net>
Date: Fri, 10 Jun 2011 22:03:12 +0000 (+0000)
Subject: - Fixed build with 5.4+
X-Git-Tag: RELEASE_1_7_2~7
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=7d35618105146cc620cce13454a5ef242bf52a12;p=m6w6%2Fext-http

- Fixed build with 5.4+
---

diff --git a/http_api.c b/http_api.c
index dbd8ab8..2c31d10 100644
--- a/http_api.c
+++ b/http_api.c
@@ -252,10 +252,17 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
 		STR_FREE(body);
 		return FAILURE;
 	}
-	
-	if (!php_ob_handler_used("zlib output compression" TSRMLS_CC) && !php_ob_handler_used("ob_gzhandler" TSRMLS_CC) && !OG(ob_lock)) {
+
+	if (
+#if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50399)
+		OG(active) && (OG(active)->flags & PHP_OUTPUT_HANDLER_FLUSHABLE) && 
+#else
+		!OG(ob_lock) &&
+#endif
+		!php_ob_handler_used("zlib output compression" TSRMLS_CC) && !php_ob_handler_used("ob_gzhandler" TSRMLS_CC)) {
 		php_end_ob_buffers(0 TSRMLS_CC);
 	}
+
 	if ((SUCCESS == sapi_send_headers(TSRMLS_C)) && body) {
 		PHPWRITE(body, strlen(body));
 	}
diff --git a/http_deflatestream_object.c b/http_deflatestream_object.c
index c3c8045..22f5c04 100644
--- a/http_deflatestream_object.c
+++ b/http_deflatestream_object.c
@@ -107,9 +107,14 @@ zend_object_value _http_deflatestream_object_new_ex(zend_class_entry *ce, http_e
 		o->stream = s;
 	}
 
+#ifdef ZEND_ENGINE_2_4
+	zend_object_std_init(OBJ_PROP(o), ce TSRMLS_CC);
+	object_properties_init(OBJ_PROP(o), ce);
+#else
 	ALLOC_HASHTABLE(OBJ_PROP(o));
 	zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0);
 	zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+#endif
 
 	ov.handle = putObject(http_deflatestream_object, o);
 	ov.handlers = &http_deflatestream_object_handlers;
diff --git a/http_inflatestream_object.c b/http_inflatestream_object.c
index 53e5571..1695bce 100644
--- a/http_inflatestream_object.c
+++ b/http_inflatestream_object.c
@@ -96,9 +96,14 @@ zend_object_value _http_inflatestream_object_new_ex(zend_class_entry *ce, http_e
 		o->stream = s;
 	}
 
+#ifdef ZEND_ENGINE_2_4
+	zend_object_std_init(OBJ_PROP(o), ce TSRMLS_CC);
+	object_properties_init(OBJ_PROP(o), ce);
+#else
 	ALLOC_HASHTABLE(OBJ_PROP(o));
 	zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0);
 	zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+#endif
 
 	ov.handle = putObject(http_inflatestream_object, o);
 	ov.handlers = &http_inflatestream_object_handlers;
diff --git a/http_message_object.c b/http_message_object.c
index e7a564f..23974c3 100644
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -513,9 +513,15 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message
 		}
 	}
 
+	
+#ifdef ZEND_ENGINE_2_4
+	zend_object_std_init(OBJ_PROP(o), ce TSRMLS_CC);
+	object_properties_init(OBJ_PROP(o), ce);
+#else
 	ALLOC_HASHTABLE(OBJ_PROP(o));
 	zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0);
 	zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+#endif
 
 	ov.handle = putObject(http_message_object, o);
 	ov.handlers = &http_message_object_handlers;
diff --git a/http_querystring_object.c b/http_querystring_object.c
index 0e7b2ac..fd87294 100644
--- a/http_querystring_object.c
+++ b/http_querystring_object.c
@@ -191,9 +191,14 @@ zend_object_value _http_querystring_object_new_ex(zend_class_entry *ce, void *no
 		*ptr = o;
 	}
 
+#ifdef ZEND_ENGINE_2_4
+	zend_object_std_init(OBJ_PROP(o), ce TSRMLS_CC);
+	object_properties_init(OBJ_PROP(o), ce);
+#else
 	ALLOC_HASHTABLE(OBJ_PROP(o));
 	zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0);
 	zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+#endif
 
 	ov.handle = putObject(http_querystring_object, o);
 	ov.handlers = &http_querystring_object_handlers;
diff --git a/http_request_object.c b/http_request_object.c
index 8ea09b0..d502006 100644
--- a/http_request_object.c
+++ b/http_request_object.c
@@ -492,9 +492,14 @@ zend_object_value _http_request_object_new_ex(zend_class_entry *ce, CURL *ch, ht
 		*ptr = o;
 	}
 
+#ifdef ZEND_ENGINE_2_4
+	zend_object_std_init(OBJ_PROP(o), ce TSRMLS_CC);
+	object_properties_init(OBJ_PROP(o), ce);
+#else
 	ALLOC_HASHTABLE(OBJ_PROP(o));
 	zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0);
 	zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+#endif
 
 	ov.handle = putObject(http_request_object, o);
 	ov.handlers = &http_request_object_handlers;
diff --git a/http_requestdatashare_object.c b/http_requestdatashare_object.c
index 8eacef8..b1491c1 100644
--- a/http_requestdatashare_object.c
+++ b/http_requestdatashare_object.c
@@ -125,9 +125,14 @@ zend_object_value _http_requestdatashare_object_new_ex(zend_class_entry *ce, htt
 		*ptr = o;
 	}
 
+#ifdef ZEND_ENGINE_2_4
+	zend_object_std_init(OBJ_PROP(o), ce TSRMLS_CC);
+	object_properties_init(OBJ_PROP(o), ce);
+#else
 	ALLOC_HASHTABLE(OBJ_PROP(o));
 	zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0);
 	zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+#endif
 
 	ov.handle = putObject(http_requestdatashare_object, o);
 	ov.handlers = &http_requestdatashare_object_handlers;
@@ -147,7 +152,13 @@ void _http_requestdatashare_object_free(zend_object *object TSRMLS_DC)
 
 static zval *_http_requestdatashare_object_read_prop(zval *object, zval *member, int type ZEND_LITERAL_KEY_DC TSRMLS_DC)
 {
-	if (type == BP_VAR_W && zend_hash_exists(&THIS_CE->default_properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1)) {
+	if (type == BP_VAR_W && 
+#ifdef ZEND_ENGINE_2_4	
+	zend_hash_exists(&THIS_CE->properties_info, Z_STRVAL_P(member), Z_STRLEN_P(member)+1)
+#else
+	zend_hash_exists(&THIS_CE->default_properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1)
+#endif
+	) {
 		zend_error(E_ERROR, "Cannot access HttpRequestDataShare default properties by reference or array key/index");
 		return NULL;
 	}
@@ -157,7 +168,13 @@ static zval *_http_requestdatashare_object_read_prop(zval *object, zval *member,
 
 static void _http_requestdatashare_object_write_prop(zval *object, zval *member, zval *value ZEND_LITERAL_KEY_DC TSRMLS_DC)
 {
-	if (zend_hash_exists(&THIS_CE->default_properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1)) {
+	if (
+#ifdef ZEND_ENGINE_2_4
+	zend_hash_exists(&THIS_CE->properties_info, Z_STRVAL_P(member), Z_STRLEN_P(member)+1)
+#else
+	zend_hash_exists(&THIS_CE->default_properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1)
+#endif
+	) {
 		int status;
 		getObjectEx(http_requestdatashare_object, obj, object);
 		
diff --git a/http_requestpool_object.c b/http_requestpool_object.c
index 653843a..47aa134 100644
--- a/http_requestpool_object.c
+++ b/http_requestpool_object.c
@@ -129,9 +129,14 @@ zend_object_value _http_requestpool_object_new(zend_class_entry *ce TSRMLS_DC)
 
 	http_request_pool_init(&o->pool);
 
+#ifdef ZEND_ENGINE_2_4
+	zend_object_std_init(OBJ_PROP(o), ce TSRMLS_CC);
+	object_properties_init(OBJ_PROP(o), ce);
+#else
 	ALLOC_HASHTABLE(OBJ_PROP(o));
 	zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0);
 	zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+#endif
 
 	ov.handle = putObject(http_requestpool_object, o);
 	ov.handlers = &http_requestpool_object_handlers;
diff --git a/http_send_api.c b/http_send_api.c
index 319c7d6..1082e29 100644
--- a/http_send_api.c
+++ b/http_send_api.c
@@ -34,12 +34,16 @@ static inline void _http_flush(void *nothing, const char *data, size_t data_len
 	/*	we really only need to flush when throttling is enabled,
 		because we push the data as fast as possible anyway if not */
 	if (HTTP_G->send.throttle_delay >= HTTP_DIFFSEC) {
+#if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50399)
+		php_output_end_all(TSRMLS_C);
+#else
 		if (OG(ob_nesting_level)) {
 			php_end_ob_buffer(1, 1 TSRMLS_CC);
 		}
 		if (!OG(implicit_flush)) {
 			sapi_flush(TSRMLS_C);
 		}
+#endif
 		http_sleep(HTTP_G->send.throttle_delay);
 	}
 }
diff --git a/missing.h b/missing.h
index de4f083..252aed9 100644
--- a/missing.h
+++ b/missing.h
@@ -17,6 +17,10 @@
 
 #include "php_version.h"
 
+#if ZEND_MODULE_API_NO >= 20100409
+#define ZEND_ENGINE_2_4
+#endif
+
 #if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50399)
 #	define ZEND_LITERAL_KEY_DC , const zend_literal *_zend_literal_key
 #	define ZEND_LITERAL_KEY_CC , _zend_literal_key