com php-src: Fix bug #67587: Redirection loop on nginx with FPM: ext/phar/phar_object.c
| From: | Stanislav Malyshev | Date: | Tue, 08 Jul 2014 17:03:26 +0000 |
| Subject: | com php-src: Fix bug #67587: Redirection loop on nginx with FPM: ext/phar/phar_object.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79342@lists.php.net to get a copy of this message | ||
Commit: e76d3cba96dc2297fdb3b4e47b9a923f8fc2913d
Author: Christian Weiske <cweiske@cweiske.de> Tue, 8 Jul 2014 18:59:30 +0200
Parents: 36644cc71e95c0b2ba1ebd2ea0a7109db80d0923
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e76d3cba96dc2297fdb3b4e47b9a923f8fc2913d
Log:
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;
Bugs:
https://bugs.php.net/67587
Changed paths:
M ext/phar/phar_object.c
Diff:
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 75aadfb..b198bc2 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]) {