Set options to NULL if no value is provided, this prevents empty headers

from being set on unset options.

diff --git a/http_request_api.c b/http_request_api.c
index 00f4b9d48d6fb7e1d28dc05b1a820efa72191605..3786caf061eb14f459e062acc8d2ee03749dee52 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -405,14 +405,14 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 
        /* proxy */
        if ((zoption = http_request_option(request, options, "proxyhost", IS_STRING))) {
 
        /* proxy */
        if ((zoption = http_request_option(request, options, "proxyhost", IS_STRING))) {

-               HTTP_CURL_OPT(PROXY, Z_STRVAL_P(zoption));
+               HTTP_CURL_OPT(PROXY, (Z_STRLEN_P(zoption) ? Z_STRVAL_P(zoption) : NULL));

                /* 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))) {
                /* 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))) {

-                       HTTP_CURL_OPT(PROXYUSERPWD, Z_STRVAL_P(zoption));
+                       HTTP_CURL_OPT(PROXYUSERPWD, (Z_STRLEN_P(zoption) ? Z_STRVAL_P(zoption) : NULL));

                }
                /* auth method */
                if ((zoption = http_request_option(request, options, "proxyauthtype", IS_LONG))) {
                }
                /* auth method */
                if ((zoption = http_request_option(request, options, "proxyauthtype", IS_LONG))) {


@@ -432,7 +432,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 
        /* auth */
        if ((zoption = http_request_option(request, options, "httpauth", IS_STRING))) {
 
        /* auth */
        if ((zoption = http_request_option(request, options, "httpauth", IS_STRING))) {

-               HTTP_CURL_OPT(USERPWD, Z_STRVAL_P(zoption));
+               HTTP_CURL_OPT(USERPWD, (Z_STRLEN_P(zoption) ? Z_STRVAL_P(zoption) : NULL));

        }
        if ((zoption = http_request_option(request, options, "httpauthtype", IS_LONG))) {
                HTTP_CURL_OPT(HTTPAUTH, Z_LVAL_P(zoption));
        }
        if ((zoption = http_request_option(request, options, "httpauthtype", IS_LONG))) {
                HTTP_CURL_OPT(HTTPAUTH, Z_LVAL_P(zoption));


@@ -449,12 +449,12 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 
        /* referer */
        if ((zoption = http_request_option(request, options, "referer", IS_STRING))) {
 
        /* referer */
        if ((zoption = http_request_option(request, options, "referer", IS_STRING))) {

-               HTTP_CURL_OPT(REFERER, Z_STRVAL_P(zoption));
+               HTTP_CURL_OPT(REFERER, (Z_STRLEN_P(zoption) ? Z_STRVAL_P(zoption) : NULL));

        }
 
        /* useragent, default "PECL::HTTP/version (PHP/version)" */
        if ((zoption = http_request_option(request, options, "useragent", IS_STRING))) {
        }
 
        /* useragent, default "PECL::HTTP/version (PHP/version)" */
        if ((zoption = http_request_option(request, options, "useragent", IS_STRING))) {

-               HTTP_CURL_OPT(USERAGENT, Z_STRVAL_P(zoption));
+               HTTP_CURL_OPT(USERAGENT, (Z_STRLEN_P(zoption) ? Z_STRVAL_P(zoption) : NULL));

        }
 
        /* additional headers, array('name' => 'value') */
        }
 
        /* additional headers, array('name' => 'value') */


@@ -493,9 +493,13 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
        /* cookies, array('name' => 'value') */
        if ((zoption = http_request_option(request, options, "cookies", IS_ARRAY))) {
                phpstr_dtor(&request->_cache.cookies);
        /* 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);
+                       }
+               } else {
+                       HTTP_CURL_OPT(COOKIE, NULL);

                }
        }
 
                }
        }