From: Michael Wallner Date: Wed, 9 Jun 2010 06:23:16 +0000 (+0000) Subject: * revert incomplete trunk-compatibility-patch X-Git-Tag: RELEASE_1_7_0~3 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=b230a80858b1ede9ed3f9c89fca205d71bb11582;p=m6w6%2Fext-http * revert incomplete trunk-compatibility-patch --- diff --git a/http_api.c b/http_api.c index aebd434..aca90e6 100644 --- a/http_api.c +++ b/http_api.c @@ -253,15 +253,9 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header return FAILURE; } -#if PHP_VERSION_ID < 50399 if (!OG(ob_lock)) { php_end_ob_buffers(0 TSRMLS_CC); } -#else - if (php_output_get_status(TSRMLS_C) & PHP_OUTPUT_LOCKED) { - php_output_end_all(TSRMLS_C); - } -#endif 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 f30cc6a..c3c8045 100644 --- a/http_deflatestream_object.c +++ b/http_deflatestream_object.c @@ -107,13 +107,9 @@ zend_object_value _http_deflatestream_object_new_ex(zend_class_entry *ce, http_e o->stream = s; } -#if PHP_VERSION_ID < 50399 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 *)); -#else - object_properties_init(&o->zo, ce); -#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 18ca266..53e5571 100644 --- a/http_inflatestream_object.c +++ b/http_inflatestream_object.c @@ -96,13 +96,9 @@ zend_object_value _http_inflatestream_object_new_ex(zend_class_entry *ce, http_e o->stream = s; } -#if PHP_VERSION_ID < 50399 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 *)); -#else - object_properties_init(&o->zo, ce); -#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 3129193..a5b2ca8 100644 --- a/http_message_object.c +++ b/http_message_object.c @@ -513,14 +513,9 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message } } -#if PHP_VERSION_ID < 50399 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 *)); -#else - zend_object_std_init(&o->zo, ce TSRMLS_CC); - object_properties_init(&o->zo, ce); -#endif ov.handle = putObject(http_message_object, o); ov.handlers = &http_message_object_handlers; @@ -579,24 +574,11 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type { getObjectEx(http_message_object, obj, object); http_message_object_prophandler *handler; - zval *return_value, *tmp_member = NULL; - - if (Z_TYPE_P(member) != IS_STRING) { - ALLOC_ZVAL(tmp_member); - MAKE_COPY_ZVAL(&member, tmp_member); - convert_to_string(tmp_member); - member = tmp_member; -#if PHP_VERSION_ID >= 50399 - _zend_literal_key = NULL; -#endif - } + zval *return_value; if (SUCCESS == http_message_object_get_prophandler(Z_STRVAL_P(member), Z_STRLEN_P(member), &handler)) { if (type == BP_VAR_W) { zend_error(E_ERROR, "Cannot access HttpMessage properties by reference or array key/index"); - if (tmp_member) { - zval_ptr_dtor(&tmp_member); - } return NULL; } @@ -615,9 +597,6 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type return_value = zend_get_std_object_handlers()->read_property(object, member, type ZEND_LITERAL_KEY_CC TSRMLS_CC); } - if (tmp_member) { - zval_ptr_dtor(&tmp_member); - } return return_value; } @@ -625,26 +604,12 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va { getObjectEx(http_message_object, obj, object); http_message_object_prophandler *handler; - zval *tmp_member = NULL; - - if (Z_TYPE_P(member) != IS_STRING) { - ALLOC_ZVAL(tmp_member); - MAKE_COPY_ZVAL(&member, tmp_member); - convert_to_string(tmp_member); - member = tmp_member; -#if PHP_VERSION_ID >= 50399 - _zend_literal_key = NULL; -#endif - } if (SUCCESS == http_message_object_get_prophandler(Z_STRVAL_P(member), Z_STRLEN_P(member), &handler)) { handler->write(obj, value TSRMLS_CC); } else { zend_get_std_object_handlers()->write_property(object, member, value ZEND_LITERAL_KEY_CC TSRMLS_CC); } - if (tmp_member) { - zval_ptr_dtor(&tmp_member); - } } static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) @@ -652,11 +617,7 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) zval *headers; getObjectEx(http_message_object, obj, object); http_message *msg = obj->message; -#if PHP_VERSION_ID < 50399 HashTable *props = OBJ_PROP(obj); -#else - HashTable *props = zend_std_get_properties(object TSRMLS_CC); -#endif zval array, *parent; INIT_ZARR(array, props); diff --git a/http_querystring_object.c b/http_querystring_object.c index 88d4c83..0e7b2ac 100644 --- a/http_querystring_object.c +++ b/http_querystring_object.c @@ -191,13 +191,9 @@ zend_object_value _http_querystring_object_new_ex(zend_class_entry *ce, void *no *ptr = o; } -#if PHP_VERSION_ID < 50399 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 *)); -#else - object_properties_init(&o->zo, ce); -#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 f06157a..8ea09b0 100644 --- a/http_request_object.c +++ b/http_request_object.c @@ -492,13 +492,9 @@ zend_object_value _http_request_object_new_ex(zend_class_entry *ce, CURL *ch, ht *ptr = o; } -#if PHP_VERSION_ID < 50399 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 *)); -#else - object_properties_init(&o->zo, ce); -#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 0604935..8eacef8 100644 --- a/http_requestdatashare_object.c +++ b/http_requestdatashare_object.c @@ -125,13 +125,9 @@ zend_object_value _http_requestdatashare_object_new_ex(zend_class_entry *ce, htt *ptr = o; } -#if PHP_VERSION_ID < 50399 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 *)); -#else - object_properties_init(&o->zo, ce); -#endif ov.handle = putObject(http_requestdatashare_object, o); ov.handlers = &http_requestdatashare_object_handlers; @@ -151,13 +147,7 @@ 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 && -#if PHP_VERSION_ID < 50399 - zend_hash_exists(&THIS_CE->default_properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1) -#else - zend_get_property_info(THIS_CE, member, 1 TSRMLS_CC) -#endif - ) { + if (type == BP_VAR_W && zend_hash_exists(&THIS_CE->default_properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1)) { zend_error(E_ERROR, "Cannot access HttpRequestDataShare default properties by reference or array key/index"); return NULL; } @@ -167,11 +157,7 @@ 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 PHP_VERSION_ID < 50399 if (zend_hash_exists(&THIS_CE->default_properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1)) { -#else - if (zend_get_property_info(THIS_CE, member, 1 TSRMLS_CC)) { -#endif int status; getObjectEx(http_requestdatashare_object, obj, object); diff --git a/http_requestpool_object.c b/http_requestpool_object.c index 43941bb..653843a 100644 --- a/http_requestpool_object.c +++ b/http_requestpool_object.c @@ -129,13 +129,9 @@ zend_object_value _http_requestpool_object_new(zend_class_entry *ce TSRMLS_DC) http_request_pool_init(&o->pool); -#if PHP_VERSION_ID < 50399 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 *)); -#else - object_properties_init(&o->zo, ce); -#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 d8bc1a0..319c7d6 100644 --- a/http_send_api.c +++ b/http_send_api.c @@ -34,24 +34,12 @@ 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 PHP_VERSION_ID < 50399 if (OG(ob_nesting_level)) { php_end_ob_buffer(1, 1 TSRMLS_CC); } if (!OG(implicit_flush)) { sapi_flush(TSRMLS_C); } -#else - int ob_level; - - if ((php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_GET_LEVEL, &ob_level TSRMLS_CC) == SUCCESS) && ob_level > 0) { - php_output_discard(TSRMLS_C); - } - - if (php_output_get_status(TSRMLS_C) & PHP_OUTPUT_IMPLICITFLUSH) { - sapi_flush(TSRMLS_C); - } -#endif http_sleep(HTTP_G->send.throttle_delay); } } diff --git a/php_http_std_defs.h b/php_http_std_defs.h index 0c5a9e5..456ae74 100644 --- a/php_http_std_defs.h +++ b/php_http_std_defs.h @@ -58,13 +58,6 @@ typedef int STATUS; Z_ARRVAL(zv) = (ht); \ } -#ifndef MAKE_COPY_ZVAL -# define MAKE_COPY_ZVAL(ppzv, pzv) \ - *(pzv) = **(ppzv); \ - zval_copy_ctor((pzv)); \ - INIT_PZVAL((pzv)); -#endif - /* return bool (v == SUCCESS) */ #define RETVAL_SUCCESS(v) RETVAL_BOOL(SUCCESS == (v)) #define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v)) @@ -189,9 +182,25 @@ typedef int STATUS; # define getObject(t, o) getObjectEx(t, o, getThis()) # define getObjectEx(t, o, v) t * o = ((t *) zend_object_store_get_object(v TSRMLS_CC)) # define putObject(t, o) zend_objects_store_put(o, (zend_objects_store_dtor_t) zend_objects_destroy_object, (zend_objects_free_object_storage_t) _ ##t## _free, NULL TSRMLS_CC); -# define freeObject(o) \ - zend_object_std_dtor(&o->zo TSRMLS_CC); \ +# ifndef WONKY +# define freeObject(o) \ + if (OBJ_GUARDS(o)) { \ + zend_hash_destroy(OBJ_GUARDS(o)); \ + FREE_HASHTABLE(OBJ_GUARDS(o)); \ + } \ + if (OBJ_PROP(o)) { \ + zend_hash_destroy(OBJ_PROP(o)); \ + FREE_HASHTABLE(OBJ_PROP(o)); \ + } \ + efree(o); +# else +# define freeObject(o) \ + if (OBJ_PROP(o)) { \ + zend_hash_destroy(OBJ_PROP(o)); \ + FREE_HASHTABLE(OBJ_PROP(o)); \ + } \ efree(o); +# endif # define OBJ_PROP(o) (o)->zo.properties # define OBJ_GUARDS(o) (o)->zo.guards