Skip to content

Commit 14609ca

Browse files
petkkrakjoe
authored andcommitted
Fix bug #69954 and remove pdo_mysql.cache_size and mysqli.cache_size INI directives
This patch removes some non working links to PHP manual and removes the pdo_mysql.cache_size and mysqli.cache_size INI directives which have been removed since PHP 5.3.0.
1 parent a59e233 commit 14609ca

File tree

3 files changed

+2
-36
lines changed

3 files changed

+2
-36
lines changed

Diff for: NEWS

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ PHP NEWS
55
- Core:
66
. Fixed bug #75368 (mmap/munmap trashing on unlucky allocations). (Nikita,
77
Dmitry)
8+
. Fixed bug #69954 (broken links and unused config items in distributed ini
9+
files). (petk)
810

911
- CLI:
1012
. Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown

Diff for: php.ini-development

-18
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,6 @@ enable_dl = Off
761761

762762
; if cgi.discard_path is enabled, the PHP CGI binary can safely be placed outside
763763
; of the web tree and people will not be able to circumvent .htaccess security.
764-
; http://php.net/cgi.dicard-path
765764
;cgi.discard_path=1
766765

767766
; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
@@ -995,13 +994,8 @@ cli_server.color = On
995994
;pdo_odbc.db2_instance_name
996995

997996
[Pdo_mysql]
998-
; If mysqlnd is used: Number of cache slots for the internal result set cache
999-
; http://php.net/pdo_mysql.cache_size
1000-
pdo_mysql.cache_size = 2000
1001-
1002997
; Default socket name for local MySQL connects. If empty, uses the built-in
1003998
; MySQL defaults.
1004-
; http://php.net/pdo_mysql.default-socket
1005999
pdo_mysql.default_socket=
10061000

10071001
[Phar]
@@ -1138,10 +1132,6 @@ mysqli.allow_persistent = On
11381132
; http://php.net/mysqli.max-links
11391133
mysqli.max_links = -1
11401134

1141-
; If mysqlnd is used: Number of cache slots for the internal result set cache
1142-
; http://php.net/mysqli.cache_size
1143-
mysqli.cache_size = 2000
1144-
11451135
; Default port number for mysqli_connect(). If unset, mysqli_connect() will use
11461136
; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
11471137
; compile-time value defined MYSQL_PORT (in that order). Win32 will only look
@@ -1176,12 +1166,10 @@ mysqli.reconnect = Off
11761166
[mysqlnd]
11771167
; Enable / Disable collection of general statistics by mysqlnd which can be
11781168
; used to tune and monitor MySQL operations.
1179-
; http://php.net/mysqlnd.collect_statistics
11801169
mysqlnd.collect_statistics = On
11811170

11821171
; Enable / Disable collection of memory usage statistics by mysqlnd which can be
11831172
; used to tune and monitor MySQL operations.
1184-
; http://php.net/mysqlnd.collect_memory_statistics
11851173
mysqlnd.collect_memory_statistics = On
11861174

11871175
; Records communication from all extensions using mysqlnd to the specified log
@@ -1190,29 +1178,23 @@ mysqlnd.collect_memory_statistics = On
11901178
;mysqlnd.debug =
11911179

11921180
; Defines which queries will be logged.
1193-
; http://php.net/mysqlnd.log_mask
11941181
;mysqlnd.log_mask = 0
11951182

11961183
; Default size of the mysqlnd memory pool, which is used by result sets.
1197-
; http://php.net/mysqlnd.mempool_default_size
11981184
;mysqlnd.mempool_default_size = 16000
11991185

12001186
; Size of a pre-allocated buffer used when sending commands to MySQL in bytes.
1201-
; http://php.net/mysqlnd.net_cmd_buffer_size
12021187
;mysqlnd.net_cmd_buffer_size = 2048
12031188

12041189
; Size of a pre-allocated buffer used for reading data sent by the server in
12051190
; bytes.
1206-
; http://php.net/mysqlnd.net_read_buffer_size
12071191
;mysqlnd.net_read_buffer_size = 32768
12081192

