- bloody workaround for internal class' static properties

- fix HttpRequest_002.phpt

diff --git a/http.c b/http.c
index dfac09e70e166f66b6274947895d4c4ddd0e86a6..2ecaa58edb9e6fa1724066aaae02506c50d8f37a 100644 (file)
--- a/http.c
+++ b/http.c
@@ -219,6 +219,8 @@ PHP_MINIT_FUNCTION(http)
        http_exception_object_init();
 #endif /* ZEND_ENGINE_2 */
 
+       zend_hash_init_ex(&http_response_statics, 0, NULL, ZVAL_INTERNAL_PTR_DTOR, 1, 0);
+       zend_fix_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC);
        return SUCCESS;
 }
 /* }}} */
@@ -226,6 +228,7 @@ PHP_MINIT_FUNCTION(http)
 /* {{{ PHP_MSHUTDOWN_FUNCTION */
 PHP_MSHUTDOWN_FUNCTION(http)
 {
+       zend_hash_destroy(&http_response_statics);
        UNREGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
        curl_global_cleanup();
@@ -244,6 +247,7 @@ PHP_RINIT_FUNCTION(http)
        }
 
        http_globals_init(HTTP_GLOBALS);
+       zend_init_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC);
        return SUCCESS;
 }
 /* }}} */
@@ -251,6 +255,7 @@ PHP_RINIT_FUNCTION(http)
 /* {{{ PHP_RSHUTDOWN_FUNCTION */
 PHP_RSHUTDOWN_FUNCTION(http)
 {
+       zend_clean_static_properties(http_response_object_ce TSRMLS_CC);
        http_globals_free(HTTP_GLOBALS);
        return SUCCESS;
 }

diff --git a/http_response_object.c b/http_response_object.c
index 77fe123d94d918b7ed395de4040f2c8d43206c46..f4528f828252390421b0d64f83ba2cf1a9079c4d 100644 (file)
--- a/http_response_object.c
+++ b/http_response_object.c
@@ -140,6 +140,8 @@ 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[] = {
 

diff --git a/missing.c b/missing.c
index 99ec620c095c4b6877046e3b511a6a1129c0d9d6..3390c75d0de18a55c495bf7eab49de6226778a4c 100644 (file)
--- a/missing.c
+++ b/missing.c
@@ -18,16 +18,11 @@
 #include "php.h"
 #include "missing.h"
 
-#ifdef ZEND_ENGINE_2
+#if PHP_MAJOR_VERSION == 5
 
-static inline zval *new_zval(zend_class_entry *ce)
+static inline zval *new_zval(int persistent)
 {
-       zval *z;
-       if (ce->type & ZEND_INTERNAL_CLASS) {
-               z = malloc(sizeof(zval));
-       } else {
-               ALLOC_ZVAL(z);
-       }
+       zval *z = pemalloc(sizeof(zval), persistent);
        INIT_PZVAL(z);
        return z;
 }
@@ -41,12 +36,18 @@ static inline zval *tmp_zval(void)
        return z;
 }
 
+static void dup_zval(zval **z)
+{
+       zval_add_ref(z);
+       SEPARATE_ZVAL(z);
+}
+
 
-#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION == 0)
+#      if PHP_MINOR_VERSION == 0
 
 int zend_declare_property_double(zend_class_entry *ce, char *name, int name_length, double value, int access_type TSRMLS_DC)
 {
-       zval *property = new_zval(ce);
+       zval *property = new_zval(ce->type & ZEND_INTERNAL_CLASS);
        ZVAL_DOUBLE(property, value);
        return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC);
 }
@@ -60,7 +61,7 @@ void zend_update_property_double(zend_class_entry *scope, zval *object, char *na
 
 int zend_declare_property_bool(zend_class_entry *ce, char *name, int name_length, long value, int access_type TSRMLS_DC)
 {
-       zval *property = new_zval(ce);
+       zval *property = new_zval(ce->type & ZEND_INTERNAL_CLASS);
        ZVAL_BOOL(property, value);
        return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC);
 }
@@ -72,9 +73,7 @@ void zend_update_property_bool(zend_class_entry *scope, zval *object, char *name
        zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC);
 }
 
