[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
lynx-dev [dev.4] patch for: partial not working on ftp:// url's (?)
From: |
Kim DeVaughn |
Subject: |
lynx-dev [dev.4] patch for: partial not working on ftp:// url's (?) |
Date: |
Wed, 21 Jul 1999 12:15:45 -0600 |
On Tue, Jul 20, 1999, Klaus Weide (address@hidden) said:
|
| If not, it may have something to do with the following (end of read_directory
| in HTFTP.c):
|
| if (server_type == APPLESHARE_SERVER ||
| server_type == NETPRESENZ_SERVER) {
| /*
| * Without closing the data socket first,
| * the response(NIL) below hangs. - KW
| */
| NETCLOSE(data_soc);
| }
|
| if (WasInterrupted || HTCheckForInterrupt()) {
| if (server_type != CMS_SERVER)
| response(NIL);
| _HTProgress(TRANSFER_INTERRUPTED);
| return HT_LOADED;
| }
| if (server_type != CMS_SERVER)
| response(NIL);
| return HT_LOADED;
|
| Maybe 'the response(NIL) below hangs' is true not only for those
| server types, but also for others. I added that NETCLOSE a long
| time ago, when testing with those weird servers seemed to show
| that they needed it, but didn't add it for cases I didn't know
| about. It should probably also be done if WasInterrupted is true
| at that point (please test, I don't want to start loading
| multimegabyte directory listings now..).
Yeah ... adding that condition fixes the "hang", and rendering to the
screen begins automatically, following a ^G/z xfer rupt. Patch attached.
FWIW, from the info screen (for isc.org) we have:
Server: isrv4.pa.vix.com FTP server (Version wu-2.4.2-academ[BETA-18-VR14](1)
Fri Feb 26 16:13:05 PST 1999)
whatever the devil *that* may be ...
/kim
Against 2.8.3dev.4:
diff -uNr lynx2-8-3/WWW/Library/Implementation/HTFTP.c
lynx2-8-3.work/WWW/Library/Implementation/HTFTP.c
--- lynx2-8-3/WWW/Library/Implementation/HTFTP.c Wed Jul 14 10:25:26 1999
+++ lynx2-8-3.work/WWW/Library/Implementation/HTFTP.c Wed Jul 21 11:37:01 1999
@@ -2776,10 +2776,13 @@
FREE(lastpath);
if (server_type == APPLESHARE_SERVER ||
- server_type == NETPRESENZ_SERVER) {
+ server_type == NETPRESENZ_SERVER ||
+ WasInterrupted) {
/*
* Without closing the data socket first,
* the response(NIL) below hangs. - KW
+ * Seems to also be needed if the xfer
+ * was interrupted ("z" or ^G). - KED
*/
NETCLOSE(data_soc);
}
##--eof--##