iliaa Mon Feb 14 19:28:40 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main rfc1867.c
Log:
MFH: file upload prunning.
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.122.2.32&r2=1.122.2.33&ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.122.2.32 php-src/main/rfc1867.c:1.122.2.33
--- php-src/main/rfc1867.c:1.122.2.32 Mon Jan 31 21:33:25 2005
+++ php-src/main/rfc1867.c Mon Feb 14 19:28:39 2005
@@ -16,7 +16,7 @@
| Jani Taskinen <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: rfc1867.c,v 1.122.2.32 2005/02/01 02:33:25 iliaa Exp $ */
+/* $Id: rfc1867.c,v 1.122.2.33 2005/02/15 00:28:39 iliaa Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -1064,11 +1064,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;
}
@@ -1076,11 +1072,7 @@
goto filedone;
}
#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
