Skip to content

Commit f2a3be9

Browse files
committed
Merge branch 'PHP-5.6'
* PHP-5.6: Fix bug #67060: use default mode of 660
2 parents 8928611 + c397fcc commit f2a3be9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

sapi/fpm/fpm/fpm_unix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ int fpm_unix_resolve_socket_premissions(struct fpm_worker_pool_s *wp) /* {{{ */
3939
/* uninitialized */
4040
wp->socket_uid = -1;
4141
wp->socket_gid = -1;
42-
wp->socket_mode = 0666;
42+
wp->socket_mode = 0660;
4343

4444
if (!c) {
4545
return 0;

sapi/fpm/php-fpm.conf.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@ listen = 127.0.0.1:9000
166166
; permissions must be set in order to allow connections from a web server. Many
167167
; BSD-derived systems allow connections regardless of permissions.
168168
; Default Values: user and group are set as the running user
169-
; mode is set to 0666
169+
; mode is set to 0660
170170
;listen.owner = @php_fpm_user@
171171
;listen.group = @php_fpm_group@
172-
;listen.mode = 0666
172+
;listen.mode = 0660
173173

174174
; List of ipv4 addresses of FastCGI clients which are allowed to connect.
175175
; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original

0 commit comments

Comments
 (0)