httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1723284 - in /httpd/httpd/trunk: CHANGES modules/ssl/ssl_engine_io.c
Date Wed, 06 Jan 2016 11:36:01 GMT
Author: ylavic
Date: Wed Jan  6 11:36:01 2016
New Revision: 1723284

URL: http://svn.apache.org/viewvc?rev=1723284&view=rev
Log:
mod_ssl: follow up to r1723122, r1723143.
s/endb/upto/ in ssl_io_filter_coalesce() and update CHANGES to
include r1723143.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/ssl/ssl_engine_io.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1723284&r1=1723283&r2=1723284&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Jan  6 11:36:01 2016
@@ -7,8 +7,9 @@ Changes with Apache 2.5.0
      correctly show in scoreboard. Fixed possible race in connection
      shutdown after review by Ylavic. [Stefan Eissing]
 
-  *) mod_ssl: Avoid one TLS record (application data) fragmentation by
-     including the last suitable bucket when coalescing.  [Yann Ylavic]
+  *) mod_ssl: Save some TLS record (application data) fragmentations by
+     including the last and subsequent suitable buckets when coalescing.
+     [Yann Ylavic]
 
   *) mod_cache_socache: Fix a possible cached entity body corruption when it
      is received from an origin server in multiple batches and forwarded by

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_io.c?rev=1723284&r1=1723283&r2=1723284&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_io.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_io.c Wed Jan  6 11:36:01 2016
@@ -1532,7 +1532,7 @@ struct coalesce_ctx {
 static apr_status_t ssl_io_filter_coalesce(ap_filter_t *f,
                                            apr_bucket_brigade *bb)
 {
-    apr_bucket *e, *endb;
+    apr_bucket *e, *upto;
     apr_size_t bytes = 0;
     struct coalesce_ctx *ctx = f->ctx;
     unsigned count = 0;
@@ -1562,7 +1562,7 @@ static apr_status_t ssl_io_filter_coales
         if (e->length) count++; /* don't count zero-length buckets */
         bytes += e->length;
     }
-    endb = e;
+    upto = e;
 
     /* Coalesce the prefix, if:
      * a) more than one bucket is found to coalesce, or
@@ -1571,7 +1571,7 @@ static apr_status_t ssl_io_filter_coales
      */
     if (bytes > 0
         && (count > 1
-            || (endb == APR_BRIGADE_SENTINEL(bb))
+            || (upto == APR_BRIGADE_SENTINEL(bb))
             || (ctx && ctx->bytes > 0))) {
         /* If coalescing some bytes, ensure a context has been
          * created. */
@@ -1589,7 +1589,7 @@ static apr_status_t ssl_io_filter_coales
          * normal path of sending the buffer + remaining buckets in
          * brigade.  */
         e = APR_BRIGADE_FIRST(bb);
-        while (e != endb) {
+        while (e != upto) {
             apr_size_t len;
             const char *data;
             apr_bucket *next;



Mime
View raw message