From: Eric Covener <covener@apache.org>
Date: Wed, 22 Jun 2016 13:16:40 +0000 (+0000)
Subject: Merge r1749688 from trunk:
X-Git-Tag: 2.4.23~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4281fca4bd2c373e07261239f9a7baa3be41b8c5;p=apache

Merge r1749688 from trunk:

spatch some AH* IDs to pick up the new INFO level messages,
also hit old DEBUG messages.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1749692 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http2/h2_conn_io.c b/modules/http2/h2_conn_io.c
index f861536370..77d1789644 100644
--- a/modules/http2/h2_conn_io.c
+++ b/modules/http2/h2_conn_io.c
@@ -171,7 +171,7 @@ static void append_scratch(h2_conn_io *io)
                                                io->c->bucket_alloc);
         APR_BRIGADE_INSERT_TAIL(io->output, b);
 #if LOG_SCRATCH
-        ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c,
+        ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(),
                       "h2_conn_io(%ld): append_scratch(%ld)", 
                       io->c->id, (long)io->slen);
 #endif
@@ -223,7 +223,7 @@ static apr_status_t read_to_scratch(h2_conn_io *io, apr_bucket *b)
         }
         status = apr_file_read(fd, io->scratch + io->slen, &len);
 #if LOG_SCRATCH
-        ap_log_cerror(APLOG_MARK, APLOG_INFO, status, io->c,
+        ap_log_cerror(APLOG_MARK, APLOG_INFO, status, io->c, APLOGNO(),
                       "h2_conn_io(%ld): FILE_to_scratch(%ld)", 
                       io->c->id, (long)len); 
 #endif
@@ -236,7 +236,7 @@ static apr_status_t read_to_scratch(h2_conn_io *io, apr_bucket *b)
         status = apr_bucket_read(b, &data, &len, APR_BLOCK_READ);
         if (status == APR_SUCCESS) {
 #if LOG_SCRATCH
-            ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c,
+            ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(),
                           "h2_conn_io(%ld): read_to_scratch(%ld)", 
                           io->c->id, (long)b->length); 
 #endif
@@ -333,7 +333,7 @@ apr_status_t h2_conn_io_write(h2_conn_io *io, const char *data, size_t length)
             remain = assure_scratch_space(io);
             if (remain >= length) {
 #if LOG_SCRATCH
-                ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c,
+                ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(),
                               "h2_conn_io(%ld): write_to_scratch(%ld)", 
                               io->c->id, (long)length); 
 #endif
@@ -343,7 +343,7 @@ apr_status_t h2_conn_io_write(h2_conn_io *io, const char *data, size_t length)
             }
             else {
 #if LOG_SCRATCH
-                ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c,
+                ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(),
                               "h2_conn_io(%ld): write_to_scratch(%ld)", 
                               io->c->id, (long)remain); 
 #endif
@@ -385,7 +385,7 @@ apr_status_t h2_conn_io_pass(h2_conn_io *io, apr_bucket_brigade *bb)
                     APR_BUCKET_REMOVE(b);
                     APR_BRIGADE_INSERT_TAIL(io->output, b);
 #if LOG_SCRATCH
-                    ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c,
+                    ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(),
                                   "h2_conn_io(%ld): pass bucket(%ld)", 
                                   io->c->id, (long)b->length);
 #endif
diff --git a/modules/http2/h2_mplx.c b/modules/http2/h2_mplx.c
index 2b8ed6bb7a..75873ac66c 100644
--- a/modules/http2/h2_mplx.c
+++ b/modules/http2/h2_mplx.c
@@ -486,11 +486,11 @@ static int task_print(void *ctx, void *val)
                       task->worker_done);
     }
     else if (task) {
-        ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, /* NO APLOGNO */
+        ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, APLOGNO(), /* NO APLOGNO */
                       "->03198: h2_stream(%ld-%d): NULL", m->id, task->stream_id);
     }
     else {
-        ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, /* NO APLOGNO */
+        ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, APLOGNO(), /* NO APLOGNO */
                       "->03198: h2_stream(%ld-NULL): NULL", m->id);
     }
     return 1;
@@ -739,7 +739,7 @@ static apr_status_t out_close(h2_mplx *m, h2_task *task)
         h2_response *r = h2_response_die(task->stream_id, 500, 
                                          task->request, m->pool);
         status = out_open(m, task->stream_id, r);
-        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, m->c,
+        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, m->c, APLOGNO(),
                       "h2_mplx(%s): close, no response, no rst", task->id);
     }
     ap_log_cerror(APLOG_MARK, APLOG_TRACE2, status, m->c,
diff --git a/modules/http2/h2_ngn_shed.c b/modules/http2/h2_ngn_shed.c
index a8dd004277..7381824fc3 100644
--- a/modules/http2/h2_ngn_shed.c
+++ b/modules/http2/h2_ngn_shed.c
@@ -139,7 +139,7 @@ h2_ngn_shed *h2_ngn_shed_get_shed(h2_req_engine *ngn)
 
 void h2_ngn_shed_abort(h2_ngn_shed *shed)
 {
-    ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, shed->c,
+    ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, shed->c, APLOGNO(),
                   "h2_ngn_shed(%ld): abort", shed->c->id);
     shed->aborted = 1;
 }
