MFB: Fixed bug #47217 (content-type is not set properly for file uploads)

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index b8b2264fc514cc30adb14813e226e4f5d7a131e4..22a18b77d8fd688077a091660b820149d0fd342e 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -378,7 +378,7 @@ PHP_MINFO_FUNCTION(curl)
 #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 @@ type_conflict:
                                                        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,