Roxen.git/ server/ base_server/ roxen.pike

Branch: Tag:

1998-02-10

1998-02-10 18:36:21 by Per Hedbor <ph@opera.com>

Fixes...

Rev: server/base_server/cache.pike:1.19
Rev: server/base_server/color.pike:1.13
Rev: server/base_server/configuration.pike:1.94
Rev: server/base_server/disk_cache.pike:1.34
Rev: server/base_server/dummy_hosts.pike:1.5
Rev: server/base_server/html.pike:1.4
Rev: server/base_server/language.pike:1.12
Rev: server/base_server/lock.pike:1.3(DEAD)
Rev: server/base_server/mainconfig.pike:1.94
Rev: server/base_server/module_support.pike:1.15
Rev: server/base_server/newdecode.pike:1.7
Rev: server/base_server/privs.pike:1.33
Rev: server/base_server/read_config.pike:1.20
Rev: server/base_server/roxen.pike:1.166
Rev: server/base_server/roxenlib.pike:1.47
Rev: server/base_server/roxenloader.pike:1.58
Rev: server/base_server/smartpipe.pike:1.1
Rev: server/base_server/socket.pike:1.11
Rev: server/modules/filesystems/filesystem.pike:1.27
Rev: server/modules/filesystems/restrictedfs.pike:1.8
Rev: server/modules/filesystems/userfs.pike:1.18
Rev: server/modules/filters/htaccess.pike:1.29
Rev: server/modules/filters/redirect.pike:1.12
Rev: server/modules/graphics/graphic_text.pike:1.101
Rev: server/modules/misc/contenttypes.pike:1.11
Rev: server/modules/misc/demo.pike:1.2
Rev: server/modules/misc/ismap.pike:1.11
Rev: server/modules/misc/userdb.pike:1.24
Rev: server/modules/misc/ypuserdb.pike:1.7
Rev: server/protocols/http.pike:1.54

1: - constant cvs_version = "$Id: roxen.pike,v 1.165 1998/02/05 02:01:02 grubba Exp $"; + constant cvs_version = "$Id: roxen.pike,v 1.166 1998/02/10 18:36:09 per Exp $";   #define IN_ROXEN   #include <roxen.h>   #include <config.h>
22:   inherit "disk_cache";   inherit "language";    + #if constant(spider.shuffle) + #ifdef THREADS + program pipe = Pipe.pipe; + #else + program pipe = (program)"smartpipe"; + #endif + #else + program pipe = Pipe.pipe; + #endif +    // This is the real Roxen version. It should be changed before each   // release -  + #ifdef __NT__ + constant real_version = "Roxen Challenger/1.2beta2 NT alpha 1"; + #else   constant real_version = "Roxen Challenger/1.2beta2"; -  + #endif      #if _DEBUG_HTTP_OBJECTS   mapping httpobjects = ([]);
38:   #define MD_PERROR(X)   #endif /* MODULE_DEBUG */    - import Array; - import spider; - import String; - import Stdio; -  +    object roxen=this_object(), current_configuration;   // int num_connections;   
57:   #endif      // A mapping from ports (objects, that is) to an array of information - // about that port. - // This will be moved to objects cloned from the configuration object - // in the future. + // about that port. This will hopefully be moved to objects cloned + // from the configuration object in the future.   mapping portno=([]);      // decode.pike used to be here.
1121:   #endif    if(!s)    { -  t = read_bytes("/etc/resolv.conf"); +  t = Stdio.read_bytes("/etc/resolv.conf");    if(t)    {    if(!sscanf(t, "domain %s\n", s))
1820:    config_ports_changed = 0;      #ifndef THREADS -  if(catch(map(configuration_ports, destruct))) -  catch(map(configuration_ports, do_dest)); +  if(catch(Array.map(configuration_ports, destruct))) +  catch(Array.map(configuration_ports, do_dest));       catch(do_dest(main_configuration_port));   
2182:    }   #endif /* send_fd */    // Fallback, when there is no external shuffler. -  object p = Pipe.pipe(); +  object p = pipe();    // p->input(from);    p->output(to);    if (to2) {
2453:    "<table width=100% cellspacing=0 cellpadding=0>\n"+    "<tr align=right><td>fd</td><td>type</td><td>mode</td>"+    "<td>size</td><td>inode</td></tr>\n"+ -  (map(get_all_active_fd(), +  (Array.map(get_all_active_fd(),    lambda(int fd)    {    return ("<tr align=right><th>"+fd+"</th><td>"+