Merge branch 'v2.6.x'

[m6w6/ext-http] / src / php_http_info.c

diff --git a/src/php_http_info.c b/src/php_http_info.c
index 81bf727b1e4d135bf931af3b084984743f41dc0a..cbaee88490c17421a7c618f7653ed2c6c8c819bc 100644 (file)
--- a/src/php_http_info.c
+++ b/src/php_http_info.c
@@ -12,7 +12,7 @@
 
 #include "php_http_api.h"
 
-php_http_info_t *php_http_info_init(php_http_info_t *i TSRMLS_DC)
+php_http_info_t *php_http_info_init(php_http_info_t *i)
 {
        if (!i) {
                i = emalloc(sizeof(*i));
@@ -30,11 +30,11 @@ void php_http_info_dtor(php_http_info_t *i)
                        PTR_SET(PHP_HTTP_INFO(i).request.method, NULL);
                        PTR_SET(PHP_HTTP_INFO(i).request.url, NULL);
                        break;
-               
+
                case PHP_HTTP_RESPONSE:
                        PTR_SET(PHP_HTTP_INFO(i).response.status, NULL);
                        break;
-               
+
                default:
                        break;
        }
@@ -49,7 +49,7 @@ void php_http_info_free(php_http_info_t **i)
        }
 }
 
-void php_http_info_to_string(php_http_info_t *info, char **str, size_t *len, const char *eol TSRMLS_DC)
+void php_http_info_to_string(php_http_info_t *info, char **str, size_t *len, const char *eol)
 {
        char *tmp = NULL;
 
@@ -86,32 +86,32 @@ void php_http_info_to_string(php_http_info_t *info, char **str, size_t *len, con
                                eol);
        }
 
-       STR_FREE(tmp);
+       PTR_FREE(tmp);
 }
 
-php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header TSRMLS_DC)
+php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_header)
 {
        const char *end, *http, *off;
        zend_bool free_info = !info;
-       
+
        /* sane parameter */
        if ((!pre_header) || (!*pre_header)) {
                return NULL;
        }
-       
+
        /* where's the end of the line */
        if (!(end = php_http_locate_eol(pre_header, NULL))) {
                end = pre_header + strlen(pre_header);
        }
-       
+
        /* there must be HTTP/1.x in the line */
        if (!(http = php_http_locate_str(pre_header, end - pre_header, "HTTP/", lenof("HTTP/")))) {
                return NULL;
        }
-       
-       info = php_http_info_init(info TSRMLS_CC);
 
-       if (!php_http_version_parse(&info->http.version, http TSRMLS_CC)) {
+       info = php_http_info_init(info);
+
+       if (!php_http_version_parse(&info->http.version, http)) {
                if (free_info) {
                        php_http_info_free(&info);
                }
@@ -143,9 +143,9 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
        /* is response */
        if (pre_header == http) {
                const char *status = NULL, *code = off;
-               
+
                info->type = PHP_HTTP_RESPONSE;
-               while (' ' == *code) ++code;
+               while (code < end && ' ' == *code) ++code;
                if (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');
@@ -167,14 +167,14 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
                } else {
                        PHP_HTTP_INFO(info).response.status = NULL;
                }
-               
+
                return info;
        }
-       
+
        /* is request */
        else if (*(http - 1) == ' ' && (!*off || *off == '\r' || *off == '\n')) {
                const char *url = strchr(pre_header, ' ');
-               
+
                info->type = PHP_HTTP_REQUEST;
                if (url && http > url) {
                        size_t url_len = url - pre_header;
@@ -187,9 +187,9 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
                        if (http > url) {
                                /* CONNECT presents an authority only */
                                if (strcasecmp(PHP_HTTP_INFO(info).request.method, "CONNECT")) {
-                                       PHP_HTTP_INFO(info).request.url = php_http_url_parse(url, http - url, PHP_HTTP_URL_STDFLAGS TSRMLS_CC);
+                                       PHP_HTTP_INFO(info).request.url = php_http_url_parse(url, http - url, PHP_HTTP_URL_STDFLAGS);
                                } else {
-                                       PHP_HTTP_INFO(info).request.url = php_http_url_parse_authority(url, http - url, PHP_HTTP_URL_STDFLAGS TSRMLS_CC);
+                                       PHP_HTTP_INFO(info).request.url = php_http_url_parse_authority(url, http - url, PHP_HTTP_URL_STDFLAGS);
                                }
                                if (!PHP_HTTP_INFO(info).request.url) {
                                        PTR_SET(PHP_HTTP_INFO(info).request.method, NULL);
@@ -203,7 +203,7 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
                        PHP_HTTP_INFO(info).request.method = NULL;
                        PHP_HTTP_INFO(info).request.url = NULL;
                }
-               
+
                return info;
        }