diff options
| author | Christian Weiske <cweiske@cweiske.de> | 2014-07-08 18:59:30 +0200 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-07-08 12:53:45 -0700 |
| commit | 0bf50a8302af94357595a21877e224fa42729e25 (patch) | |
| tree | 8c88a91310fbe8a9f9fe512e340c09b0d20f1f32 | |
| parent | d472434ea05f35926e1492afd9282e6db402b52c (diff) | |
| download | php-git-0bf50a8302af94357595a21877e224fa42729e25.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-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/phar/phar_object.c | 1 |
2 files changed, 4 insertions, 0 deletions
@@ -31,6 +31,9 @@ PHP NEWS . Fixed bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756), which affected builds against libpq < 7.3. (Adam) +- Phar: + . Fixed bug #67587 (Redirection loop on nginx with FPM). (Christian Weiske) + - Streams: . Fixed bug #67430 (http:// wrapper doesn't follow 308 redirects). (Adam) diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 8e27685759..a021200fda 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]) { |