From 62214f6d57cb7e2c81f8c831936b93023cfef3f2 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Mon, 29 Feb 2016 22:11:11 +0000 Subject: [PATCH] mod_http2: add missing APLOGNO()s. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1732959 13f79535-47bb-0310-9956-ffa450edef68 --- docs/log-message-tags/next-number | 2 +- modules/http2/h2_mplx.c | 2 +- modules/http2/h2_proxy_session.c | 12 ++++++------ modules/http2/h2_task_output.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number index 7a3861d736..ba2fe96819 100644 --- a/docs/log-message-tags/next-number +++ b/docs/log-message-tags/next-number @@ -1 +1 @@ -3341 +3349 diff --git a/modules/http2/h2_mplx.c b/modules/http2/h2_mplx.c index 2d4c3ae369..6311d67d4e 100644 --- a/modules/http2/h2_mplx.c +++ b/modules/http2/h2_mplx.c @@ -662,7 +662,7 @@ h2_stream *h2_mplx_next_submit(h2_mplx *m, h2_ihash_t *streams) * reset by the client. Should no longer happen since such * streams should clear io's from the ready queue. */ - ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, APLOGNO() + ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, APLOGNO(03347) "h2_mplx(%ld): stream for response %d closed, " "resetting io to close request processing", m->id, io->id); diff --git a/modules/http2/h2_proxy_session.c b/modules/http2/h2_proxy_session.c index c65cdbdc3d..9e6ef35755 100644 --- a/modules/http2/h2_proxy_session.c +++ b/modules/http2/h2_proxy_session.c @@ -145,7 +145,7 @@ static int on_frame_recv(nghttp2_session *ngh2, const nghttp2_frame *frame, char buffer[256]; h2_util_frame_print(frame, buffer, sizeof(buffer)/sizeof(buffer[0])); - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO() + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(03341) "h2_session(%s): recv FRAME[%s]", session->id, buffer); } @@ -166,7 +166,7 @@ static int on_frame_recv(nghttp2_session *ngh2, const nghttp2_frame *frame, char buffer[256]; h2_util_frame_print(frame, buffer, sizeof(buffer)/sizeof(buffer[0])); - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO() + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(03342) "h2_session(%s): recv FRAME[%s]", session->id, buffer); } @@ -185,7 +185,7 @@ static int before_frame_send(nghttp2_session *ngh2, char buffer[256]; h2_util_frame_print(frame, buffer, sizeof(buffer)/sizeof(buffer[0])); - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO() + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(03343) "h2_session(%s): sent FRAME[%s]", session->id, buffer); } @@ -361,7 +361,7 @@ static int on_data_chunk_recv(nghttp2_session *ngh2, uint8_t flags, } status = ap_pass_brigade(stream->r->output_filters, stream->output); if (status != APR_SUCCESS) { - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, session->c, APLOGNO() + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, session->c, APLOGNO(03344) "h2_session(%s-%d): passing output", session->id, stream->id); nghttp2_submit_rst_stream(ngh2, NGHTTP2_FLAG_NONE, @@ -849,7 +849,7 @@ static int is_accepting_streams(h2_proxy_session *session) static void transit(h2_proxy_session *session, const char *action, h2_proxys_state nstate) { - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO() + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(03345) "h2_proxy_session(%s): transit [%s] -- %s --> [%s]", session->id, state_name(session->state), action, state_name(nstate)); session->state = nstate; @@ -1208,7 +1208,7 @@ apr_status_t h2_proxy_session_process(h2_proxy_session *session) default: ap_log_cerror(APLOG_MARK, APLOG_ERR, APR_EGENERAL, session->c, - APLOGNO()"h2_session(%s): unknown state %d", + APLOGNO(03346)"h2_session(%s): unknown state %d", session->id, session->state); dispatch_event(session, H2_PROXYS_EV_PROTO_ERROR, 0, NULL); break; diff --git a/modules/http2/h2_task_output.c b/modules/http2/h2_task_output.c index 0cf3d355e0..1a2bd86331 100644 --- a/modules/http2/h2_task_output.c +++ b/modules/http2/h2_task_output.c @@ -101,7 +101,7 @@ static apr_status_t open_if_needed(h2_task_output *output, ap_filter_t *f, h2_task_logio_add_bytes_out(f->c, bytes_written); } get_trailers(output); - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, f->c, APLOGNO(03204) + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, f->c, APLOGNO(03348) "h2_task_output(%s): open as needed %s %s %s", output->task->id, output->task->request->method, output->task->request->authority, -- 2.49.0