-#endif /* PHP_VERSION == 5.0 */
-
-#if (PHP_MAJOR_VERSION >= 5)
+#      endif /* PHP_MINOR_VERSION == 0 */
 
 int zend_declare_class_constant(zend_class_entry *ce, char *name, size_t name_length, zval *value TSRMLS_DC)
 {
@@ -83,21 +82,21 @@ int zend_declare_class_constant(zend_class_entry *ce, char *name, size_t name_le
 
 int zend_declare_class_constant_long(zend_class_entry *ce, char *name, size_t name_length, long value TSRMLS_DC)
 {
-       zval *constant = new_zval(ce);
+       zval *constant = new_zval(ce->type & ZEND_INTERNAL_CLASS);
        ZVAL_LONG(constant, value);
        return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC);
 }
 
 int zend_declare_class_constant_bool(zend_class_entry *ce, char *name, size_t name_length, zend_bool value TSRMLS_DC)
 {
-       zval *constant = new_zval(ce);
+       zval *constant = new_zval(ce->type & ZEND_INTERNAL_CLASS);
        ZVAL_BOOL(constant, value);
        return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC);
 }
 
 int zend_declare_class_constant_double(zend_class_entry *ce, char *name, size_t name_length, double value TSRMLS_DC)
 {
-       zval *constant = new_zval(ce);
+       zval *constant = new_zval(ce->type & ZEND_INTERNAL_CLASS);
        ZVAL_DOUBLE(constant, value);
        return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC);
 }
