Oops, thought it was OK. That causes the hangers?

> Am 21.12.2017 um 18:45 schrieb yla...@apache.org:
> 
> Author: ylavic
> Date: Thu Dec 21 17:45:08 2017
> New Revision: 1818960
> 
> URL: http://svn.apache.org/viewvc?rev=1818960&view=rev
> Log:
> mpm_event: follow up to r1818804.
> 
> Allow DONE as a successful ap_run_process_connection() return value, for
> instance h2_conn_run() and h2_task_process_conn() uses it, third-party
> modules may too...
> 
> 
> Modified:
>    httpd/httpd/trunk/server/mpm/event/event.c
> 
> Modified: httpd/httpd/trunk/server/mpm/event/event.c
> URL: 
> http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1818960&r1=1818959&r2=1818960&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/server/mpm/event/event.c (original)
> +++ httpd/httpd/trunk/server/mpm/event/event.c Thu Dec 21 17:45:08 2017
> @@ -1049,10 +1049,16 @@ static void process_socket(apr_thread_t
>         apr_atomic_inc32(&clogged_count);
>         rc = ap_run_process_connection(c);
>         apr_atomic_dec32(&clogged_count);
> +        if (rc == DONE) {
> +            rc = OK;
> +        }
>     }
>     else if (cs->pub.state == CONN_STATE_READ_REQUEST_LINE) {
> read_request:
>         rc = ap_run_process_connection(c);
> +        if (rc == DONE) {
> +            rc = OK;
> +        }
>     }
>     /*
>      * The process_connection hooks above should set the connection state
> @@ -1077,8 +1083,8 @@ read_request:
>      * worker or prefork MPMs for instance.
>      */
>     if (rc != OK || (cs->pub.state != CONN_STATE_LINGER
> -                     && cs->pub.state != 
> CONN_STATE_CHECK_REQUEST_LINE_READABLE
>                      && cs->pub.state != CONN_STATE_WRITE_COMPLETION
> +                     && cs->pub.state != 
> CONN_STATE_CHECK_REQUEST_LINE_READABLE
>                      && cs->pub.state != CONN_STATE_SUSPENDED)) {
>         ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO()
>                       "process_socket: connection processing %s: closing",
> 
> 

Reply via email to