MFH.

Stefan Esser · Stefan Esser · commit e384ab1666a8 · 2004-05-23T10:15:24.000Z
diff --git a/main/rfc1867.c b/main/rfc1867.c
@@ -1031,19 +1031,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

Original file line number	Diff line number	Diff line change
`@@ -1031,19 +1031,19 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler)`
`1031`	`1031`	`php_mb_gpc_encoding_converter(&filename, &str_len, 1, NULL, NULL TSRMLS_CC);`
`1032`	`1032`	`}`
`1033`	`1033`	`s = php_mb_strrchr(filename, '\\' TSRMLS_CC);`
`1034`		`- if (tmp = php_mb_strrchr(filename, '/' TSRMLS_CC)) {`
	`1034`	`+ if ((tmp = php_mb_strrchr(filename, '/' TSRMLS_CC)) > s) {`
`1035`	`1035`	`s = tmp;`
`1036`	`1036`	`}`
`1037`	`1037`	`num_vars--;`
`1038`	`1038`	`} else {`
`1039`	`1039`	`s = strrchr(filename, '\\');`
`1040`		`- if (tmp = strrchr(filename, '/')) {`
	`1040`	`+ if ((tmp = strrchr(filename, '/')) > s) {`
`1041`	`1041`	`s = tmp;`
`1042`	`1042`	`}`
`1043`	`1043`	`}`
`1044`	`1044`	`#else`
`1045`	`1045`	`s = strrchr(filename, '\\');`
`1046`		`- if (tmp = strrchr(filename, '/')) {`
	`1046`	`+ if ((tmp = strrchr(filename, '/')) > s) {`
`1047`	`1047`	`s = tmp;`
`1048`	`1048`	`}`
`1049`	`1049`	`#endif`