cvs: php4(PHP_4_3) /sapi/cgi cgi_main.c
| From: | Moriyoshi Koizumi | Date: | Sat, 17 May 2003 18:55:24 +0000 |
| Subject: | cvs: php4(PHP_4_3) /sapi/cgi cgi_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-21011@lists.php.net to get a copy of this message | ||
moriyoshi Sat May 17 14:55:24 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/sapi/cgi cgi_main.c
Log:
MFH(r-1.225): fixed bug #23669
# When the script is launched with the "Action" directive,
# PATH_TRANSLATED is then populated to indicate the virtual location of
# the script, and both REDIRECT_URL / PATH_INFO are set to the virtual URI.
# Otherwise, REDIRECT_URL may take an arbitrary value instead of the actual
# URI, which cannot be relied upon at all.
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.190.2.25 php4/sapi/cgi/cgi_main.c:1.190.2.26
--- php4/sapi/cgi/cgi_main.c:1.190.2.25 Sat May 17 04:06:52 2003
+++ php4/sapi/cgi/cgi_main.c Sat May 17 14:55:23 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.190.2.25 2003/05/17 08:06:52 sas Exp $ */
+/* $Id: cgi_main.c,v 1.190.2.26 2003/05/17 18:55:23 moriyoshi Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -683,7 +683,7 @@
}
}
- if (env_redirect_url) {
+ if (env_path_translated != NULL && env_redirect_url != NULL) {
/*
pretty much apache specific. If we have a redirect_url
then our script_filename and script_name point to the