projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
270b6b6
)
fix _GET reference for any 7.x
author
Michael Wallner
<mike@php.net>
Thu, 28 Feb 2019 17:08:50 +0000
(18:08 +0100)
committer
Michael Wallner
<mike@php.net>
Thu, 28 Feb 2019 17:08:50 +0000
(18:08 +0100)
src/php_http_querystring.c
patch
|
blob
|
history
diff --git
a/src/php_http_querystring.c
b/src/php_http_querystring.c
index c15b2dda187e2d2f2b8739b892e265e71cfd1fa1..63125da627fcbc5fe0cc7a114eb3127fccab1f0b 100644
(file)
--- a/
src/php_http_querystring.c
+++ b/
src/php_http_querystring.c
@@
-378,6
+378,7
@@
PHP_METHOD(HttpQueryString, getGlobalInstance)
if (Z_TYPE_P(instance) == IS_OBJECT) {
RETVAL_ZVAL(instance, 1, 0);
} else if ((_GET = php_http_env_get_superglobal(ZEND_STRL("_GET")))) {
if (Z_TYPE_P(instance) == IS_OBJECT) {
RETVAL_ZVAL(instance, 1, 0);
} else if ((_GET = php_http_env_get_superglobal(ZEND_STRL("_GET")))) {
+#if PHP_VERSION_ID >= 70200
zval tmp, *qa;
ZVAL_OBJ(return_value, php_http_querystring_object_new(php_http_querystring_class_entry));
zval tmp, *qa;
ZVAL_OBJ(return_value, php_http_querystring_object_new(php_http_querystring_class_entry));
@@
-386,6
+387,12
@@
PHP_METHOD(HttpQueryString, getGlobalInstance)
qa = Z_OBJ_HT_P(return_value)->get_property_ptr_ptr(return_value, &tmp, BP_VAR_RW, NULL);
ZVAL_NEW_REF(qa, _GET);
zval_ptr_dtor(&tmp);
qa = Z_OBJ_HT_P(return_value)->get_property_ptr_ptr(return_value, &tmp, BP_VAR_RW, NULL);
ZVAL_NEW_REF(qa, _GET);
zval_ptr_dtor(&tmp);
+#else
+ ZVAL_OBJ(return_value, php_http_querystring_object_new(php_http_querystring_class_entry));
+
+ ZVAL_MAKE_REF(_GET);
+ zend_update_property(php_http_querystring_class_entry, return_value, ZEND_STRL("queryArray"), _GET);
+#endif
zend_update_static_property(php_http_querystring_class_entry, ZEND_STRL("instance"), return_value);
} else {
zend_update_static_property(php_http_querystring_class_entry, ZEND_STRL("instance"), return_value);
} else {