svn commit: r951761 - /httpd/httpd/trunk/modules/echo/mod_echo.c

[jo...@apache.org]

Author: jorton
Date: Sat Jun  5 20:35:51 2010
New Revision: 951761

URL: http://svn.apache.org/viewvc?rev=951761&view=rev
Log:
* modules/echo/mod_echo.c (process_echo_connection): Use _cleanup
  rather than _destroy to clear a brigade which is to be re-used.

Modified:
    httpd/httpd/trunk/modules/echo/mod_echo.c

Modified: httpd/httpd/trunk/modules/echo/mod_echo.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/echo/mod_echo.c?rev=951761&r1=951760&r2=951761&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/echo/mod_echo.c (original)
+++ httpd/httpd/trunk/modules/echo/mod_echo.c Sat Jun  5 20:35:51 2010
@@ -150,7 +150,7 @@ static int process_echo_connection(conn_
         /* 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_
 
         /* 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);