iliaa Mon Jan 26 15:25:26 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl interface.c
/php-src NEWS
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.62.2.14.2.40&r2=1.62.2.14.2.41&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.40
php-src/ext/curl/interface.c:1.62.2.14.2.41
--- php-src/ext/curl/interface.c:1.62.2.14.2.40 Wed Dec 31 11:17:36 2008
+++ php-src/ext/curl/interface.c Mon Jan 26 15:25:23 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.40 2008/12/31 11:17:36 sebastian Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.41 2009/01/26 15:25:23 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1513,14 +1513,13 @@
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,
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1401&r2=1.2027.2.547.2.1402&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1401 php-src/NEWS:1.2027.2.547.2.1402
--- php-src/NEWS:1.2027.2.547.2.1401 Mon Jan 26 11:09:11 2009
+++ php-src/NEWS Mon Jan 26 15:25:25 2009
@@ -17,6 +17,8 @@
- 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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
