Commit 5c42236c authored by Graham Leggett's avatar Graham Leggett
Browse files

*) PASV FTP works now. 

*) Reworked the line-at-a-time read from the control connection to
workaround a stray empty bucket returned by the HTTP_IN filter.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88775 13f79535-47bb-0310-9956-ffa450edef68
parent 972421f7

modules/proxy/mod_proxy.h

+2 −0
Original line number Diff line number Diff line
@@ -210,6 +210,8 @@ apr_status_t ap_proxy_null_filter(ap_filter_t *f, apr_bucket_brigade *bb); 
int ap_proxy_ftp_canon(request_rec *r, char *url);

int ap_proxy_ftp_handler(request_rec *r, char *url);

apr_status_t ap_proxy_send_dir_filter(ap_filter_t *f, apr_bucket_brigade *bb);

apr_status_t ap_proxy_string_read(conn_rec *c, apr_bucket_brigade *bb, char *buff, size_t bufflen);





/* proxy_http.c */

modules/proxy/proxy_ftp.c

+269 −221

File changed.

Preview size limit exceeded, changes collapsed.