diff options
author | Justin Erenkrantz <jerenkrantz@apache.org> | 2002-01-25 02:11:47 +0100 |
---|---|---|
committer | Justin Erenkrantz <jerenkrantz@apache.org> | 2002-01-25 02:11:47 +0100 |
commit | 94d01b65aa7ce7a9c06f7e65708be628f049cf30 (patch) | |
tree | 44bc08edb40c53a92c7502614a24a8d8a2fd43a2 /modules/echo/mod_echo.c | |
parent | Enable the BrowserMatch for Microsoft's DAV client -- we know it is (diff) | |
download | apache2-94d01b65aa7ce7a9c06f7e65708be628f049cf30.tar.xz apache2-94d01b65aa7ce7a9c06f7e65708be628f049cf30.zip |
Change ap_get_brigade prototype to remove *readbytes in favor of readbytes.
If you need the length, you should be using apr_brigade_length. This is
much more consistent. Of all the places that call ap_get_brigade, only
one (ap_http_filter) needs the length. This makes it now possible to
pass constants down without assigning them to a temporary variable first.
Also:
- Change proxy_ftp to use EXHAUSTIVE mode (didn't catch its -1 before)
- Fix buglet in mod_ssl that would cause it to return too much data in
some circumstances
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93014 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/echo/mod_echo.c')
-rw-r--r-- | modules/echo/mod_echo.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/echo/mod_echo.c b/modules/echo/mod_echo.c index 7d28603389..53d8a29650 100644 --- a/modules/echo/mod_echo.c +++ b/modules/echo/mod_echo.c @@ -94,7 +94,6 @@ static int process_echo_connection(conn_rec *c) apr_bucket_brigade *bb; apr_bucket *b; apr_status_t rv; - apr_off_t zero = 0; EchoConfig *pConfig = ap_get_module_config(c->base_server->module_config, &echo_module); @@ -107,7 +106,7 @@ static int process_echo_connection(conn_rec *c) for ( ; ; ) { /* Get a single line of input from the client */ if ((rv = ap_get_brigade(c->input_filters, bb, AP_MODE_GETLINE, - APR_BLOCK_READ, &zero) != APR_SUCCESS || + APR_BLOCK_READ, 0) != APR_SUCCESS || APR_BRIGADE_EMPTY(bb))) { apr_brigade_destroy(bb); break; |