mirror of
https://github.com/apache/httpd.git
synced 2025-08-07 04:02:58 +03:00
Prevent ap_add_output_filters_by_type from being called in
ap_set_content_type if the content-type hasn't changed. Reviewed by: Ryan Bloom git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94368 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
4
CHANGES
4
CHANGES
@@ -1,5 +1,9 @@
|
|||||||
Changes with Apache 2.0.35
|
Changes with Apache 2.0.35
|
||||||
|
|
||||||
|
*) Prevent ap_add_output_filters_by_type from being called in
|
||||||
|
ap_set_content_type if the content-type hasn't changed.
|
||||||
|
[Justin Erenkrantz]
|
||||||
|
|
||||||
*) Performance: implemented the bucket allocator made possible by the
|
*) Performance: implemented the bucket allocator made possible by the
|
||||||
API change in 2.0.34. [Cliff Woolley]
|
API change in 2.0.34. [Cliff Woolley]
|
||||||
|
|
||||||
|
@@ -1272,14 +1272,16 @@ static void fixup_vary(request_rec *r)
|
|||||||
|
|
||||||
AP_DECLARE(void) ap_set_content_type(request_rec *r, const char *ct)
|
AP_DECLARE(void) ap_set_content_type(request_rec *r, const char *ct)
|
||||||
{
|
{
|
||||||
r->content_type = ct;
|
if (!r->content_type || strcmp(r->content_type, ct)) {
|
||||||
|
r->content_type = ct;
|
||||||
|
|
||||||
/* Insert filters requested by the AddOutputFiltersByType
|
/* Insert filters requested by the AddOutputFiltersByType
|
||||||
* configuration directive. Content-type filters must be
|
* configuration directive. Content-type filters must be
|
||||||
* inserted after the content handlers have run because
|
* inserted after the content handlers have run because
|
||||||
* only then, do we reliably know the content-type.
|
* only then, do we reliably know the content-type.
|
||||||
*/
|
*/
|
||||||
ap_add_output_filters_by_type(r);
|
ap_add_output_filters_by_type(r);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef struct header_filter_ctx {
|
typedef struct header_filter_ctx {
|
||||||
|
Reference in New Issue
Block a user