brian 98/05/20 20:37:48
Modified: src CHANGES
src/modules/proxy proxy_ftp.c
Log:
PR: 505
Not a generic fix for RFC1123 and 959, but closer than what was there before.
Still doesn't read directories from DJB's anonftpd right, but then again
neither does Netscape.
Revision Changes Path
1.856 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.855
retrieving revision 1.856
diff -u -r1.855 -r1.856
--- CHANGES 1998/05/20 15:34:24 1.855
+++ CHANGES 1998/05/21 03:37:22 1.856
@@ -1,5 +1,9 @@
Changes with Apache 1.3b7
+ *) Fix discrepancy in proxy_ftp.c which was causing failures when
+ trying to connect to certain ftpd's, such as anonftpd.
+ [Rick Ohnemus <[EMAIL PROTECTED]>]
+
*) Make mod_rewrite use ap_open_piped_log() for RewriteLog directive's
logfile instead of fiddling around itself with child spawning stuff.
[Ralf S. Engelschall]
1.58 +8 -3 apache-1.3/src/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_ftp.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- proxy_ftp.c 1998/04/11 12:00:40 1.57
+++ proxy_ftp.c 1998/05/21 03:37:47 1.58
@@ -803,9 +803,14 @@
pstr = strtok(pasv, " "); /* separate result code */
if (pstr != NULL) {
presult = atoi(pstr);
- pstr = strtok(NULL, "("); /* separate address & port params */
- if (pstr != NULL)
- pstr = strtok(NULL, ")");
+ if (*(pstr + strlen(pstr) + 1) == '=')
+ pstr += strlen(pstr) + 2;
+ else
+ {
+ pstr = strtok(NULL, "("); /* separate address & port params */
+ if (pstr != NULL)
+ pstr = strtok(NULL, ")");
+ }
}
else
presult = atoi(pasv);
