Commit 2942dac8 authored by Christophe Jaillet's avatar Christophe Jaillet
Browse files

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
parent 5800f07e

STATUS

+0 −4
Changes for STATUS: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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 ]

modules/filters/mod_deflate.c

+1 −1
Changes for modules/filters/mod_deflate.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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);