diff options
author | Xinchen Hui <laruence@gmail.com> | 2017-05-09 11:01:52 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@gmail.com> | 2017-05-09 11:01:52 +0800 |
commit | 15dbe775d1912f0572524e61066e787d8862a9c4 (patch) | |
tree | 38b801b5a4ed5d5c9faf89f615ffe12f81fc3a46 | |
parent | 72073228ca8842ebef072e3bbd0ce90527b8085e (diff) | |
parent | 99549ce79c79ad43a883e76fc95e3c508051039e (diff) | |
download | php-git-15dbe775d1912f0572524e61066e787d8862a9c4.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix typo: exectute => execute
-rw-r--r-- | sapi/fpm/www.conf.in | 2 |
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 |