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

diff --git a/STATUS b/STATUS
index 88ad0e63ae07245afb6532c3c87e4a7e8d7cb059..9d27ec5a5587e7c18f18ffbd69f5967ec3e9e666 100644 (file)
--- 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 5e390d78750d4f13d7c3e1517d3aea9a86fc2725..0b38e9a3f14967b88d30c2a51806f0d69baf5b60 100644 (file)
--- 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);