X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php-fpm-config.patch;h=0557026126306a020fcb0944a1e6942d97b34eb1;hb=6ab82cb76564c9241efa5db87fb560ad61c5fee9;hp=c4b2d8a088be2c5bf4f914c6035beb259956775b;hpb=dccfdb642699a3ed67e7237de27992afdee1f86d;p=packages%2Fphp.git diff --git a/php-fpm-config.patch b/php-fpm-config.patch index c4b2d8a..0557026 100644 --- a/php-fpm-config.patch +++ b/php-fpm-config.patch @@ -1,5 +1,5 @@ ---- php-5.6.2/sapi/fpm/php-fpm.conf.in 2014-10-27 08:20:34.963718145 +0200 -+++ php-5.6.2.old/sapi/fpm/php-fpm.conf.in 2014-10-27 08:07:47.762117299 +0200 +--- php-7.1.0beta3/sapi/fpm/php-fpm.conf.in~ 2016-08-19 09:48:00.000000000 +0300 ++++ php-7.1.0beta3/sapi/fpm/php-fpm.conf.in 2016-08-31 13:59:19.139523160 +0300 @@ -14,14 +14,14 @@ ; Pid file ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ @@ -9,7 +9,7 @@ ; Error log file ; If it's set to "syslog", log is sent to syslogd instead of being written - ; in a local file. + ; into a local file. ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ ; Default Value: log/php-fpm.log -;error_log = log/php-fpm.log @@ -17,9 +17,9 @@ ; syslog_facility is used to specify what type of program is logging the ; message. This lets syslogd specify that messages from different facilities ---- php-5.6.2.old/sapi/fpm/www.conf.in 2014-10-27 08:07:47.762117299 +0200 -+++ php-5.6.2/sapi/fpm/www.conf.in 2014-10-27 08:23:41.232196777 +0200 -@@ -33,7 +33,7 @@ +--- php-5.6.5/sapi/fpm/www.conf.in~ 2015-02-04 19:26:16.000000000 +0200 ++++ php-5.6.5/sapi/fpm/www.conf.in 2015-02-04 19:27:25.275218535 +0200 +@@ -32,7 +32,7 @@ ; (IPv6 and IPv4-mapped) on a specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. @@ -28,20 +28,20 @@ ; Set listen(2) backlog. ; Default Value: 511 (-1 on FreeBSD and OpenBSD) -@@ -44,9 +44,9 @@ - ; BSD-derived systems allow connections regardless of permissions. - ; Default Values: user and group are set as the running user - ; mode is set to 0660 +@@ -46,9 +46,9 @@ + ; and group can be specified either by name or by their numeric IDs. + ; Default Values: Owner is set to the master process running user. If the group + ; is not set, the owner's group is used. Mode is set to 0660. -;listen.owner = @php_fpm_user@ -;listen.group = @php_fpm_group@ -;listen.mode = 0660 +listen.owner = root +listen.group = @php_fpm_group@ +listen.mode = 0660 + ; When POSIX Access Control Lists are supported you can set them using ; these options, value is a comma separated list of user/group names. - ; When set, listen.owner and listen.group are ignored -@@ -59,7 +59,7 @@ +@@ -53,7 +53,7 @@ ; must be separated by a comma. If this value is left blank, connections will be ; accepted from any ip address. ; Default Value: any @@ -50,7 +50,7 @@ ; Specify the nice(2) priority to apply to the pool processes (only if set) ; The value can vary from -19 (highest priority) to 20 (lower priority) -@@ -382,7 +382,7 @@ +@@ -372,7 +372,7 @@ ; the current environment. ; Default Value: clean env ;env[HOSTNAME] = $HOSTNAME @@ -70,16 +70,18 @@ ths = document.getElementsByTagName("th"); for (var i=0; i