From: Michael Wallner <mike@php.net>
Date: Tue, 4 Oct 2016 08:23:40 +0000 (+0200)
Subject: prepare 2.6.0RC1
X-Git-Tag: RELEASE_2_6_0_RC1~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=b9c2b5402989474fd11040eb029cd31ead9e7f34;p=m6w6%2Fext-http

prepare 2.6.0RC1
---

diff --git a/package.xml b/package.xml
index 7191f31..0718bd6 100644
--- a/package.xml
+++ b/package.xml
@@ -31,7 +31,7 @@ https://mdref.m6w6.name/http
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>
- <date>2016-09-12</date>
+ <date>2016-10-04</date>
  <version>
   <release>2.6.0RC1</release>
   <api>2.6.0</api>
@@ -71,14 +71,17 @@ Changes from beta1:
 * Fixed recursive calls to the event loop dispatcher
 
 Changes from beta2:
-* Fix bug #73055: crash in http\QueryString (Mike, @rc0r)
+* Fix bug #73055: crash in http\QueryString (Mike, @rc0r) (CVE-2016-7398)
+* Fix bug #73185: Buffer overflow in HTTP parse_hostinfo() (Mike, @rc0r)
 * Fix HTTP/2 version parser for older libcurl versions (Mike)
 ]]></notes>
  <contents>
   <dir name="/">
    <file role="doc" name="AUTHORS"/>
    <file role="doc" name="BUGS"/>
+   <file role="doc" name="CHANGELOG.md"/>
    <file role="doc" name="CONTRIBUTING.md"/>
+   <file role="doc" name="CVE.md"/>
    <file role="doc" name="CREDITS"/>
    <file role="doc" name="LICENSE"/>
    <file role="doc" name="README.md"/>
@@ -219,6 +222,7 @@ Changes from beta2:
      <file role="test" name="client027.phpt"/>
      <file role="test" name="client028.phpt"/>
      <file role="test" name="client029.phpt"/>
+     <file role="test" name="client030.phpt"/>
      <file role="test" name="clientrequest001.phpt"/>
      <file role="test" name="clientrequest002.phpt"/>
      <file role="test" name="clientrequest003.phpt"/>
diff --git a/php_http.h b/php_http.h
index eb022ef..5d57d73 100644
--- 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.6.0beta2"
+#define PHP_PECL_HTTP_VERSION "2.6.0RC1"
 
 extern zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry