branch off v1 as R_1_7

[m6w6/ext-http] / http_querystring_object.c

diff --git a/http_querystring_object.c b/http_querystring_object.c
index d30cc1bf256b7368d3f6bb1913bde074562b0252..4c82edabcff853fb0dfa9fe14886c9e0991b662f 100644 (file)
--- a/http_querystring_object.c
+++ b/http_querystring_object.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2007, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -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(o, ce TSRMLS_CC);
+       object_properties_init(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;
@@ -247,8 +252,13 @@ static inline zval *_http_querystring_instantiate(zval *this_ptr, zend_bool glob
                        
                        zend_update_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, qarray TSRMLS_CC);
                        zend_update_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, qstring TSRMLS_CC);
+#ifdef Z_SET_ISREF
+                       Z_SET_ISREF_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC));
+                       Z_SET_ISREF_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC));
+#else
                        zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC)->is_ref = 1;
                        zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC)->is_ref = 1;
+#endif
        
                        if (params) {
                                http_querystring_modify(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC), params);
@@ -258,7 +268,7 @@ static inline zval *_http_querystring_instantiate(zval *this_ptr, zend_bool glob
                        }
                }
        } else {
-               qarray = ecalloc(1, sizeof(zval));
+               MAKE_STD_ZVAL(qarray);
                array_init(qarray);
                
                zend_update_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, qarray TSRMLS_CC);
@@ -267,6 +277,8 @@ static inline zval *_http_querystring_instantiate(zval *this_ptr, zend_bool glob
                if (params && http_querystring_modify(qarray, params) && !defer_update) {
                        http_querystring_update(qarray, zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC));
                }
+               
+               zval_ptr_dtor(&qarray);
        }
        
        return this_ptr;
@@ -278,10 +290,11 @@ static inline void _http_querystring_get(zval *this_ptr, int type, char *name, u
        zval **arrval, *qarray = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC);
                
        if ((Z_TYPE_P(qarray) == IS_ARRAY) && (SUCCESS == zend_hash_find(Z_ARRVAL_P(qarray), name, name_len + 1, (void *) &arrval))) {
-               RETVAL_ZVAL(*arrval, 1, 0);
-               
                if (type) {
-                       convert_to_type(type, return_value);
+                       zval *value = http_zsep(type, *arrval);
+                       RETVAL_ZVAL(value, 1, 1);
+               } else {
+                       RETVAL_ZVAL(*arrval, 1, 0);
                }
                        
                if (del && (SUCCESS == zend_hash_del(Z_ARRVAL_P(qarray), name, name_len + 1))) {
@@ -434,7 +447,7 @@ PHP_METHOD(HttpQueryString, mod)
 PHP_METHOD(HttpQueryString, singleton)
 {
        zend_bool global = 1;
-       zval *instance = *zend_std_get_static_property(THIS_CE, ZEND_STRS("instance")-1, 0 TSRMLS_CC);
+       zval *instance = *zend_std_get_static_property(THIS_CE, ZEND_STRS("instance")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC);
        
        SET_EH_THROW_HTTP();
        if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &global)) {