handle 0 as specified in documentation

3 files changed, 12 insertions, 1 deletions

diff --git a/src/daemon/connection.c b/src/daemon/connection.c
index e94b1d46..3fd03a41 100644
--- a/src/daemon/connection.c
+++ b/src/daemon/connection.c
@@ -330,6 +330,9 @@ try_ready_normal_body (struct MHD_Connection *connection)
                        MHD_MIN (response->data_buffer_size,
                                 response->total_size -
                                 connection->response_write_position));
+  if ( (ret == 0) &&
+       (0 != (connection->daemon->options & MHD_USE_SELECT_INTERNALLY)) )
+    abort(); /* serious client API violation */
   if (ret == -1)
     {
       /* either error or http 1.0 transfer, close
@@ -1715,6 +1718,12 @@ MHD_connection_handle_write (struct MHD_Connection *connection)
           if (connection->socket_fd != -1)
             connection_close_error (connection);
           return MHD_NO;
+        case MHD_TLS_CONNECTION_INIT:
+        case MHD_TLS_HELLO_REQUEST:
+        case MHD_TLS_HANDSHAKE_FAILED:
+        case MHD_TLS_HANDSHAKE_COMPLETE:
+          EXTRA_CHECK(0);
+          break;
         }
       break;
     }
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index f116c192..599f983a 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -251,6 +251,9 @@ MHD_handle_connection (void *data)
         tv.tv_sec = timeout - (now - con->last_activity);
       else
         tv.tv_sec = 0;
+      if ( (con->state == MHD_CONNECTION_NORMAL_BODY_UNREADY) ||
+           (con->state == MHD_CONNECTION_CHUNKED_BODY_UNREADY) )
+        timeout = 1; /* do not block */ 
       num_ready = SELECT (max + 1,
                           &rs, &ws, &es, (timeout != 0) ? &tv : NULL);
       if (num_ready < 0)
diff --git a/src/daemon/reason_phrase.c b/src/daemon/reason_phrase.c
index 095b6302..9ec4b346 100644
--- a/src/daemon/reason_phrase.c
+++ b/src/daemon/reason_phrase.c
@@ -2,7 +2,6 @@
      This file is part of libmicrohttpd
      (C) 2007 Lymba
 
-
      This library is free software; you can redistribute it and/or
      modify it under the terms of the GNU Lesser General Public
      License as published by the Free Software Foundation; either