From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 26 Jan 2009 15:25:25 +0000 (+0000)
Subject: MFB: Fixed bug #47217 (content-type is not set properly for file uploads)
X-Git-Tag: php-5.2.9RC1~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3959313932a3348e4d4bffe4d42d72cbb37ba59e;p=php

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

diff --git a/NEWS b/NEWS
index fed548ec6e..1d92e2f672 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,8 @@ PHP                                                                        NEWS
 - Fixed bug in xml_error_string() which resulted in messages being
   off by one. (Scott)
 
+- Fixed bug #47217 (content-type is not set properly for file uploads).
+  (Ilia)
 - Fixed bug #47174 (base64_decode() interprets pad char in mid string as
   terminator). (Ilia)
 - Fixed bug #47165 (Possible memory corruption when passing return value by
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 600935722e..0114565830 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1513,14 +1513,13 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
 							return 1;
 						}
 						if (type) {
-							type++;
 							error = curl_formadd(&first, &last, 
 											 CURLFORM_COPYNAME, string_key,
 											 CURLFORM_NAMELENGTH, (long)string_key_len - 1,
 											 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, string_key,