php: update patches for 5.5.13.
This commit is contained in:
parent
48ee4d3dd0
commit
daa90022e9
|
@ -1,5 +1,5 @@
|
||||||
--- sapi/fpm/php-fpm.conf.in 2013-06-19 22:03:18.000000000 +0200
|
--- sapi/fpm/php-fpm.conf.in 2014-04-29 10:04:30.000000000 +0200
|
||||||
+++ sapi/fpm/php-fpm.conf.in 2013-06-20 17:03:03.728835784 +0200
|
+++ sapi/fpm/php-fpm.conf.in 2014-05-01 07:36:14.762839158 +0200
|
||||||
@@ -12,7 +12,7 @@
|
@@ -12,7 +12,7 @@
|
||||||
; Relative path can also be used. They will be prefixed by:
|
; Relative path can also be used. They will be prefixed by:
|
||||||
; - the global prefix if it's been set (-p argument)
|
; - the global prefix if it's been set (-p argument)
|
||||||
|
@ -27,14 +27,14 @@
|
||||||
+listen = /run/php-fpm/php-fpm.sock
|
+listen = /run/php-fpm/php-fpm.sock
|
||||||
|
|
||||||
; Set listen(2) backlog.
|
; Set listen(2) backlog.
|
||||||
; Default Value: 128 (-1 on FreeBSD and OpenBSD)
|
; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
|
||||||
@@ -167,9 +168,9 @@
|
@@ -167,9 +168,9 @@
|
||||||
; BSD-derived systems allow connections regardless of permissions.
|
; BSD-derived systems allow connections regardless of permissions.
|
||||||
; Default Values: user and group are set as the running user
|
; Default Values: user and group are set as the running user
|
||||||
; mode is set to 0666
|
; mode is set to 0660
|
||||||
-;listen.owner = @php_fpm_user@
|
-;listen.owner = @php_fpm_user@
|
||||||
-;listen.group = @php_fpm_group@
|
-;listen.group = @php_fpm_group@
|
||||||
-;listen.mode = 0666
|
-;listen.mode = 0660
|
||||||
+listen.owner = @php_fpm_user@
|
+listen.owner = @php_fpm_user@
|
||||||
+listen.group = @php_fpm_group@
|
+listen.group = @php_fpm_group@
|
||||||
+listen.mode = 0660
|
+listen.mode = 0660
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- php.ini-production 2013-08-15 22:42:04.000000000 +0200
|
--- php.ini-production 2014-04-29 10:04:30.000000000 +0200
|
||||||
+++ php.ini-production 2013-08-16 08:03:36.178726858 +0200
|
+++ php.ini-production 2014-05-01 07:32:06.928871679 +0200
|
||||||
@@ -305,7 +305,7 @@
|
@@ -296,7 +296,7 @@
|
||||||
; or per-virtualhost web server configuration file. This directive is
|
; or per-virtualhost web server configuration file. This directive is
|
||||||
; *NOT* affected by whether Safe Mode is turned On or Off.
|
; *NOT* affected by whether Safe Mode is turned On or Off.
|
||||||
; http://php.net/open-basedir
|
; http://php.net/open-basedir
|
||||||
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
; This directive allows you to disable certain functions for security reasons.
|
; This directive allows you to disable certain functions for security reasons.
|
||||||
; It receives a comma-delimited list of function names. This directive is
|
; It receives a comma-delimited list of function names. This directive is
|
||||||
@@ -702,7 +702,7 @@
|
@@ -693,7 +693,7 @@
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
; UNIX: "/path1:/path2"
|
; UNIX: "/path1:/path2"
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
;
|
;
|
||||||
; Windows: "\path1;\path2"
|
; Windows: "\path1;\path2"
|
||||||
;include_path = ".;c:\php\includes"
|
;include_path = ".;c:\php\includes"
|
||||||
@@ -725,7 +725,7 @@
|
@@ -716,7 +716,7 @@
|
||||||
|
|
||||||
; Directory in which the loadable extensions (modules) reside.
|
; Directory in which the loadable extensions (modules) reside.
|
||||||
; http://php.net/extension-dir
|
; http://php.net/extension-dir
|
||||||
|
@ -27,7 +27,7 @@
|
||||||
; On windows:
|
; On windows:
|
||||||
; extension_dir = "ext"
|
; extension_dir = "ext"
|
||||||
|
|
||||||
@@ -863,50 +863,48 @@
|
@@ -854,50 +854,48 @@
|
||||||
; If you only provide the name of the extension, PHP will look for it in its
|
; If you only provide the name of the extension, PHP will look for it in its
|
||||||
; default extension directory.
|
; default extension directory.
|
||||||
;
|
;
|
||||||
|
|
Loading…
Reference in New Issue