2001-06-30
2001-06-30 15:44:05 by Martin Stjernholm <mast@lysator.liu.se>
-
3557f5c1ce93bd4cdda37e8163e912440216ed28
(13 lines)
(+8/-5)
[
Show
| Annotate
]
Branch: 5.2
Fixed so that the configuration has the proper name, even before create()
executes.
Rev: server/base_server/configuration.pike:1.444
Rev: server/base_server/module.pike:1.117
Rev: server/base_server/roxen.pike:1.682
Rev: server/base_server/rxml.pike:1.306
6:
// Per Hedbor, Henrik Grubbström, Pontus Hagland, David Hedbor and others.
// ABS and suicide systems contributed freely by Francesco Chemolli
- constant cvs_version="$Id: roxen.pike,v 1.681 2001/06/30 13:43:05 mast Exp $";
+ constant cvs_version="$Id: roxen.pike,v 1.682 2001/06/30 15:44:05 mast Exp $";
// The argument cache. Used by the image cache.
ArgCache argcache;
3407:
private mapping(string:Configuration) config_lookup = ([]);
// Maps config name to config object.
- Thread.Local module_init_info = Thread.Local();
- // Used temporarily at module initialization to hold some info so that
- // it's available even before create() in the module is called.
+ Thread.Local bootstrap_info = Thread.Local();
+ // Used temporarily at configuration and module initialization to hold
+ // some info so that it's available even before create() in the
+ // configuration/module is called.
void fix_config_lookup()
{
3437: Inside #if defined(DEBUG)
if (get_configuration (name))
error ("A configuration called %O already exists.\n", name);
#endif
- Configuration cf = _configuration( name );
+ bootstrap_info->set (name);
+ Configuration cf = _configuration();
configurations += ({ cf });
fix_config_lookup();
return cf;