Merge branch 'PHP-7.4'

jackie-chen · Jun 17, 2019 · 80e4a6a · 80e4a6a
2 parents ca8f348 + ad1b62f
commit 80e4a6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
@@ -2674,7 +2674,7 @@ static PHP_FUNCTION(preg_quote)
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_STR(str)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_STR(delim)
+		Z_PARAM_STR_EX(delim, 1, 0)
 	ZEND_PARSE_PARAMETERS_END();
 
 	/* Nothing to do if we got an empty string */

diff --git a/sapi/fpm/www.conf.in b/sapi/fpm/www.conf.in
@@ -114,7 +114,7 @@ pm.max_children = 5
 
 ; The number of child processes created on startup.
 ; Note: Used only when pm is set to 'dynamic'
-; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
+; Default Value: (min_spare_servers + max_spare_servers) / 2
 pm.start_servers = 2
 
 ; The desired minimum number of idle server processes.