Merge branch 'v2.6.x'

diff --cc package.xml
index 60a8e35981d5011eedd40f7ef87eb8a1a9953560,352bf4799914eb8466b828c9c9d60e44809f668f..e104c7ebfc599fbd073a995a959a13849331cc85
--- 1/package.xml
--- 2/package.xml
+++ b/package.xml
@@@ -33,8 -33,8 +33,8 @@@ https://mdref.m6w6.name/htt
   </lead>
   <date>2016-08-22</date>
   <version>
-   <release>3.1.0beta1</release>
 -  <release>2.6.0beta2</release>
 -  <api>2.6.0</api>
++  <release>3.1.0beta2</release>
 +  <api>3.1.0</api>
   </version>
   <stability>
    <release>beta</release>

diff --cc php_http.h
index 6a9f01bf7176e0c230b67d294452447a079c89b9,eb022ef2c776f8288766d21e214294d8bafd9d79..21510238f637271736f8e1e80ee44d04576928a8
--- 1/php_http.h
--- 2/php_http.h
+++ b/php_http.h
@@@ -13,7 -13,7 +13,7 @@@
  #ifndef PHP_EXT_HTTP_H
  #define PHP_EXT_HTTP_H
  
- #define PHP_PECL_HTTP_VERSION "3.1.0beta1"
 -#define PHP_PECL_HTTP_VERSION "2.6.0beta2"
++#define PHP_PECL_HTTP_VERSION "3.1.0beta2"
  
  extern zend_module_entry http_module_entry;
  #define phpext_http_ptr &http_module_entry

diff --cc src/php_http_client_curl.c
Simple merge