Commit 1f603763 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1726888 from trunk: 

Fix some duplicate definitions
Submitted by: mrumph
Reviewed/backported by: jim


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

STATUS

+0 −4
Original line number Diff line number Diff line
@@ -113,10 +113,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
  [ start all new proposals below, under PATCHES PROPOSED. ]





  *) mod_ssl: Fix some duplicate definitions

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

     2.4.x patch:  trunk works

     +1: mrumph, icing, jim



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

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

modules/ssl/ssl_engine_io.c

+6 −9
Original line number Diff line number Diff line
@@ -1326,19 +1326,19 @@ static apr_status_t ssl_io_filter_input(ap_filter_t *f, 
    const char *start = inctx->buffer; /* start of block to return */

    apr_size_t len = sizeof(inctx->buffer); /* length of block to return */

    int is_init = (mode == AP_MODE_INIT);

    apr_bucket *bucket;



    if (f->c->aborted) {

        /* XXX: Ok, if we aborted, we ARE at the EOS.  We also have

         * aborted.  This 'double protection' is probably redundant,

         * but also effective against just about anything.

         */

        apr_bucket *bucket = apr_bucket_eos_create(f->c->bucket_alloc);

        bucket = apr_bucket_eos_create(f->c->bucket_alloc);

        APR_BRIGADE_INSERT_TAIL(bb, bucket);

        return APR_ECONNABORTED;

    }



    if (!inctx->ssl) {

        apr_bucket *bucket;

        SSLConnRec *sslconn = myConnConfig(f->c);

        if (sslconn->non_ssl_request == NON_SSL_SEND_REQLINE) {

            bucket = HTTP_ON_HTTPS_PORT_BUCKET(f->c->bucket_alloc);
@@ -1433,7 +1433,7 @@ static apr_status_t ssl_io_filter_input(ap_filter_t *f, 


    /* Create a transient bucket out of the decrypted data. */

    if (len > 0) {

        apr_bucket *bucket =

        bucket =

            apr_bucket_transient_create(start, len, f->c->bucket_alloc);

        APR_BRIGADE_INSERT_TAIL(bb, bucket);

    }
@@ -1572,8 +1572,6 @@ static apr_status_t ssl_io_filter_coalesce(ap_filter_t *f, 
     * the filter stack, first prepending anything that has been

     * coalesced. */

    if (ctx && ctx->bytes) {

        apr_bucket *e;



        ap_log_cerror(APLOG_MARK, APLOG_TRACE4, 0, f->c,

                      "coalesce: passing on %" APR_SIZE_T_FMT " bytes", ctx->bytes);
@@ -1790,6 +1788,7 @@ static apr_status_t ssl_io_filter_buffer(ap_filter_t *f, 
{

    struct modssl_buffer_ctx *ctx = f->ctx;

    apr_status_t rv;

    apr_bucket *e, *d;



    ap_log_cerror(APLOG_MARK, APLOG_TRACE4, 0, f->c,

                  "read from buffered SSL brigade, mode %d, "
@@ -1814,8 +1813,6 @@ static apr_status_t ssl_io_filter_buffer(ap_filter_t *f, 
    }



    if (mode == AP_MODE_READBYTES) {

        apr_bucket *e;



        /* Partition the buffered brigade. */

        rv = apr_brigade_partition(ctx->bb, bytes, &e);

        if (rv && rv != APR_INCOMPLETE) {
@@ -1830,7 +1827,7 @@ static apr_status_t ssl_io_filter_buffer(ap_filter_t *f, 
        if (rv == APR_INCOMPLETE) {

            APR_BRIGADE_CONCAT(bb, ctx->bb);

        } else {

            apr_bucket *d = APR_BRIGADE_FIRST(ctx->bb);

            d = APR_BRIGADE_FIRST(ctx->bb);



            e = APR_BUCKET_PREV(e);
@@ -1857,7 +1854,7 @@ static apr_status_t ssl_io_filter_buffer(ap_filter_t *f, 
    }



    if (APR_BRIGADE_EMPTY(ctx->bb)) {

        apr_bucket *e = APR_BRIGADE_LAST(bb);

        e = APR_BRIGADE_LAST(bb);



        /* Ensure that the brigade is terminated by an EOS if the

         * buffered request body has been entirely consumed. */