releasing 0.9.52v0.9.52

4 files changed, 174 insertions, 192 deletions

diff --git a/ChangeLog b/ChangeLog
index 6e6986a4..cac4cb00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 17 19:08:18 CEST 2016
+        Fixed misc. issues relating to upgrade.
+        Releasing experimental 0.9.52. -CG
+
 Wed Oct 12 14:26:20 CEST 2016
         Migrated repository from Subversion to Git. -CG
 
diff --git a/configure.ac b/configure.ac
index eee0d2d0..a18f0b13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,14 +22,14 @@
 #
 AC_PREREQ([2.64])
 LT_PREREQ([2.4.0])
-AC_INIT([GNU Libmicrohttpd],[0.9.51],[libmicrohttpd@gnu.org])
+AC_INIT([GNU Libmicrohttpd],[0.9.52],[libmicrohttpd@gnu.org])
 AM_INIT_AUTOMAKE([silent-rules] [subdir-objects])
 AC_CONFIG_HEADERS([MHD_config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-LIB_VERSION_CURRENT=51
+LIB_VERSION_CURRENT=52
 LIB_VERSION_REVISION=0
-LIB_VERSION_AGE=39
+LIB_VERSION_AGE=40
 AC_SUBST(LIB_VERSION_CURRENT)
 AC_SUBST(LIB_VERSION_REVISION)
 AC_SUBST(LIB_VERSION_AGE)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index aa281890..f85c0b7f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -28,7 +28,6 @@ src/microhttpd/memorypool.c
 src/microhttpd/mhd_compat.c
 src/microhttpd/mhd_itc.c
 src/microhttpd/mhd_mono_clock.c
-src/microhttpd/mhd_sem.c
 src/microhttpd/mhd_sockets.c
 src/microhttpd/mhd_str.c
 src/microhttpd/mhd_threads.c
diff --git a/po/libmicrohttpd.pot b/po/libmicrohttpd.pot
index 3e8921f9..2af0c97f 100644
--- a/po/libmicrohttpd.pot
+++ b/po/libmicrohttpd.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU libmicrohttpd 0.9.51\n"
+"Project-Id-Version: GNU libmicrohttpd 0.9.52\n"
 "Report-Msgid-Bugs-To: libmicrohttpd@gnu.org\n"
-"POT-Creation-Date: 2016-09-27 20:37+0200\n"
+"POT-Creation-Date: 2016-10-17 19:09+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,122 +33,123 @@ msgstr ""
 msgid "Failed to add Basic auth header\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:530
-msgid "Failed to signal end of connection via pipe"
+#: src/microhttpd/connection.c:528
+msgid ""
+"Failed to signal end of connection via inter-thread communication channel"
 msgstr ""
 
-#: src/microhttpd/connection.c:623
+#: src/microhttpd/connection.c:621
 msgid "Closing connection (application reported error generating data)\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:669
+#: src/microhttpd/connection.c:667
 msgid "Closing connection (out of memory)\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:713
+#: src/microhttpd/connection.c:711
 msgid "Closing connection (application error generating response)\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:1234
+#: src/microhttpd/connection.c:1233
 #, c-format
 msgid ""
 "Error processing request (HTTP response code is %u (`%s')). Closing "
 "connection.\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:1251 src/microhttpd/connection.c:2861
-#: src/microhttpd/connection.c:2964
+#: src/microhttpd/connection.c:1250 src/microhttpd/connection.c:2859
+#: src/microhttpd/connection.c:2962
 msgid "Closing connection (failed to create response header)\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:1275 src/microhttpd/connection.c:2330
-#: src/microhttpd/connection.c:2391 src/microhttpd/connection.c:2628
+#: src/microhttpd/connection.c:1274 src/microhttpd/connection.c:2329
+#: src/microhttpd/connection.c:2390 src/microhttpd/connection.c:2626
 #: src/microhttpd/connection_https.c:139
 #, c-format
 msgid "In function %s handling connection at state: %s\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:1491
+#: src/microhttpd/connection.c:1490
 msgid "Not enough memory in pool to allocate header record!\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:1533
+#: src/microhttpd/connection.c:1532
 msgid "Not enough memory in pool to parse cookies!\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:1738 src/microhttpd/connection.c:1900
+#: src/microhttpd/connection.c:1737 src/microhttpd/connection.c:1899
 msgid "Application reported internal error, closing connection.\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:1790 src/microhttpd/connection.c:1845
+#: src/microhttpd/connection.c:1789 src/microhttpd/connection.c:1844
 msgid ""
 "Received malformed HTTP request (bad chunked encoding). Closing connection.\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:1908
+#: src/microhttpd/connection.c:1907
 msgid "libmicrohttpd API violation"
 msgstr ""
 
-#: src/microhttpd/connection.c:1924
+#: src/microhttpd/connection.c:1923
 msgid ""
 "WARNING: incomplete POST processing and connection not suspended will result "
 "in hung connection.\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:2028
+#: src/microhttpd/connection.c:2027
 #, c-format
 msgid "Sent response: `%.*s'\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:2089
+#: src/microhttpd/connection.c:2088
 msgid "Received malformed line (no colon). Closing connection.\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:2225
+#: src/microhttpd/connection.c:2224
 msgid "Received HTTP 1.1 request without `Host' header.\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:2420 src/microhttpd/connection.c:2495
+#: src/microhttpd/connection.c:2419 src/microhttpd/connection.c:2493
 #, c-format
 msgid "Failed to send data: %s\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:2429
+#: src/microhttpd/connection.c:2428
 #, c-format
 msgid "Sent 100 continue response: `%.*s'\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:2470
+#: src/microhttpd/connection.c:2468
 msgid "Data offset exceeds limit"
 msgstr ""
 
-#: src/microhttpd/connection.c:2480
+#: src/microhttpd/connection.c:2478
 #, c-format
 msgid "Sent %d-byte DATA response: `%.*s'\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:2546 src/microhttpd/daemon.c:5237
+#: src/microhttpd/connection.c:2544 src/microhttpd/daemon.c:5249
 msgid "Internal error\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:3166 src/microhttpd/daemon.c:2054
-#: src/microhttpd/daemon.c:3392 src/microhttpd/daemon.c:3412
-#: src/microhttpd/daemon.c:4322 src/microhttpd/daemon.c:4340
-#: src/microhttpd/response.c:814 src/microhttpd/response.c:840
+#: src/microhttpd/connection.c:3164 src/microhttpd/daemon.c:2078
+#: src/microhttpd/daemon.c:3417 src/microhttpd/daemon.c:3437
+#: src/microhttpd/daemon.c:4387 src/microhttpd/daemon.c:4405
+#: src/microhttpd/response.c:838 src/microhttpd/response.c:864
 #, c-format
 msgid "Call to epoll_ctl failed: %s\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:3330
+#: src/microhttpd/connection.c:3328
 msgid "Application used invalid status code for 'upgrade' response!\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:3340
+#: src/microhttpd/connection.c:3338
 msgid ""
 "Application attempted 'upgrade' without setting MHD_USE_SUSPEND_RESUME!\n"
 msgstr ""
 
-#: src/microhttpd/connection.c:3351
+#: src/microhttpd/connection.c:3349
 msgid ""
 "Application attempted 'upgrade' HTTPS connection in epoll mode without "
 "setting MHD_USE_HTTPS_EPOLL_UPGRADE!\n"
@@ -158,30 +159,30 @@ msgstr ""
 msgid "Error: received handshake message out of context\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:113
+#: src/microhttpd/daemon.c:107
 #, c-format
 msgid "Fatal error in GNU libmicrohttpd %s:%u: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:329
+#: src/microhttpd/daemon.c:323
 msgid "Failed to add IP connection count node\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:387
+#: src/microhttpd/daemon.c:381
 msgid "Failed to find previously-added IP address\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:393
+#: src/microhttpd/daemon.c:387
 msgid "Previously-added IP address had counter of zero\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:559
+#: src/microhttpd/daemon.c:553
 msgid ""
 "Failed to setup x509 certificate/key: pre 3.X.X version of GnuTLS does not "
 "support setting key password"
 msgstr ""
 
-#: src/microhttpd/daemon.c:609
+#: src/microhttpd/daemon.c:603
 #, c-format
 msgid "Error: invalid credentials type %d specified.\n"
 msgstr ""
@@ -191,381 +192,374 @@ msgstr ""
 msgid "Maximum socket in select set: %d\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:943 src/microhttpd/daemon.c:960
-#: src/microhttpd/daemon.c:2178 src/microhttpd/daemon.c:2552
-#: src/microhttpd/daemon.c:5097
+#: src/microhttpd/daemon.c:945 src/microhttpd/daemon.c:962
+#: src/microhttpd/daemon.c:2202 src/microhttpd/daemon.c:2576
+#: src/microhttpd/daemon.c:5142
 msgid "Failed to remove FD from epoll set\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:1156
+#: src/microhttpd/daemon.c:1185
 msgid "Error preparing select\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:1176 src/microhttpd/daemon.c:1404
+#: src/microhttpd/daemon.c:1205 src/microhttpd/daemon.c:1426
 #, c-format
 msgid "Error during select (%d): `%s'\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:1226 src/microhttpd/daemon.c:1477
+#: src/microhttpd/daemon.c:1255 src/microhttpd/daemon.c:1500
 #, c-format
 msgid "Error during poll: `%s'\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:1386
+#: src/microhttpd/daemon.c:1408
 msgid "Failed to add FD to fd_set\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:1507
+#: src/microhttpd/daemon.c:1546 src/microhttpd/response.c:664
 msgid "Processing thread terminating. Closing connection\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:1783 src/microhttpd/daemon.c:4852
+#: src/microhttpd/daemon.c:1809 src/microhttpd/daemon.c:4906
 #, c-format
 msgid "Socket descriptor larger than FD_SETSIZE: %d > %d\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:1798 src/microhttpd/daemon.c:2472
+#: src/microhttpd/daemon.c:1824 src/microhttpd/daemon.c:2496
 #, c-format
 msgid "Accepted connection on socket %d\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:1810
+#: src/microhttpd/daemon.c:1836
 msgid "Server reached connection limit. Closing inbound connection.\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:1828
+#: src/microhttpd/daemon.c:1854
 msgid "Connection rejected by application. Closing connection.\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:1876 src/microhttpd/daemon.c:1896
-#: src/microhttpd/daemon.c:2981
+#: src/microhttpd/daemon.c:1902 src/microhttpd/daemon.c:1922
+#: src/microhttpd/daemon.c:3006
 #, c-format
 msgid "Error allocating memory: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:1929
+#: src/microhttpd/daemon.c:1955
 #, c-format
 msgid "Failed to set nonblocking mode on connection socket: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:1957
+#: src/microhttpd/daemon.c:1983
 #, c-format
 msgid "Failed to setup TLS credentials: unknown credential type %d\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:1966
+#: src/microhttpd/daemon.c:1992
 msgid "Unknown credential type"
 msgstr ""
 
-#: src/microhttpd/daemon.c:2034
-msgid "Failed to signal new connection via pipe."
+#: src/microhttpd/daemon.c:2058
+msgid "Failed to signal new connection via inter-thread communication channel."
 msgstr ""
 
-#: src/microhttpd/daemon.c:2140
+#: src/microhttpd/daemon.c:2164
 msgid "Cannot suspend connections without enabling MHD_USE_SUSPEND_RESUME!\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:2205
+#: src/microhttpd/daemon.c:2229
 msgid "Cannot resume connections without enabling MHD_USE_SUSPEND_RESUME!\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:2215
-msgid "Failed to signal resume via pipe."
+#: src/microhttpd/daemon.c:2239
+msgid "Failed to signal resume via inter-thread communication channel."
 msgstr ""
 
-#: src/microhttpd/daemon.c:2342
+#: src/microhttpd/daemon.c:2366
 #, c-format
 msgid "Failed to set nonblocking mode on new client socket: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:2350
+#: src/microhttpd/daemon.c:2374
 msgid "Failed to set noninheritable mode on new client socket.\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:2418
+#: src/microhttpd/daemon.c:2442
 #, c-format
 msgid "Error accepting connection: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:2435
+#: src/microhttpd/daemon.c:2459
 msgid ""
 "Hit process or system resource limit at FIRST connection. This is really bad "
 "as there is no sane way to proceed. Will try busy waiting for system "
 "resources to become magically available.\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:2443
+#: src/microhttpd/daemon.c:2467
 #, c-format
 msgid ""
 "Hit process or system resource limit at %u connections, temporarily "
 "suspending accept(). Consider setting a lower MHD_OPTION_CONNECTION_LIMIT.\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:2455
+#: src/microhttpd/daemon.c:2479
 #, c-format
 msgid "Failed to set nonblocking mode on incoming connection socket: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:2465
+#: src/microhttpd/daemon.c:2489
 msgid "Failed to set noninheritable mode on incoming connection socket.\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:2509 src/microhttpd/daemon.c:5201
-#: src/microhttpd/daemon.c:5216 src/microhttpd/daemon.c:5330
-#: src/microhttpd/daemon.c:5361
+#: src/microhttpd/daemon.c:2535 src/microhttpd/daemon.c:5213
+#: src/microhttpd/daemon.c:5228 src/microhttpd/daemon.c:5356
+#: src/microhttpd/daemon.c:5387
 msgid "Failed to join a thread\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:2602
+#: src/microhttpd/daemon.c:2627
 msgid "Illegal call to MHD_get_timeout\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:2820
+#: src/microhttpd/daemon.c:2845
 msgid "Could not obtain daemon fdsets"
 msgstr ""
 
-#: src/microhttpd/daemon.c:2836
+#: src/microhttpd/daemon.c:2861
 msgid "Could not add listen socket to fdset"
 msgstr ""
 
-#: src/microhttpd/daemon.c:2863
-msgid "Could not add control pipe FD to fdset"
+#: src/microhttpd/daemon.c:2888
+msgid "Could not add control inter-thread communication channel FD to fdset"
 msgstr ""
 
-#: src/microhttpd/daemon.c:2920
+#: src/microhttpd/daemon.c:2945
 #, c-format
 msgid "select failed: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:3078 src/microhttpd/daemon.c:3208
+#: src/microhttpd/daemon.c:3103 src/microhttpd/daemon.c:3233
 #, c-format
 msgid "poll failed: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:3297 src/microhttpd/daemon.c:3468
+#: src/microhttpd/daemon.c:3322 src/microhttpd/daemon.c:3493
 #, c-format
 msgid "Call to epoll_wait failed: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:3430 src/microhttpd/daemon.c:3784
+#: src/microhttpd/daemon.c:3455 src/microhttpd/daemon.c:3853
 msgid "Failed to remove listen FD from epoll set\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:3794
-msgid "Failed to signal quiesce via pipe"
+#: src/microhttpd/daemon.c:3861
+msgid "Failed to signal quiesce via inter-thread communication channel"
 msgstr ""
 
-#: src/microhttpd/daemon.c:3817
-msgid "failed to signal quiesce via pipe"
+#: src/microhttpd/daemon.c:3882
+msgid "failed to signal quiesce via inter-thread communication channel"
 msgstr ""
 
-#: src/microhttpd/daemon.c:3950
+#: src/microhttpd/daemon.c:4015
 #, c-format
 msgid "Specified thread pool size (%u) too big\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:3964 src/microhttpd/daemon.c:3975
-#: src/microhttpd/daemon.c:3986 src/microhttpd/daemon.c:3997
-#: src/microhttpd/daemon.c:4039
+#: src/microhttpd/daemon.c:4029 src/microhttpd/daemon.c:4040
+#: src/microhttpd/daemon.c:4051 src/microhttpd/daemon.c:4062
+#: src/microhttpd/daemon.c:4104
 #, c-format
-msgid "MHD HTTPS option %d passed to MHD but MHD_USE_SSL not set\n"
+msgid "MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4016
+#: src/microhttpd/daemon.c:4081
 msgid "Error initializing DH parameters\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4028
+#: src/microhttpd/daemon.c:4093
 msgid "Bad Diffie-Hellman parameters format\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4056
+#: src/microhttpd/daemon.c:4121
 #, c-format
 msgid "Setting priorities to `%s' failed: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4069
+#: src/microhttpd/daemon.c:4134
 msgid ""
 "MHD_OPTION_HTTPS_CERT_CALLBACK requires building MHD with GnuTLS >= 3.0\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4238
+#: src/microhttpd/daemon.c:4303
 #, c-format
 msgid "MHD HTTPS option %d passed to MHD compiled without HTTPS support\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4244
+#: src/microhttpd/daemon.c:4309
 #, c-format
 msgid "Invalid option %d! (Did you terminate the list with MHD_OPTION_END?)\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4270
+#: src/microhttpd/daemon.c:4335
 #, c-format
 msgid "Call to epoll_create1 failed: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4280
+#: src/microhttpd/daemon.c:4345
 msgid "Failed to set noninheritable mode on epoll FD.\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4465
+#: src/microhttpd/daemon.c:4530
 #, c-format
-msgid "Failed to create control pipe: %s\n"
+msgid "Failed to create inter-thread communication channel: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4475
-#, c-format
+#: src/microhttpd/daemon.c:4544
 msgid ""
-"Failed to make read side of inter-thread control channel non-blocking: %s\n"
+"file descriptor for inter-thread communication channel exceeds maximum "
+"value\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4490
-msgid "file descriptor for control pipe exceeds maximum value\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:4529
+#: src/microhttpd/daemon.c:4583
 msgid "Specified value for NC_SIZE too large\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4543
+#: src/microhttpd/daemon.c:4597
 #, c-format
 msgid "Failed to allocate memory for nonce-nc map: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4559
+#: src/microhttpd/daemon.c:4613
 msgid "MHD failed to initialize nonce-nc mutex\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4577
+#: src/microhttpd/daemon.c:4631
 msgid "MHD thread pooling only works with MHD_USE_SELECT_INTERNALLY\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4587
+#: src/microhttpd/daemon.c:4641
 msgid ""
 "Combining MHD_USE_THREAD_PER_CONNECTION and MHD_USE_SUSPEND_RESUME is not "
 "supported.\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4597
+#: src/microhttpd/daemon.c:4651
 msgid "Threaded operations are not supported on Symbian.\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4611
+#: src/microhttpd/daemon.c:4665
 #, c-format
 msgid "Failed to create socket for listening: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4629 src/microhttpd/daemon.c:4673
-#: src/microhttpd/daemon.c:4705 src/microhttpd/daemon.c:4775
-#: src/microhttpd/daemon.c:4806
+#: src/microhttpd/daemon.c:4683 src/microhttpd/daemon.c:4727
+#: src/microhttpd/daemon.c:4759 src/microhttpd/daemon.c:4829
+#: src/microhttpd/daemon.c:4860
 #, c-format
 msgid "setsockopt failed: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4683
+#: src/microhttpd/daemon.c:4737
 msgid "Cannot allow listening address reuse: SO_REUSEPORT not defined\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4713
+#: src/microhttpd/daemon.c:4767
 msgid ""
 "Cannot disallow listening address reuse: SO_EXCLUSIVEADDRUSE not defined\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4786
+#: src/microhttpd/daemon.c:4840
 #, c-format
 msgid "Failed to bind to port %u: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4817
+#: src/microhttpd/daemon.c:4871
 #, c-format
 msgid "Failed to listen for connections: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4833
+#: src/microhttpd/daemon.c:4887
 #, c-format
 msgid "Failed to set nonblocking mode on listening socket: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4869
+#: src/microhttpd/daemon.c:4923
 msgid ""
 "Combining MHD_USE_THREAD_PER_CONNECTION and MHD_USE_EPOLL is not supported.\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4881
+#: src/microhttpd/daemon.c:4935
 msgid "epoll is not supported on this platform by this build.\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4891 src/microhttpd/daemon.c:4901
+#: src/microhttpd/daemon.c:4945 src/microhttpd/daemon.c:4955
 msgid "MHD failed to initialize IP connection limit mutex\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4916
+#: src/microhttpd/daemon.c:4970
 msgid "Failed to initialize TLS support\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4938
+#: src/microhttpd/daemon.c:4992
 #, c-format
 msgid "Failed to create listen thread: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4987
+#: src/microhttpd/daemon.c:5041
 #, c-format
-msgid "Failed to create worker control pipe: %s\n"
+msgid "Failed to create worker inter-thread communication channel: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:4996
-#, c-format
+#: src/microhttpd/daemon.c:5053
 msgid ""
-"Failed to make read side of worker inter-thread control channel non-"
-"blocking: %s\n"
-msgstr ""
-
-#: src/microhttpd/daemon.c:5008
-msgid "File descriptor for worker control pipe exceeds maximum value\n"
+"File descriptor for worker inter-thread communication channel exceeds "
+"maximum value\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:5030
+#: src/microhttpd/daemon.c:5075
 msgid "MHD failed to initialize cleanup connection mutex\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:5044
+#: src/microhttpd/daemon.c:5089
 #, c-format
 msgid "Failed to create pool thread: %s\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:5178
+#: src/microhttpd/daemon.c:5190
 msgid "MHD_stop_daemon() called while we have suspended connections.\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:5186 src/microhttpd/daemon.c:5289
-msgid "Failed to signal shutdown via pipe"
+#: src/microhttpd/daemon.c:5198 src/microhttpd/daemon.c:5317
+msgid "Failed to signal shutdown via inter-thread communication channel"
 msgstr ""
 
-#: src/microhttpd/daemon.c:5245
-msgid "Failed to add wpipe to epoll set to signal termination\n"
+#: src/microhttpd/daemon.c:5257
+msgid ""
+"Failed to add inter-thread communication channel FD to epoll set to signal "
+"termination\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:5311
+#: src/microhttpd/daemon.c:5339
 msgid "MHD listen socket shutdown\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:5327
-msgid "Failed to signal shutdown via pipe."
+#: src/microhttpd/daemon.c:5353
+msgid "Failed to signal shutdown via inter-thread communication channel."
 msgstr ""
 
-#: src/microhttpd/daemon.c:5699
+#: src/microhttpd/daemon.c:5725
 msgid "Failed to initialize winsock\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:5702
+#: src/microhttpd/daemon.c:5728
 msgid "Winsock version 2.2 is not available\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:5709 src/microhttpd/daemon.c:5713
+#: src/microhttpd/daemon.c:5735 src/microhttpd/daemon.c:5739
 msgid "Failed to initialise multithreading in libgcrypt\n"
 msgstr ""
 
-#: src/microhttpd/daemon.c:5718
+#: src/microhttpd/daemon.c:5744
 msgid "libgcrypt is too old. MHD was compiled for libgcrypt 1.6.0 or newer\n"
 msgstr ""
 
@@ -615,61 +609,46 @@ msgstr ""
 msgid "Failed to add Digest auth header\n"
 msgstr ""
 
-#: src/microhttpd/mhd_itc.c:48
-msgid "Failed to write to eventfd\n"
-msgstr ""
-
-#: src/microhttpd/mhd_sem.c:92 src/microhttpd/mhd_sem.c:114
-#: src/microhttpd/mhd_locks.h:107
-msgid "Failed to lock mutex\n"
-msgstr ""
-
-#: src/microhttpd/mhd_sem.c:97
-msgid "pthread_cond_wait failed\n"
-msgstr ""
-
-#: src/microhttpd/mhd_sem.c:101 src/microhttpd/mhd_sem.c:118
-#: src/microhttpd/mhd_locks.h:127
-msgid "Failed to unlock mutex\n"
-msgstr ""
-
-#: src/microhttpd/mhd_sem.c:131
-msgid "pthread_cond_destroy failed\n"
-msgstr ""
-
-#: src/microhttpd/mhd_sem.c:133 src/microhttpd/mhd_locks.h:88
-msgid "Failed to destroy mutex\n"
-msgstr ""
-
-#: src/microhttpd/response.c:700
+#: src/microhttpd/response.c:721
 msgid ""
 "Invalid response for upgrade: application failed to set the 'Upgrade' "
 "header!\n"
 msgstr ""
 
-#: src/microhttpd/response.c:732
+#: src/microhttpd/response.c:760
 #, c-format
 msgid "Failed to make loopback sockets non-blocking: %s\n"
 msgstr ""
 
-#: src/microhttpd/response.c:741
+#: src/microhttpd/response.c:771
 #, c-format
 msgid "Socketpair descriptor larger than FD_SETSIZE: %d > %d\n"
 msgstr ""
 
-#: src/microhttpd/response.c:837
+#: src/microhttpd/response.c:861
 msgid "Error cleaning up while handling epoll error"
 msgstr ""
 
-#: src/microhttpd/response.c:883
-msgid "Failed to create semaphore for upgrade handling\n"
+#: src/microhttpd/internal.h:74
+msgid "Failed to close FD.\n"
+msgstr ""
+
+#: src/microhttpd/mhd_itc.h:347
+msgid "Failed to destroy ITC.\n"
+msgstr ""
+
+#: src/microhttpd/mhd_locks.h:111
+msgid "Failed to destroy mutex.\n"
+msgstr ""
+
+#: src/microhttpd/mhd_locks.h:144
+msgid "Failed to lock mutex.\n"
 msgstr ""
 
-#: src/microhttpd/mhd_itc.h:91 src/microhttpd/mhd_itc.h:174
-#: src/microhttpd/mhd_itc.h:177
-msgid "close failed"
+#: src/microhttpd/mhd_locks.h:170
+msgid "Failed to unlock mutex.\n"
 msgstr ""
 
-#: src/microhttpd/mhd_sockets.h:203 src/microhttpd/mhd_sockets.h:208
-msgid "close failed\n"
+#: src/microhttpd/mhd_sockets.h:248
+msgid "Close socket failed.\n"
 msgstr ""