summaryrefslogtreecommitdiffstats
path: root/server/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'server/core.c')
-rw-r--r--server/core.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/server/core.c b/server/core.c
index b5f7aa5a59..b4b32e56fd 100644
--- a/server/core.c
+++ b/server/core.c
@@ -2930,7 +2930,6 @@ static int default_handler(request_rec *r)
* when the charset is translated).
*/
int bld_content_md5;
- apr_pool_t *main_pool;
/*
* The old way of doing handlers meant that this handler would
@@ -2975,9 +2974,8 @@ static int default_handler(request_rec *r)
if (r->method_number != M_GET && r->method_number != M_POST) {
return HTTP_METHOD_NOT_ALLOWED;
}
- main_pool = (r->main) ? (r->main->pool) : (r->pool);
- if ((status = apr_file_open(&fd, r->filename, APR_READ | APR_BINARY, 0, main_pool)) != APR_SUCCESS) {
+ if ((status = apr_file_open(&fd, r->filename, APR_READ | APR_BINARY, 0, r->pool)) != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
"file permissions deny server access: %s", r->filename);
return HTTP_FORBIDDEN;