From: Michael Wallner <mike@php.net>
Date: Tue, 23 Aug 2016 09:51:01 +0000 (+0200)
Subject: Merge branch 'v2.6.x'
X-Git-Tag: RELEASE_3_1_0_BETA2~3
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=d7652a44e061886c95dcb730e13c52163039d429;p=m6w6%2Fext-http

Merge branch 'v2.6.x'
---

d7652a44e061886c95dcb730e13c52163039d429
diff --cc package.xml
index 60a8e35,352bf47..e104c7e
--- a/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 6a9f01b,eb022ef..2151023
--- a/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