httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaillet...@apache.org
Subject svn commit: r1684490 - in /httpd/httpd/branches/2.4.x: STATUS modules/filters/mod_deflate.c
Date Tue, 09 Jun 2015 18:03:20 GMT
Author: jailletc36
Date: Tue Jun  9 18:03:20 2015
New Revision: 1684490

URL: http://svn.apache.org/r1684490
Log:
Merge r1619453 from trunk

   * mod_deflate: Add missing APLOGNO.

Submitted by: ylavic
Reviewed by: jailletc36, gsmith, druggeri
Backported by: jailletc36

Modified:
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/filters/mod_deflate.c

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1684490&r1=1684489&r2=1684490&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Jun  9 18:03:20 2015
@@ -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 ]

Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_deflate.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_deflate.c?rev=1684490&r1=1684489&r2=1684490&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_deflate.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_deflate.c Tue Jun  9 18:03:20 2015
@@ -1280,7 +1280,7 @@ static apr_status_t deflate_in_filter(ap
 
                 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);



Mime
View raw message