From: Graham Leggett Date: Fri, 3 Jul 2020 11:19:10 +0000 (+0000) Subject: Add log numbers to util_etag.c. X-Git-Tag: 2.5.0-alpha2-ci-test-only~1288 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4c582b72509c3a83932a5b0b2df516d6eba3c4b;p=thirdparty%2Fapache%2Fhttpd.git Add log numbers to util_etag.c. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879470 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number index fde32dc6d61..6b0da655092 100644 --- a/docs/log-message-tags/next-number +++ b/docs/log-message-tags/next-number @@ -1 +1 @@ -10251 +10256 diff --git a/server/util_etag.c b/server/util_etag.c index e6ed53284fa..89ab648b574 100644 --- a/server/util_etag.c +++ b/server/util_etag.c @@ -164,7 +164,7 @@ AP_DECLARE(char *) ap_make_etag_ex(request_rec *r, etag_rec *er) else if (er->pathname) { if ((status = apr_file_open(&fd, er->pathname, APR_READ | APR_BINARY, 0, r->pool)) != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(10251) "Make etag: could not open %s", er->pathname); return ""; } @@ -177,7 +177,7 @@ AP_DECLARE(char *) ap_make_etag_ex(request_rec *r, etag_rec *er) SHA1_DIGEST_BASE64_LEN + vlv_len + 4); if ((status = apr_file_seek(fd, APR_CUR, &offset)) != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(10252) "Make etag: could not seek"); if (er->pathname) { apr_file_close(fd); @@ -186,7 +186,7 @@ AP_DECLARE(char *) ap_make_etag_ex(request_rec *r, etag_rec *er) } if ((status = apr_file_seek(fd, APR_SET, &zero)) != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(10253) "Make etag: could not seek"); if (er->pathname) { apr_file_close(fd); @@ -201,7 +201,7 @@ AP_DECLARE(char *) ap_make_etag_ex(request_rec *r, etag_rec *er) nbytes = sizeof(buf); } if (status != APR_EOF) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(10254) "Make etag: could not read"); if (er->pathname) { apr_file_close(fd); @@ -210,7 +210,7 @@ AP_DECLARE(char *) ap_make_etag_ex(request_rec *r, etag_rec *er) } if ((status = apr_file_seek(fd, APR_SET, &offset)) != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO() + ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r, APLOGNO(10255) "Make etag: could not seek"); if (er->pathname) { apr_file_close(fd);