diff options
| author | Rainer Jung <rjung@apache.org> | 2016-01-19 13:02:41 +0100 |
|---|---|---|
| committer | Rainer Jung <rjung@apache.org> | 2016-01-19 13:02:41 +0100 |
| commit | af14d158a34d1ae0983f6ec45461db500a3991b1 (patch) | |
| tree | 1b71f886604419904aa474d0d02ce0d8af3eb168 /server | |
| parent | Silence compiler warning (twice): (diff) | |
| download | apache2-af14d158a34d1ae0983f6ec45461db500a3991b1.tar.xz apache2-af14d158a34d1ae0983f6ec45461db500a3991b1.zip | |
Added many log numbers to log statements that
had none.
Those were not detected by the coccinelle script.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725485 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
| -rw-r--r-- | server/util_script.c | 4 | ||||
| -rw-r--r-- | server/vhost.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/server/util_script.c b/server/util_script.c index 651b119094..37508f81d0 100644 --- a/server/util_script.c +++ b/server/util_script.c @@ -473,12 +473,14 @@ AP_DECLARE(int) ap_scan_script_header_err_core_ex(request_rec *r, char *buffer, const char *msg = "Premature end of script headers"; if (first_header) msg = "End of script output before headers"; + /* Intentional no APLOGNO */ ap_log_rerror(SCRIPT_LOG_MARK, APLOG_ERR|APLOG_TOCLIENT, 0, r, "%s: %s", msg, apr_filepath_name_get(r->filename)); return HTTP_INTERNAL_SERVER_ERROR; } else if (rv == -1) { + /* Intentional no APLOGNO */ ap_log_rerror(SCRIPT_LOG_MARK, APLOG_ERR|APLOG_TOCLIENT, 0, r, "Script timed out before returning headers: %s", apr_filepath_name_get(r->filename)); @@ -586,6 +588,7 @@ AP_DECLARE(int) ap_scan_script_header_err_core_ex(request_rec *r, char *buffer, } } + /* Intentional no APLOGNO */ ap_log_rerror(SCRIPT_LOG_MARK, APLOG_ERR|APLOG_TOCLIENT, 0, r, "malformed header from script '%s': Bad header: %.30s", apr_filepath_name_get(r->filename), w); @@ -618,6 +621,7 @@ AP_DECLARE(int) ap_scan_script_header_err_core_ex(request_rec *r, char *buffer, else if (!ap_casecmpstr(w, "Status")) { r->status = cgi_status = atoi(l); if (!ap_is_HTTP_VALID_RESPONSE(cgi_status)) + /* Intentional no APLOGNO */ ap_log_rerror(SCRIPT_LOG_MARK, APLOG_ERR|APLOG_TOCLIENT, 0, r, "Invalid status line from script '%s': %.30s", apr_filepath_name_get(r->filename), l); diff --git a/server/vhost.c b/server/vhost.c index eab2e194c1..12bdd55304 100644 --- a/server/vhost.c +++ b/server/vhost.c @@ -298,7 +298,7 @@ static void dump_iphash_statistics(server_rec *main_s) } qsort(count, IPHASH_TABLE_SIZE, sizeof(count[0]), iphash_compare); p = buf + apr_snprintf(buf, sizeof(buf), - "iphash: total hashed = %u, avg chain = %u, " + APLOGNO(03235) "iphash: total hashed = %u, avg chain = %u, " "chain lengths (count x len):", total, total / IPHASH_TABLE_SIZE); total = 1; @@ -314,6 +314,8 @@ static void dump_iphash_statistics(server_rec *main_s) } p += apr_snprintf(p, sizeof(buf) - (p - buf), " %ux%u", total, count[IPHASH_TABLE_SIZE - 1]); + /* Intentional no APLOGNO */ + /* buf provides APLOGNO */ ap_log_error(APLOG_MARK, APLOG_DEBUG, main_s, buf); } #endif |