prepare 2.5.6

diff --git a/TODO b/TODO
index 33b759f2d5c26778d012dcb06c727c837ff7116d..468f9c154ddbb0d22c2981166b5d1cdad2b0f65a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,4 @@
 * let the message body be a simple query string unless files are added
 * php_http_message_serialize reverses the chain twice; remove that
 * let the message body be a simple query string unless files are added
 * php_http_message_serialize reverses the chain twice; remove that

-* CURLOPT_PROXY_HEADER and CURLOPT_HEADEROPT
\ No newline at end of file
+* CURLOPT_PROXY_HEADER and CURLOPT_HEADEROPT
+* CURLMOPT_PIPELINING changed to a bitmask
\ No newline at end of file

diff --git a/package.xml b/package.xml
index 1e123024bb63f1522d8db1d29faccdb7780f3bae..da6a13d17fc8ce26a2883b92b362e1062b13ef65 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -35,9 +35,9 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>

- <date>2015-12-07</date>
+ <date>2016-03-09</date>

  <version>
  <version>

-  <release>2.5.6dev</release>
+  <release>2.5.6</release>

   <api>2.5.0</api>
  </version>
  <stability>
   <api>2.5.0</api>
  </version>
  <stability>


@@ -46,7 +46,10 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
  </stability>
  <license uri="http://copyfree.org/content/standard/licenses/2bsd/license.txt">BSD-2-Clause</license>
  <notes><![CDATA[
  </stability>
  <license uri="http://copyfree.org/content/standard/licenses/2bsd/license.txt">BSD-2-Clause</license>
  <notes><![CDATA[

-* Fix gh-issue #20: setSslOptions notice with curl 7.43
+* Fix php-bug #71719: Buffer overflow in HTTP url parsing functions (Mike, rc0r)
+* Fix gh-issue #28: Possible null pointer dereference in php_http_url_mod() (rc0r)
+* Fix gh-issue #22: Fix PHP5 config.w32 (Jan Ehrhardt)
+* Fix gh-issue #20: setSslOptions notice with curl 7.43 (Mike, Vitaliy Demidov)

 ]]></notes>
  <contents>
   <dir name="/">
 ]]></notes>
  <contents>
   <dir name="/">


@@ -128,6 +131,7 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
    <dir name="tests">
     <file role="test" name="skipif.inc"/>
      <dir name="data">
    <dir name="tests">
     <file role="test" name="skipif.inc"/>
      <dir name="data">

+      <file role="test" name="bug71719.bin"/>

       <file role="test" name="message_r_content_range.txt"/>
       <file role="test" name="message_r_multipart_put.txt"/>
       <file role="test" name="message_rr_empty.txt"/>
       <file role="test" name="message_r_content_range.txt"/>
       <file role="test" name="message_r_multipart_put.txt"/>
       <file role="test" name="message_rr_empty.txt"/>


@@ -157,6 +161,7 @@ http://dev.iworks.at/ext-http/lcov/ext/http/
      <file role="test" name="bug69076.phpt"/>
      <file role="test" name="bug69313.phpt"/>
      <file role="test" name="bug69357.phpt"/>
      <file role="test" name="bug69076.phpt"/>
      <file role="test" name="bug69313.phpt"/>
      <file role="test" name="bug69357.phpt"/>

+     <file role="test" name="bug71719.phpt"/>

      <file role="test" name="client001.phpt"/>
      <file role="test" name="client002.phpt"/>
      <file role="test" name="client003.phpt"/>
      <file role="test" name="client001.phpt"/>
      <file role="test" name="client002.phpt"/>
      <file role="test" name="client003.phpt"/>

diff --git a/php_http.h b/php_http.h
index be5aeb5878a1cb22f96b815dead0d0a4a3d5dc2e..8002c7603e14990d65e8281a50c0a8b73567fe6d 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -13,7 +13,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 

-#define PHP_PECL_HTTP_VERSION "2.5.6dev"
+#define PHP_PECL_HTTP_VERSION "2.5.6"

 
 extern zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry
 
 extern zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry