diff options
| author | Paul Querna <pquerna@apache.org> | 2008-04-07 11:53:58 +0200 |
|---|---|---|
| committer | Paul Querna <pquerna@apache.org> | 2008-04-07 11:53:58 +0200 |
| commit | 064a1ffbff2a66fcc1c9c4260571a276cebbc526 (patch) | |
| tree | 2959a591f361cc2a3a2ac9040fa02d681bf0effa /modules/http/http_core.c | |
| parent | Include http_config.h from http_core, since now without CORE_PRIVATE, you need (diff) | |
| download | apache2-064a1ffbff2a66fcc1c9c4260571a276cebbc526.tar.xz apache2-064a1ffbff2a66fcc1c9c4260571a276cebbc526.zip | |
Remove calls to ap_graceful_stop_signalled, and replace by using ap_mpm_query
to determine if the MPM is trying to stop the process.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645434 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/http/http_core.c')
| -rw-r--r-- | modules/http/http_core.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/modules/http/http_core.c b/modules/http/http_core.c index b4cafaf435..faf47b671e 100644 --- a/modules/http/http_core.c +++ b/modules/http/http_core.c @@ -221,8 +221,14 @@ static int ap_process_http_connection(conn_rec *c) ap_update_child_status(c->sbh, SERVER_BUSY_KEEPALIVE, NULL); - if (ap_graceful_stop_signalled()) + int mpm_state = 0; + if (ap_mpm_query(AP_MPMQ_MPM_STATE, &mpm_state)) { break; + } + + if (mpm_state == AP_MPMQ_STOPPING) { + break; + } if (!csd) { csd = ap_get_module_config(c->conn_config, &core_module); |