diff options
| author | Zeev Suraski <zeev@php.net> | 1999-04-28 21:37:54 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 1999-04-28 21:37:54 +0000 |
| commit | e22a1a08a5457448cbf3e6b37d6b79aefeaf0be5 (patch) | |
| tree | a85cc81d7ddf66436365424a1d0918ca2f676eab /ext/mysql/mysql.c | |
| parent | d843632629fa6705ebe1f15818e4f73fbe9c9e17 (diff) | |
| download | php-git-e22a1a08a5457448cbf3e6b37d6b79aefeaf0be5.tar.gz | |
Get the MySQL module to use the new INI mechanism feature
Diffstat (limited to 'ext/mysql/mysql.c')
| -rw-r--r-- | ext/mysql/mysql.c | 56 |
1 files changed, 10 insertions, 46 deletions
diff --git a/ext/mysql/mysql.c b/ext/mysql/mysql.c index 5e4c257af2..b19215d283 100644 --- a/ext/mysql/mysql.c +++ b/ext/mysql/mysql.c @@ -148,7 +148,9 @@ php3_module_entry mysql_module_entry = { "MySQL", mysql_functions, php3_minit_mysql, php3_mshutdown_mysql, php3_rinit_mysql, NULL, php3_info_mysql, STANDARD_MODULE_PROPERTIES }; -#ifndef ZTS +#ifdef ZTS +int mysql_globals_id; +#else php_mysql_globals mysql_globals; #endif @@ -227,44 +229,6 @@ static void _close_mysql_plink(MYSQL *link) } -static PHP_INI_MH(OnMySQLInt) -{ - long *p; -#ifndef ZTS - char *base = (char *) &mysql_globals; -#else - char *base; - MySLS_FETCH(); - - base = (char *) mysql_globals; -#endif - - p = (long *) (base+(size_t) mh_arg1); - - *p = atoi(new_value); - return SUCCESS; -} - - -static PHP_INI_MH(OnMySQLStr) -{ - char **p; -#ifndef ZTS - char *base = (char *) &mysql_globals; -#else - char *base; - MySLS_FETCH(); - - base = (char *) mysql_globals; -#endif - - p = (char **) (base+(size_t) mh_arg1); - - *p = new_value; - return SUCCESS; -} - - static PHP_INI_MH(OnMySQLPort) { MySLS_FETCH(); @@ -292,13 +256,13 @@ static PHP_INI_MH(OnMySQLPort) PHP_INI_BEGIN() - PHP_INI_ENTRY1("mysql.allow_persistent", "1", PHP_INI_SYSTEM, OnMySQLInt, (void *) XtOffsetOf(php_mysql_globals, allow_persistent)) - PHP_INI_ENTRY1("mysql.max_persistent", "-1", PHP_INI_SYSTEM, OnMySQLInt, (void *) XtOffsetOf(php_mysql_globals, max_persistent)) - PHP_INI_ENTRY1("mysql.max_links", "-1", PHP_INI_SYSTEM, OnMySQLInt, (void *) XtOffsetOf(php_mysql_globals, max_links)) - PHP_INI_ENTRY1("mysql.default_host", NULL, PHP_INI_ALL, OnMySQLStr, (void *) XtOffsetOf(php_mysql_globals, default_host)) - PHP_INI_ENTRY1("mysql.default_user", NULL, PHP_INI_ALL, OnMySQLStr, (void *) XtOffsetOf(php_mysql_globals, default_user)) - PHP_INI_ENTRY1("mysql.default_password", NULL, PHP_INI_ALL, OnMySQLStr, (void *) XtOffsetOf(php_mysql_globals, default_password)) - PHP_INI_ENTRY1("mysql.default_port", NULL, PHP_INI_ALL, OnMySQLPort, NULL) + STD_PHP_INI_ENTRY("mysql.allow_persistent", "1", PHP_INI_SYSTEM, OnUpdateInt, allow_persistent, php_mysql_globals, mysql_globals) + STD_PHP_INI_ENTRY("mysql.max_persistent", "-1", PHP_INI_SYSTEM, OnUpdateInt, max_persistent, php_mysql_globals, mysql_globals) + STD_PHP_INI_ENTRY("mysql.max_links", "-1", PHP_INI_SYSTEM, OnUpdateInt, max_links, php_mysql_globals, mysql_globals) + STD_PHP_INI_ENTRY("mysql.default_host", NULL, PHP_INI_ALL, OnUpdateString, default_host, php_mysql_globals, mysql_globals) + STD_PHP_INI_ENTRY("mysql.default_user", NULL, PHP_INI_ALL, OnUpdateString, default_user, php_mysql_globals, mysql_globals) + STD_PHP_INI_ENTRY("mysql.default_password", NULL, PHP_INI_ALL, OnUpdateString, default_password, php_mysql_globals, mysql_globals) + PHP_INI_ENTRY("mysql.default_port", NULL, PHP_INI_ALL, OnMySQLPort) PHP_INI_END() |