Merge branch 'v2.6.x'

diff --git a/.gitignore b/.gitignore
index 328656c61a95866820f9b69f4b846b30766e2e42..348538c871f9b28e83aab75ed0d0bc888950a349 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@ lcov_data
 *.phar
 !travis/*.phar
 vendor/
+<<<<<<< HEAD
 /php_http_api.h
 /php_http_buffer.h
 /php_http_client.h
@@ -74,3 +75,39 @@ vendor/
 /php_http_utf8.h
 /php_http_version.h
 /tests/helper/server.log
+=======
+tests/helper/server.log
+php_http_api.h
+php_http_buffer.h
+php_http_client.h
+php_http_client_curl.h
+php_http_client_curl_event.h
+php_http_client_curl_user.h
+php_http_client_request.h
+php_http_client_response.h
+php_http_cookie.h
+php_http_curl.h
+php_http_encoding.h
+php_http_env.h
+php_http_env_request.h
+php_http_env_response.h
+php_http_etag.h
+php_http_exception.h
+php_http_filter.h
+php_http_header.h
+php_http_header_parser.h
+php_http_info.h
+php_http_message.h
+php_http_message_body.h
+php_http_message_parser.h
+php_http_misc.h
+php_http_negotiate.h
+php_http_object.h
+php_http_options.h
+php_http_params.h
+php_http_querystring.h
+php_http_response_codes.h
+php_http_url.h
+php_http_utf8.h
+php_http_version.h
+>>>>>>> v2.6.x

diff --git a/package.xml b/package.xml
index 29942ef774afdfda9dcb8801c7b69252734bff57..fe4e1b0280966f59893e51d7864857920835ff27 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -31,9 +31,9 @@ https://mdref.m6w6.name/http
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>
- <date>2016-09-07</date>
+ <date>2016-09-12</date>
  <version>
-  <release>3.1.0beta2</release>
+  <release>3.1.0RC1</release>
   <api>3.1.0</api>
  </version>
  <stability>
@@ -68,6 +68,10 @@ https://mdref.m6w6.name/http
 
 Changes from beta1:
 * Fixed recursive calls to the event loop dispatcher
+
+Changes from beta2:
+* Fix bug #73055: crash in http\QueryString (Mike, @rc0r)
+* Fix HTTP/2 version parser for older libcurl versions (Mike)
 ]]></notes>
  <contents>
   <dir name="/">
@@ -184,6 +188,7 @@ Changes from beta1:
      <file role="test" name="bug69313.phpt"/>
      <file role="test" name="bug69357.phpt"/>
      <file role="test" name="bug71719.phpt"/>
+     <file role="test" name="bug73055.phpt"/>
      <file role="test" name="client001.phpt"/>
      <file role="test" name="client002.phpt"/>
      <file role="test" name="client003.phpt"/>

diff --git a/src/php_http_params.c b/src/php_http_params.c
index 8988f43c65c0cd33dcd9ff7220304c0c4065d7bd..92cc558962af525355cfa0fc32672dd858e8e3a5 100644 (file)
--- a/src/php_http_params.c
+++ b/src/php_http_params.c
@@ -489,7 +489,7 @@ static void merge_param(HashTable *params, zval *zdata, zval **current_param, zv
                        zval *test_ptr;
 
                        while (Z_TYPE_P(zdata_ptr) == IS_ARRAY && (test_ptr = zend_hash_get_current_data(Z_ARRVAL_P(zdata_ptr)))) {
-                               if (Z_TYPE_P(test_ptr) == IS_ARRAY) {
+                               if (Z_TYPE_P(test_ptr) == IS_ARRAY && Z_TYPE_P(ptr) == IS_ARRAY) {
                                        zval *tmp_ptr = ptr;
 
                                        /* now find key in ptr */

diff --git a/tests/bug61444.phpt b/tests/bug61444.phpt
index 5362c714aed0d5d4243a4bfc1f71e9eb1d40945a..fcd26f83ec0349d77283375af47f5c24cb8b30b4 100644 (file)
--- a/tests/bug61444.phpt
+++ b/tests/bug61444.phpt
@@ -1,5 +1,5 @@
 --TEST--
-. become _ in query strings due to php_default_treat_data()
+Bug #61444 (. become _ in query strings due to php_default_treat_data())
 --SKIPIF--
 <?php
 include "skipif.inc";

diff --git a/tests/bug71719.phpt b/tests/bug71719.phpt
index fb0138bbe0a4f8188c6d1dc867642fa5d0478275..5322357665ccb8ec6c6d2896a277db4471386e3f 100644 (file)
--- a/tests/bug71719.phpt
+++ b/tests/bug71719.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Buffer overflow in HTTP url parsing functions
+Bug #71719 (Buffer overflow in HTTP url parsing functions)
 --SKIPIF--
 <?php
 include "skipif.inc";