diff options
| author | Ryan Bloom <rbb@apache.org> | 2001-06-15 00:56:12 +0200 |
|---|---|---|
| committer | Ryan Bloom <rbb@apache.org> | 2001-06-15 00:56:12 +0200 |
| commit | afaf89964297a5dfec8a101a9243ffe6dac15140 (patch) | |
| tree | 7b4111326588b36e7bb4c29f74262542bca298cd | |
| parent | fix some more signalling issues: (diff) | |
| download | apache2-afaf89964297a5dfec8a101a9243ffe6dac15140.tar.xz apache2-afaf89964297a5dfec8a101a9243ffe6dac15140.zip | |
Back out the change to allocate files out of the main request pool, and
implement pool-based setaside for FILE and MMAP buckets.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89370 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | server/core.c | 4 | ||||
| -rw-r--r-- | server/protocol.c | 2 |
2 files changed, 2 insertions, 4 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; diff --git a/server/protocol.c b/server/protocol.c index d0b9b2a094..09d40c0242 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -881,7 +881,7 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_content_length_filter(ap_filter_t *f, } if ((ctx->curr_len < AP_MIN_BYTES_TO_WRITE) && !send_it) { - return ap_save_brigade(f, &ctx->saved, &b, r->pool); + return ap_save_brigade(f, &ctx->saved, &b, (r->main) ? r->main->pool : r->pool); } /* We will compute a content length if: |