CVS update: php31/main
| From: | shane | Date: | Wed, 16 Sep 1998 19:15:24 +0000 |
| Subject: | CVS update: php31/main | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1181@lists.php.net to get a copy of this message | ||
Date: Wednesday September 16, 1998 @ 15:15
Author: shane
Update of /repository/php31/main
In directory asf:/u2/tmp/cvs-serv20230/main
Modified Files:
debugger.c php3_ini.c
Log Message:
fix cfg_get functions. I know they'll be changing eventualy, might as well
have it work now though.
apache works again.
Index: php31/main/debugger.c
diff -c php31/main/debugger.c:2.1 php31/main/debugger.c:2.2
*** php31/main/debugger.c:2.1 Sun Sep 6 17:34:35 1998
--- php31/main/debugger.c Wed Sep 16 15:15:24 1998
***************
*** 247,266 ****
{
TLS_VARS;
! /* FIXME
! * this will be done automatically when all the configuration magic is done
! */
! /*
! if (cfg_get_string("debugger.host", &GLOBAL(debugger_host)) == FAILURE) {
GLOBAL(debugger_host) = "localhost";
}
! if (cfg_get_long("debugger.port", &GLOBAL(debugger_port)) == FAILURE) {
GLOBAL(debugger_port) = 7869;
}
! if (cfg_get_long("debugger.enabled", &GLOBAL(debugger_default)) == FAILURE) {
GLOBAL(debugger_default) = 0;
}
- */
GLOBAL(myhostname) = find_hostname();
GLOBAL(mypid) = getpid();
--- 247,261 ----
{
TLS_VARS;
! if (ini_get_string("debugger.host", &GLOBAL(debugger_host)) == FAILURE) {
GLOBAL(debugger_host) = "localhost";
}
! if (ini_get_long("debugger.port", &GLOBAL(debugger_port)) == FAILURE) {
GLOBAL(debugger_port) = 7869;
}
! if (ini_get_long("debugger.enabled", &GLOBAL(debugger_default)) == FAILURE) {
GLOBAL(debugger_default) = 0;
}
GLOBAL(myhostname) = find_hostname();
GLOBAL(mypid) = getpid();
Index: php31/main/php3_ini.c
diff -c php31/main/php3_ini.c:2.2 php31/main/php3_ini.c:2.3
*** php31/main/php3_ini.c:2.2 Thu Sep 3 03:11:19 1998
--- php31/main/php3_ini.c Wed Sep 16 15:15:24 1998
***************
*** 23,29 ****
PHPAPI void _php3_set_ini(php3_ini_structure *conf){
TLS_VARS;
! /* GLOBAL(php3_ini)=_php3_copy_ini_master(); */
if(conf)memcpy(GLOBAL(php3_ini),conf,sizeof(php3_ini_structure));
}
--- 23,30 ----
PHPAPI void _php3_set_ini(php3_ini_structure *conf){
TLS_VARS;
! if(php3_ini_master.use_registry)return;
! GLOBAL(php3_ini)=_php3_copy_ini_master();
if(conf)memcpy(GLOBAL(php3_ini),conf,sizeof(php3_ini_structure));
}
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net