diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-07-08 12:54:02 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-07-08 12:54:20 -0700 |
| commit | 5312c39cfbcd366cd287d1ea855b847bb9ebda51 (patch) | |
| tree | 173700d4a7bd04a4ed3912c72e371750a837c511 | |
| parent | 5cf0084a92022a7c84b2047945d62680dd50c62b (diff) | |
| parent | 0bf50a8302af94357595a21877e224fa42729e25 (diff) | |
| download | php-git-5312c39cfbcd366cd287d1ea855b847bb9ebda51.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #67587: Redirection loop on nginx with FPM
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/phar/phar_object.c | 1 |
2 files changed, 4 insertions, 0 deletions
@@ -39,6 +39,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) + - SPL: . Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting). (research at insighti dot org, Laruence) diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 0eba4e7054..ba52140f32 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]) { |