diff options
| author | Zeev Suraski <zeev@php.net> | 2000-06-16 01:53:35 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-06-16 01:53:35 +0000 |
| commit | f29eae1302093b66fb68a5b83689d990b368cd7c (patch) | |
| tree | 8bec3d56f3245309834c9f79022689dfdeda7373 /ext | |
| parent | e3ae196da80914b95a959c36e30e82e2fcf3bfde (diff) | |
| download | php-git-f29eae1302093b66fb68a5b83689d990b368cd7c.tar.gz | |
Move timeout code to Zend, allow Win32 timeouts
@- Implemented max_execution_time under Win32 (Zeev)
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/mysql/php_mysql.c | 17 | ||||
| -rw-r--r-- | ext/mysql/php_mysql.h | 1 |
2 files changed, 11 insertions, 7 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 8e341bf671..2eb11df834 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -210,7 +210,7 @@ static void _close_mysql_plink(MYSQL *link) static PHP_INI_MH(OnMySQLPort) { MySLS_FETCH(); - + if (new_value==NULL) { /* default port */ #ifndef PHP_WIN32 struct servent *serv_ptr; @@ -236,11 +236,12 @@ static PHP_INI_MH(OnMySQLPort) PHP_INI_BEGIN() STD_PHP_INI_BOOLEAN("mysql.allow_persistent", "1", PHP_INI_SYSTEM, OnUpdateInt, allow_persistent, zend_mysql_globals, mysql_globals) STD_PHP_INI_ENTRY_EX("mysql.max_persistent", "-1", PHP_INI_SYSTEM, OnUpdateInt, max_persistent, zend_mysql_globals, mysql_globals, display_link_numbers) - STD_PHP_INI_ENTRY_EX("mysql.max_links", "-1", PHP_INI_SYSTEM, OnUpdateInt, max_links, zend_mysql_globals, mysql_globals, display_link_numbers) - STD_PHP_INI_ENTRY("mysql.default_host", NULL, PHP_INI_ALL, OnUpdateString, default_host, zend_mysql_globals, mysql_globals) - STD_PHP_INI_ENTRY("mysql.default_user", NULL, PHP_INI_ALL, OnUpdateString, default_user, zend_mysql_globals, mysql_globals) - 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_EX("mysql.max_links", "-1", PHP_INI_SYSTEM, OnUpdateInt, max_links, zend_mysql_globals, mysql_globals, display_link_numbers) + STD_PHP_INI_ENTRY("mysql.default_host", NULL, PHP_INI_ALL, OnUpdateString, default_host, zend_mysql_globals, mysql_globals) + STD_PHP_INI_ENTRY("mysql.default_user", NULL, PHP_INI_ALL, OnUpdateString, default_user, zend_mysql_globals, mysql_globals) + 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) PHP_INI_END() @@ -311,7 +312,7 @@ PHP_MINFO_FUNCTION(mysql) static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) { - char *user,*passwd,*host,*socket=NULL,*tmp; + char *user,*passwd,*host,*socket,*tmp; char *hashed_details; int hashed_details_length,port = MYSQL_PORT; MYSQL *mysql; @@ -319,6 +320,8 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent) MySLS_FETCH(); PLS_FETCH(); + socket = MySG(default_socket); + if (PG(sql_safe_mode)) { if (ZEND_NUM_ARGS()>0) { php_error(E_NOTICE,"SQL safe mode in effect - ignoring host/user/password information"); diff --git a/ext/mysql/php_mysql.h b/ext/mysql/php_mysql.h index 5b98e82994..1a9f0a3d74 100644 --- a/ext/mysql/php_mysql.h +++ b/ext/mysql/php_mysql.h @@ -82,6 +82,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mysql) long allow_persistent; long default_port; char *default_host, *default_user, *default_password; + char *default_socket; ZEND_END_MODULE_GLOBALS(mysql); #ifdef ZTS |