@@ -204,7 +204,7 @@ apr_status_t h2_ngn_shed_push_task(h2_ngn_shed *shed, const char *ngn_type,
         status = einit(newngn, newngn->id, newngn->type, newngn->pool,
                        shed->req_buffer_size, task->r, 
                        &newngn->out_consumed, &newngn->out_consumed_ctx);
-        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, task->c,
+        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, task->c, APLOGNO(),
                       "h2_ngn_shed(%ld): create engine %s (%s)", 
                       shed->c->id, newngn->id, newngn->type);
         if (status == APR_SUCCESS) {
@@ -247,11 +247,11 @@ apr_status_t h2_ngn_shed_pull_task(h2_ngn_shed *shed,
     
     AP_DEBUG_ASSERT(ngn);
     *ptask = NULL;
-    ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, shed->c,
+    ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, shed->c, APLOGNO(),
                   "h2_ngn_shed(%ld): pull task for engine %s, shutdown=%d", 
                   shed->c->id, ngn->id, want_shutdown);
     if (shed->aborted) {
-        ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, shed->c,
+        ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, shed->c, APLOGNO(),
                       "h2_ngn_shed(%ld): abort while pulling requests %s", 
                       shed->c->id, ngn->id);
         ngn->shutdown = 1;
@@ -270,7 +270,7 @@ apr_status_t h2_ngn_shed_pull_task(h2_ngn_shed *shed,
     }
     
     if ((entry = pop_detached(ngn))) {
-        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, entry->task->c,
+        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, entry->task->c, APLOGNO(),
                       "h2_ngn_shed(%ld): pulled request %s for engine %s", 
                       shed->c->id, entry->task->id, ngn->id);
         ngn->no_live++;
@@ -293,7 +293,7 @@ apr_status_t h2_ngn_shed_pull_task(h2_ngn_shed *shed,
     
     if (1) {
         h2_ngn_entry *entry = H2_REQ_ENTRIES_FIRST(&ngn->entries);
-        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, shed->c,
+        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, shed->c, APLOGNO(),
                       "h2_ngn_shed(%ld): pull task, nothing, first task %s", 
                       shed->c->id, entry->task->id);
     }
@@ -303,7 +303,7 @@ apr_status_t h2_ngn_shed_pull_task(h2_ngn_shed *shed,
 static apr_status_t ngn_done_task(h2_ngn_shed *shed, h2_req_engine *ngn, 
                                   h2_task *task, int waslive, int aborted)
 {
-    ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, shed->c,
+    ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, shed->c, APLOGNO(),
                   "h2_ngn_shed(%ld): task %s %s by %s", 
                   shed->c->id, task->id, aborted? "aborted":"done", ngn->id);
     ngn->no_finished++;
diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c
index 2d4e0a41e7..4f47d65c06 100644
--- a/modules/http2/h2_session.c
+++ b/modules/http2/h2_session.c
@@ -1785,7 +1785,7 @@ static void h2_session_ev_conn_error(h2_session *session, int arg, const char *m
             break;
         
         default:
-            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c,
+            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(),
                           "h2_session(%ld): conn error -> shutdown", session->id);
             h2_session_shutdown(session, arg, msg, 0);
             break;
@@ -1802,7 +1802,7 @@ static void h2_session_ev_proto_error(h2_session *session, int arg, const char *
             break;
         
         default:
-            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c,
+            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(),
                           "h2_session(%ld): proto error -> shutdown", session->id);
             h2_session_shutdown(session, arg, msg, 0);
             break;
@@ -2122,6 +2122,7 @@ apr_status_t h2_session_process(h2_session *session, int async)
                     }
                     else {
                         ap_log_cerror( APLOG_MARK, APLOG_DEBUG, status, c,
+				      APLOGNO(),
                                       "h2_session(%ld): idle, no data, error", 
                                       session->id);
                         dispatch_event(session, H2_SESSION_EV_CONN_ERROR, 0, "timeout");
@@ -2288,6 +2289,7 @@ apr_status_t h2_session_process(h2_session *session, int async)
                 }
                 else {
                     ap_log_cerror(APLOG_MARK, APLOG_WARNING, status, c,
+				  APLOGNO(),
                                   "h2_session(%ld): waiting on conditional",
                                   session->id);
                     h2_session_shutdown(session, H2_ERR_INTERNAL_ERROR, 
diff --git a/modules/http2/h2_task.c b/modules/http2/h2_task.c
index 8cf1ce1ee5..6ecc9ac47f 100644
--- a/modules/http2/h2_task.c
+++ b/modules/http2/h2_task.c
@@ -442,7 +442,7 @@ static apr_status_t output_write(h2_task *task, ap_filter_t* f,
     
     /* If the passed brigade is not empty, save it before return */
     if (!APR_BRIGADE_EMPTY(bb)) {
-        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, task->c,
+        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, task->c, APLOGNO(),
                       "h2_task(%s): could not write all, saving brigade", 
                       task->id);
         if (!task->output.bb) {
@@ -806,7 +806,7 @@ apr_status_t h2_task_freeze(h2_task *task)
 {   
     if (!task->frozen) {
         task->frozen = 1;
-        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, task->c, 
+        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, task->c, APLOGNO(), 
                       "h2_task(%s), frozen", task->id);
     }
     return APR_SUCCESS;
@@ -816,7 +816,7 @@ apr_status_t h2_task_thaw(h2_task *task)
 {
     if (task->frozen) {
         task->frozen = 0;
-        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, task->c, 
+        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, task->c, APLOGNO(), 
                       "h2_task(%s), thawed", task->id);
     }
     task->detached = 1;