Finished with tests; fixed test_quiesce (curl returns an error

when the http2 connection closes, although curl correctly receives
the response). Some deferred code that needs better code :S

Author: maru

src/microhttpd/connection_http2.c

@@ -1478,12 +1478,22 @@ MHD_http2_session_delete (struct MHD_Connection *connection)
     stream = next;
   }
 
-  MHD_pool_destroy (h2->pool);
-  h2->pool = NULL;
-  nghttp2_session_del (h2->session);
-  free (h2);
-  connection->h2 = NULL;
-  connection->state = MHD_CONNECTION_HTTP2_CLOSED;
+  if (NULL != h2->pool)
+  {
+    MHD_pool_destroy (h2->pool);
+    h2->pool = NULL;
+  }
+  if (NULL != h2->session)
+  {
+    nghttp2_session_del (h2->session);
+    h2->session = NULL;
+  }
+  if (NULL != connection->h2)
+  {
+    free (h2);
+    connection->h2 = NULL;
+  }
+  connection->state = MHD_CONNECTION_CLOSED;
   connection->pool = NULL;
   connection->read_buffer = NULL;
   connection->read_buffer_size = 0;
@@ -1650,7 +1660,7 @@ MHD_http2_handle_write (struct MHD_Connection *connection)
                                   [connection->write_buffer_send_offset],
                                   connection->write_buffer_append_offset -
                                     connection->write_buffer_send_offset);
-      // ENTER("send_cls ret=%d", ret);
+      // ENTER("send_cls ret=%ld", ret);
       if (ret < 0)
       {
         if (MHD_ERR_AGAIN_ == ret)
@@ -1672,7 +1682,7 @@ MHD_http2_handle_write (struct MHD_Connection *connection)
     connection->write_buffer_append_offset = 0;
     connection->write_buffer_send_offset = 0;
 
-    /* FILL WRITE BUFFER */
+    /* Fill write buffer */
     if (http2_fill_write_buffer(h2->session, h2) != 0)
     {
       MHD_connection_close_ (connection, MHD_REQUEST_TERMINATED_WITH_ERROR);
@@ -1734,7 +1744,10 @@ MHD_http2_handle_idle (struct MHD_Connection *connection)
       return MHD_NO;
     }
   }
-  // ENTER("[id=%zu]", connection->h2->session_id);
+  if (connection->state == MHD_CONNECTION_HTTP2_CLOSED)
+    return MHD_NO;
+
+  // ENTER("[id=%d] %s", (connection->h2 ? (int)connection->h2->session_id : -1), MHD_state_to_string (connection->state));
   if (connection->write_buffer_append_offset - connection->write_buffer_send_offset != 0)
   {
     MHD_update_last_activity_ (connection);
@@ -1746,15 +1759,31 @@ MHD_http2_handle_idle (struct MHD_Connection *connection)
   }
 
   /* TODO: resume all deferred streams */
-  if (connection->h2->deferred_stream > 0)
+  if (connection->h2 && connection->h2->deferred_stream > 0)
   {
     nghttp2_session_resume_data(connection->h2->session, connection->h2->deferred_stream);
+    struct http2_stream *stream;
+    stream = nghttp2_session_get_stream_user_data (connection->h2->session, connection->h2->deferred_stream);
+    if (stream == NULL)
+      return 0;
+    size_t unused = 0;
+    return http2_call_connection_handler (connection, stream, NULL, &unused);
   }
 
   return MHD_YES;
 }
 
 
+/**
+ * Suspend handling of network data for the current stream.
+ * @param connection connection to handle
+ */
+void
+MHD_http2_suspend_stream (struct MHD_Connection *connection)
+{
+  connection->h2->deferred_stream = connection->h2->current_stream_id;
+}
+
 /**
  * Queue a response to be transmitted to the client (as soon as
  * possible but after #MHD_AccessHandlerCallback returns).

src/microhttpd/connection_http2.h

@@ -150,7 +150,7 @@ struct http2_stream
    * is already set.
    */
   unsigned int response_code;
