You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2014/07/14 22:48:32 UTC

svn commit: r1610522 - in /httpd/httpd/branches/2.4.x/modules: filters/mod_deflate.c generators/mod_cgid.c

Author: jailletc36
Date: Mon Jul 14 20:48:32 2014
New Revision: 1610522

URL: http://svn.apache.org/r1610522
Log:
Add missing APLOGNO + fix a typo in a comment

r1610518 in trunk

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

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=1610522&r1=1610521&r2=1610522&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 Mon Jul 14 20:48:32 2014
@@ -131,7 +131,7 @@ static int check_gzip(request_rec *r, ap
             }
         }
         else if (ap_strchr_c(encoding, ',') != NULL) {
-            /* If the outermost encoding isn't gzip, there's nowt
+            /* If the outermost encoding isn't gzip, there's nothing
              * we can do.  So only check the last non-identity token
              */
             char *new_encoding = apr_pstrdup(r->pool, encoding);
@@ -1272,7 +1272,7 @@ static apr_status_t deflate_in_filter(ap
                 ctx->inflate_total += len;
                 if (inflate_limit && ctx->inflate_total > inflate_limit) { 
                     inflateEnd(&ctx->stream);
-                    ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO()
+                    ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02647)
                             "Inflated content length of %" APR_OFF_T_FMT
                             " is larger than the configured limit"
                             " of %" APR_OFF_T_FMT, 
@@ -1340,7 +1340,7 @@ static apr_status_t deflate_in_filter(ap
                         ctx->inflate_total += len;
                         if (inflate_limit && ctx->inflate_total > inflate_limit) { 
                             inflateEnd(&ctx->stream);
-                            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO()
+                            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02648)
                                     "Inflated content length of %" APR_OFF_T_FMT
                                     " is larger than the configured limit"
                                     " of %" APR_OFF_T_FMT, 
@@ -1350,7 +1350,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(02649)
                                     "Inflated content ratio is larger than the "
                                     "configured limit %i by %i time(s)",
                                     dc->ratio_limit, dc->ratio_burst);
@@ -1790,7 +1790,7 @@ static apr_status_t inflate_out_filter(a
             if (ctx->stream.avail_out == 0) {
 
                 if (!check_ratio(r, ctx, dc)) {
-                    ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO()
+                    ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(02650)
                             "Inflated content ratio is larger than the "
                             "configured limit %i by %i time(s)",
                             dc->ratio_limit, dc->ratio_burst);

Modified: httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c?rev=1610522&r1=1610521&r2=1610522&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c (original)
+++ httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c Mon Jul 14 20:48:32 2014
@@ -1551,7 +1551,7 @@ static int cgid_handler(request_rec *r)
             if (rv != APR_SUCCESS) {
                 /* silly script stopped reading, soak up remaining message */
                 child_stopped_reading = 1;
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, 
+                ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,  APLOGNO(02651)
                               "Error writing request body to script %s", 
                               r->filename);