From notifications-return-361-archive-asf-public=cust-asf.ponee.io@httpd.apache.org Tue Jul 20 11:45:51 2021 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mxout1-ec2-va.apache.org (mxout1-ec2-va.apache.org [3.227.148.255]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id B49D6180658 for ; Tue, 20 Jul 2021 13:45:51 +0200 (CEST) Received: from mail.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mxout1-ec2-va.apache.org (ASF Mail Server at mxout1-ec2-va.apache.org) with SMTP id CD97A42437 for ; Tue, 20 Jul 2021 11:45:41 +0000 (UTC) Received: (qmail 40216 invoked by uid 500); 20 Jul 2021 11:45:35 -0000 Mailing-List: contact notifications-help@httpd.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@httpd.apache.org Delivered-To: mailing list notifications@httpd.apache.org Received: (qmail 40137 invoked by uid 99); 20 Jul 2021 11:45:35 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Jul 2021 11:45:35 +0000 From: =?utf-8?q?GitBox?= To: notifications@httpd.apache.org Subject: =?utf-8?q?=5BGitHub=5D_=5Bhttpd=5D_rpluem_commented_on_a_change_in_pull_requ?= =?utf-8?q?est_=23208=3A_Event_child_graceful_stop?= Message-ID: <162678153490.6490.12036127025108477267.asfpy@gitbox.apache.org> Date: Tue, 20 Jul 2021 11:45:34 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit References: In-Reply-To: rpluem commented on a change in pull request #208: URL: https://github.com/apache/httpd/pull/208#discussion_r672320187 ########## File path: server/mpm/event/event.c ########## @@ -1020,14 +1011,14 @@ static void process_socket(apr_thread_t *thd, apr_pool_t * p, apr_socket_t * soc apr_pool_cleanup_null); ap_set_module_config(c->conn_config, &mpm_event_module, cs); c->current_thread = thd; + c->cs = &cs->pub; cs->c = c; - c->cs = &(cs->pub); cs->p = p; Review comment: This is fine. You can leave as is. ########## File path: server/mpm/event/event.c ########## @@ -1228,8 +1221,8 @@ static void process_socket(apr_thread_t *thd, apr_pool_t * p, apr_socket_t * soc ap_log_error(APLOG_MARK, APLOG_ERR, rv, ap_server_conf, APLOGNO(03093) "process_socket: apr_pollset_add failure for " "keep alive"); - apr_socket_close(cs->pfd.desc.s); - ap_queue_info_push_pool(worker_queue_info, cs->p); + close_connection(cs); + signal_threads(ST_GRACEFUL); Review comment: Makes sense. ########## File path: server/mpm/event/event.c ########## @@ -1921,37 +1961,40 @@ static void * APR_THREAD_FUNC listener_thread(apr_thread_t * thd, void *dummy) } /* Same for queues, use their next expiry, if any. */ - timeout_time = queues_next_expiry; - if (timeout_time - && (timeout_interval < 0 - || timeout_time <= now - || timeout_interval > timeout_time - now)) { - timeout_interval = timeout_time > now ? timeout_time - now : 1; + expiry = queues_next_expiry; + if (expiry + && (timeout < 0 + || expiry <= now + || timeout > expiry - now)) { + timeout = expiry > now ? expiry - now : 0; Review comment: ok ########## File path: server/mpm/event/event.c ########## @@ -2249,7 +2303,6 @@ static void * APR_THREAD_FUNC listener_thread(apr_thread_t * thd, void *dummy) } } /* listener main loop */ - close_listeners(&closed); Review comment: ok ########## File path: server/mpm/event/event.c ########## @@ -1189,17 +1180,19 @@ static void process_socket(apr_thread_t *thd, apr_pool_t * p, apr_socket_t * soc } if (pending != DECLINED || c->aborted - || c->keepalive != AP_CONN_KEEPALIVE - || listener_may_exit) { + || c->keepalive != AP_CONN_KEEPALIVE) { cs->pub.state = CONN_STATE_LINGER; } else if (ap_run_input_pending(c) == OK) { cs->pub.state = CONN_STATE_READ_REQUEST_LINE; goto read_request; } - else { Review comment: Makes sense. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscribe@httpd.apache.org For queries about this service, please contact Infrastructure at: users@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscribe@httpd.apache.org For additional commands, e-mail: notifications-help@httpd.apache.org