- add HttpDeflateStream and HttpInflateStream objects

[m6w6/ext-http] / http_request_api.c

diff --git a/http_request_api.c b/http_request_api.c
index 15b101f728367400b8e27774ce40c7ecf87a74de..d96c1808a9fb4d68b4c02ea4c8230f7786095e97 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -29,8 +29,6 @@
 #      include "php_http_request_object.h"
 #endif
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
 /* {{{ cruft for thread safe SSL crypto locks */
 #if defined(ZTS) && defined(HTTP_HAVE_SSL)
 #      ifdef PHP_WIN32
@@ -224,7 +222,7 @@ PHP_HTTP_API http_request *_http_request_init_ex(http_request *request, CURL *ch
        memset(r, 0, sizeof(http_request));
        
        r->ch = ch;
-       r->url = (url && *url) ? estrdup(url) : NULL;
+       r->url = (url) ? http_absolute_url(url) : NULL;
        r->meth = (meth > 0) ? meth : HTTP_GET;
        
        phpstr_init(&r->conv.request);
@@ -502,7 +500,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
                }
        }
 
-#if LIBCURL_VERSIONNUM >= 0x070f01
+#if LIBCURL_VERSION_NUM >= 0x070f01
        /* reset cookies */
        if ((zoption = http_request_option(request, options, "resetcookies", IS_BOOL)) && Z_LVAL_P(zoption)) {
                HTTP_CURL_OPT(COOKIELIST, "ALL");