iliaa Sun Jul 25 15:19:26 2004 EDT
Modified files:
/php-src/main rfc1867.c
Log:
Fixed bug #29369 (Uploaded files with ' or " in their names get their names
truncated at those characters).
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.159&r2=1.160&ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.159 php-src/main/rfc1867.c:1.160
--- php-src/main/rfc1867.c:1.159 Sat Jul 10 03:46:09 2004
+++ php-src/main/rfc1867.c Sun Jul 25 15:19:26 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: rfc1867.c,v 1.159 2004/07/10 07:46:09 andi Exp $ */
+/* $Id: rfc1867.c,v 1.160 2004/07/25 19:19:26 iliaa Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -632,6 +632,7 @@
if ((quote = *str) == '"' || quote == '\'') {
strend = str + 1;
+look_for_quote:
while (*strend && *strend != quote) {
if (*strend == '\\' && strend[1] && strend[1] == quote) {
strend += 2;
@@ -639,6 +640,14 @@
++strend;
}
}
+ if (*strend && *strend == quote) {
+ char p = *(strend + 1);
+ if (p != '\r' && p != '\n' && p != '\0') {
+ strend++;
+ goto look_for_quote;
+ }
+ }
+
res = substring_conf(str + 1, strend - str - 1, quote TSRMLS_CC);
if (*strend == quote) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
