You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2016/02/29 23:11:11 UTC
svn commit: r1732959 - in /httpd/httpd/trunk:
docs/log-message-tags/next-number modules/http2/h2_mplx.c
modules/http2/h2_proxy_session.c modules/http2/h2_task_output.c
Author: ylavic
Date: Mon Feb 29 22:11:11 2016
New Revision: 1732959
URL: http://svn.apache.org/viewvc?rev=1732959&view=rev
Log:
mod_http2: add missing APLOGNO()s.
Modified:
httpd/httpd/trunk/docs/log-message-tags/next-number
httpd/httpd/trunk/modules/http2/h2_mplx.c
httpd/httpd/trunk/modules/http2/h2_proxy_session.c
httpd/httpd/trunk/modules/http2/h2_task_output.c
Modified: httpd/httpd/trunk/docs/log-message-tags/next-number
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/log-message-tags/next-number?rev=1732959&r1=1732958&r2=1732959&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/log-message-tags/next-number (original)
+++ httpd/httpd/trunk/docs/log-message-tags/next-number Mon Feb 29 22:11:11 2016
@@ -1 +1 @@
-3341
+3349
Modified: httpd/httpd/trunk/modules/http2/h2_mplx.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_mplx.c?rev=1732959&r1=1732958&r2=1732959&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_mplx.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_mplx.c Mon Feb 29 22:11:11 2016
@@ -662,7 +662,7 @@ h2_stream *h2_mplx_next_submit(h2_mplx *
* 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);
Modified: httpd/httpd/trunk/modules/http2/h2_proxy_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_proxy_session.c?rev=1732959&r1=1732958&r2=1732959&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_proxy_session.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_proxy_session.c Mon Feb 29 22:11:11 2016
@@ -145,7 +145,7 @@ static int on_frame_recv(nghttp2_session
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
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_ses
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_se
}
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
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
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;
Modified: httpd/httpd/trunk/modules/http2/h2_task_output.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_task_output.c?rev=1732959&r1=1732958&r2=1732959&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_task_output.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_task_output.c Mon Feb 29 22:11:11 2016
@@ -101,7 +101,7 @@ static apr_status_t open_if_needed(h2_ta
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,