summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Soria Parra <dsp@php.net>2009-06-09 13:31:39 +0000
committerDavid Soria Parra <dsp@php.net>2009-06-09 13:31:39 +0000
commit368569c05be209da433f9e7139929487249f19de (patch)
treed7a0544d44634b64a966e18d51e8c2d9fa5e888e
parentba79cd5a23d7b15c311e6a54149ca94b3264ae49 (diff)
downloadphp-git-368569c05be209da433f9e7139929487249f19de.tar.gz
MFH: Fix bug #47042 (cgi sapi is incorrectly removing the SCRIPT_FILENAME for non apache).
The fix was provided by Sriram Natarajan.
-rw-r--r--sapi/cgi/cgi_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 61a4e4b4ae..a736560951 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1085,8 +1085,8 @@ static void init_request_info(TSRMLS_D)
}
if (env_path_translated != NULL && env_redirect_url != NULL &&
- orig_script_filename != NULL && script_path_translated != NULL
- ) {
+ env_path_translated != script_path_translated &&
+ strcmp(env_path_translated, script_path_translated) != 0) {
/*
* pretty much apache specific. If we have a redirect_url
* then our script_filename and script_name point to the