Branch: Tag:

2003-01-23

2003-01-23 16:21:02 by Martin Nilsson <mani@lysator.liu.se>

More cleanup

Rev: server/plugins/protocols/ftp.pike:2.87
Rev: server/plugins/protocols/http.pike:1.393
Rev: server/plugins/protocols/prot_ftp.pike:2.5
Rev: server/plugins/protocols/prot_ftps.pike:2.6
Rev: server/plugins/protocols/prot_hilfe.pike:2.17
Rev: server/plugins/protocols/prot_http.pike:2.7
Rev: server/plugins/protocols/prot_https.pike:2.8
Rev: server/plugins/protocols/prot_tetris.pike:2.6

4:   /*    * FTP protocol mk 2    * -  * $Id: ftp.pike,v 2.86 2003/01/07 18:34:07 jhs Exp $ +  * $Id: ftp.pike,v 2.87 2003/01/23 16:21:02 mani Exp $    *    * Henrik Grubbström <grubba@roxen.com>    */
1554:    int local_port;       // The listen port object -  roxen.Protocol port_obj; +  core.Protocol port_obj;       /*    * Misc
1957:       object throttler=session->throttler;    object pipe; -  pipe = roxen.get_shuffler( fd ); +  pipe = core.get_shuffler( fd );    if( conf )    conf->connection_add( this_object(), pipe );   
3332:       void ftp_SYST(string args)    { -  send(215, ({ "UNIX Type: L8: Roxen Information Server"})); +  send(215, ({ "UNIX Type: L8: ChiliMoon Internet Server"}));    }       void ftp_CLNT(string args)
3431:    "TYPE: %s, FORM: %s; STRUcture: %s; transfer MODE: %s\n"    "End of status",    replace(fd->query_address(1), " ", ":"), -  roxen.version(), +  core.version(),    port_obj->sorted_urls * "\nListening on ",    replace(fd->query_address(), " ", ":"),    user?sprintf("as %s", user):"anonymously",
3708: Inside #if 1
   line, describe_backtrace(err));    }   #else -  roxen->handle(lambda(function f, string args, string line) { +  core->handle(lambda(function f, string args, string line) {    mixed err;    if (err = catch {    f(args);
3797:    s = replace(s,    ({ "$roxen_version", "$roxen_build", "$full_version",    "$pike_version", "$ident", }), -  ({ roxen->__roxen_version__, roxen->__roxen_build__, -  roxen->real_version, version(), roxen->version() })); +  ({ core.__roxen_version__, core.__roxen_build__, +  core.real_version, version(), core.version() }));       send(220, s/"\n", 1);    }