diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-11-18 14:29:28 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-11-18 14:29:52 +0100 |
| commit | 583a273849932adec3051a9ce06d591fe1ba21cd (patch) | |
| tree | 8761850319322d8bf751a7609eece2100e320a88 | |
| parent | 74b3e809d98e963d59f54728249083b4e82e8f70 (diff) | |
| parent | e44deba1e9f51e562d620536f21b6aac987f280f (diff) | |
| download | php-git-583a273849932adec3051a9ce06d591fe1ba21cd.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | php.ini-development | 22 | ||||
| -rw-r--r-- | php.ini-production | 22 |
3 files changed, 47 insertions, 0 deletions
@@ -17,6 +17,9 @@ PHP NEWS This may be enabled again using envirionment variable USE_ZEND_DTRACE=1. (Dmitry) +- Mysqlnd:
+ . Fixed bug #64526 (Add missing mysqlnd.* parameters to php.ini-*). (cmb)
+
- ODBC: . Fixed bug #73448 (odbc_errormsg returns trash, always 513 bytes). (Anatol) diff --git a/php.ini-development b/php.ini-development index c1f92c6c0d..e8800fc905 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1184,6 +1184,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 @@ -1193,6 +1206,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 a2c3240aaa..03254ad8c1 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1184,6 +1184,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 @@ -1193,6 +1206,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 |