- reset CURLOPT_CUSTOMREQUEST at the correct places

[m6w6/ext-http] / http_request_api.c

diff --git a/http_request_api.c b/http_request_api.c
index 8c112497896f0ecc78fadf01bf3332c978ee5cb8..1da4e332b9ff4063b160c4bff23aa9d16d8d39a8 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -391,6 +391,7 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
                HTTP_CURL_OPT(READDATA, NULL);
                HTTP_CURL_OPT(INFILESIZE, 0);
                HTTP_CURL_OPT(HTTP_VERSION, CURL_HTTP_VERSION_NONE);
+               HTTP_CURL_OPT(CUSTOMREQUEST, NULL);
        }
 }
 /* }}} */
@@ -642,6 +643,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
        switch (request->meth)
        {
                case HTTP_GET:
+                       HTTP_CURL_OPT(CUSTOMREQUEST, NULL);
                        HTTP_CURL_OPT(NOBODY, 0);
                        HTTP_CURL_OPT(POST, 0);
                        HTTP_CURL_OPT(UPLOAD, 0);
@@ -649,6 +651,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
                break;
 
                case HTTP_HEAD:
+                       HTTP_CURL_OPT(CUSTOMREQUEST, NULL);
                        HTTP_CURL_OPT(POST, 0);
                        HTTP_CURL_OPT(UPLOAD, 0);
                        HTTP_CURL_OPT(HTTPGET, 0);
@@ -656,6 +659,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
                break;
 
                case HTTP_POST:
+                       HTTP_CURL_OPT(CUSTOMREQUEST, NULL);
                        HTTP_CURL_OPT(UPLOAD, 0);
                        HTTP_CURL_OPT(HTTPGET, 0);
                        HTTP_CURL_OPT(NOBODY, 0);
@@ -663,6 +667,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
                break;
 
                case HTTP_PUT:
+                       HTTP_CURL_OPT(CUSTOMREQUEST, NULL);
                        HTTP_CURL_OPT(HTTPGET, 0);
                        HTTP_CURL_OPT(NOBODY, 0);
                        HTTP_CURL_OPT(POST, 0);