www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Don't assume that the byterange filter will always be called more than

Browse Source 
once.  It is perfectly legal to call the byterange filter one time,
with all the data.  Without this patch, that case will seg fault.
Submitted by:	Ryan Morgan <rmogran@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88320 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ryan Bloom
2001-02-25 16:57:08 +00:00
parent c200a5ea11
commit c03d4e0715
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGES
View File

@@ -1,9 +1,15 @@
Changes with Apache 2.0.12-dev Changes with Apache 2.0.13-dev
*) Don't assume that there will always be multiple calls to the byterange
filter. It is possible that we will need to do byteranges with only
one call to the filter. [Ryan Morgan <rmorgan@covalent.net>]
*) Move the error_bucket definition from the http module to the *) Move the error_bucket definition from the http module to the
core server. Every protocol will need this ability, not just core server. Every protocol will need this ability, not just
HTTP. [Ryan Bloom] HTTP. [Ryan Bloom]
Changes with Apache 2.0.12
*) Modify mod_file_cache to save pre-formatted strings for *) Modify mod_file_cache to save pre-formatted strings for
content-length and last-modified headers for performance. content-length and last-modified headers for performance.
[Mike Abbot <mja@trudge.engr.sgi.com>] [Mike Abbot <mja@trudge.engr.sgi.com>]

12
modules/http/http_protocol.c
View File

@@ -280,10 +280,14 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_byterange_filter(
NULL); NULL);
ap_xlate_proto_to_ascii(bound_head, strlen(bound_head)); ap_xlate_proto_to_ascii(bound_head, strlen(bound_head));
/* concat the passed brigade with our saved brigade */ /* If we have a saved brigade from a previous run, concat the passed
APR_BRIGADE_CONCAT(ctx->bb, bb); * brigade with our saved brigade. Otherwise just continue.
bb = ctx->bb; */
ctx->bb = NULL; /* ### strictly necessary? call brigade_destroy? */ if (ctx->bb) {
APR_BRIGADE_CONCAT(ctx->bb, bb);
bb = ctx->bb;
ctx->bb = NULL; /* ### strictly necessary? call brigade_destroy? */
}
/* It is possible that we won't have a content length yet, so we have to /* It is possible that we won't have a content length yet, so we have to
* compute the length before we can actually do the byterange work. * compute the length before we can actually do the byterange work.