From c3200376cd66459d40a1a520074119713c9c8dff Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Thu, 11 Oct 2012 10:10:18 +0000
Subject: [PATCH] 2.0.0beta1

---
 ThanksTo.txt             |  1 +
 config9.m4               |  2 +-
 package.xml              | 27 ++++++++++++++++++---------
 php_http.h               |  2 +-
 php_http_header_parser.c |  2 +-
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/ThanksTo.txt b/ThanksTo.txt
index 8dbd1d8..b65cc4d 100644
--- a/ThanksTo.txt
+++ b/ThanksTo.txt
@@ -7,6 +7,7 @@ so they could be fixed in a reasonable way, or suggested useful features
 to implement, in alphabetical order:
 
 	Ilia Alshanetsky (ilia at php dot net)
+	Anatoly Belsky (ab at php dot net)
 	Petr Czaderna (petr at hroch dot info)
 	David James (james82 at gmail dot com)
 	Thomas Landro Johnsen (thomas dot l dot johnsen at gmail dot com)
diff --git a/config9.m4 b/config9.m4
index 63062de..2351eb5 100644
--- a/config9.m4
+++ b/config9.m4
@@ -356,7 +356,7 @@ dnl ----
 
 PHP_ARG_WITH([http-shared-deps], [whether to depend on extensions which have been built shared],
 [  --without-http-shared-deps   HTTP: do not depend on extensions like hash
-                                     and iconv (when they're built shared)], $PHP_HTTP, $PHP_HTTP)
+                                     and iconv (when they are built shared)], $PHP_HTTP, $PHP_HTTP)
 dnl ----
 dnl HASH
 dnl ----
diff --git a/package.xml b/package.xml
index 8f5d7aa..57a64d2 100644
--- a/package.xml
+++ b/package.xml
@@ -26,21 +26,29 @@ Extended HTTP support. Again. Keep in mind that it's got the major version 2, be
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>
- <date>2012-04-13</date>
+ <date>2012-10-11</date>
  <version>
-  <release>2.0.0alpha1</release>
+  <release>2.0.0beta1</release>
   <api>2.0.0</api>
  </version>
  <stability>
-  <release>alpha</release>
-  <api>alpha</api>
+  <release>beta</release>
+  <api>beta</api>
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
-+ Added http\Client\AbstractClient::request(string method, string url[, array headers=null[, mixed body=null[, array options=null]]])
-+ Added constants http\Params::PARSE_RAW, ::PARSE_DEFAULT, ::PARSE_URLENCODED, ::PARSE_DIMENSION, ::PARSE_QUERY
-+ Added fourth parameter 'flags' to http\Params' constructor, which defaults to http\Params::PARSE_DEFAULT
-* Fixed bug #61444 (query string converts . to _ in param names)
+* PHP-5.3 compatibility by Anatoly Belsky
+* Fixed http\Client's history handling
+* Disallow serialization of non-serializable objects
+* Fixed parsing of folded headers
+* Fixed the parsing HTTP messages from streams
+* Fixed leak in persistent handles cleanup routine
++ Added http\Url::SANITIZE_PATH; URL paths are not sanitized by default anymore
++ Added JSON Content-Type handler for request body processing if ext/json is present
++ Added missing IANA HTTP response codes
++ Added http\Message\Body::getResource()
++ Added QueryString proxy methods to http\Env\Request
++ Added Serializable to http\Message\Body's interfaces
 ]]></notes>
  <contents>
   <dir name="/">
@@ -140,6 +148,7 @@ Extended HTTP support. Again. Keep in mind that it's got the major version 2, be
      <file role="test" name="message_rr_helloworld_chunked.txt"/>
      <file role="test" name="urls.txt"/>
     </dir>
+    <file role="test" name="bug61444.phpt"/>
     <file role="test" name="envrequestbody001.phpt"/>
     <file role="test" name="envrequestbody002.phpt"/>
     <file role="test" name="envrequestbody003.phpt"/>
@@ -184,7 +193,7 @@ Extended HTTP support. Again. Keep in mind that it's got the major version 2, be
  <dependencies>
   <required>
    <php>
-    <min>5.3.99</min>
+    <min>5.3.0</min>
    </php>
    <pearinstaller>
     <min>1.4.1</min>
diff --git a/php_http.h b/php_http.h
index bbea3e7..df63d83 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_HTTP_EXT_VERSION "2.0.0dev"
+#define PHP_HTTP_EXT_VERSION "2.0.0beta1"
 
 zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry
diff --git a/php_http_header_parser.c b/php_http_header_parser.c
index e0dea5b..866a84e 100644
--- a/php_http_header_parser.c
+++ b/php_http_header_parser.c
@@ -155,7 +155,7 @@ PHP_HTTP_API STATUS php_http_header_parser_parse(php_http_header_parser_t *parse
 
 #define SET_ADD_VAL(slen, eol_len) \
 	do { \
-		char *ptr = buffer->data; \
+		const char *ptr = buffer->data; \
 		size_t len = slen; \
 		 \
 		while (len > 0 && PHP_HTTP_IS_CTYPE(space, *ptr)) { \
-- 
2.30.2