From 7fdce96b02d4516ad81878fdf21f3bf627e87db8 Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Tue, 9 Jun 2015 18:03:20 +0000 Subject: [PATCH] Merge r1619453 from trunk * mod_deflate: Add missing APLOGNO. Submitted by: ylavic Reviewed by: jailletc36, gsmith, druggeri Backported by: jailletc36 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1684490 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 4 ---- modules/filters/mod_deflate.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/STATUS b/STATUS index 88ad0e63ae..9d27ec5a55 100644 --- a/STATUS +++ b/STATUS @@ -106,10 +106,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) mod_deflate: Add missing APLOGNO. - trunk patch: http://svn.apache.org/r1619453 - 2.4.x patch: trunk works (minus next-number) - +1: jailletc36, gsmith, druggeri PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c index 5e390d7875..0b38e9a3f1 100644 --- a/modules/filters/mod_deflate.c +++ b/modules/filters/mod_deflate.c @@ -1280,7 +1280,7 @@ static apr_status_t deflate_in_filter(ap_filter_t *f, if (!check_ratio(r, ctx, dc)) { inflateEnd(&ctx->stream); - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02805) "Inflated content ratio is larger than the " "configured limit %i by %i time(s)", dc->ratio_limit, dc->ratio_burst); -- 2.50.1