iliaa Mon Feb 14 19:26:35 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/main rfc1867.c
Log:
MFH: file upload path prunning.
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.159.2.10&r2=1.159.2.11&ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.159.2.10 php-src/main/rfc1867.c:1.159.2.11
--- php-src/main/rfc1867.c:1.159.2.10 Mon Jan 31 21:33:17 2005
+++ php-src/main/rfc1867.c Mon Feb 14 19:26:35 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: rfc1867.c,v 1.159.2.10 2005/02/01 02:33:17 iliaa Exp $ */
+/* $Id: rfc1867.c,v 1.159.2.11 2005/02/15 00:26:35 iliaa Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -1077,11 +1077,7 @@
str_len = strlen(filename);
php_mb_gpc_encoding_converter(&filename, &str_len, 1, NULL, NULL TSRMLS_CC);
}
-#ifdef PHP_WIN32
s = php_mb_strrchr(filename, '\\' TSRMLS_CC);
-#else
- s = filename;
-#endif
if ((tmp = php_mb_strrchr(filename, '/'
TSRMLS_CC)) > s) {
s = tmp;
}
@@ -1090,11 +1086,7 @@
}
#endif
-#ifdef PHP_WIN32
s = strrchr(filename, '\\');
-#else
- s = filename;
-#endif
if ((tmp = strrchr(filename, '/')) > s) {
s = tmp;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
