X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php-fpm-config.patch;h=8f5bf23a9a9a520dccfda4ed02322e9cf70ceac1;hb=b713a129bbe1ba9f4d7a609b2008bafc70c467e3;hp=34948a1f367f93aa001eb4bd5c3692bd04adec6c;hpb=cdbeb446bb6eff94d314e6c8c59433508bac5492;p=packages%2Fphp.git diff --git a/php-fpm-config.patch b/php-fpm-config.patch index 34948a1..8f5bf23 100644 --- a/php-fpm-config.patch +++ b/php-fpm-config.patch @@ -1,15 +1,25 @@ ---- php-5.3.14/sapi/fpm/php-fpm.conf.in~ 2012-06-13 11:18:44.000000000 +0300 -+++ php-5.3.14/sapi/fpm/php-fpm.conf.in 2012-07-12 15:38:49.056368781 +0300 -@@ -22,7 +22,7 @@ +--- php-5.3.29/sapi/fpm/php-fpm.conf.in 2014-10-27 07:58:34.296908403 +0200 ++++ php-5.3.29.old/sapi/fpm/php-fpm.conf.in 2014-10-27 07:46:00.292540344 +0200 +@@ -14,14 +15,14 @@ ; Pid file ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ ; Default Value: none -;pid = run/php-fpm.pid -+pid = /var/run/php/@processname@.pid ++pid = /var/run/@processname@.pid ; Error log file ; If it's set to "syslog", log is sent to syslogd instead of being written -@@ -140,7 +140,7 @@ + ; in a local file. + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: log/php-fpm.log +-;error_log = log/php-fpm.log ++error_log = /var/log/php/@processname@.log + + ; 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.3.29.old/sapi/fpm/php-fpm.conf-d.in 2014-10-27 07:46:00.639222822 +0200 ++++ php-5.3.29/sapi/fpm/php-fpm.conf-d.in 2014-10-27 08:02:11.543472244 +0200 +@@ -30,7 +30,7 @@ ; specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. @@ -18,16 +28,29 @@ ; Set listen(2) backlog. A value of '-1' means unlimited. ; Default Value: 128 (-1 on FreeBSD and OpenBSD) -@@ -161,7 +161,7 @@ +@@ -41,9 +41,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 +-;listen.owner = @php_fpm_user@ +-;listen.group = @php_fpm_group@ +-;listen.mode = 0660 ++listen.owner = root ++listen.group = @php_fpm_group@ ++listen.mode = 0660 + + ; List of ipv4 addresses of FastCGI clients which are allowed to connect. + ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +@@ -51,7 +51,7 @@ ; must be separated by a comma. If this value is left blank, connections will be ; accepted from any ip address. ; Default Value: any -;listen.allowed_clients = 127.0.0.1 +listen.allowed_clients = 127.0.0.1 - ; Choose how the process manager will control the number of child processes. - ; Possible Values: -@@ -208,12 +208,12 @@ + ; 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) +@@ -106,12 +106,12 @@ ; The desired minimum number of idle server processes. ; Note: Used only when pm is set to 'dynamic' ; Note: Mandatory when pm is set to 'dynamic' @@ -42,7 +65,7 @@ ; The number of seconds after which an idle process will be killed. ; Note: Used only when pm is set to 'ondemand' -@@ -323,7 +323,7 @@ +@@ -221,7 +221,7 @@ ; anything, but it may not be a good idea to use the .php extension or it ; may conflict with a real PHP file. ; Default Value: not set @@ -51,7 +74,7 @@ ; The ping URI to call the monitoring page of FPM. If this value is not set, no ; URI will be recognized as a ping page. This could be used to test from outside -@@ -449,7 +449,7 @@ +@@ -347,7 +347,7 @@ ; Note: on highloaded environement, this can cause some delay in the page ; process time (several ms). ; Default Value: no @@ -60,7 +83,7 @@ ; 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 -@@ -463,7 +463,7 @@ +@@ -361,7 +361,7 @@ ; the current environment. ; Default Value: clean env ;env[HOSTNAME] = $HOSTNAME @@ -80,14 +103,14 @@ ths = document.getElementsByTagName("th"); for (var i=0; i