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.

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 34140b9516fb6dcd8da97ffdddae80fc5a65ba36..940a463cf443c02b4cf49ecaf4949cb3ebbcb0e7 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -683,7 +683,7 @@ static void init_request_info(TSRMLS_D)
                                }
                        }
 
-                       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