httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1601624 - in /httpd/httpd/trunk: modules/echo/mod_echo.c modules/filters/mod_deflate.c modules/filters/mod_ratelimit.c modules/filters/mod_substitute.c modules/generators/mod_cgi.c modules/proxy/mod_proxy_ftp.c server/core_filters.c
Date Tue, 10 Jun 2014 12:44:15 GMT
Author: ylavic
Date: Tue Jun 10 12:44:15 2014
New Revision: 1601624

URL: http://svn.apache.org/r1601624
Log:
Strip useless apr_brigade_cleanup() calls.

Modified:
    httpd/httpd/trunk/modules/echo/mod_echo.c
    httpd/httpd/trunk/modules/filters/mod_deflate.c
    httpd/httpd/trunk/modules/filters/mod_ratelimit.c
    httpd/httpd/trunk/modules/filters/mod_substitute.c
    httpd/httpd/trunk/modules/generators/mod_cgi.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
    httpd/httpd/trunk/server/core_filters.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=1601624&r1=1601623&r2=1601624&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/echo/mod_echo.c (original)
+++ httpd/httpd/trunk/modules/echo/mod_echo.c Tue Jun 10 12:44:15 2014
@@ -160,7 +160,6 @@ static int process_echo_connection(conn_
 
         /* Something horribly wrong happened.  Someone didn't block! */
         if (APR_BRIGADE_EMPTY(bb)) {
-            apr_brigade_cleanup(bb);
             ap_log_error(APLOG_MARK, APLOG_INFO, rv, c->base_server, APLOGNO(01612)
                          "ProtocolEcho: Error - read empty brigade from %s!",
                          c->client_ip);

Modified: httpd/httpd/trunk/modules/filters/mod_deflate.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_deflate.c?rev=1601624&r1=1601623&r2=1601624&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_deflate.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_deflate.c Tue Jun 10 12:44:15 2014
@@ -930,7 +930,6 @@ static apr_status_t deflate_out_filter(a
         apr_bucket_delete(e);
     }
 
-    apr_brigade_cleanup(bb);
     return APR_SUCCESS;
 }
 
@@ -1750,7 +1749,6 @@ static apr_status_t inflate_out_filter(a
         apr_bucket_delete(e);
     }
 
-    apr_brigade_cleanup(bb);
     return APR_SUCCESS;
 }
 

Modified: httpd/httpd/trunk/modules/filters/mod_ratelimit.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_ratelimit.c?rev=1601624&r1=1601623&r2=1601624&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_ratelimit.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_ratelimit.c Tue Jun 10 12:44:15 2014
@@ -116,7 +116,6 @@ rate_limit_filter(ap_filter_t *f, apr_bu
 
         if (!APR_BRIGADE_EMPTY(ctx->holdingbb)) {
             APR_BRIGADE_CONCAT(bb, ctx->holdingbb);
-            apr_brigade_cleanup(ctx->holdingbb);
         }
 
         while (ctx->state == RATE_FULLSPEED && !APR_BRIGADE_EMPTY(bb)) {

Modified: httpd/httpd/trunk/modules/filters/mod_substitute.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_substitute.c?rev=1601624&r1=1601623&r2=1601624&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_substitute.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_substitute.c Tue Jun 10 12:44:15 2014
@@ -391,8 +391,8 @@ static apr_status_t substitute_filter(ap
                 if (rv != APR_SUCCESS)
                     goto err;
                 APR_BRIGADE_CONCAT(ctx->passbb, ctx->pattbb);
+                apr_brigade_cleanup(ctx->linebb);
             }
-            apr_brigade_cleanup(ctx->linebb);
             APR_BUCKET_REMOVE(b);
             APR_BRIGADE_INSERT_TAIL(ctx->passbb, b);
         }

Modified: httpd/httpd/trunk/modules/generators/mod_cgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_cgi.c?rev=1601624&r1=1601623&r2=1601624&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_cgi.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_cgi.c Tue Jun 10 12:44:15 2014
@@ -921,8 +921,6 @@ static int cgi_handler(request_rec *r)
 
     AP_DEBUG_ASSERT(script_in != NULL);
 
-    apr_brigade_cleanup(bb);
-
 #if APR_FILES_AS_SOCKETS
     apr_file_pipe_timeout_set(script_in, 0);
     apr_file_pipe_timeout_set(script_err, 0);

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c?rev=1601624&r1=1601623&r2=1601624&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c Tue Jun 10 12:44:15 2014
@@ -2085,7 +2085,6 @@ static int proxy_ftp_handler(request_rec
 #endif
             /* sanity check */
             if (APR_BRIGADE_EMPTY(bb)) {
-                apr_brigade_cleanup(bb);
                 break;
             }
 

Modified: httpd/httpd/trunk/server/core_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core_filters.c?rev=1601624&r1=1601623&r2=1601624&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core_filters.c (original)
+++ httpd/httpd/trunk/server/core_filters.c Tue Jun 10 12:44:15 2014
@@ -625,7 +625,6 @@ static void setaside_remaining_output(ap
             }
             ap_save_brigade(f, &(ctx->buffered_bb), &bb,
                             ctx->deferred_write_pool);
-            apr_brigade_cleanup(bb);
         }
     }
     else if (ctx->deferred_write_pool) {



Mime
View raw message