12091193
; Timeout for network requests in seconds.
1210-
; http://php.net/mysqlnd.net_read_timeout
12111194
;mysqlnd.net_read_timeout = 31536000
12121195

12131196
; SHA-256 Authentication Plugin related. File with the MySQL server public RSA
12141197
; key.
1215-
; http://php.net/mysqlnd.sha256_server_public_key
12161198
;mysqlnd.sha256_server_public_key =
12171199

12181200
[OCI8]

Diff for: php.ini-production

-18
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,6 @@ enable_dl = Off
761761

762762
; if cgi.discard_path is enabled, the PHP CGI binary can safely be placed outside
763763
; of the web tree and people will not be able to circumvent .htaccess security.
764-
; http://php.net/cgi.dicard-path
765764
;cgi.discard_path=1
766765

767766
; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
@@ -995,13 +994,8 @@ cli_server.color = On
995994
;pdo_odbc.db2_instance_name
996995

997996
[Pdo_mysql]
998-
; If mysqlnd is used: Number of cache slots for the internal result set cache
999-
; http://php.net/pdo_mysql.cache_size
1000-
pdo_mysql.cache_size = 2000
1001-
1002997
; Default socket name for local MySQL connects. If empty, uses the built-in
1003998
; MySQL defaults.
1004-
; http://php.net/pdo_mysql.default-socket
1005999
pdo_mysql.default_socket=
10061000

10071001
[Phar]
@@ -1138,10 +1132,6 @@ mysqli.allow_persistent = On
11381132
; http://php.net/mysqli.max-links
11391133
mysqli.max_links = -1
11401134

1141-
; If mysqlnd is used: Number of cache slots for the internal result set cache
1142-
; http://php.net/mysqli.cache_size
1143-
mysqli.cache_size = 2000
1144-
11451135
; Default port number for mysqli_connect(). If unset, mysqli_connect() will use
11461136
; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
11471137
; compile-time value defined MYSQL_PORT (in that order). Win32 will only look
@@ -1176,12 +1166,10 @@ mysqli.reconnect = Off
11761166
[mysqlnd]
11771167
; Enable / Disable collection of general statistics by mysqlnd which can be
11781168
; used to tune and monitor MySQL operations.
1179-
; http://php.net/mysqlnd.collect_statistics
11801169
mysqlnd.collect_statistics = On
11811170

11821171
; Enable / Disable collection of memory usage statistics by mysqlnd which can be
11831172
; used to tune and monitor MySQL operations.
1184-
; http://php.net/mysqlnd.collect_memory_statistics
11851173
mysqlnd.collect_memory_statistics = Off
11861174

11871175
; Records communication from all extensions using mysqlnd to the specified log
@@ -1190,29 +1178,23 @@ mysqlnd.collect_memory_statistics = Off
11901178
;mysqlnd.debug =
11911179

11921180
; Defines which queries will be logged.
1193-
; http://php.net/mysqlnd.log_mask
11941181
;mysqlnd.log_mask = 0
11951182

11961183
; Default size of the mysqlnd memory pool, which is used by result sets.
1197-
; http://php.net/mysqlnd.mempool_default_size
11981184
;mysqlnd.mempool_default_size = 16000
11991185

12001186
; Size of a pre-allocated buffer used when sending commands to MySQL in bytes.
1201-
; http://php.net/mysqlnd.net_cmd_buffer_size
12021187
;mysqlnd.net_cmd_buffer_size = 2048
12031188

12041189
; Size of a pre-allocated buffer used for reading data sent by the server in
12051190
; bytes.
1206-
; http://php.net/mysqlnd.net_read_buffer_size
12071191
;mysqlnd.net_read_buffer_size = 32768
12081192

12091193
; Timeout for network requests in seconds.
1210-
; http://php.net/mysqlnd.net_read_timeout
12111194
;mysqlnd.net_read_timeout = 31536000
12121195

12131196
; SHA-256 Authentication Plugin related. File with the MySQL server public RSA
12141197
; key.
1215-
; http://php.net/mysqlnd.sha256_server_public_key
12161198
;mysqlnd.sha256_server_public_key =
12171199

12181200
[OCI8]

0 commit comments

Comments
 (0)