Commit 0a5c743c authored by Stefan Eissing's avatar Stefan Eissing
Browse files

On the 2.4.x branch: 

merge of r1783683,1783693,1783756,1783759-1783760,1783762,1783912,1783996 from trunk



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

CHANGES

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


Changes with Apache 2.4.26



  *) mod_proxy_http2: support for ProxyPreserverHost directive. [Stefan Eissing]

  

  *) mod_http2: fix for crash when running out of memory.

     [Robert Swiecki <robert@swiecki.net>, Stefan Eissing]

     

  *) mod_proxy_fcgi: Return HTTP 504 rather than 503 in case of proxy timeout.

     [Luca Toscano]

modules/http2/h2_conn.c

+16 −4
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <http_protocol.h>

#include <http_request.h>



#include <mpm_common.h>



#include "h2_private.h"

#include "h2.h"

#include "h2_config.h"
@@ -253,6 +255,7 @@ apr_status_t h2_conn_pre_close(struct h2_ctx *ctx, conn_rec *c) 
conn_rec *h2_slave_create(conn_rec *master, int slave_id, apr_pool_t *parent)

{

    apr_allocator_t *allocator;

    apr_status_t status;

    apr_pool_t *pool;

    conn_rec *c;

    void *cfg;
@@ -265,18 +268,27 @@ conn_rec *h2_slave_create(conn_rec *master, int slave_id, apr_pool_t *parent) 
    /* We create a pool with its own allocator to be used for

     * processing a request. This is the only way to have the processing

     * independant of its parent pool in the sense that it can work in

     * another thread.

     * another thread. Also, the new allocator needs its own mutex to

     * synchronize sub-pools.

     */

    apr_allocator_create(&allocator);

    apr_pool_create_ex(&pool, parent, NULL, allocator);

    apr_pool_tag(pool, "h2_slave_conn");

    apr_allocator_max_free_set(allocator, ap_max_mem_free);

    status = apr_pool_create_ex(&pool, parent, NULL, allocator);

    if (status != APR_SUCCESS) {

        ap_log_cerror(APLOG_MARK, APLOG_ERR, status, master, 

                      APLOGNO(10004) "h2_session(%ld-%d): create slave pool",

                      master->id, slave_id);

        return NULL;

    }

    apr_allocator_owner_set(allocator, pool);

    apr_pool_tag(pool, "h2_slave_conn");

 

    c = (conn_rec *) apr_palloc(pool, sizeof(conn_rec));

    if (c == NULL) {

        ap_log_cerror(APLOG_MARK, APLOG_ERR, APR_ENOMEM, master, 

                      APLOGNO(02913) "h2_session(%ld-%d): create slave",

                      master->id, slave_id);

        apr_pool_destroy(pool);

        return NULL;

    }

modules/http2/h2_conn_io.c

+2 −2
Original line number Diff line number Diff line
@@ -117,8 +117,8 @@ static void h2_conn_io_bb_log(conn_rec *c, int stream_id, int level, 
        line = *buffer? buffer : "(empty)";

    }

    /* Intentional no APLOGNO */

    ap_log_cerror(APLOG_MARK, level, 0, c, "h2_session(%s)-%s: %s", 

                  c->log_id, tag, line);

    ap_log_cerror(APLOG_MARK, level, 0, c, "h2_session(%ld)-%s: %s", 

                  c->id, tag, line);



}

modules/http2/h2_mplx.c

+27 −8
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include <http_core.h>

#include <http_log.h>



#include <mpm_common.h>



#include "mod_http2.h"



#include "h2.h"
@@ -232,39 +234,56 @@ h2_mplx *h2_mplx_create(conn_rec *c, apr_pool_t *parent, 
                        h2_workers *workers)

{

    apr_status_t status = APR_SUCCESS;

    apr_allocator_t *allocator = NULL;

    apr_allocator_t *allocator;

    apr_thread_mutex_t *mutex;

    h2_mplx *m;

    ap_assert(conf);

    

    status = apr_allocator_create(&allocator);

    if (status != APR_SUCCESS) {

        return NULL;

    }



    m = apr_pcalloc(parent, sizeof(h2_mplx));

    if (m) {

        m->id = c->id;

        APR_RING_ELEM_INIT(m, link);

        m->c = c;



        /* We create a pool with its own allocator to be used for

         * processing slave connections. This is the only way to have the

         * processing independant of its parent pool in the sense that it

         * can work in another thread. Also, the new allocator needs its own

         * mutex to synchronize sub-pools.

         */

        status = apr_allocator_create(&allocator);

        if (status != APR_SUCCESS) {

            return NULL;

        }

        apr_allocator_max_free_set(allocator, ap_max_mem_free);

        apr_pool_create_ex(&m->pool, parent, NULL, allocator);

        if (!m->pool) {

            apr_allocator_destroy(allocator);

            return NULL;

        }

        apr_pool_tag(m->pool, "h2_mplx");

        apr_allocator_owner_set(allocator, m->pool);

        status = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT,

                                         m->pool);

        if (status != APR_SUCCESS) {

            apr_pool_destroy(m->pool);

            return NULL;

        }

        apr_allocator_mutex_set(allocator, mutex);



        status = apr_thread_mutex_create(&m->lock, APR_THREAD_MUTEX_DEFAULT,

                                         m->pool);

        if (status != APR_SUCCESS) {

            apr_pool_destroy(m->pool);

            return NULL;

        }

        

        status = apr_thread_cond_create(&m->task_thawed, m->pool);

        if (status != APR_SUCCESS) {

            apr_pool_destroy(m->pool);

            return NULL;

        }

    

        m->bucket_alloc = apr_bucket_alloc_create(m->pool);

        m->max_streams = h2_config_geti(conf, H2_CONF_MAX_STREAMS);

        m->stream_max_mem = h2_config_geti(conf, H2_CONF_STREAM_MAX_MEM);

modules/http2/h2_mplx.h

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ struct h2_mplx { 
    long id;

    conn_rec *c;

    apr_pool_t *pool;

    apr_bucket_alloc_t *bucket_alloc;



    APR_RING_ENTRY(h2_mplx) link;