From 28676404f30a0814a8e027d63b3cec4959475c46 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Thu, 13 Apr 2006 15:28:43 +0000
Subject: [PATCH] - release 1.0.0RC3

---
 docs/functions.html        |  7 ++++++-
 http_functions.c           | 13 +++++++------
 package.xml                | 15 +++++++++------
 php_http.h                 |  2 +-
 tests/HttpMessage_003.phpt |  4 +++-
 tests/HttpRequest_006.phpt |  6 ++++++
 6 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/docs/functions.html b/docs/functions.html
index 164af4c..e0d1e1c 100644
--- a/docs/functions.html
+++ b/docs/functions.html
@@ -402,6 +402,9 @@ See http_get() for a full list of available options.</p>
 Accepts an optional third string parameter containing the raw request body.<br />
 See http_get() for a full list of available options.</p>
 <p>Returns the HTTP response(s) as string on success, or FALSE on failure.</p>
+<h2 id="http_request_body_encode">string http_request_body_encode(array fields, array files)</h2>
+<p>Generate x-www-form-urlencoded resp. form-data encoded request body.</p>
+<p>Returns encoded string on success, or FALSE on failure.</p>
 <h2 id="http_request_method_register">int http_request_method_register(string method)</h2>
 <p>Register a custom request method.</p>
 <p>Expects a string parameter containing the request method name to register.</p>
@@ -1209,6 +1212,8 @@ http.cache_log is set.</p>
 </li>
 <li><a href="#http_request">http_request</a>
 </li>
+<li><a href="#http_request_body_encode">http_request_body_encode</a>
+</li>
 <li><a href="#http_request_method_register">http_request_method_register</a>
 </li>
 <li><a href="#http_request_method_unregister">http_request_method_unregister</a>
@@ -1410,7 +1415,7 @@ http.cache_log is set.</p>
 </li>
 </ul>
 </div>
-    <p><b>Generated at: Thu, 06 Apr 2006 15:55:09 +0200</b></p>
+    <p><b>Generated at: Thu, 13 Apr 2006 17:25:58 +0200</b></p>
 </body>
 </html>
 
diff --git a/http_functions.c b/http_functions.c
index 2675fbc..ad2e3d2 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -1668,12 +1668,6 @@ PHP_FUNCTION(http_request)
 }
 /* }}} */
 
-/* {{{ proto string http_request_body_encode(array fields, array files)
- *
- * Generate x-www-form-urlencoded resp. form-data encoded request body.
- *
- * Returns encoded string on success, or FALSE on failure.
- */
 static char *file_get_contents(char *file, size_t *len TSRMLS_DC)
 {
 	php_stream *s = NULL;
@@ -1694,6 +1688,13 @@ struct FormData {
 	size_t length;
 };
 CURLcode Curl_getFormData(struct FormData **, struct curl_httppost *post, curl_off_t *size);
+
+/* {{{ proto string http_request_body_encode(array fields, array files)
+ *
+ * Generate x-www-form-urlencoded resp. form-data encoded request body.
+ *
+ * Returns encoded string on success, or FALSE on failure.
+ */
 PHP_FUNCTION(http_request_body_encode)
 {
 	zval *fields = NULL, *files = NULL;
diff --git a/package.xml b/package.xml
index 70912bf..f5c532d 100644
--- a/package.xml
+++ b/package.xml
@@ -30,14 +30,17 @@ HttpResponse
   </maintainer>
   </maintainers>
  <release>
-  <version>1.0.0RC2</version>
-  <date>2006-03-28</date>
+  <version>1.0.0RC3</version>
+  <date>2006-04-13</date>
   <license>BSD, revised</license>
   <state>beta</state>
-  <notes>* Fixed Bug #7192: Build against libcurl &gt;= 7.15.2 fails
-* Fixed access of super globals
-* Fixed sending userspace streams
-* Fixed too aggressive caching behaviour of HttpResponse
+  <notes>+ Added missing http_request() function
++ Added missing http_request_body_encode() function
+- Improved performance of the message and header parser
+- Disallow $HttpMessage-&gt;prepend($HttpMessage) causing infinite recursion
+* Fixed internal http_parse_headers() always returning success
+* Fixed missing &quot;parentMessage&quot; entry in print_r($HttpMessageObject)
+* Fixed possible crash if the response does not contain a status message
   </notes>
   <deps>
    <dep type="php" rel="ge" version="4.3"/>
diff --git a/php_http.h b/php_http.h
index 447293f..9b7fc3c 100644
--- a/php_http.h
+++ b/php_http.h
@@ -15,7 +15,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_EXT_HTTP_VERSION "1.0.0RC3-dev"
+#define PHP_EXT_HTTP_VERSION "1.0.0RC3"
 
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
diff --git a/tests/HttpMessage_003.phpt b/tests/HttpMessage_003.phpt
index 2eab2dc..5e94bf3 100644
--- a/tests/HttpMessage_003.phpt
+++ b/tests/HttpMessage_003.phpt
@@ -1,5 +1,5 @@
 --TEST--
-HttpMessage implmenets Serializable, Countable
+HttpMessage implements Serializable, Countable
 --SKIPIF--
 <?php
 include 'skip.inc';
@@ -63,6 +63,8 @@ object(HttpMessage)#%d (%d) {
   }
   ["body:protected"]=>
   string(0) ""
+  ["parentMessage:protected"]=>
+  NULL
 }
 int(1)
 Done
diff --git a/tests/HttpRequest_006.phpt b/tests/HttpRequest_006.phpt
index ba8e6ed..e40884b 100644
--- a/tests/HttpRequest_006.phpt
+++ b/tests/HttpRequest_006.phpt
@@ -59,6 +59,8 @@ object(HttpMessage)#%d (%d) {
 </methodCall>
 "
 "
+  ["parentMessage:protected"]=>
+  NULL
 }
 object(HttpMessage)#%d (%d) {
   ["type:protected"]=>
@@ -98,6 +100,8 @@ object(HttpMessage)#%d (%d) {
 </methodCall>
 "
 "
+  ["parentMessage:protected"]=>
+  NULL
 }
 object(HttpMessage)#%d (%d) {
   ["type:protected"]=>
@@ -137,5 +141,7 @@ object(HttpMessage)#%d (%d) {
 </methodCall>
 "
 "
+  ["parentMessage:protected"]=>
+  NULL
 }
 Done
-- 
2.30.2