diff options
| author | Stas Bekman <stas@apache.org> | 2003-02-26 00:25:19 +0100 |
|---|---|---|
| committer | Stas Bekman <stas@apache.org> | 2003-02-26 00:25:19 +0100 |
| commit | 3da232d51fd06d9bec9b2346123baf3e15d2679f (patch) | |
| tree | 5ff74539582281ee0ccbfa8f4ecca5e573dd2eeb /server | |
| parent | When using Redirect in directory context, append requested query (diff) | |
| download | apache2-3da232d51fd06d9bec9b2346123baf3e15d2679f.tar.xz apache2-3da232d51fd06d9bec9b2346123baf3e15d2679f.zip | |
check the return value of ap_run_pre_connection(). So if the
pre_connection phase fails (without setting c->aborted)
ap_run_process_connection is not executed.
PR:
Obtained from:
Submitted by:
Reviewed by: trawick, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98798 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
| -rw-r--r-- | server/connection.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/server/connection.c b/server/connection.c index ac0e80fd9a..a7c1b3f21f 100644 --- a/server/connection.c +++ b/server/connection.c @@ -199,10 +199,14 @@ AP_DECLARE(void) ap_lingering_close(conn_rec *c) AP_CORE_DECLARE(void) ap_process_connection(conn_rec *c, void *csd) { + apr_status_t rc; ap_update_vhost_given_ip(c); - ap_run_pre_connection(c, csd); - + rc = ap_run_pre_connection(c, csd); + if (rc != OK && rc != DONE) { + c->aborted = 1; + } + if (!c->aborted) { ap_run_process_connection(c); } |