Commit 11da8269 authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Remove MPM-private stuff from conn_state_t 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204104 13f79535-47bb-0310-9956-ffa450edef68
parent d791f639

include/ap_mmn.h

+3 −2
Changes for include/ap_mmn.h: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -367,14 +367,15 @@ 
 * 20111025.2 (2.3.15-dev) Add ap_lua_ssl_val to mod_lua

 * 20111118.0 (2.5.0-dev)  Add conn_rec to error_log hook

 * 20111118.1 (2.5.0-dev)  Add reclvl to ap_expr_eval_ctx_t

 * 20111120.0 (2.5.0-dev)  Remove parts of conn_state_t that are private to the MPM

 */



#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */



#ifndef MODULE_MAGIC_NUMBER_MAJOR

#define MODULE_MAGIC_NUMBER_MAJOR 20111118

#define MODULE_MAGIC_NUMBER_MAJOR 20111120

#endif

#define MODULE_MAGIC_NUMBER_MINOR 1                   /* 0...n */

#define MODULE_MAGIC_NUMBER_MINOR 0                   /* 0...n */



/**

 * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

include/httpd.h

+0 −12
Changes for include/httpd.h: 0 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -1144,18 +1144,6 @@ typedef enum { 
 * @brief A structure to contain connection state information

 */

struct conn_state_t {

    /** APR_RING of expiration timeouts */

    APR_RING_ENTRY(conn_state_t) timeout_list;

    /** the expiration time of the next keepalive timeout */

    apr_time_t expiration_time;

    /** connection record this struct refers to */

    conn_rec *c;

    /** memory pool to allocate from */

    apr_pool_t *p;

    /** bucket allocator */

    apr_bucket_alloc_t *bucket_alloc;

    /** poll file descriptor information */

    apr_pollfd_t pfd;

    /** Current state of the connection */

    conn_state_e state;

};

modules/http/http_core.c

+1 −0
Changes for modules/http/http_core.c: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ static int ap_process_http_async_connection(conn_rec *c) 
    request_rec *r;

    conn_state_t *cs = c->cs;



    AP_DEBUG_ASSERT(cs != NULL);

    AP_DEBUG_ASSERT(cs->state == CONN_STATE_READ_REQUEST_LINE);



    while (cs->state == CONN_STATE_READ_REQUEST_LINE) {

modules/http/http_request.c

+2 −0
Changes for modules/http/http_request.c: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ AP_DECLARE(void) ap_process_request_after_handler(request_rec *r) 
     * already by the EOR bucket's cleanup function.

     */



    if (c->cs)

        c->cs->state = CONN_STATE_WRITE_COMPLETION;

    check_pipeline(c);

    AP_PROCESS_REQUEST_RETURN((uintptr_t)r, r->uri, r->status);
@@ -325,6 +326,7 @@ void ap_process_async_request(request_rec *r) 
        if (ap_extended_status) {

            ap_time_process_request(c->sbh, STOP_PREQUEST);

        }

        if (c->cs)

            c->cs->state = CONN_STATE_SUSPENDED;

#if APR_HAS_THREADS

        apr_thread_mutex_unlock(r->invoke_mtx);

server/core.c

+0 −7
Changes for server/core.c: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -4511,13 +4511,6 @@ static conn_rec *core_create_conn(apr_pool_t *ptrans, server_rec *server, 
    c->id = id;

    c->bucket_alloc = alloc;



    c->cs = (conn_state_t *)apr_pcalloc(ptrans, sizeof(conn_state_t));

    APR_RING_INIT(&(c->cs->timeout_list), conn_state_t, timeout_list);

    c->cs->expiration_time = 0;

    c->cs->state = CONN_STATE_CHECK_REQUEST_LINE_READABLE;

    c->cs->c = c;

    c->cs->p = ptrans;

    c->cs->bucket_alloc = alloc;

    c->clogging_input_filters = 0;



    return c;