-  
+
   /**
    * How many more bytes of the body do we expect
    * to read? #MHD_SIZE_UNKNOWN for unknown.
@@ -312,6 +312,14 @@ MHD_http2_queue_response (struct MHD_Connection *connection,
                           unsigned int status_code,
                           struct MHD_Response *response);
 
+
+/**
+ * Suspend handling of network data for the current stream.
+ * @param connection connection to handle
+ */
+void
+MHD_http2_suspend_stream (struct MHD_Connection *connection);
+
 #endif /* HTTP2_SUPPORT */
 
 #endif

src/microhttpd/daemon.c

@@ -2613,6 +2613,13 @@ internal_suspend_connection_ (struct MHD_Connection *connection)
               daemon->suspended_connections_tail,
               connection);
   connection->suspended = true;
+#ifdef HTTP2_SUPPORT
+  if (connection->http_version == HTTP_VERSION(2, 0))
+    {
+      MHD_http2_suspend_stream (connection);
+    }
+#endif /* HTTP2_SUPPORT */
+
 #ifdef EPOLL_SUPPORT
   if (0 != (daemon->options & MHD_USE_EPOLL))
     {
@@ -5470,7 +5477,7 @@ MHD_start_daemon_va (unsigned int flags,
   MHD_DLOG (daemon,  _("Using debug build of libmicrohttpd.\n") );
 #endif /* HAVE_MESSAGES */
 #endif /* ! NDEBUG */
-  
+
   if ( (0 != (*pflags & MHD_USE_ITC)) &&
        (0 == daemon->worker_pool_size) )
     {
@@ -5572,15 +5579,15 @@ MHD_start_daemon_va (unsigned int flags,
     {
       /* try to open listen socket */
       int domain;
-      
+
 #ifdef HAVE_INET6
       domain = (*pflags & MHD_USE_IPv6) ? PF_INET6 : PF_INET;
 #else  /* ! HAVE_INET6 */
       if (*pflags & MHD_USE_IPv6)
 	goto free_and_fail;
       domain = PF_INET;
 #endif /* ! HAVE_INET6 */
-      
+
       listen_fd = MHD_socket_create_listen_(domain);
       if (MHD_INVALID_SOCKET == listen_fd)
 	{

src/testcurl/Makefile.am

@@ -79,6 +79,7 @@ check_PROGRAMS += \
   perf_get_concurrent
 if ENABLE_HTTP2
 check_PROGRAMS += \
+  test_quiesce_http2 \
   test_concurrent_stop_http2 \
   perf_get_concurrent_http2
 endif

src/testcurl/test_quiesce.c

@@ -221,6 +221,7 @@ testGet (int type, int pool_count, int poll_flag)
   cbc.buf = buf;
   cbc.size = 2048;
   cbc.pos = 0;
+  memset(cbc.buf, 0, cbc.size);
   if (pool_count > 0) {
     d = MHD_start_daemon (use_http2 | type | MHD_USE_ERROR_LOG | MHD_USE_ITC | poll_flag,
                           port, NULL, NULL, &ahc_echo, "GET",
@@ -282,7 +283,10 @@ testGet (int type, int pool_count, int poll_flag)
     }
 
   cbc.pos = 0;
-  if (CURLE_OK != (errornum = curl_easy_perform (c)))
+  memset(cbc.buf, 0, cbc.size);
+  errornum = curl_easy_perform (c);
+  if (((errornum != CURLE_OK) && (http_version < CURL_HTTP_VERSION_2)) ||
+      ((errornum != CURLE_OK) && (errornum != CURLE_RECV_ERROR) && (http_version >= CURL_HTTP_VERSION_2)))
     {
       fprintf (stderr,
                "curl_easy_perform failed: `%s'\n",