summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2014-07-08 18:59:30 +0200
committerStanislav Malyshev <stas@php.net>2014-07-08 12:54:57 -0700
commite65e013e15f49d82ede44af8bdd52c27c0cd8274 (patch)
tree2228549912af7f8ed050bbab8f28d99be0021906
parentb9ead7c67db61ee294e3a0d2551c31087237b070 (diff)
downloadphp-git-e65e013e15f49d82ede44af8bdd52c27c0cd8274.tar.gz
Fix bug #67587: Redirection loop on nginx with FPM
Redirection will work correctly as long as PATH_INFO is available, e.g. via the following nginx configuration: set $path_info $fastcgi_path_info; fastcgi_param PATH_INFO $path_info;
-rw-r--r--ext/phar/phar_object.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 75aadfbc54..b198bc2fd1 100644
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -606,6 +606,7 @@ PHP_METHOD(Phar, webPhar)
}
if ((strlen(sapi_module.name) == sizeof("cgi-fcgi")-1 && !strncmp(sapi_module.name, "cgi-fcgi", sizeof("cgi-fcgi")-1))
+ || (strlen(sapi_module.name) == sizeof("fpm-fcgi")-1 && !strncmp(sapi_module.name, "fpm-fcgi", sizeof("fpm-fcgi")-1))
|| (strlen(sapi_module.name) == sizeof("cgi")-1 && !strncmp(sapi_module.name, "cgi", sizeof("cgi")-1))) {
if (PG(http_globals)[TRACK_VARS_SERVER]) {