From 1090760c65b564b30c0e30598cd19a1238e683f6 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Thu, 29 Nov 2012 09:20:44 +0000
Subject: [PATCH] 2.0.0beta2

---
 KnownIssues.txt   |  1 -
 ThanksTo.txt      |  2 +-
 package.xml       | 36 ++++++++++++++++++++++--------------
 php_http.h        |  2 +-
 php_http_filter.c | 10 +++++-----
 5 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/KnownIssues.txt b/KnownIssues.txt
index 94a0a94..5f47b6d 100644
--- a/KnownIssues.txt
+++ b/KnownIssues.txt
@@ -1,6 +1,5 @@
 Known Issues
 ============
-$Id: KnownIssues.txt 292753 2009-12-29 12:30:43Z mike $
 
 Windows:
 	If you keep getting "SSL connect error" when trying to issue 
diff --git a/ThanksTo.txt b/ThanksTo.txt
index b65cc4d..e13c32f 100644
--- a/ThanksTo.txt
+++ b/ThanksTo.txt
@@ -1,6 +1,5 @@
 Thanks To
 =========
-$Id: ThanksTo.txt 275653 2009-02-12 13:11:05Z mike $
 
 People who repeatedly reported issues with this extension in a manner
 so they could be fixed in a reasonable way, or suggested useful features
@@ -9,6 +8,7 @@ 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)
+	Benjamin Eberlei (kontakt at beberlei dot de)
 	David James (james82 at gmail dot com)
 	Thomas Landro Johnsen (thomas dot l dot johnsen at gmail dot com)
 	Clay Loveless (clay at killersoft dot com)
diff --git a/package.xml b/package.xml
index 57a64d2..e9148c1 100644
--- a/package.xml
+++ b/package.xml
@@ -26,9 +26,9 @@ 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-10-11</date>
+ <date>2012-11-29</date>
  <version>
-  <release>2.0.0beta1</release>
+  <release>2.0.0beta2</release>
   <api>2.0.0</api>
  </version>
  <stability>
@@ -37,18 +37,16 @@ Extended HTTP support. Again. Keep in mind that it's got the major version 2, be
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
-* 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
+! >80% test coverage
+* Fixed http\Request\Pool with libevent2
+* Fixed http\Env\Request::getFiles() with multiple-file-uploads
+* Fixed PHP-5.3 compatibility
+* Fixed reference handling of http\Message\Body::getResource()
+* Fixed reading stream filters to correctly detect EOF of tmp and mem streams
+- Change: merge message headers with the same key
+- Change: the stream message parser can optionally return after each message
+- Change: you have to care yourself for Content headers if a message's body has a reading stream filter attached
++ Added http\Env::getResponseStatusForAllCodes()
 ]]></notes>
  <contents>
   <dir name="/">
@@ -152,7 +150,12 @@ Extended HTTP support. Again. Keep in mind that it's got the major version 2, be
     <file role="test" name="envrequestbody001.phpt"/>
     <file role="test" name="envrequestbody002.phpt"/>
     <file role="test" name="envrequestbody003.phpt"/>
+    <file role="test" name="envrequestfiles001.phpt"/>
+    <file role="test" name="envrequestfiles002.phpt"/>
+    <file role="test" name="envrequestform.phpt"/>
     <file role="test" name="envrequestheader001.phpt"/>
+    <file role="test" name="envrequestquery.phpt"/>
+    <file role="test" name="envresponsecodes.phpt"/>
     <file role="test" name="envresponseheader001.phpt"/>
     <file role="test" name="envresponseranges001.phpt"/>
     <file role="test" name="etag001.phpt"/>
@@ -167,6 +170,7 @@ Extended HTTP support. Again. Keep in mind that it's got the major version 2, be
     <file role="test" name="message005.phpt"/>
     <file role="test" name="negotiate001.phpt"/>
     <file role="test" name="params001.phpt"/>
+    <file role="test" name="params002.phpt"/>
     <file role="test" name="persistenthandles001.phpt"/>
     <file role="test" name="phpunit.phpt"/>
     <file role="test" name="propertyproxy001.phpt"/>
@@ -175,15 +179,19 @@ Extended HTTP support. Again. Keep in mind that it's got the major version 2, be
     <file role="test" name="response001.phpt"/>
     <file role="test" name="response002.phpt"/>
     <file role="test" name="response003.phpt"/>
+    <file role="test" name="serialize001.phpt"/>
     <file role="test" name="url001.phpt"/>
    </dir>
    <dir name="phpunit">
+    <file role="test" name="ClientRequestTest.php"/>
     <file role="test" name="CookieTest.php"/>
+    <file role="test" name="DataShareTest.php"/>
     <file role="test" name="EncodingTest.php"/>
     <file role="test" name="HeaderTest.php"/>
     <file role="test" name="MessageBodyTest.php"/>
     <file role="test" name="ObjectTest.php"/>
     <file role="test" name="ParamsTest.php"/>
+    <file role="test" name="PoolTest.php"/>
     <file role="test" name="QueryStringTest.php"/>
     <file role="test" name="RequestTest.php"/>
     <file role="test" name="UrlTest.php"/>
diff --git a/php_http.h b/php_http.h
index df63d83..c69054d 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.0beta1"
+#define PHP_HTTP_EXT_VERSION "2.0.0beta2"
 
 zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry
diff --git a/php_http_filter.c b/php_http_filter.c
index 4f34801..dd4fa14 100644
--- a/php_http_filter.c
+++ b/php_http_filter.c
@@ -236,7 +236,7 @@ static PHP_HTTP_FILTER_FUNCTION(chunked_encode)
 		}
 #if DBG_FILTER
 		fprintf(stderr, "update: chunked (-> %zu) (w: %zu, r: %zu)\n", ptr->buflen, stream->writepos, stream->readpos);
-#endif DBG_FILTER
+#endif
 		
 		nxt = ptr->next;
 		php_stream_bucket_unlink(ptr TSRMLS_CC);
@@ -258,7 +258,7 @@ static PHP_HTTP_FILTER_FUNCTION(chunked_encode)
 	if (PHP_HTTP_FILTER_IS_CLOSING(stream, flags)) {
 #if DBG_FILTER
 		fprintf(stderr, "finish: chunked\n");
-#endif DBG_FILTER
+#endif
 		
 		NEW_BUCKET("0" PHP_HTTP_CRLF PHP_HTTP_CRLF, lenof("0" PHP_HTTP_CRLF PHP_HTTP_CRLF));
 	}
@@ -298,7 +298,7 @@ static PHP_HTTP_FILTER_FUNCTION(zlib)
 
 #if DBG_FILTER
 		fprintf(stderr, "bucket: b=%p p=%p p=%p\n", ptr->brigade, ptr->prev,  ptr->next);
-#endif DBG_FILTER
+#endif
 		
 		nxt = ptr->next;
 		php_stream_bucket_unlink(ptr TSRMLS_CC);
@@ -326,7 +326,7 @@ static PHP_HTTP_FILTER_FUNCTION(zlib)
 		
 #if DBG_FILTER
 		fprintf(stderr, "flush: deflate (-> %zu)\n", encoded_len);
-#endif DBG_FILTER
+#endif
 		
 		if (encoded) {
 			if (encoded_len) {
@@ -344,7 +344,7 @@ static PHP_HTTP_FILTER_FUNCTION(zlib)
 		
 #if DBG_FILTER
 		fprintf(stderr, "finish: deflate (-> %zu)\n", encoded_len);
-#endif DBG_FILTER
+#endif
 		
 		if (encoded) {
 			if (encoded_len) {
-- 
2.30.2