@@ -109,7 +108,7 @@ int zend_declare_class_constant_string(zend_class_entry *ce, char *name, size_t
 
 int zend_declare_class_constant_stringl(zend_class_entry *ce, char *name, size_t name_length, char *value, size_t value_length TSRMLS_DC)
 {
-       zval *constant = new_zval(ce);
+       zval *constant = new_zval(ce->type & ZEND_INTERNAL_CLASS);
        if (ce->type & ZEND_INTERNAL_CLASS) {
                ZVAL_STRINGL(constant, zend_strndup(value, value_length), value_length, 0);
        } else {
@@ -118,7 +117,6 @@ int zend_declare_class_constant_stringl(zend_class_entry *ce, char *name, size_t
        return zend_declare_class_constant(ce, name, name_length, constant TSRMLS_CC);
 }
 
-
 int zend_update_static_property(zend_class_entry *scope, char *name, size_t name_len, zval *value TSRMLS_DC)
 {
        int retval;
@@ -127,6 +125,44 @@ int zend_update_static_property(zend_class_entry *scope, char *name, size_t name
        
        EG(scope) = scope;
        
+       if (!(property = zend_std_get_static_property(scope, name, name_len, 0 TSRMLS_CC))) {
+               retval = FAILURE;
+       } else if (*property == value) {
+               retval = SUCCESS;
+       } else {
+               if (PZVAL_IS_REF(*property)) {
+                       zval_dtor(*property);
+                       (*property)->type = value->type;
+                       (*property)->value = value->value;
+                       
+                       if (value->refcount) {
+                               zval_copy_ctor(*property);
+                       }
+               } else {
+                       **property = *value;
+                       zval_copy_ctor(*property);
+               }
+               retval = SUCCESS;
+       }
+       
+       if (!value->refcount) {
+               zval_dtor(value);
+               FREE_ZVAL(value);
+       }
+       
+       EG(scope) = old_scope;
+       
+       return retval;
+}
+
+int trash(zend_class_entry *scope, char *name, size_t name_len, zval *value TSRMLS_DC)
+{
+       int retval;
+       zval **property = NULL;
+       zend_class_entry *old_scope = EG(scope);
+       
+       EG(scope) = scope;
+       
        if (!(property = zend_std_get_static_property(scope, name, name_len, 0 TSRMLS_CC))) {
                retval = FAILURE;
        } else if (*property == value) {
@@ -274,8 +310,24 @@ int zend_update_static_property_stringl(zend_class_entry *scope, char *name, siz
        return zend_update_static_property(scope, name, name_len, tmp TSRMLS_CC);
 }
 
-#endif /* PHP_MAJOR_VERSION >= 5 */
-#endif /* ZEND_ENGINE_2 */
+void zend_fix_static_properties(zend_class_entry *ce, HashTable *static_members TSRMLS_DC)
+{
+       zend_hash_copy(static_members, ce->static_members, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+       zend_hash_destroy(ce->static_members);
+       zend_hash_init_ex(ce->static_members, 0, NULL, ZVAL_PTR_DTOR, 1, 0);
+}
+
+void zend_init_static_properties(zend_class_entry *ce, HashTable *static_members TSRMLS_DC)
+{
+       zend_hash_copy(ce->static_members, static_members, (copy_ctor_func_t) dup_zval, NULL, sizeof(zval *));
+}
+
+void zend_clean_static_properties(zend_class_entry *ce TSRMLS_DC)
+{
+       zend_hash_clean(ce->static_members);
+}
+
+#endif /* PHP_MAJOR_VERSION == 5 */
 
 /*
  * Local variables:

diff --git a/missing.h b/missing.h
index 028767a098d31f3e89ee71419e18fe5611102feb..519fbfc8745329554f32064709bc23660623f7dd 100644 (file)
--- a/missing.h
+++ b/missing.h
@@ -20,17 +20,15 @@
 
 #include "php_version.h"
 
-#ifdef ZEND_ENGINE_2
-
-#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION == 0)
+#if (PHP_MAJOR_VERSION == 5) 
+#      if (PHP_MINOR_VERSION == 0)
 extern int zend_declare_property_double(zend_class_entry *ce, char *name, int name_length, double value, int access_type TSRMLS_DC);
 extern void zend_update_property_double(zend_class_entry *scope, zval *object, char *name, int name_length, double value TSRMLS_DC);
 
 extern int zend_declare_property_bool(zend_class_entry *ce, char *name, int name_length, long value, int access_type TSRMLS_DC);
 extern void zend_update_property_bool(zend_class_entry *scope, zval *object, char *name, int name_length, long value TSRMLS_DC);
-#endif
+#      endif
 
-#if (PHP_MAJOR_VERSION >= 5)
 extern int zend_declare_class_constant(zend_class_entry *ce, char *name, size_t name_length, zval *value TSRMLS_DC);
 extern int zend_declare_class_constant_null(zend_class_entry *ce, char *name, size_t name_length TSRMLS_DC);
 extern int zend_declare_class_constant_long(zend_class_entry *ce, char *name, size_t name_length, long value TSRMLS_DC);
@@ -38,7 +36,6 @@ extern int zend_declare_class_constant_bool(zend_class_entry *ce, char *name, si
 extern int zend_declare_class_constant_double(zend_class_entry *ce, char *name, size_t name_length, double value TSRMLS_DC);
 extern int zend_declare_class_constant_string(zend_class_entry *ce, char *name, size_t name_length, char *value TSRMLS_DC);
 extern int zend_declare_class_constant_stringl(zend_class_entry *ce, char *name, size_t name_length, char *value, size_t value_length TSRMLS_DC);
-#endif
 
 extern int zend_update_static_property(zend_class_entry *scope, char *name, size_t name_len, zval *value TSRMLS_DC);
 extern int zend_update_static_property_bool(zend_class_entry *scope, char *name, size_t name_len, zend_bool value TSRMLS_DC);
@@ -47,6 +44,10 @@ extern int zend_update_static_property_double(zend_class_entry *scope, char *nam
 extern int zend_update_static_property_string(zend_class_entry *scope, char *name, size_t name_len, char *value TSRMLS_DC);
 extern int zend_update_static_property_stringl(zend_class_entry *scope, char *name, size_t name_len, char *value, size_t value_len TSRMLS_DC);
 
+extern void zend_fix_static_properties(zend_class_entry *ce, HashTable *static_members TSRMLS_DC);
+extern void zend_init_static_properties(zend_class_entry *ce, HashTable *static_members TSRMLS_DC);
+extern void zend_clean_static_properties(zend_class_entry *ce TSRMLS_DC);
+
 #endif
 #endif
 

diff --git a/php_http_response_object.h b/php_http_response_object.h
index fbc15276a3cc373354281988882ab95d6484e24e..70b8783b694adbeaf04e83c9f6a9e01a7fccd2aa 100644 (file)
--- a/php_http_response_object.h
+++ b/php_http_response_object.h
@@ -19,6 +19,8 @@
 #define PHP_HTTP_RESPONSE_OBJECT_H
 #ifdef ZEND_ENGINE_2
 
+extern HashTable http_response_statics;
+
 extern zend_class_entry *http_response_object_ce;
 extern zend_function_entry http_response_object_fe[];
 

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index 00673eb338f58585871cae1983fa5586c1dabd3e..fac59a3c3203ca745aeb09e31f5188f1b08371c3 100644 (file)
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -362,7 +362,7 @@ typedef int STATUS;
 
 #ifndef TSRMLS_SET_CTX
 #      ifdef ZTS
-#              define TSRMLS_SET_CTX(ctx)      (void ***) ctx = tsrm_ls
+#              define TSRMLS_SET_CTX(ctx)      ctx = (void ***) tsrm_ls
 #      else
 #              define TSRMLS_SET_CTX(ctx)
 #      endif

diff --git a/tests/HttpRequest_002.phpt b/tests/HttpRequest_002.phpt
index f6f0f7439e6f5797d1fb5a7742152e2577e93c92..349f1faf38c752e4970fda9c31e7748dfa4493c6 100644 (file)
--- a/tests/HttpRequest_002.phpt
+++ b/tests/HttpRequest_002.phpt
@@ -11,7 +11,7 @@ checkurl('www.google.com');
 <?php
 echo "-TEST\n";
 $r = new HttpRequest('http://www.google.com', HTTP_GET);
-var_dump($r->send());
+$r->send();
 print_r($r->getResponseInfo());
 $r->setMethod(HTTP_POST);
 $r->addPostFields(array('q'=>'foobar','start'=>10));
@@ -22,7 +22,6 @@ var_dump(false != strstr($r->getResponseBody(), "Not Implemented"));
 ?>
 --EXPECTF--
 %sTEST
-bool(true)
 Array
 (
     [effective_url] => http://www.google.com/