derick Fri May 21 04:11:43 2004 EDT
Modified files:
/php-src/main rfc1867.c
Log:
- Fixed bug #28456 (Problem with enclosed / in uploaded file names)
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.155&r2=1.156&ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.155 php-src/main/rfc1867.c:1.156
--- php-src/main/rfc1867.c:1.155 Tue May 11 11:30:54 2004
+++ php-src/main/rfc1867.c Fri May 21 04:11:43 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: rfc1867.c,v 1.155 2004/05/11 15:30:54 derick Exp $ */
+/* $Id: rfc1867.c,v 1.156 2004/05/21 08:11:43 derick Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -835,7 +835,7 @@
while (!multipart_buffer_eof(mbuff TSRMLS_CC))
{
char buff[FILLUNIT];
- char *cd=NULL,*param=NULL,*filename=NULL;
+ char *cd=NULL,*param=NULL,*filename=NULL, *tmp=NULL;
int blen=0, wlen=0;
zend_llist_clean(&header);
@@ -1044,12 +1044,21 @@
php_mb_gpc_encoding_converter(&filename,
&str_len, 1, NULL, NULL TSRMLS_CC);
}
s = php_mb_strrchr(filename, '\\' TSRMLS_CC);
+ if (tmp = php_mb_strrchr(filename, '/')) {
+ s = tmp;
+ }
num_vars--;
} else {
s = strrchr(filename, '\\');
+ if (tmp = strrchr(filename, '/')) {
+ s = tmp;
+ }
}
#else
s = strrchr(filename, '\\');
+ if (tmp = strrchr(filename, '/')) {
+ s = tmp;
+ }
#endif
if (!is_anonymous) {
if (s && s > filename) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
