diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-10-28 13:48:02 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-10-28 13:48:02 +0400 |
| commit | c6fb00e6d77039a10a8544e33768a5686e0bda08 (patch) | |
| tree | c9f1547e741dc91e47a7d0414ef966a03b45f1ea | |
| parent | b0f9768e02c8877347c9d8796b0bb413e82ec678 (diff) | |
| parent | 09ad5fbbb35f9b3180c853cb05cbb2b3ac6a298a (diff) | |
| download | php-git-c6fb00e6d77039a10a8544e33768a5686e0bda08.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
increase backlog to the highest value everywhere
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
| -rw-r--r-- | ext/odbc/php_odbc_includes.h | 2 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_sockets.h | 2 | ||||
| -rw-r--r-- | sapi/fpm/php-fpm.conf.in | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h index ca237c0537..c00583b16a 100644 --- a/ext/odbc/php_odbc_includes.h +++ b/ext/odbc/php_odbc_includes.h @@ -232,7 +232,7 @@ typedef struct odbc_connection { } odbc_connection; typedef struct odbc_result_value { - char name[32]; + char name[256]; char *value; SQLLEN vallen; SQLLEN coltype; diff --git a/sapi/fpm/fpm/fpm_sockets.h b/sapi/fpm/fpm/fpm_sockets.h index cce5712b8c..121c016a7b 100644 --- a/sapi/fpm/fpm/fpm_sockets.h +++ b/sapi/fpm/fpm/fpm_sockets.h @@ -19,7 +19,7 @@ #if (__FreeBSD__) || (__OpenBSD__) #define FPM_BACKLOG_DEFAULT -1 #else -#define FPM_BACKLOG_DEFAULT 128 +#define FPM_BACKLOG_DEFAULT 65535 #endif enum fpm_address_domain fpm_sockets_domain_from_address(char *addr); diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in index af4f2fa325..9002a2933b 100644 --- a/sapi/fpm/php-fpm.conf.in +++ b/sapi/fpm/php-fpm.conf.in @@ -159,8 +159,8 @@ group = @php_fpm_group@ listen = 127.0.0.1:9000 ; Set listen(2) backlog. -; Default Value: 128 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 128 +; Default Value: 65535 (-1 on FreeBSD and OpenBSD) +;listen.backlog = 65535 ; Set permissions for unix socket, if one is used. In Linux, read/write ; permissions must be set in order to allow connections from a web server. Many |