X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_querystring.c;h=63125da627fcbc5fe0cc7a114eb3127fccab1f0b;hp=f3d1f1d7100c6287d032b74f178a781bdea680fa;hb=0b72352b1621d00979bc035d6cddfa6aba5a0e0e;hpb=a8b478a15ba6febd3f50b31f8763772ca9327f18

diff --git a/src/php_http_querystring.c b/src/php_http_querystring.c
index f3d1f1d..63125da 100644
--- a/src/php_http_querystring.c
+++ b/src/php_http_querystring.c
@@ -370,21 +370,31 @@ ZEND_END_ARG_INFO();
 PHP_METHOD(HttpQueryString, getGlobalInstance)
 {
 	zval *instance, *_GET;
-	zend_string *zs;
 
 	php_http_expect(SUCCESS == zend_parse_parameters_none(), invalid_arg, return);
 
-	zs = zend_string_init(ZEND_STRL("instance"), 0);
-	instance = zend_std_get_static_property(php_http_querystring_class_entry, zs, 0);
-	zend_string_release(zs);
+	instance = zend_read_static_property(php_http_querystring_class_entry, ZEND_STRL("instance"), 0);
 
 	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_STRING(&tmp, "queryArray");
+		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 {
 		php_http_throw(unexpected_val, "Could not acquire reference to superglobal GET array");
 	}