diff options
| author | Joe Orton <jorton@apache.org> | 2010-06-05 22:35:51 +0200 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2010-06-05 22:35:51 +0200 |
| commit | f26b981093988de05cb2b2a468c3a72f519c45d0 (patch) | |
| tree | b9b7bf46c4a3a79b5d4dd15c0124a069e98e2e1f /modules/echo | |
| parent | Fix the RPM spec file to autogenerate self-signed certs in the place (diff) | |
| download | apache2-f26b981093988de05cb2b2a468c3a72f519c45d0.tar.xz apache2-f26b981093988de05cb2b2a468c3a72f519c45d0.zip | |
* modules/echo/mod_echo.c (process_echo_connection): Use _cleanup
rather than _destroy to clear a brigade which is to be re-used.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951761 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/echo')
| -rw-r--r-- | modules/echo/mod_echo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/echo/mod_echo.c b/modules/echo/mod_echo.c index 63e329260b..bc0be70f8c 100644 --- a/modules/echo/mod_echo.c +++ b/modules/echo/mod_echo.c @@ -150,7 +150,7 @@ static int process_echo_connection(conn_rec *c) /* Get a single line of input from the client */ if (((rv = ap_get_brigade(c->input_filters, bb, AP_MODE_GETLINE, APR_BLOCK_READ, 0)) != APR_SUCCESS)) { - apr_brigade_destroy(bb); + apr_brigade_cleanup(bb); if (!APR_STATUS_IS_EOF(rv) && ! APR_STATUS_IS_TIMEUP(rv)) ap_log_error(APLOG_MARK, APLOG_INFO, rv, c->base_server, "ProtocolEcho: Failure reading from %s", @@ -160,7 +160,7 @@ static int process_echo_connection(conn_rec *c) /* Something horribly wrong happened. Someone didn't block! */ if (APR_BRIGADE_EMPTY(bb)) { - apr_brigade_destroy(bb); + apr_brigade_cleanup(bb); ap_log_error(APLOG_MARK, APLOG_INFO, rv, c->base_server, "ProtocolEcho: Error - read empty brigade from %s!", c->remote_ip); |