jorton Thu Jan 6 05:34:04 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/curl curl.c
Log:
MFH: - Fixed bug #31413 (curl POSTFIELDS crashes on 64-bit platforms).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.793&r2=1.1247.2.794&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.793 php-src/NEWS:1.1247.2.794
--- php-src/NEWS:1.1247.2.793 Tue Jan 4 01:53:42 2005
+++ php-src/NEWS Thu Jan 6 05:34:02 2005
@@ -2,6 +2,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, Version 4.3.11
- Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
+- Fixed bug #31413 (curl POSTFIELDS crashes on 64-bit platforms). (Joe)
- Fixed bug #31396 (compile fails with gd 2.0.33 without freetype). (Jani)
- Fixed bug #31371 (highlight_file() trims new line after heredoc). (Ilia)
- Fixed bug #31270 (missing safe_mode/open_basedir check in swf_openfile()).
(Ilia)
http://cvs.php.net/diff.php/php-src/ext/curl/curl.c?r1=1.124.2.27&r2=1.124.2.28&ty=u
Index: php-src/ext/curl/curl.c
diff -u php-src/ext/curl/curl.c:1.124.2.27 php-src/ext/curl/curl.c:1.124.2.28
--- php-src/ext/curl/curl.c:1.124.2.27 Sun Oct 31 23:56:10 2004
+++ php-src/ext/curl/curl.c Thu Jan 6 05:34:03 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: curl.c,v 1.124.2.27 2004/11/01 04:56:10 iliaa Exp $ */
+/* $Id: curl.c,v 1.124.2.28 2005/01/06 10:34:03 jorton Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -955,16 +955,16 @@
if (*postval == '@') {
error = curl_formadd(&first,
&last,
CURLFORM_COPYNAME, string_key,
-
CURLFORM_NAMELENGTH, string_key_len - 1,
+
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
CURLFORM_FILE, ++postval,
CURLFORM_END);
}
else {
error = curl_formadd(&first,
&last,
CURLFORM_COPYNAME, string_key,
-
CURLFORM_NAMELENGTH, string_key_len - 1,
+
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
CURLFORM_COPYCONTENTS, postval,
-
CURLFORM_CONTENTSLENGTH, Z_STRLEN_PP(current),
+
CURLFORM_CONTENTSLENGTH, (long)Z_STRLEN_PP(current),
CURLFORM_END);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
