mirror of
https://github.com/apache/httpd.git
synced 2026-10-23 22:49:01 +03:00
bd34a1bc19
- A new End-Of-Request bucket is pushed through the output filter
chain after the last bucket of the response.
- This bucket gets destroyed by ap_core_output_filter() after the
buckets in front of it have been sent.
- The destroy callback of the EOR bucket invokes the access logger
and frees the request's pool.
With this change, the request logger now runs after the last byte of
the response is _sent_, rather than after the last byte of the response
is _generated_. This should make the bytes-sent count in the access
log more accurate in cases where the client closes the connection
midway through the sending of the response.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-dev@307339 13f79535-47bb-0310-9956-ffa450edef68
67 lines
1.8 KiB
C
67 lines
1.8 KiB
C
/* Copyright 2000-2005 The Apache Software Foundation or its licensors, as
|
|
* applicable.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include "httpd.h"
|
|
#include "http_request.h"
|
|
|
|
static apr_status_t eor_bucket_read(apr_bucket *b, const char **str,
|
|
apr_size_t *len, apr_read_type_e block)
|
|
{
|
|
*str = NULL;
|
|
*len = 0;
|
|
return APR_SUCCESS;
|
|
}
|
|
|
|
AP_DECLARE(apr_bucket *) ap_bucket_eor_make(apr_bucket *b, request_rec *r)
|
|
{
|
|
b->length = 0;
|
|
b->start = 0;
|
|
b->data = r;
|
|
b->type = &ap_bucket_type_eor;
|
|
|
|
return b;
|
|
}
|
|
|
|
AP_DECLARE(apr_bucket *) ap_bucket_eor_create(apr_bucket_alloc_t *list,
|
|
request_rec *r)
|
|
{
|
|
apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
|
|
|
|
APR_BUCKET_INIT(b);
|
|
b->free = apr_bucket_free;
|
|
b->list = list;
|
|
return ap_bucket_eor_make(b, r);
|
|
}
|
|
|
|
static void eor_bucket_destroy(void *data)
|
|
{
|
|
request_rec *r = (request_rec *)data;
|
|
if (r != NULL) {
|
|
ap_run_log_transaction(r);
|
|
apr_pool_destroy(r->pool);
|
|
}
|
|
}
|
|
|
|
AP_DECLARE_DATA const apr_bucket_type_t ap_bucket_type_eor = {
|
|
"EOR", 5, APR_BUCKET_METADATA,
|
|
eor_bucket_destroy,
|
|
eor_bucket_read,
|
|
apr_bucket_setaside_noop,
|
|
apr_bucket_split_notimpl,
|
|
apr_bucket_simple_copy
|
|
};
|
|
|