[libmicrohttpd] branch master updated (e544cf36 -> 51088191)

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from e544cf36 Added fallback functions for MHD_monotonic_msec_counter() 
values
     new 3e678300 microhttpd.h: removed duplicated macro
     new 17d8406e get_date_str(): added error check
     new 51088191 test_shutdown_select: file description fixed

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/include/microhttpd.h              | 3 +--
 src/microhttpd/connection.c           | 3 ++-
 src/microhttpd/test_shutdown_select.c | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 6735f642..166e9b47 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -109,6 +109,7 @@ extern "C"
 #ifndef MHD_PLATFORM_H
 #if defined(_WIN32) && ! defined(__CYGWIN__) && \
   ! defined(_CRT_DECLARE_NONSTDC_NAMES)
+/* Declare POSIX-compatible names */
 #define _CRT_DECLARE_NONSTDC_NAMES 1
 #endif /* _WIN32 && ! __CYGWIN__ && ! _CRT_DECLARE_NONSTDC_NAMES */
 #include <stdarg.h>
@@ -119,8 +120,6 @@ extern "C"
 #include <sys/time.h>
 #include <sys/socket.h>
 #else  /* _WIN32 && ! __CYGWIN__ */
-/* Declare POSIX-compatible names */
-#define _CRT_DECLARE_NONSTDC_NAMES 1
 #include <ws2tcpip.h>
 #if defined(_MSC_FULL_VER) && ! defined (_SSIZE_T_DEFINED)
 #define _SSIZE_T_DEFINED
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 51574113..bcb3f934 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -1322,7 +1322,8 @@ get_date_str (char *date)
   struct tm *pNow;
 #endif
 
-  time (&t);
+  if ((time_t) -1 == time (&t))
+    return false;
 #if defined(HAVE_C11_GMTIME_S)
   if (NULL == gmtime_s (&t,
                         &now))
diff --git a/src/microhttpd/test_shutdown_select.c 
b/src/microhttpd/test_shutdown_select.c
index 121c38cc..08b30426 100644
--- a/src/microhttpd/test_shutdown_select.c
+++ b/src/microhttpd/test_shutdown_select.c
@@ -22,10 +22,10 @@
  * @file microhttpd/test_shutdown_select.c
  * @brief  Test whether shutdown socket triggers select()/poll()
  * @details On some platforms shutting down the socket in one thread
- *          trigger select() or poll() waiting for this socket in
- *          other thread. libmicrohttpd depend on this behavior on
- *          those platforms. This program check whether select()
- *          and poll() (if available) works as expected.
+ *          triggers select() or poll() waiting for this socket in
+ *          other thread. libmicrohttpd depends on this behavior on
+ *          these platforms. This program check whether select()
+ *          and poll() (if available) work as expected.
  * @author Karlson2k (Evgeny Grin)
  */
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.