From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 15 Feb 2005 00:26:35 +0000 (+0000)
Subject: MFH: file upload path prunning.
X-Git-Tag: php-5.0.4RC1~159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54b442330c6248537a5739f262aecfd438502c95;p=php

MFH: file upload path prunning.
---

diff --git a/main/rfc1867.c b/main/rfc1867.c
index 982d058525..cc54e4e54a 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -1077,11 +1077,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
 					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 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
 			}
 #endif
 
-#ifdef PHP_WIN32
 			s = strrchr(filename, '\\');
-#else
-			s = filename;
-#endif
 			if ((tmp = strrchr(filename, '/')) > s) {
 				s = tmp;
 			}