integrate

3 files changed, 13 insertions, 2 deletions

diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index 4f2a5d58..d29ce4aa 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -247,7 +247,11 @@ MHD_handle_connection (void *data)
         tv.tv_sec = 0;
       if ((con->state == MHD_CONNECTION_NORMAL_BODY_UNREADY) ||
           (con->state == MHD_CONNECTION_CHUNKED_BODY_UNREADY))
-        timeout = 1;            /* do not block */
+        {
+          /* do not block (we're waiting for our callback to succeed) */
+          timeout = 1;  
+          tv.tv_sec = 0;
+        }
       num_ready = SELECT (max + 1,
                           &rs, &ws, &es, (timeout != 0) ? &tv : NULL);
       if (num_ready < 0)
diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am
index 925a3a86..eeede99a 100644
--- a/src/testcurl/https/Makefile.am
+++ b/src/testcurl/https/Makefile.am
@@ -17,6 +17,7 @@ check_PROGRAMS = \
   tls_daemon_options_test \
   tls_authentication_test \
   mhds_multi_daemon_test \
+  mhds_get_test \
   mhds_session_info_test \
   tls_thread_mode_test \
   tls_multi_thread_mode_test
@@ -93,3 +94,10 @@ mhds_multi_daemon_test_LDADD  = \
   $(top_builddir)/src/testcurl/libcurl_version_check.a \
   $(top_builddir)/src/daemon/libmicrohttpd.la \
   @LIBCURL@  
+
+mhds_get_test_SOURCES = \
+  mhds_get_test.c
+mhds_get_test_LDADD  = \
+  $(top_builddir)/src/testcurl/libcurl_version_check.a \
+  $(top_builddir)/src/daemon/libmicrohttpd.la \
+  @LIBCURL@  
diff --git a/src/testcurl/https/bug-test.c b/src/testcurl/https/mhds_get_test.c
index 8c28bea7..302c6e9a 100644
--- a/src/testcurl/https/bug-test.c
+++ b/src/testcurl/https/mhds_get_test.c
@@ -348,7 +348,6 @@ main (int argc, char *const *argv)
     test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_TLSv1);
   errorCount +=
     test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_SSLv3);
-  /* TODO resolve cipher setting issue when compiling against GNU TLS */
   errorCount +=
     test_cipher_option (test_fd, "DES-CBC3-SHA", CURL_SSLVERSION_TLSv1);