- version bump

- better wrong param count error messages
- fix greedy response message parsing with proxy CONNECT requests

diff --git a/http_request_api.c b/http_request_api.c
index bfb3574da277345d342f217154aa5699292f2c07..797e9a2a54744e6881ea7fc430baf080513ac3db 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -947,21 +947,30 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
 {
        http_request *request = (http_request *) ctx;
 
+#define EMPTY_HEADER(d, l) ((l == 1 && d[0] == '\n') || (l == 2 && d[0] == '\r' && d[1] == '\n'))
        switch (type) {
                case CURLINFO_DATA_IN:
                        if (request->conv.last_type == CURLINFO_HEADER_IN) {
                                phpstr_appends(&request->conv.response, HTTP_CRLF);
                        }
-               case CURLINFO_HEADER_IN:
                        phpstr_append(&request->conv.response, data, length);
                        break;
+               case CURLINFO_HEADER_IN:
+                       if (!EMPTY_HEADER(data, length)) {
+                               phpstr_append(&request->conv.response, data, length);
+                       }
+                       break;
                case CURLINFO_DATA_OUT:
                        if (request->conv.last_type == CURLINFO_HEADER_OUT) {
                                phpstr_appends(&request->conv.request, HTTP_CRLF);
                        }
-               case CURLINFO_HEADER_OUT:
                        phpstr_append(&request->conv.request, data, length);
                        break;
+               case CURLINFO_HEADER_OUT:
+                       if (!EMPTY_HEADER(data, length)) {
+                               phpstr_append(&request->conv.request, data, length);
+                       }
+                       break;
                default:
 #if 0
                        fprintf(stderr, "## ", type);
@@ -980,13 +989,14 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
                        if (data[length-1] != 0xa) {
                                fprintf(stderr, "\n");
                        }
-#endif
-#if 0
-                       fprintf(stderr, "%.*s%s", length, data, data[length-1]=='\n'?"":"\n");
 #endif
                        break;
        }
 
+#if 0
+       fprintf(stderr, "DEBUG: %3d (%5zu) %.*s%s", type, length, length, data, data[length-1]=='\n'?"":"\n");
+#endif
+       
        if (type) {
                request->conv.last_type = type;
        }

diff --git a/package2.xml b/package2.xml
index b9e136e811990c0c24bd55e77e0733f97500ee5c..595bd7ce8f708c8fdc1b8995a40fbf2953f88508 100644 (file)
--- a/package2.xml
+++ b/package2.xml
@@ -28,9 +28,9 @@ support. Parallel requests are available for PHP 5 and greater.
   <email>mike@php.net</email>
   <active>yes</active>
  </lead>
- <date>2006-12-04</date>
+ <date>2006-12-19</date>
  <version>
-  <release>1.4.0RC1</release>
+  <release>1.4.0RC2</release>
   <api>1.4.0</api>
  </version>
  <stability>
@@ -39,17 +39,8 @@ support. Parallel requests are available for PHP 5 and greater.
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
-* Improved response performance
-+ Added "ipresolve" request option
-+ Added HTTP_IPRESOLVE_{ANY|V4|V6}, HttpRequest::IPRESOLVE_{ANY|V4|V6} constants
-+ Added missing HTTP_SSL_VERSION_{ANY|TLSv1|SSLv2|SSLv3}, HttpRequest::SSL_VERSION_{ANY|TLSv1|SSLv2|SSLv3} constants
-+ Added factory methods to HttpMessage, HttpQueryString, HttpRequest, HttpRequestDataShare, HttpDeflateStream, HttpInflateStream
-* Fixed aborted PUT request when empty put data was set with HttpRequest::setPutData()
-* Fixed crash when using non-associative arrays as request headers
-* Fixed crash when serializing incomplete HttpMessage objects
-* Fixed bug #9282: libcurl version error in configure (keith at iveys dot org)
-* Fixed crash when retrieving the response message from an unserialized HttpRequest object
-- Removed obsolete HTML function reference
+* Fixed infinite loop with http_parse_params("=")
+* Fixed greedy response message parsing with proxy CONNECT requests (petr at hroch dot info)
 ]]></notes>
  <contents>
   <dir name="/">

diff --git a/php_http.h b/php_http.h
index ec45112770f95e670812483f4fcdd11bdef2613b..302bc86294edfb2b43918899c9c999cc0ae2afc0 100644 (file)
--- 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.4.0RC1"
+#define PHP_EXT_HTTP_VERSION "1.4.0RC2"
 
 #ifdef HAVE_CONFIG_H
 #      include "config.h"

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index 0a80180d210dde01166ff35ae1ca03af3933354b..a454d61dac1d36185a2f3d8648d5f4d951c09c04 100644 (file)
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -93,10 +93,7 @@ typedef int STATUS;
        }
 
 /* function accepts no args */
-#define NO_ARGS \
-       if (ZEND_NUM_ARGS()) { \
-               zend_error(E_NOTICE, "Wrong parameter count for %s()", get_active_function_name(TSRMLS_C)); \
-       }
+#define NO_ARGS zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "")
 
 /* CR LF */
 #define HTTP_CRLF "\r\n"