diff options
| author | Graham Leggett <minfrin@apache.org> | 2001-04-12 03:57:48 +0200 |
|---|---|---|
| committer | Graham Leggett <minfrin@apache.org> | 2001-04-12 03:57:48 +0200 |
| commit | 07e7e196f4e0ab1edf3172f1a128c4253c20b504 (patch) | |
| tree | 483ac93f3f63fd80ad821dd6e17cf0829e17e419 /modules/proxy/proxy_util.c | |
| parent | When I initially pulled the BYTERANGE filter into the core, Greg Stein (diff) | |
| download | apache2-07e7e196f4e0ab1edf3172f1a128c4253c20b504.tar.xz apache2-07e7e196f4e0ab1edf3172f1a128c4253c20b504.zip | |
FTP directory filter works now.
Many FIXME notes added.
Much overhauling of proxy_ftp.c
PR:
Obtained from:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88817 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/proxy/proxy_util.c')
| -rw-r--r-- | modules/proxy/proxy_util.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 42c45648a3..8a99573764 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -1082,7 +1082,8 @@ int ap_proxy_pre_http_connection(conn_rec *c, request_rec *r) } /* converts a series of buckets into a string */ -apr_status_t ap_proxy_string_read(conn_rec *c, apr_bucket_brigade *bb, char *buff, size_t bufflen) +apr_status_t ap_proxy_string_read(conn_rec *c, apr_bucket_brigade *bb, + char *buff, size_t bufflen, int *eos) { apr_bucket *e; apr_status_t rv; @@ -1093,6 +1094,7 @@ apr_status_t ap_proxy_string_read(conn_rec *c, apr_bucket_brigade *bb, char *buf /* start with an empty string */ buff[0] = 0; + *eos = 0; /* get line-at-a-time */ c->remain = 0; @@ -1108,6 +1110,9 @@ apr_status_t ap_proxy_string_read(conn_rec *c, apr_bucket_brigade *bb, char *buf /* loop through each bucket */ while (!found && !APR_BRIGADE_EMPTY(bb)) { e = APR_BRIGADE_FIRST(bb); + if (APR_BUCKET_IS_EOS(e)) { + *eos = 1; + } if (APR_SUCCESS != apr_bucket_read(e, (const char **)&response, &len, APR_BLOCK_READ)) { return rv; } |