aboutsummaryrefslogtreecommitdiffstats
path: root/community/php7/php7-fpm-version-suffix.patch
diff options
context:
space:
mode:
authorTBK <tbk@jjtc.eu>2018-03-30 22:41:16 +0200
committerAndy Postnikov <apostnikov@gmail.com>2018-03-31 01:51:44 +0300
commitac7e5e0a83fe9c831741e657a7be44139072d630 (patch)
tree9d7ad3aac86857c21ddfc95e4b006b7575361095 /community/php7/php7-fpm-version-suffix.patch
parent1489b024a895cfafd987b92e74e42d9cea137ef9 (diff)
community/php7: upgrade to 7.2.4
Diffstat (limited to 'community/php7/php7-fpm-version-suffix.patch')
-rw-r--r--community/php7/php7-fpm-version-suffix.patch36
1 files changed, 30 insertions, 6 deletions
diff --git a/community/php7/php7-fpm-version-suffix.patch b/community/php7/php7-fpm-version-suffix.patch
index e8aee952f38..0d4dee7c2e9 100644
--- a/community/php7/php7-fpm-version-suffix.patch
+++ b/community/php7/php7-fpm-version-suffix.patch
@@ -1,20 +1,33 @@
--- a/sapi/fpm/fpm/fpm_conf.c
+++ b/sapi/fpm/fpm/fpm_conf.c
-@@ -1180,3 +1180,3 @@
+@@ -1205,7 +1205,7 @@
+ }
+
if (!fpm_global_config.error_log) {
- fpm_global_config.error_log = strdup("log/php-fpm.log");
+ fpm_global_config.error_log = strdup("log/php7/error.log");
}
-@@ -1191,3 +1191,3 @@
+
+ #ifdef HAVE_SYSTEMD
+@@ -1216,7 +1216,7 @@
+
+ #ifdef HAVE_SYSLOG_H
if (!fpm_global_config.syslog_ident) {
- fpm_global_config.syslog_ident = strdup("php-fpm");
+ fpm_global_config.syslog_ident = strdup("php-fpm7");
}
-@@ -1683,3 +1683,3 @@
+
+ if (fpm_global_config.syslog_facility < 0) {
+@@ -1710,7 +1710,7 @@
+ if (fpm_globals.prefix == NULL) {
+ spprintf(&tmp, 0, "%s/php-fpm.conf", PHP_SYSCONFDIR);
} else {
- spprintf(&tmp, 0, "%s/etc/php-fpm.conf", fpm_globals.prefix);
+ spprintf(&tmp, 0, "%s/etc/php7/php-fpm.conf", fpm_globals.prefix);
}
+
+ if (!tmp) {
+
--- a/sapi/fpm/php-fpm.conf.in
+++ b/sapi/fpm/php-fpm.conf.in
@@ -16,3 +16,3 @@
@@ -38,18 +51,29 @@
--- a/sapi/fpm/www.conf.in
+++ b/sapi/fpm/www.conf.in
-@@ -252,3 +252,3 @@
+@@ -256,7 +256,7 @@
+
+ ; The access log file
; Default: not set
-;access.log = log/$pool.access.log
+;access.log = log/php7/$pool.access.log
-@@ -316,3 +316,3 @@
+ ; The access log format.
+ ; The following syntax is allowed
+@@ -320,7 +320,7 @@
+ ; The log file for slow requests
+ ; Default Value: not set
; Note: slowlog is mandatory if request_slowlog_timeout is set
-;slowlog = log/$pool.log.slow
+;slowlog = log/php7/$pool.slow.log
-@@ -410,3 +410,3 @@
+ ; The timeout for serving a single request after which a PHP backtrace will be
+ ; dumped to the 'slowlog' file. A value of '0s' means 'off'.
+@@ -418,6 +418,6 @@
+ ; specified at startup with the -d argument
+ ;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
;php_flag[display_errors] = off
-;php_admin_value[error_log] = /var/log/fpm-php.www.log
+;php_admin_value[error_log] = /var/log/php7/$pool.error.log
;php_admin_flag[log_errors] = on
+ ;php_admin_value[memory_limit] = 32M