Merge branch 'R_2_0'

diff --git a/config9.m4 b/config9.m4
index a5ede93f7ba36990cf0bf5fe2420a75b3156176d..ce63132d6fd090cd2fdd32c6d84ff2089eddb88a 100644 (file)
--- a/config9.m4
+++ b/config9.m4
@@ -187,10 +187,9 @@ dnl ----
                        save_LIBS="$LIBS"
                        LIBS=
                        save_CFLAGS="$CFLAGS"
-                       CFLAGS=`$CURL_CONFIG --cflags`
+                       CFLAGS="$CFLAGS `$CURL_CONFIG --cflags`"
                        save_LDFLAGS="$LDFLAGS"
-                       LDFLAGS=`$CURL_CONFIG --libs`
-                       LDFLAGS="$LDFLAGS $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
+                       LDFLAGS="$LDFLAGS `$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
                
                        AC_MSG_CHECKING([for SSL support in libcurl])
                        CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`

diff --git a/php_http_client_curl.c b/php_http_client_curl.c
index 4033b9f56c5c0c61a36b19ae4475d5e9edb50f19..c6918426264ea3fa32df358a5f208c2ba14d63b5 100644 (file)
--- a/php_http_client_curl.c
+++ b/php_http_client_curl.c
@@ -1492,8 +1492,8 @@ static STATUS php_http_client_curl_handler_prepare(php_http_client_curl_handler_
                        }
                }
                php_http_buffer_dtor(&header);
-               curl_easy_setopt(curl->handle, CURLOPT_HTTPHEADER, curl->options.headers);
        }
+       curl_easy_setopt(curl->handle, CURLOPT_HTTPHEADER, curl->options.headers);
 
        /* attach request body */
        if ((body_size = php_http_message_body_size(msg->body))) {