iliaa           Mon Feb 23 14:50:48 2004 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src    NEWS 
    /php-src/ext/curl   curl.c 
  Log:
  MFH: Fixed bug #27341 (HEAD requests fail to return data).
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.574&r2=1.1247.2.575&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.574 php-src/NEWS:1.1247.2.575
--- php-src/NEWS:1.1247.2.574   Mon Feb 23 14:14:58 2004
+++ php-src/NEWS        Mon Feb 23 14:50:46 2004
@@ -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)
http://cvs.php.net/diff.php/php-src/ext/curl/curl.c?r1=1.124.2.15&r2=1.124.2.16&ty=u
Index: php-src/ext/curl/curl.c
diff -u php-src/ext/curl/curl.c:1.124.2.15 php-src/ext/curl/curl.c:1.124.2.16
--- php-src/ext/curl/curl.c:1.124.2.15  Sun Jan 25 19:18:25 2004
+++ php-src/ext/curl/curl.c     Mon Feb 23 14:50:47 2004
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: curl.c,v 1.124.2.15 2004/01/26 00:18:25 sniper Exp $ */
+/* $Id: curl.c,v 1.124.2.16 2004/02/23 19:50:47 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1020,7 +1020,8 @@
        
        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);
                }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to