archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.6' into PHP-7.0

Browse source
This commit is contained in:
Christoph M. Becker 2016-11-18 14:29:28 +01:00
commit 583a273849
3 changed files with 47 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -17,6 +17,9 @@ PHP NEWS
This may be enabled again using envirionment variable USE_ZEND_DTRACE=1. This may be enabled again using envirionment variable USE_ZEND_DTRACE=1.
(Dmitry) (Dmitry)
- Mysqlnd:
. Fixed bug #64526 (Add missing mysqlnd.* parameters to php.ini-*). (cmb)
- ODBC: - ODBC:
. Fixed bug #73448 (odbc_errormsg returns trash, always 513 bytes). . Fixed bug #73448 (odbc_errormsg returns trash, always 513 bytes).
(Anatol) (Anatol)

22
php.ini-development
View file

@ -1184,6 +1184,19 @@ mysqlnd.collect_statistics = On
; http://php.net/mysqlnd.collect_memory_statistics ; http://php.net/mysqlnd.collect_memory_statistics
mysqlnd.collect_memory_statistics = On 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. ; Size of a pre-allocated buffer used when sending commands to MySQL in bytes.
; http://php.net/mysqlnd.net_cmd_buffer_size ; http://php.net/mysqlnd.net_cmd_buffer_size
;mysqlnd.net_cmd_buffer_size = 2048 ;mysqlnd.net_cmd_buffer_size = 2048
@ -1193,6 +1206,15 @@ mysqlnd.collect_memory_statistics = On
; http://php.net/mysqlnd.net_read_buffer_size ; http://php.net/mysqlnd.net_read_buffer_size
;mysqlnd.net_read_buffer_size = 32768 ;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] [OCI8]
; Connection: Enables privileged connections using external ; Connection: Enables privileged connections using external

22
php.ini-production
View file

@ -1184,6 +1184,19 @@ mysqlnd.collect_statistics = On
; http://php.net/mysqlnd.collect_memory_statistics ; http://php.net/mysqlnd.collect_memory_statistics
mysqlnd.collect_memory_statistics = Off 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. ; Size of a pre-allocated buffer used when sending commands to MySQL in bytes.
; http://php.net/mysqlnd.net_cmd_buffer_size ; http://php.net/mysqlnd.net_cmd_buffer_size
;mysqlnd.net_cmd_buffer_size = 2048 ;mysqlnd.net_cmd_buffer_size = 2048
@ -1193,6 +1206,15 @@ mysqlnd.collect_memory_statistics = Off
; http://php.net/mysqlnd.net_read_buffer_size ; http://php.net/mysqlnd.net_read_buffer_size
;mysqlnd.net_read_buffer_size = 32768 ;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] [OCI8]
; Connection: Enables privileged connections using external ; Connection: Enables privileged connections using external