Commit 897b9b4d authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Fix segfault caused by r1204104 on non-async mpms. 


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

include/httpd.h

+1 −1
Changes for include/httpd.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -1080,7 +1080,7 @@ struct conn_rec { 
    void *sbh;

    /** The bucket allocator to use for all bucket/brigade creations */

    struct apr_bucket_alloc_t *bucket_alloc;

    /** The current state of this connection */

    /** The current state of this connection; may be NULL if not used by MPM */

    conn_state_t *cs;

    /** Is there data pending in the input filters? */

    int data_in_input_filters;

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
@@ -185,6 +185,7 @@ static int ap_process_http_sync_connection(conn_rec *c) 


        ap_update_child_status(c->sbh, SERVER_BUSY_WRITE, r);

        if (r->status == HTTP_OK) {

            if (cs)

                cs->state = CONN_STATE_HANDLER;

            ap_process_request(r);

            /* After the call to ap_process_request, the