Merge branch 'master' into phpng

[m6w6/ext-http] / php_http_env_request.c

diff --git a/php_http_env_request.c b/php_http_env_request.c
index 6d1fc583c6a6da84b86a564542bd94278920f9a4..0ee68f464ade730199dc260857d70c221072bc61 100644 (file)
--- a/php_http_env_request.c
+++ b/php_http_env_request.c
@@ -166,13 +166,14 @@ static PHP_METHOD(HttpEnvRequest, __construct)
                zval *this_ptr = getThis(); \
                zval qs_tmp, *qs = zend_read_property(Z_OBJCE_P(this_ptr), this_ptr, ZEND_STRL(prop), 0, &qs_tmp); \
                 \
+               ZVAL_NULL(&rv); \
                array_init(&mn); \
                Z_TRY_ADDREF_P(qs); \
                add_next_index_zval(&mn, qs); \
                add_next_index_stringl(&mn, ZEND_STRL("get")); \
                zend_fcall_info_init(&mn, 0, &fci, &fcc, NULL, NULL); \
                zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args); \
-               zend_fcall_info_argp(&fci TSRMLS_CC, ZEND_NUM_ARGS(), args); \
+               zend_fcall_info_argp(&fci, ZEND_NUM_ARGS(), args); \
                zend_fcall_info_call(&fci, &fcc, &rv, NULL); \
                zend_fcall_info_args_clear(&fci, 1); \
                efree(args); \
@@ -192,7 +193,7 @@ static PHP_METHOD(HttpEnvRequest, getForm)
                call_querystring_get("form");
        } else {
                zval zform_tmp, *zform = zend_read_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("form"), 0, &zform_tmp);
-               RETURN_ZVAL_FAST(zform);
+               RETURN_ZVAL(zform, 1, 0);
        }
 }
 
@@ -208,7 +209,7 @@ static PHP_METHOD(HttpEnvRequest, getQuery)
                call_querystring_get("query");
        } else {
                zval zquery_tmp, *zquery = zend_read_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("query"), 0, &zquery_tmp);
-               RETURN_ZVAL_FAST(zquery);
+               RETURN_ZVAL(zquery, 1, 0);
        }
 }
 
@@ -224,7 +225,7 @@ static PHP_METHOD(HttpEnvRequest, getCookie)
                call_querystring_get("cookie");
        } else {
                zval zcookie_tmp, *zcookie = zend_read_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("cookie"), 0, &zcookie_tmp);
-               RETURN_ZVAL_FAST(zcookie);
+               RETURN_ZVAL(zcookie, 1, 0);
        }
 }
 
@@ -234,7 +235,7 @@ static PHP_METHOD(HttpEnvRequest, getFiles)
 {
        if (SUCCESS == zend_parse_parameters_none()) {
                zval zfiles_tmp, *zfiles = zend_read_property(php_http_env_request_class_entry, getThis(), ZEND_STRL("files"), 0, &zfiles_tmp);
-               RETURN_ZVAL_FAST(zfiles);
+               RETURN_ZVAL(zfiles, 1, 0);
        }
 }