From 66989ec303950332036fca13fe68f2fec8816a8e Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Mon, 14 Jul 2014 20:44:21 +0000 Subject: [PATCH] Add missing APLOGNO + fix a typo in a comment git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1610518 13f79535-47bb-0310-9956-ffa450edef68 --- docs/log-message-tags/next-number | 2 +- modules/filters/mod_deflate.c | 10 +++++----- modules/generators/mod_cgid.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number index 8634b83fcb..fa7a2a84f9 100644 --- a/docs/log-message-tags/next-number +++ b/docs/log-message-tags/next-number @@ -1 +1 @@ -2647 +2652 diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c index 6eefecbb8a..0acc07db92 100644 --- a/modules/filters/mod_deflate.c +++ b/modules/filters/mod_deflate.c @@ -136,7 +136,7 @@ static int check_gzip(request_rec *r, apr_table_t *hdrs1, apr_table_t *hdrs2) } } 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); @@ -1307,7 +1307,7 @@ static apr_status_t deflate_in_filter(ap_filter_t *f, 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, @@ -1375,7 +1375,7 @@ static apr_status_t deflate_in_filter(ap_filter_t *f, 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, @@ -1385,7 +1385,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(02649) "Inflated content ratio is larger than the " "configured limit %i by %i time(s)", dc->ratio_limit, dc->ratio_burst); @@ -1827,7 +1827,7 @@ static apr_status_t inflate_out_filter(ap_filter_t *f, 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); diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c index fd3a2dbfa5..1950564028 100644 --- a/modules/generators/mod_cgid.c +++ b/modules/generators/mod_cgid.c @@ -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); -- 2.50.1