Merge R_2_5

[m6w6/ext-http] / php_http_info.c

diff --git a/php_http_info.c b/php_http_info.c
index 66007bf33d32edac36520a9a657235807da4e9af..6eef822707c1bfa6082672be7a91762e31ee094e 100644 (file)
--- a/php_http_info.c
+++ b/php_http_info.c
@@ -69,7 +69,7 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
                return NULL;
        }
        
-       info = php_http_info_init(info TSRMLS_CC);
+       info = php_http_info_init(info);
 
        /* and nothing than SPACE or NUL after HTTP/X.x */
        if (!php_http_version_parse(&info->http.version, http)
@@ -93,7 +93,7 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
                const char *status = NULL, *code = http + sizeof("HTTP/X.x");
                
                info->type = PHP_HTTP_RESPONSE;
-               while (' ' == *code) ++code;
+               while (code < end && ' ' == *code) ++code;
                if (code && end > code) {
                        /* rfc7230#3.1.2 The status-code element is a 3-digit integer code */
                        PHP_HTTP_INFO(info).response.code = 100*(*code++ - '0');
@@ -139,6 +139,10 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
                                } else {
                                        PHP_HTTP_INFO(info).request.url = php_http_url_parse_authority(url, http - url, ~0);
                                }
+                               if (!PHP_HTTP_INFO(info).request.url) {
+                                       PTR_SET(PHP_HTTP_INFO(info).request.method, NULL);
+                                       return NULL;
+                               }
                        } else {
                                PTR_SET(PHP_HTTP_INFO(info).request.method, NULL);
                                return NULL;