Branch: Tag:

2004-05-17

2004-05-17 13:17:23 by Martin Nilsson <mani@lysator.liu.se>

WebServer sync. [2.90]

Rev: server/plugins/protocols/ftp.pike:2.92

4:   /*    * FTP protocol mk 2    * -  * $Id: ftp.pike,v 2.91 2004/05/17 13:16:09 mani Exp $ +  * $Id: ftp.pike,v 2.92 2004/05/17 13:17:23 mani Exp $    *    * Henrik Grubbström <grubba@roxen.com>    */
1735:       f->set_nonblocking(lambda(mixed ignored, string data) {    DWRITE("FTP: async_connect ok. Got data.\n"); -  f->set_nonblocking(0,0,0); +  f->set_nonblocking(0,0,0,0,0);    fun(f, data, @args);    },    lambda(mixed ignored) {    DWRITE("FTP: async_connect ok.\n"); -  f->set_nonblocking(0,0,0); +  f->set_nonblocking(0,0,0,0,0);    fun(f, "", @args);    },    lambda(mixed ignored) {    DWRITE("FTP: connect_and_send failed\n");    destruct(f);    fun(0, 0, @args); -  +  }, +  lambda(mixed ignored) { +  DWRITE("FTP: connect_and_send failed\n"); +  destruct(f); +  fun(0, 0, @args);    });      #ifdef FD_DEBUG
2784:    // Compatibility...    master_session->misc->home = home;    -  array(int)|object st = conf->stat_file(home, master_session); +  object session = RequestID2(master_session); +  session->method = "STAT"; +  array(int)|object st = conf->stat_file(home, session);       if (st && (st[1] < 0)) {    cwd = home;