diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2003-05-28 16:18:14 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2003-05-28 16:18:14 +0000 |
| commit | 9a9b55e60b34d7c5d5424091543eb20172ce812e (patch) | |
| tree | f20c928c58a79c4812730a464283a7d19efe79e9 /ext/mysql/php_mysql.c | |
| parent | 2dc78733629f49fe634a6201c9ca577923fc6ede (diff) | |
| download | php-git-9a9b55e60b34d7c5d5424091543eb20172ce812e.tar.gz | |
I see no reason not to allow people to set the timeout on a mysql_connect
from inside a script with ini_set(). We allow user-settable timeouts on
other socket connections so having this as a system-settable only
directive doesn't make much sense to me.
Diffstat (limited to 'ext/mysql/php_mysql.c')
| -rw-r--r-- | ext/mysql/php_mysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 2d766c4dcc..4ff77fc294 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -315,7 +315,7 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("mysql.default_password", NULL, PHP_INI_ALL, OnUpdateString, default_password, zend_mysql_globals, mysql_globals) PHP_INI_ENTRY("mysql.default_port", NULL, PHP_INI_ALL, OnMySQLPort) STD_PHP_INI_ENTRY("mysql.default_socket", NULL, PHP_INI_ALL, OnUpdateStringUnempty, default_socket, zend_mysql_globals, mysql_globals) - STD_PHP_INI_ENTRY("mysql.connect_timeout", "-1", PHP_INI_SYSTEM, OnUpdateInt, connect_timeout, zend_mysql_globals, mysql_globals) + STD_PHP_INI_ENTRY("mysql.connect_timeout", "-1", PHP_INI_ALL, OnUpdateInt, connect_timeout, zend_mysql_globals, mysql_globals) STD_PHP_INI_BOOLEAN("mysql.trace_mode", "0", PHP_INI_ALL, OnUpdateInt, trace_mode, zend_mysql_globals, mysql_globals) PHP_INI_END() /* }}} */ |