- Added .phar to default authorized extensions

diff --git a/NEWS b/NEWS
index 88568fac19318f972f5ab215147f608edb86297b..ab9cde78174b5a43398833faf8b31b7e631f090f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,7 @@ PHP                                                                        NEWS
 - Improved PHP-FPM SAPI:
   . Enhance error log when the primary script can't be open. FR #60199. (fat)
   . Remove EXPERIMENTAL flag. (fat)
+  . Added .phar to default authorized extensions. (fat)
 
 
 11 Nov 2011, PHP 5.4.0 RC1

diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index 2a31d1a5110a6c3b4b1cd9a94b88ca89caccb868..61f066fc91ab98829f3ce736d27b4ffb69eb5b3e 100644 (file)
--- a/sapi/fpm/fpm/fpm_conf.c
+++ b/sapi/fpm/fpm/fpm_conf.c
@@ -973,7 +973,7 @@ static int fpm_conf_process_all_pools() /* {{{ */
 
                /* security.limit_extensions */
                if (!wp->config->security_limit_extensions) {
-                       wp->config->security_limit_extensions = strdup(".php");
+                       wp->config->security_limit_extensions = strdup(".php .phar");
                }
 
                if (*wp->config->security_limit_extensions) {