3 files changed, 12 insertions, 8 deletions

diff --git a/src/plugins/http/http.c b/src/plugins/http/http.c
index 5998a9ebd18..43b0993e462 100644
--- a/src/plugins/http/http.c
+++ b/src/plugins/http/http.c
@@ -525,7 +525,7 @@ http_ts_disconnect_callback (session_t *ts)
 
   hc_handle.as_u32 = ts->opaque;
 
-  HTTP_DBG (1, "hc [%u]%x", ts->thread_index, hc_index);
+  HTTP_DBG (1, "hc [%u]%x", ts->thread_index, hc_handle.conn_index);
 
   hc = http_conn_get_w_thread (hc_handle.conn_index, ts->thread_index);
 
@@ -543,7 +543,7 @@ http_ts_reset_callback (session_t *ts)
 
   hc_handle.as_u32 = ts->opaque;
 
-  HTTP_DBG (1, "hc [%u]%x", ts->thread_index, hc_index);
+  HTTP_DBG (1, "hc [%u]%x", ts->thread_index, hc_handle.conn_index);
 
   hc = http_conn_get_w_thread (hc_handle.conn_index, ts->thread_index);
 
@@ -607,7 +607,8 @@ http_ts_cleanup_callback (session_t *ts, session_cleanup_ntf_t ntf)
   hc_handle.as_u32 = ts->opaque;
   hc = http_conn_get_w_thread (hc_handle.conn_index, ts->thread_index);
 
-  HTTP_DBG (1, "going to free hc [%u]%x", ts->thread_index, hc_index);
+  HTTP_DBG (1, "going to free hc [%u]%x", ts->thread_index,
+	    hc_handle.conn_index);
 
   if (!(hc->flags & HTTP_CONN_F_PENDING_TIMER))
     http_conn_timer_stop (hc);
diff --git a/src/plugins/http/http1.c b/src/plugins/http/http1.c
index ec118aa4e52..265f6e7b24f 100644
--- a/src/plugins/http/http1.c
+++ b/src/plugins/http/http1.c
@@ -998,6 +998,7 @@ http1_req_state_wait_transport_method (http_conn_t *hc, http_req_t *req,
   /* send at least "control data" which is necessary minimum,
    * if there is some space send also portion of body */
   max_enq = http_io_as_max_write (req);
+  max_enq -= sizeof (msg);
   if (max_enq < req->control_data_len)
     {
       clib_warning ("not enough room for control data in app's rx fifo");
@@ -1859,10 +1860,12 @@ http1_transport_rx_callback (http_conn_t *hc)
 
   if (!http1_req_state_is_rx_valid (req))
     {
-      clib_warning ("hc [%u]%x invalid rx state: http req state "
-		    "'%U', session state '%U'",
-		    hc->c_thread_index, hc->hc_hc_index, format_http_req_state,
-		    req->state, format_http_conn_state, hc);
+      if (http_io_ts_max_read (hc))
+	clib_warning ("hc [%u]%x invalid rx state: http req state "
+		      "'%U', session state '%U'",
+		      hc->c_thread_index, hc->hc_hc_index,
+		      format_http_req_state, req->state,
+		      format_http_conn_state, hc);
       http_io_ts_drain_all (hc);
       return;
     }
diff --git a/src/plugins/http/http_private.h b/src/plugins/http/http_private.h
index ebec59aeaee..8354bf29289 100644
--- a/src/plugins/http/http_private.h
+++ b/src/plugins/http/http_private.h
@@ -691,7 +691,7 @@ http_conn_accept_request (http_conn_t *hc, http_req_t *req)
   int rv;
 
   HTTP_DBG (1, "hc [%u]%x req %x", hc->hc_hc_index, hc->c_thread_index,
-	    req->hr_req_index);
+	    req->hr_req_handle);
 
   /* allocate app session and initialize */
   as = session_alloc (hc->c_thread_index);