back to dev

[m6w6/ext-http] / php_http_info.c

diff --git a/php_http_info.c b/php_http_info.c
index dca784fd513090b3ac7a328805cbe6d123c6454d..7efd70ec7914426f697a3a7718984400e5f24253 100644 (file)
--- a/php_http_info.c
+++ b/php_http_info.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2013, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -27,12 +27,12 @@ void php_http_info_dtor(php_http_info_t *i)
 {
        switch (i->type) {
                case PHP_HTTP_REQUEST:
-                       STR_SET(PHP_HTTP_INFO(i).request.method, NULL);
-                       STR_SET(PHP_HTTP_INFO(i).request.url, NULL);
+                       PTR_SET(PHP_HTTP_INFO(i).request.method, NULL);
+                       PTR_SET(PHP_HTTP_INFO(i).request.url, NULL);
                        break;
                
                case PHP_HTTP_RESPONSE:
-                       STR_SET(PHP_HTTP_INFO(i).response.status, NULL);
+                       PTR_SET(PHP_HTTP_INFO(i).response.status, NULL);
                        break;
                
                default:
@@ -120,9 +120,9 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
                        while (' ' == *url) ++url;
                        while (' ' == *(http-1)) --http;
                        if (http > url) {
-                               PHP_HTTP_INFO(info).request.url = estrndup(url, http - url);
+                               PHP_HTTP_INFO(info).request.url = php_http_url_parse(url, http - url, ~0 TSRMLS_CC);
                        } else {
-                               STR_SET(PHP_HTTP_INFO(info).request.method, NULL);
+                               PTR_SET(PHP_HTTP_INFO(info).request.method, NULL);
                                return NULL;
                        }
                } else {