Commit 502c1ec8 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

backport of r1723122,1723143 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1727393 13f79535-47bb-0310-9956-ffa450edef68
parent dd2efd7d

CHANGES

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 


Changes with Apache 2.4.19



  *) mod_ssl: Save some TLS record (application data) fragmentations by

     including the last and subsequent suitable buckets when coalescing.



  *) mod_proxy_fcgi: Suppress HTTP error 503 and message 01075, 

     "Error dispatching request", when the cause appears to be

STATUS

+0 −10
Original line number Diff line number Diff line
@@ -112,16 +112,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) mod_ssl: Save some TLS record (application data) fragmentations by

     including the last and subsequent suitable buckets when coalescing.

     trunk patch: http://svn.apache.org/r1723122

                  http://svn.apache.org/r1723143

                  http://svn.apache.org/r1723284

     2.4.x patch: trunk works, modulo CHANGES (from both r1723122,1723284)

                  For convenience (possibly):

                  http://people.apache.org/~ylavic/httpd-2.4.x-ssl_io_filter_coalesce.patch

     +1: ylavic, jim, icing





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

modules/ssl/ssl_engine_io.c

+6 −5
Original line number Diff line number Diff line
@@ -1463,7 +1463,7 @@ struct coalesce_ctx { 
static apr_status_t ssl_io_filter_coalesce(ap_filter_t *f,

                                           apr_bucket_brigade *bb)

{

    apr_bucket *e, *last = NULL;

    apr_bucket *e, *endb;

    apr_size_t bytes = 0;

    struct coalesce_ctx *ctx = f->ctx;

    unsigned count = 0;
@@ -1490,19 +1490,20 @@ static apr_status_t ssl_io_filter_coalesce(ap_filter_t *f, 
             && (ctx == NULL

                 || bytes + ctx->bytes + e->length < COALESCE_BYTES);

         e = APR_BUCKET_NEXT(e)) {

        last = e;

        if (e->length) count++; /* don't count zero-length buckets */

        bytes += e->length;

    }

    endb = e;



    /* Coalesce the prefix, if:

     * a) more than one bucket is found to coalesce, or

     * b) the brigade contains only a single data bucket, or

     * c)

     * c) the data bucket is not last but we have buffered data already.

     */

    if (bytes > 0

        && (count > 1

            || (count == 1 && APR_BUCKET_NEXT(last) == APR_BRIGADE_SENTINEL(bb)))) {

            || (endb == APR_BRIGADE_SENTINEL(bb))

            || (ctx && ctx->bytes > 0))) {

        /* If coalescing some bytes, ensure a context has been

         * created. */

        if (!ctx) {
@@ -1519,7 +1520,7 @@ static apr_status_t ssl_io_filter_coalesce(ap_filter_t *f, 
         * normal path of sending the buffer + remaining buckets in

         * brigade.  */

        e = APR_BRIGADE_FIRST(bb);

        while (e != last) {

        while (e != endb) {

            apr_size_t len;

            const char *data;

            apr_bucket *next;