From: Rainer Jung Date: Tue, 19 Jan 2016 00:27:36 +0000 (+0000) Subject: Added many log numbers to log statements that X-Git-Tag: 2.5.0-alpha~2388 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1585b13217f4cbe47391eab37397235793b3394e;p=thirdparty%2Fapache%2Fhttpd.git Added many log numbers to log statements that had none. Handled all files server/*.c. Excluded startup error messages in server/config.c and server/main.c. I used the coccinelle script provided by Stefan. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725395 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/server/core.c b/server/core.c index 1a464c13228..5f276c4ca89 100644 --- a/server/core.c +++ b/server/core.c @@ -4663,7 +4663,7 @@ static int core_override_type(request_rec *r) const char *val; val = ap_expr_str_exec(r, conf->expr_handler, &err); if (err) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(03154) "Can't evaluate handler expression: %s", err); return HTTP_INTERNAL_SERVER_ERROR; } diff --git a/server/protocol.c b/server/protocol.c index c471644b9cf..f36e9bdad95 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -2039,7 +2039,7 @@ AP_DECLARE(const char *) ap_select_protocol(conn_rec *c, request_rec *r, if (APLOGcdebug(c)) { const char *p = apr_array_pstrcat(pool, conf->protocols, ','); - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(03155) "select protocol from %s, choices=%s for server %s", p, apr_array_pstrcat(pool, choices, ','), s->server_hostname); @@ -2083,7 +2083,7 @@ AP_DECLARE(const char *) ap_select_protocol(conn_rec *c, request_rec *r, /* Select the most preferred protocol */ if (APLOGcdebug(c)) { - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(03156) "select protocol, proposals=%s preferences=%s configured=%s", apr_array_pstrcat(pool, proposals, ','), apr_array_pstrcat(pool, prefs, ','), @@ -2103,7 +2103,8 @@ AP_DECLARE(const char *) ap_select_protocol(conn_rec *c, request_rec *r, } } if (APLOGcdebug(c)) { - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, "selected protocol=%s", + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(03157) + "selected protocol=%s", protocol? protocol : "(none)"); } diff --git a/server/util_filter.c b/server/util_filter.c index 3a18169a52e..cb736362e00 100644 --- a/server/util_filter.c +++ b/server/util_filter.c @@ -636,7 +636,8 @@ AP_DECLARE(apr_status_t) ap_pass_brigade_fchk(request_rec *r, va_start(ap, fmt); res = apr_pvsprintf(r->pool, fmt, ap); va_end(ap); - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, "%s", res); + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, APLOGNO(03158) + "%s", res); } return HTTP_INTERNAL_SERVER_ERROR; }