You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rs...@hyperreal.org on 1998/06/13 14:06:03 UTC
cvs commit: apache-1.3/src/modules/proxy proxy_ftp.c
rse 98/06/13 05:06:02
Modified: src CHANGES
src/modules/proxy proxy_ftp.c
Log:
Fix parsing of FTP `SIZE' responses in proxy module: The newline was not
truncated which forced following HTTP headers to be data in the HTTP reponse.
Although the reponse now is copied out from the response buffer because it is
only temporary and overridden at other points.
Original patch submitted by: Charles Fu <cc...@bacchus.com>
Corrected patch submitted by: Ralf S. Engelschall
PR: 2412
Revision Changes Path
1.913 +6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.912
retrieving revision 1.913
diff -u -r1.912 -r1.913
--- CHANGES 1998/06/13 11:24:07 1.912
+++ CHANGES 1998/06/13 12:05:58 1.913
@@ -1,5 +1,11 @@
Changes with Apache 1.3.1
+ *) Fix parsing of FTP `SIZE' responses in proxy module: The newline was not
+ truncated which forced following HTTP headers to be data in the HTTP
+ reponse. Although the reponse now is copied out from the response buffer
+ because it is only temporary and overridden at other points.
+ [Ralf S. Engelschall, Charles Fu <cc...@bacchus.com>] PR#2412
+
*) Portability fix for APACI shadow tree support: Swap order of awk and sed
in top-level configure script to avoid sed fails on some platforms (for
instance SunOS 4.1.3 and NCR SysV) because of the non-newline-termined
1.62 +5 -1 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.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- proxy_ftp.c 1998/06/08 14:23:50 1.61
+++ proxy_ftp.c 1998/06/13 12:06:01 1.62
@@ -933,7 +933,11 @@
len = 0;
}
else if (i == 213) { /* Size command ok */
- size = resp;
+ for (j = 0; j < resplen && isdigit(resp[j]); j++)
+ ;
+ resp[j] = '\0';
+ if (resp[0] != '\0')
+ size = ap_pstrdup(p, resp);
}
}
}
Re: cvs commit: apache-1.3/src/modules/proxy proxy_ftp.c
Posted by Alvaro Martinez Echevarria <al...@lander.es>.
> On 13 Jun 1998 rse@hyperreal.org wrote:
> > Index: CHANGES
> > ===================================================================
> > RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
> > retrieving revision 1.912
> > retrieving revision 1.913
> > diff -u -r1.912 -r1.913
> > --- CHANGES 1998/06/13 11:24:07 1.912
> > +++ CHANGES 1998/06/13 12:05:58 1.913
> > @@ -1,5 +1,11 @@
> > Changes with Apache 1.3.1
> >
> > + *) Fix parsing of FTP `SIZE' responses in proxy module: The newline was not
> > + truncated which forced following HTTP headers to be data in the HTTP
> > + reponse. Although the reponse now is copied out from the response buffer
> > + because it is only temporary and overridden at other points.
> > + [Ralf S. Engelschall, Charles Fu <cc...@bacchus.com>] PR#2412
> > +
OK, this is exactly what I was trying to say the other day
about wasting time and someone doing again the work I had already
done. I submitted to the list a patch for this problem
(previously reported in PR#2367) more than three days ago, and
the day after a new message wondering what ever happened to it.
Anyway, I guess this time it is (mostly) my fault, because I
didn't send copies of my messages to the bug-db. Or maybe it's
just that Ralf didn't like my solution. In both cases I'd say :'-(
Regards.
.------------------------------------------------------------------.
| Alvaro Martínez Echevarría | LANDER SISTEMAS |
| alvaro@lander.es | Pº Castellana, 121 |
`--------------------------------| 28046 Madrid, SPAIN |
| Tel: +34-91-5562883 |
| Fax: +34-91-5563001 |
`---------------------------------'
Re: cvs commit: apache-1.3/src/modules/proxy proxy_ftp.c
Posted by Marc Slemko <ma...@worldgate.com>.
On 13 Jun 1998 rse@hyperreal.org wrote:
>
> Index: CHANGES
> ===================================================================
> RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
> retrieving revision 1.912
> retrieving revision 1.913
> diff -u -r1.912 -r1.913
> --- CHANGES 1998/06/13 11:24:07 1.912
> +++ CHANGES 1998/06/13 12:05:58 1.913
> @@ -1,5 +1,11 @@
> Changes with Apache 1.3.1
>
> + *) Fix parsing of FTP `SIZE' responses in proxy module: The newline was not
> + truncated which forced following HTTP headers to be data in the HTTP
> + reponse. Although the reponse now is copied out from the response buffer
> + because it is only temporary and overridden at other points.
> + [Ralf S. Engelschall, Charles Fu <cc...@bacchus.com>] PR#2412
> +
Sorry, I'm not sure I understand what you are trying to say in the secnod
sentence here. Could you perhaps clarify the entry a bit?
Thanks.
On a somewhat unrelated note, I have been noticing what seems like a
tendency to have huge CHANGES entries lately that ramble on about things
instead of succinctly saying what has been changed.
Re: cvs commit: apache-1.3/src/modules/proxy proxy_ftp.c
Posted by Marc Slemko <ma...@worldgate.com>.
On 13 Jun 1998 rse@hyperreal.org wrote:
>
> Index: CHANGES
> ===================================================================
> RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
> retrieving revision 1.912
> retrieving revision 1.913
> diff -u -r1.912 -r1.913
> --- CHANGES 1998/06/13 11:24:07 1.912
> +++ CHANGES 1998/06/13 12:05:58 1.913
> @@ -1,5 +1,11 @@
> Changes with Apache 1.3.1
>
> + *) Fix parsing of FTP `SIZE' responses in proxy module: The newline was not
> + truncated which forced following HTTP headers to be data in the HTTP
> + reponse. Although the reponse now is copied out from the response buffer
> + because it is only temporary and overridden at other points.
> + [Ralf S. Engelschall, Charles Fu <cc...@bacchus.com>] PR#2412
> +
Sorry, I'm not sure I understand what you are trying to say in the secnod
sentence here. Could you perhaps clarify the entry a bit?
Thanks.
On a somewhat unrelated note, I have been noticing what seems like a
tendency to have huge CHANGES entries lately that ramble on about things
instead of succinctly saying what has been changed.