You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2001/10/01 17:45:11 UTC
cvs commit: httpd-2.0/modules/proxy proxy_ftp.c
wrowe 01/10/01 08:45:11
Modified: modules/proxy proxy_ftp.c
Log:
Should be no change to the execution - simply clean up two compiler
warnings, signed/unsigned mismatch in != and mismatched type for port.
Revision Changes Path
1.80 +2 -2 httpd-2.0/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_ftp.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- proxy_ftp.c 2001/08/20 16:49:29 1.79
+++ proxy_ftp.c 2001/10/01 15:45:11 1.80
@@ -374,7 +374,7 @@
}
pos = memchr(response, APR_ASCII_LF, len);
if (pos != NULL) {
- if ((pos - response + 1) != len) {
+ if ((response + len) != (pos + 1)) {
len = pos - response + 1;
apr_bucket_split(e, pos - response + 1);
@@ -1130,7 +1130,7 @@
"%d,%d,%d,%d,%d,%d", &h3, &h2, &h1, &h0, &p1, &p0) == 6)) {
apr_sockaddr_t *pasv_addr;
- int pasvport = (p1 << 8) + p0;
+ apr_port_t pasvport = (p1 << 8) + p0;
ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
"proxy: FTP: PASV contacting host %d.%d.%d.%d:%d",
h3, h2, h1, h0, pasvport);