Merge branch 'master' of git.php.net:/pecl/http/pecl_http

* 'master' of git.php.net:/pecl/http/pecl_http:
  release 2.4.0
  it is always bad to rely on external things
  back to dev
  release 2.3.2
  fis querystring offset set bug
  fis querystring offset set bug
  this test requires online

diff --git a/package.xml b/package.xml
index 40a72274f9f2a9232a3451681c4386aca2266690..bdf3b890296613e60b1cc3af2d91ee03663a8ca1 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -35,18 +35,18 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>
- <date>2015-03-01</date>
+ <date>2015-03-18</date>
  <version>
-  <release>2.4.0dev</release>
+  <release>2.4.0</release>
   <api>2.4.0</api>
  </version>
  <stability>
-  <release>beta</release>
-  <api>beta</api>
+  <release>stable</release>
+  <api>stable</api>
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
-*
+* Split off pecl/apfd and pecl/json_post
 ]]></notes>
  <contents>
   <dir name="/">

diff --git a/php_http.h b/php_http.h
index baacd4b61945060475dd90e7634b3635ea18f8cb..02326fb64828d520000fc5bbe4cc81dbc1a9926f 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -13,7 +13,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_PECL_HTTP_VERSION "2.4.0dev"
+#define PHP_PECL_HTTP_VERSION "2.4.0"
 
 extern zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry

diff --git a/php_http_querystring.c b/php_http_querystring.c
index 15a000b8cd434859810757d1ab3db53734679080..d2657484668ade531a876860c51354707e06a99e 100644 (file)
--- a/php_http_querystring.c
+++ b/php_http_querystring.c
@@ -606,11 +606,19 @@ PHP_METHOD(HttpQueryString, offsetSet)
                return;
        }
 
-       MAKE_STD_ZVAL(param);
-       array_init(param);
-       Z_ADDREF_P(value);
-       add_assoc_zval_ex(param, offset_str, offset_len + 1, value);
-       php_http_querystring_set(getThis(), param, 0 TSRMLS_CC);
+       param = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0 TSRMLS_CC);
+
+       if (Z_TYPE_P(param) == IS_ARRAY && zend_symtable_exists(Z_ARRVAL_P(param), offset_str, offset_len + 1)) {
+               Z_ADDREF_P(value);
+               zend_symtable_update(Z_ARRVAL_P(param), offset_str, offset_len + 1, (void *) &value, sizeof(zval *), NULL);
+               Z_ADDREF_P(param);
+       } else {
+               MAKE_STD_ZVAL(param);
+               array_init(param);
+               Z_ADDREF_P(value);
+               add_assoc_zval_ex(param, offset_str, offset_len + 1, value);
+       }
+       php_http_querystring_set(getThis(), param, QS_MERGE TSRMLS_CC);
        zval_ptr_dtor(&param);
 }
 

diff --git a/tests/bug66388.phpt b/tests/bug66388.phpt
index 9f9c95e9ed1aa723fe3b41c717e0850b9715f10c..e4cbf2ace925966ab1964cfdc92cf1a0b4167148 100644 (file)
--- a/tests/bug66388.phpt
+++ b/tests/bug66388.phpt
@@ -27,7 +27,7 @@ echo $client->send()->getResponse()->getResponseCode();
 ?>
 
 ===DONE===
---EXPECT--
+--EXPECTF--
 Test
-401
+40%d
 ===DONE===

diff --git a/tests/querystring003.phpt b/tests/querystring003.phpt
new file mode 100644 (file)
index 0000000..a504174
--- /dev/null
+++ b/tests/querystring003.phpt
@@ -0,0 +1,22 @@
+--TEST--
+querystring offset set
+--SKIPIF--
+<?php
+include "skipif.inc";
+?>
+--FILE--
+<?php
+
+echo "Test\n";
+
+$qs = new http\QueryString("foo=bar&bar=baz");
+echo $qs,"\n";
+$qs["foo"] = "baz";
+echo $qs,"\n";
+?>
+===DONE===
+--EXPECT--
+Test
+foo=bar&bar=baz
+foo=baz&bar=baz
+===DONE===