Skip to content

Commit

Permalink
Merge pull request #41 from devilbox/release-0.29
Browse files Browse the repository at this point in the history
Fix default listen.backlog value
  • Loading branch information
cytopia authored Aug 4, 2018
2 parents c246645 + 8a4736f commit ff6afb7
Show file tree
Hide file tree
Showing 19 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Dockerfiles/base/data/php-fpm.conf/php-fpm-5.2.conf
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

<value name="listen_options">
Set listen(2) backlog
<value name="backlog">128</value>
<value name="backlog">1024</value>
Set permissions for unix socket, if one used.
In Linux read/write permissions must be set in order to allow connections from web server.
Many BSD-derrived systems allow connections regardless of permissions.
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/base/data/php-fpm.conf/php-fpm-5.3.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ access.log = /proc/self/fd/2

; This should not be greater than `cat /proc/sys/net/core/somaxconn`, otherwise connections
; are silently truncated
listen.backlog = 128
listen.backlog = 1024


; ############################################################
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/base/data/php-fpm.conf/php-fpm-5.4.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ access.log = /proc/self/fd/2

; This should not be greater than `cat /proc/sys/net/core/somaxconn`, otherwise connections
; are silently truncated
listen.backlog = 128
listen.backlog = 1024


; ############################################################
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/base/data/php-fpm.conf/php-fpm-5.5.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ access.log = /proc/self/fd/2

; This should not be greater than `cat /proc/sys/net/core/somaxconn`, otherwise connections
; are silently truncated
listen.backlog = 128
listen.backlog = 1024


; ############################################################
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/base/data/php-fpm.conf/php-fpm-5.6.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ access.log = /proc/self/fd/2

; This should not be greater than `cat /proc/sys/net/core/somaxconn`, otherwise connections
; are silently truncated
listen.backlog = 128
listen.backlog = 1024


; ############################################################
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/base/data/php-fpm.conf/php-fpm-7.0.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ access.log = /proc/self/fd/2

; This should not be greater than `cat /proc/sys/net/core/somaxconn`, otherwise connections
; are silently truncated
listen.backlog = 128
listen.backlog = 1024


; ############################################################
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/base/data/php-fpm.conf/php-fpm-7.1.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ access.log = /proc/self/fd/2

; This should not be greater than `cat /proc/sys/net/core/somaxconn`, otherwise connections
; are silently truncated
listen.backlog = 128
listen.backlog = 1024


; ############################################################
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/base/data/php-fpm.conf/php-fpm-7.2.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ access.log = /proc/self/fd/2

; This should not be greater than `cat /proc/sys/net/core/somaxconn`, otherwise connections
; are silently truncated
listen.backlog = 128
listen.backlog = 1024


; ############################################################
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/base/data/php-fpm.conf/php-fpm-7.3.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ access.log = /proc/self/fd/2

; This should not be greater than `cat /proc/sys/net/core/somaxconn`, otherwise connections
; are silently truncated
listen.backlog = 128
listen.backlog = 1024


; ############################################################
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/work/data/php-fpm.conf/php-fpm-5.2.conf
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

<value name="listen_options">
Set listen(2) backlog
<value name="backlog">128</value>
<value name="backlog">1024</value>
Set permissions for unix socket, if one used.
In Linux read/write permissions must be set in order to allow connections from web server.
Many BSD-derrived systems allow connections regardless of permissions.
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/work/data/php-fpm.conf/php-fpm-5.3.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ access.log = /proc/self/fd/2

; This should not be greater than `cat /proc/sys/net/core/somaxconn`, otherwise connections
; are silently truncated
listen.backlog = 128
listen.backlog = 1024


; ############################################################
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/work/data/php-fpm.conf/php-fpm-5.4.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ access.log = /proc/self/fd/2

; This should not be greater than `cat /proc/sys/net/core/somaxconn`, otherwise connections
; are silently truncated
listen.backlog = 128
listen.backlog = 1024


; ############################################################
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/work/data/php-fpm.conf/php-fpm-5.5.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ access.log = /proc/self/fd/2

; This should not be greater than `cat /proc/sys/net/core/somaxconn`, otherwise connections
; are silently truncated
listen.backlog = 128
listen.backlog = 1024


; ############################################################
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/work/data/php-fpm.conf/php-fpm-5.6.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ access.log = /proc/self/fd/2

; This should not be greater than `cat /proc/sys/net/core/somaxconn`, otherwise connections
; are silently truncated
listen.backlog = 128
listen.backlog = 1024


; ############################################################
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/work/data/php-fpm.conf/php-fpm-7.0.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ access.log = /proc/self/fd/2

; This should not be greater than `cat /proc/sys/net/core/somaxconn`, otherwise connections
; are silently truncated
listen.backlog = 128
listen.backlog = 1024


; ############################################################
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/work/data/php-fpm.conf/php-fpm-7.1.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ access.log = /proc/self/fd/2

; This should not be greater than `cat /proc/sys/net/core/somaxconn`, otherwise connections
; are silently truncated
listen.backlog = 128
listen.backlog = 1024


; ############################################################
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/work/data/php-fpm.conf/php-fpm-7.2.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ access.log = /proc/self/fd/2

; This should not be greater than `cat /proc/sys/net/core/somaxconn`, otherwise connections
; are silently truncated
listen.backlog = 128
listen.backlog = 1024


; ############################################################
Expand Down
2 changes: 1 addition & 1 deletion Dockerfiles/work/data/php-fpm.conf/php-fpm-7.3.conf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ access.log = /proc/self/fd/2

; This should not be greater than `cat /proc/sys/net/core/somaxconn`, otherwise connections
; are silently truncated
listen.backlog = 128
listen.backlog = 1024


; ############################################################
Expand Down
2 changes: 1 addition & 1 deletion build/ansible/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ php_settings_fpm:
# Network
listen: 9000
# Backlog
listen_backlog: 128
listen_backlog: 1024
# Logging
log_level: notice
error_log: /proc/self/fd/2
Expand Down

0 comments on commit ff6afb7

Please sign in to comment.