summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--ext/phar/phar_object.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index cfdd26cc59..b56ba35a9a 100644
--- a/NEWS
+++ b/NEWS
@@ -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]) {