aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2018-02-16 03:10:24 +0100
committerChristian Grothoff <christian@grothoff.org>2018-02-16 03:10:24 +0100
commit9bf8e55fe1b8306e1319956dab78b462477a4b63 (patch)
tree4e5d08443e48bc0d7abc230f0c0de482bd457c0d
parent0ad862d39957b4ad107314d19ff3ac93d5ecbf07 (diff)
downloadlibmicrohttpd-9bf8e55fe1b8306e1319956dab78b462477a4b63.tar.gz
libmicrohttpd-9bf8e55fe1b8306e1319956dab78b462477a4b63.zip
fixing #5278 as suggested by reporter
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac1
-rw-r--r--src/include/microhttpd.h2
-rw-r--r--src/lib/connection_add.c2
-rw-r--r--src/microhttpd/daemon.c2
5 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5eb20f4c..7feebbb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
1Fri Feb 16 03:09:33 CET 2018
2 Fixing #5278 as suggested by reporter. -CG/texec
3
1Thu Feb 1 10:12:22 CET 2018 4Thu Feb 1 10:12:22 CET 2018
2 Releasing GNU libicrohttpd 0.9.59. -CG 5 Releasing GNU libicrohttpd 0.9.59. -CG
3 6
diff --git a/configure.ac b/configure.ac
index 03aba82b..aa975650 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2022,6 +2022,7 @@ doc/examples/Makefile
2022m4/Makefile 2022m4/Makefile
2023src/Makefile 2023src/Makefile
2024src/include/Makefile 2024src/include/Makefile
2025src/lib/Makefile
2025src/microhttpd/Makefile 2026src/microhttpd/Makefile
2026src/examples/Makefile 2027src/examples/Makefile
2027src/testcurl/Makefile 2028src/testcurl/Makefile
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index 4f219fd0..3af9cf22 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -126,7 +126,7 @@ typedef intptr_t ssize_t;
126 * Current version of the library. 126 * Current version of the library.
127 * 0x01093001 = 1.9.30-1. 127 * 0x01093001 = 1.9.30-1.
128 */ 128 */
129#define MHD_VERSION 0x00095900 129#define MHD_VERSION 0x00095901
130 130
131/** 131/**
132 * MHD-internal return code for "YES". 132 * MHD-internal return code for "YES".
diff --git a/src/lib/connection_add.c b/src/lib/connection_add.c
index 5ce9030a..edca88f9 100644
--- a/src/lib/connection_add.c
+++ b/src/lib/connection_add.c
@@ -288,7 +288,7 @@ thread_main_handle_connection (void *data)
288 num_ready = MHD_SYS_select_ (maxsock + 1, 288 num_ready = MHD_SYS_select_ (maxsock + 1,
289 &rs, 289 &rs,
290 &ws, 290 &ws,
291 NULL, 291 &es,
292 tvp); 292 tvp);
293 if (num_ready < 0) 293 if (num_ready < 0)
294 { 294 {
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 9097d53d..d8a89e25 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -1938,7 +1938,7 @@ thread_main_handle_connection (void *data)
1938 num_ready = MHD_SYS_select_ (maxsock + 1, 1938 num_ready = MHD_SYS_select_ (maxsock + 1,
1939 &rs, 1939 &rs,
1940 &ws, 1940 &ws,
1941 NULL, 1941 &es,
1942 tvp); 1942 tvp);
1943 if (num_ready < 0) 1943 if (num_ready < 0)
1944 { 1944 {