Roxen.git/ server/ base_server/ roxen.pike

1997-03-02

1997-03-02 09:52:44 by Per Hedbor <ph@opera.com>

• 82f519a018c76dcbbdad1009c01b6c2433ca269d (22 lines) (+13/-9) ^{[ Show | Annotate ]}
  Branch: 5.2

Fixes for the latest pike...

Rev: server/base_server/roxen.pike:1.42
Rev: server/base_server/roxenloader.pike:1.10
Rev: server/modules/proxies/proxy.pike:1.13
Rev: server/protocols/http.pike:1.20
Rev: server/start:1.7

1: - string cvs_version = "$Id: roxen.pike,v 1.41 1997/02/27 19:46:01 per Exp $"; + string cvs_version = "$Id: roxen.pike,v 1.42 1997/03/02 09:52:41 per Exp $";   #define IN_ROXEN   #ifdef THREADS   #include <fifo.h>
903:      object load(string s) // Should perhaps be renamed to 'reload'.   { + // perror("Module is "+s+"?");    if(file_stat(s+".pike"))    { -  + // perror("Yes, compile "+s+"?");    if(__p=compile_file(s+".pike"))    { -  + // perror("Yes.");    my_loaded[__p]=s+".pike";    return __p();    } else
935:    array(string) dirs=({d});      //perror("Expand dir "+d+"\n"); -  +  catch {    foreach((get_dir(d) || ({})) - ({"CVS"}) , nd)    if(file_stat(d+nd)[1]==-2)    dirs+=expand_dir(d+nd+"/"); -  +  }; // This catch is needed....    return dirs;   }   
967:   void create()   {    add_constant("roxen", this_object()); -  (object)"color"; -  (object)"fonts"; +  (object)"color.pike"; +  (object)"fonts,pike";    Configuration = (program)"configuration";   }