diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 16846029b05..6deea3fd0dd 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1062,7 +1062,9 @@ static void init_request_info(TSRMLS_D)
 				TRANSLATE_SLASHES(env_document_root);
 			}
 
-			if (env_path_translated != NULL && env_redirect_url != NULL) {
+			if (env_path_translated != NULL && env_redirect_url != NULL &&
+			    orig_script_filename != NULL && script_path_translated != NULL &&
+			    strcmp(orig_script_filename, script_path_translated) != 0) {
 				/*
 				   pretty much apache specific.  If we have a redirect_url
 				   then our script_filename and script_name point to the