- http_request_defaults() already takes care of resetting curl options so check strin...

[m6w6/ext-http] / http_request_api.c

diff --git a/http_request_api.c b/http_request_api.c
index 6bc27e514b03efb16d33b6f6e577d684bcb3ab11..8e7d0b0f3bf9a73443e4362d9cd23ef9a2bdd4ce 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -88,6 +88,10 @@ PHP_MINIT_FUNCTION(http_request)
        HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST);
        HTTP_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM);
        HTTP_LONG_CONSTANT("HTTP_AUTH_ANY", CURLAUTH_ANY);
+       
+       HTTP_LONG_CONSTANT("HTTP_VERSION_NONE", CURL_HTTP_VERSION_NONE);
+       HTTP_LONG_CONSTANT("HTTP_VERSION_1_0", CURL_HTTP_VERSION_1_0);
+       HTTP_LONG_CONSTANT("HTTP_VERSION_1_1", CURL_HTTP_VERSION_1_1);
 
        return SUCCESS;
 }
@@ -358,6 +362,7 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
                HTTP_CURL_OPT(IOCTLDATA, NULL);
                HTTP_CURL_OPT(READDATA, NULL);
                HTTP_CURL_OPT(INFILESIZE, 0);
+               HTTP_CURL_OPT(HTTP_VERSION, CURL_HTTP_VERSION_NONE);
        }
 }
 /* }}} */
@@ -404,13 +409,16 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 
        /* proxy */
        if ((zoption = http_request_option(request, options, "proxyhost", IS_STRING))) {
-               HTTP_CURL_OPT(PROXY, Z_STRVAL_P(zoption));
+               if (Z_STRLEN_P(zoption)) {
+                       HTTP_CURL_OPT(PROXY, Z_STRVAL_P(zoption));
+               }
+
                /* port */
                if ((zoption = http_request_option(request, options, "proxyport", IS_LONG))) {
                        HTTP_CURL_OPT(PROXYPORT, Z_LVAL_P(zoption));
                }
                /* user:pass */
-               if ((zoption = http_request_option(request, options, "proxyauth", IS_STRING))) {
+               if ((zoption = http_request_option(request, options, "proxyauth", IS_STRING)) && Z_STRLEN_P(zoption)) {
                        HTTP_CURL_OPT(PROXYUSERPWD, Z_STRVAL_P(zoption));
                }
                /* auth method */
@@ -430,7 +438,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
        }
 
        /* auth */
-       if ((zoption = http_request_option(request, options, "httpauth", IS_STRING))) {
+       if ((zoption = http_request_option(request, options, "httpauth", IS_STRING)) && Z_STRLEN_P(zoption)) {
                HTTP_CURL_OPT(USERPWD, Z_STRVAL_P(zoption));
        }
        if ((zoption = http_request_option(request, options, "httpauthtype", IS_LONG))) {
@@ -447,12 +455,12 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
        }
 
        /* referer */
-       if ((zoption = http_request_option(request, options, "referer", IS_STRING))) {
+       if ((zoption = http_request_option(request, options, "referer", IS_STRING)) && Z_STRLEN_P(zoption)) {
                HTTP_CURL_OPT(REFERER, Z_STRVAL_P(zoption));
        }
 
        /* useragent, default "PECL::HTTP/version (PHP/version)" */
-       if ((zoption = http_request_option(request, options, "useragent", IS_STRING))) {
+       if ((zoption = http_request_option(request, options, "useragent", IS_STRING)) && Z_STRLEN_P(zoption)) {
                HTTP_CURL_OPT(USERAGENT, Z_STRVAL_P(zoption));
        }
 
@@ -485,16 +493,18 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
                }
        }
        if ((zoption = http_request_option(request, options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) {
-               request->_cache.headers = curl_slist_append(request->_cache.headers, "Accept-Encoding: gzip;q=1.0,deflate;q=0.5,*;q=0.1");
+               request->_cache.headers = curl_slist_append(request->_cache.headers, "Accept-Encoding: gzip;q=1.0,deflate;q=0.5");
        }
        HTTP_CURL_OPT(HTTPHEADER, request->_cache.headers);
 
        /* cookies, array('name' => 'value') */
        if ((zoption = http_request_option(request, options, "cookies", IS_ARRAY))) {
                phpstr_dtor(&request->_cache.cookies);
-               if (SUCCESS == http_urlencode_hash_recursive(HASH_OF(zoption), &request->_cache.cookies, "; ", sizeof("; ")-1, NULL, 0)) {
-                       phpstr_fix(&request->_cache.cookies);
-                       HTTP_CURL_OPT(COOKIE, request->_cache.cookies.data);
+               if (zend_hash_num_elements(Z_ARRVAL_P(zoption))) {
+                       if (SUCCESS == http_urlencode_hash_recursive(HASH_OF(zoption), &request->_cache.cookies, "; ", sizeof("; ")-1, NULL, 0)) {
+                               phpstr_fix(&request->_cache.cookies);
+                               HTTP_CURL_OPT(COOKIE, request->_cache.cookies.data);
+                       }
                }
        }
 
@@ -534,6 +544,11 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
                HTTP_CURL_OPT(MAXFILESIZE, Z_LVAL_P(zoption));
        }
 
+       /* http protocol */
+       if ((zoption = http_request_option(request, options, "protocol", IS_LONG))) {
+               HTTP_CURL_OPT(HTTP_VERSION, Z_LVAL_P(zoption));
+       }
+
        /* lastmodified */
        if ((zoption = http_request_option(request, options, "lastmodified", IS_LONG))) {
                if (Z_LVAL_P(zoption)) {
@@ -623,7 +638,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
        }
 
        /* attach request body */
-       if (request->body && (request->meth != HTTP_GET) && (request->meth != HTTP_HEAD)) {
+       if (request->body && (request->meth != HTTP_GET) && (request->meth != HTTP_HEAD) && (request->meth != HTTP_OPTIONS)) {
                switch (request->body->type)
                {
                        case HTTP_REQUEST_BODY_CSTRING: