From e44deba1e9f51e562d620536f21b6aac987f280f Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Fri, 18 Nov 2016 14:17:19 +0100 Subject: [PATCH] Fix #64526: Add missing mysqlnd.* parameters to php.ini-* --- NEWS | 3 +++ php.ini-development | 22 ++++++++++++++++++++++ php.ini-production | 22 ++++++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/NEWS b/NEWS index 1370f08ac1f..63c7610e9c4 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2016, PHP 5.6.29 +- Mysqlnd: + . Fixed bug #64526 (Add missing mysqlnd.* parameters to php.ini-*). (cmb) + - Opcache: . Fixed bug #73402 (Opcache segfault when using class constant to call a method). (Laruence) diff --git a/php.ini-development b/php.ini-development index 76f2174f5ed..38812f1405c 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1250,6 +1250,19 @@ mysqlnd.collect_statistics = On ; http://php.net/mysqlnd.collect_memory_statistics mysqlnd.collect_memory_statistics = On +; Records communication from all extensions using mysqlnd to the specified log +; file. +; http://php.net/mysqlnd.debug +;mysqlnd.debug = + +; Defines which queries will be logged. +; http://php.net/mysqlnd.log_mask +;mysqlnd.log_mask = 0 + +; Default size of the mysqlnd memory pool, which is used by result sets. +; http://php.net/mysqlnd.mempool_default_size +;mysqlnd.mempool_default_size = 16000 + ; Size of a pre-allocated buffer used when sending commands to MySQL in bytes. ; http://php.net/mysqlnd.net_cmd_buffer_size ;mysqlnd.net_cmd_buffer_size = 2048 @@ -1259,6 +1272,15 @@ mysqlnd.collect_memory_statistics = On ; http://php.net/mysqlnd.net_read_buffer_size ;mysqlnd.net_read_buffer_size = 32768 +; Timeout for network requests in seconds. +; http://php.net/mysqlnd.net_read_timeout +;mysqlnd.net_read_timeout = 31536000 + +; SHA-256 Authentication Plugin related. File with the MySQL server public RSA +; key. +; http://php.net/mysqlnd.sha256_server_public_key +;mysqlnd.sha256_server_public_key = + [OCI8] ; Connection: Enables privileged connections using external diff --git a/php.ini-production b/php.ini-production index b593c24230d..07ca8dc400e 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1250,6 +1250,19 @@ mysqlnd.collect_statistics = On ; http://php.net/mysqlnd.collect_memory_statistics mysqlnd.collect_memory_statistics = Off +; Records communication from all extensions using mysqlnd to the specified log +; file. +; http://php.net/mysqlnd.debug +;mysqlnd.debug = + +; Defines which queries will be logged. +; http://php.net/mysqlnd.log_mask +;mysqlnd.log_mask = 0 + +; Default size of the mysqlnd memory pool, which is used by result sets. +; http://php.net/mysqlnd.mempool_default_size +;mysqlnd.mempool_default_size = 16000 + ; Size of a pre-allocated buffer used when sending commands to MySQL in bytes. ; http://php.net/mysqlnd.net_cmd_buffer_size ;mysqlnd.net_cmd_buffer_size = 2048 @@ -1259,6 +1272,15 @@ mysqlnd.collect_memory_statistics = Off ; http://php.net/mysqlnd.net_read_buffer_size ;mysqlnd.net_read_buffer_size = 32768 +; Timeout for network requests in seconds. +; http://php.net/mysqlnd.net_read_timeout +;mysqlnd.net_read_timeout = 31536000 + +; SHA-256 Authentication Plugin related. File with the MySQL server public RSA +; key. +; http://php.net/mysqlnd.sha256_server_public_key +;mysqlnd.sha256_server_public_key = + [OCI8] ; Connection: Enables privileged connections using external