MFH: Fixed bug #27341 (HEAD requests fail to return data).

diff --git a/NEWS b/NEWS
index 4f8460cbe9be9f9cff6f365bdb2590b600a4b37c..c18c3b0254a4061444d47de0150e90e341861c85 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Feb 2004, Version 4.3.5
+- Fixed bug #27341 (HEAD requests fail to return data). (Ilia)
 - Fixed bug #27337 (missing sapi_shutdown() in sapi/isapi causes memory leak). 
   (Jani, msisolak at yahoo dot com)
 - Fixed bug #27328 (ftp extension relies on 32-bit longs). (Sara)

diff --git a/ext/curl/curl.c b/ext/curl/curl.c
index e583a675cd0c9783afcc5f87fb2b9546713447c7..64c637bb1b4501e3cc2f501e7fa1bf3cd30d235f 100644 (file)
--- a/ext/curl/curl.c
+++ b/ext/curl/curl.c
@@ -1020,7 +1020,8 @@ PHP_FUNCTION(curl_exec)
        
        error = curl_easy_perform(ch->cp);
        SAVE_CURL_ERROR(ch, error);
-       if (error != CURLE_OK) {
+       /* CURLE_PARTIAL_FILE is returned by HEAD requests */
+       if (error != CURLE_OK && error != CURLE_PARTIAL_FILE) {
                if (ch->handlers->write->buf.len > 0) {
                        smart_str_free(&ch->handlers->write->buf);
                }