From: Stefan Eissing <icing@apache.org>
Date: Fri, 18 Dec 2015 15:13:40 +0000 (+0000)
Subject: logging tweaks and task check
X-Git-Tag: 2.5.0-alpha~2521
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98b1293c3c2b5173a8abee8e2bc396d8e4799916;p=apache

logging tweaks and task check

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1720806 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http2/h2_conn.c b/modules/http2/h2_conn.c
index 5bc3d475ec..e9ed9a8468 100644
--- a/modules/http2/h2_conn.c
+++ b/modules/http2/h2_conn.c
@@ -133,6 +133,7 @@ apr_status_t h2_conn_setup(h2_ctx *ctx, conn_rec *c, request_rec *r)
 {
     h2_session *session;
     
+    ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, "setup");
     if (!workers) {
         ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, c, APLOGNO(02911) 
                       "workers not initialized");
@@ -163,6 +164,7 @@ apr_status_t h2_conn_process(h2_ctx *ctx, int async)
         session->c->cs->sense = CONN_SENSE_DEFAULT;
     }
 
+    ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, "process");
     status = h2_session_process(session, async);
 
     if (session->c->cs) {
diff --git a/modules/http2/h2_ctx.c b/modules/http2/h2_ctx.c
index fa0a3c8e94..b40037cb35 100644
--- a/modules/http2/h2_ctx.c
+++ b/modules/http2/h2_ctx.c
@@ -98,7 +98,7 @@ h2_ctx *h2_ctx_server_set(h2_ctx *ctx, server_rec *s)
 
 int h2_ctx_is_task(h2_ctx *ctx)
 {
-    return ctx && !!ctx->task;
+    return ctx && ctx->task;
 }
 
 struct h2_task *h2_ctx_get_task(h2_ctx *ctx)
diff --git a/modules/http2/h2_h2.c b/modules/http2/h2_h2.c
index 6a3231dc4b..5bff7052f0 100644
--- a/modules/http2/h2_h2.c
+++ b/modules/http2/h2_h2.c
@@ -584,6 +584,7 @@ int h2_h2_process_conn(conn_rec* c)
     ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, c, "h2_h2, process_conn");
     if (h2_ctx_is_task(ctx)) {
         /* our stream pseudo connection */
+        ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, c, "h2_h2, task, declined");
         return DECLINED;
     }