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 355c692b65181d76fd330bd1c6e04d101b7e5714..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); \