MFH: file upload path prunning.

diff --git a/main/rfc1867.c b/main/rfc1867.c
index 982d058525d2cac7cedb654a98071153ca8e326d..cc54e4e54a233b397e856e74b4ff397849e871e0 100644 (file)
--- 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;
                        }