iliaa           Mon Jan 26 15:21:50 2009 UTC

  Modified files:              
    /php-src/ext/curl   interface.c 
  Log:
  
  MFB: Fixed bug #47217 (content-type is not set properly for file uploads)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.145&r2=1.146&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.145 php-src/ext/curl/interface.c:1.146
--- php-src/ext/curl/interface.c:1.145  Sun Jan 25 23:02:18 2009
+++ php-src/ext/curl/interface.c        Mon Jan 26 15:21:49 2009
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: interface.c,v 1.145 2009/01/25 23:02:18 tony2001 Exp $ */
+/* $Id: interface.c,v 1.146 2009/01/26 15:21:49 iliaa Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -378,7 +378,7 @@
 #if LIBCURL_VERSION_NUM > 0x070f03 /* 7.15.4 */
                        {"CharConv", CURL_VERSION_CONV},
 #endif
-                       NULL, 0
+                       {NULL, 0}
                };
 
                php_info_print_table_row(1, "Features");
@@ -1686,14 +1686,13 @@
                                                        return 1;
                                                }
                                                if (type) {
-                                                       type++;
                                                        error = 
curl_formadd(&first, &last, 
                                                                                
         CURLFORM_COPYNAME, key,
                                                                                
         CURLFORM_NAMELENGTH, l,
                                                                                
         CURLFORM_FILE, postval,
-                                                                               
         CURLFORM_CONTENTTYPE, type,
+                                                                               
         CURLFORM_CONTENTTYPE, type + sizeof(";type=") - 1,
                                                                                
         CURLFORM_END);
-                                                       *(type - 1) = ';';
+                                                       *type = ';';
                                                } else {
                                                        error = 
curl_formadd(&first, &last, 
                                                                                
         CURLFORM_COPYNAME, key,



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

Reply via email to