summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2017-05-09 11:01:33 +0800
committerXinchen Hui <laruence@gmail.com>2017-05-09 11:01:33 +0800
commit99549ce79c79ad43a883e76fc95e3c508051039e (patch)
tree558f81a7abc58a8e505f975d47b7d92fc35bf944
parent1a06fae5438e9efa6a165d4f3028c6817ced3a4f (diff)
parentabad134681e265eef8ee3ddbd856eed0517076c5 (diff)
downloadphp-git-99549ce79c79ad43a883e76fc95e3c508051039e.tar.gz
Merge branch 'patch-1' of https://github.com/ifdattic/php-src into PHP-7.0
* 'patch-1' of https://github.com/ifdattic/php-src: Fix typo: exectute => execute
-rw-r--r--sapi/fpm/www.conf.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/fpm/www.conf.in b/sapi/fpm/www.conf.in
index beddb1e2ef..975d18cffe 100644
--- a/sapi/fpm/www.conf.in
+++ b/sapi/fpm/www.conf.in
@@ -373,7 +373,7 @@ pm.max_spare_servers = 3
; Limits the extensions of the main script FPM will allow to parse. This can
; prevent configuration mistakes on the web server side. You should only limit
; FPM to .php extensions to prevent malicious users to use other extensions to
-; exectute php code.
+; execute php code.
; Note: set an empty value to allow all extensions.
; Default Value: .php
;security.limit_extensions = .php .php3 .php4 .php5 .php7