This is more correct.

diff --git a/main/rfc1867.c b/main/rfc1867.c
index 1cf76f4f93a2f89f5822967017edc5608023fa5e..4ba7298e93a006509938ea2e27f3cfba75040314 100644 (file)
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -1044,19 +1044,19 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)
                                        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, '/' TSRMLS_CC)) {
+                               if ((tmp = php_mb_strrchr(filename, '/' TSRMLS_CC)) > s) {
                                        s = tmp;
                                }
                                num_vars--;
                        } else {
                                s = strrchr(filename, '\\');
-                               if (tmp = strrchr(filename, '/')) {
+                               if ((tmp = strrchr(filename, '/')) > s) {
                                        s = tmp;
                                }
                        }
 #else
                        s = strrchr(filename, '\\');
-                       if (tmp = strrchr(filename, '/')) {
+                       if ((tmp = strrchr(filename, '/')) > s) {
                                s = tmp;
                        }
 #endif