libmicrohttpd

HTTP/1.x server C library (MHD 1.x, stable)
Log | Files | Refs | Submodules | README | LICENSE

commit f7c5c302a3ade612b4915ed1de6a7dfdffe143b5
parent 3be7e06961015dcbd5a22f63a73aad79038bdfdf
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date:   Mon, 28 Dec 2020 21:38:03 +0300

Released GNU libmicrohttpd 0.9.72

Diffstat:
MChangeLog | 3+++
Mconfigure.ac | 6+++---
Mpo/libmicrohttpd.pot | 433+++++++++++++++++++++++++++++++++++++++++++------------------------------------
Msrc/include/microhttpd.h | 5+++--
4 files changed, 246 insertions(+), 201 deletions(-)

diff --git a/ChangeLog b/ChangeLog @@ -1,3 +1,6 @@ +Mon 28 Dec 2020 21:36:00 MSK + Releasing libmicrohttpd 0.9.72. -EG + Mon 28 Dec 2020 09:37:00 MSK Completely reworked and rewritten TCP_CORK, TCP_NOPUSH, TCP_NODELAY and MSG_MORE handling. Reduced number of sys-calls, fixed portability for diff --git a/configure.ac b/configure.ac @@ -22,15 +22,15 @@ # AC_PREREQ([2.64]) LT_PREREQ([2.4.0]) -AC_INIT([GNU Libmicrohttpd],[0.9.71],[libmicrohttpd@gnu.org]) +AC_INIT([GNU Libmicrohttpd],[0.9.72],[libmicrohttpd@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([silent-rules] [subdir-objects]) AC_CONFIG_HEADERS([MHD_config.h]) AC_CONFIG_MACRO_DIR([m4]) -LIB_VERSION_CURRENT=68 +LIB_VERSION_CURRENT=69 LIB_VERSION_REVISION=0 -LIB_VERSION_AGE=56 +LIB_VERSION_AGE=57 AC_SUBST(LIB_VERSION_CURRENT) AC_SUBST(LIB_VERSION_REVISION) AC_SUBST(LIB_VERSION_AGE) diff --git a/po/libmicrohttpd.pot b/po/libmicrohttpd.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU libmicrohttpd 0.9.71\n" "Report-Msgid-Bugs-To: libmicrohttpd@gnu.org\n" -"POT-Creation-Date: 2020-06-28 21:53+0200\n" +"POT-Creation-Date: 2020-12-28 21:36+0300\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" @@ -21,772 +21,813 @@ msgstr "" msgid "Error: received handshake message out of context.\n" msgstr "" -#: src/microhttpd/mhd_locks.h:123 +#: src/microhttpd/mhd_locks.h:125 msgid "Failed to destroy mutex.\n" msgstr "" -#: src/microhttpd/mhd_locks.h:156 +#: src/microhttpd/mhd_locks.h:158 msgid "Failed to lock mutex.\n" msgstr "" -#: src/microhttpd/mhd_locks.h:182 +#: src/microhttpd/mhd_locks.h:184 msgid "Failed to unlock mutex.\n" msgstr "" -#: src/microhttpd/internal.h:84 +#: src/microhttpd/internal.h:96 msgid "Failed to close FD.\n" msgstr "" -#: src/microhttpd/digestauth.c:601 +#: src/microhttpd/digestauth.c:603 msgid "" "Stale nonce received. If this happens a lot, you should probably increase " "the size of the nonce array.\n" msgstr "" -#: src/microhttpd/digestauth.c:807 +#: src/microhttpd/digestauth.c:809 msgid "Failed to allocate memory for copy of URI arguments.\n" msgstr "" -#: src/microhttpd/digestauth.c:949 +#: src/microhttpd/digestauth.c:952 msgid "Authentication failed, invalid timestamp format.\n" msgstr "" -#: src/microhttpd/digestauth.c:1009 +#: src/microhttpd/digestauth.c:1014 msgid "Authentication failed, invalid format.\n" msgstr "" -#: src/microhttpd/digestauth.c:1019 +#: src/microhttpd/digestauth.c:1024 msgid "Authentication failed, invalid nc format.\n" msgstr "" -#: src/microhttpd/digestauth.c:1044 +#: src/microhttpd/digestauth.c:1050 msgid "Failed to allocate memory for auth header processing.\n" msgstr "" -#: src/microhttpd/digestauth.c:1104 +#: src/microhttpd/digestauth.c:1110 msgid "Authentication failed, URI does not match.\n" msgstr "" -#: src/microhttpd/digestauth.c:1123 +#: src/microhttpd/digestauth.c:1129 msgid "Authentication failed, arguments do not match.\n" msgstr "" -#: src/microhttpd/digestauth.c:1281 +#: src/microhttpd/digestauth.c:1290 msgid "Digest size mismatch.\n" msgstr "" -#: src/microhttpd/digestauth.c:1374 +#: src/microhttpd/digestauth.c:1383 msgid "Could not register nonce (is the nonce array size zero?).\n" msgstr "" -#: src/microhttpd/digestauth.c:1399 +#: src/microhttpd/digestauth.c:1408 msgid "Failed to allocate memory for auth response header.\n" msgstr "" -#: src/microhttpd/digestauth.c:1441 +#: src/microhttpd/digestauth.c:1450 msgid "Failed to add Digest auth header.\n" msgstr "" -#: src/microhttpd/daemon.c:140 +#: src/microhttpd/daemon.c:135 #, c-format msgid "Fatal error in GNU libmicrohttpd %s:%u: %s\n" msgstr "" -#: src/microhttpd/daemon.c:451 +#: src/microhttpd/daemon.c:449 msgid "Failed to add IP connection count node.\n" msgstr "" -#: src/microhttpd/daemon.c:509 +#: src/microhttpd/daemon.c:507 msgid "Failed to find previously-added IP address.\n" msgstr "" -#: src/microhttpd/daemon.c:515 +#: src/microhttpd/daemon.c:513 msgid "Previously-added IP address had counter of zero.\n" msgstr "" -#: src/microhttpd/daemon.c:625 +#: src/microhttpd/daemon.c:623 msgid "" "Failed to setup x509 certificate/key: pre 3.X.X version of GnuTLS does not " "support setting key password.\n" msgstr "" -#: src/microhttpd/daemon.c:684 +#: src/microhttpd/daemon.c:682 #, c-format msgid "Error: invalid credentials type %d specified.\n" msgstr "" -#: src/microhttpd/daemon.c:1088 +#: src/microhttpd/daemon.c:1086 #, c-format msgid "Maximum socket in select set: %d\n" msgstr "" -#: src/microhttpd/daemon.c:1149 +#: src/microhttpd/daemon.c:1147 msgid "" "MHD_get_fdset2() called with except_fd_set set to NULL. Such behavior is " "unsupported.\n" msgstr "" -#: src/microhttpd/daemon.c:1356 src/microhttpd/daemon.c:6725 +#: src/microhttpd/daemon.c:1361 src/microhttpd/daemon.c:7197 msgid "" "Initiated daemon shutdown while \"upgraded\" connection was not closed.\n" msgstr "" -#: src/microhttpd/daemon.c:1371 src/microhttpd/daemon.c:1606 +#: src/microhttpd/daemon.c:1375 src/microhttpd/daemon.c:1613 msgid "Failed to forward to application " msgstr "" -#: src/microhttpd/daemon.c:1536 src/microhttpd/daemon.c:1662 +#: src/microhttpd/daemon.c:1543 src/microhttpd/daemon.c:1669 msgid "Failed to forward to remote client " msgstr "" -#: src/microhttpd/daemon.c:1730 +#: src/microhttpd/daemon.c:1739 msgid "Error preparing select.\n" msgstr "" -#: src/microhttpd/daemon.c:1764 src/microhttpd/daemon.c:1918 -#: src/microhttpd/daemon.c:2062 +#: src/microhttpd/daemon.c:1774 src/microhttpd/daemon.c:1929 +#: src/microhttpd/daemon.c:2073 #, c-format msgid "Error during select (%d): `%s'\n" msgstr "" -#: src/microhttpd/daemon.c:1813 src/microhttpd/daemon.c:1939 -#: src/microhttpd/daemon.c:2131 +#: src/microhttpd/daemon.c:1824 src/microhttpd/daemon.c:1950 +#: src/microhttpd/daemon.c:2142 #, c-format msgid "Error during poll: `%s'\n" msgstr "" -#: src/microhttpd/daemon.c:1902 src/microhttpd/daemon.c:2044 +#: src/microhttpd/daemon.c:1913 src/microhttpd/daemon.c:2055 msgid "Failed to add FD to fd_set.\n" msgstr "" -#: src/microhttpd/daemon.c:2184 +#: src/microhttpd/daemon.c:2195 msgid "Processing thread terminating. Closing connection.\n" msgstr "" -#: src/microhttpd/daemon.c:2214 +#: src/microhttpd/daemon.c:2225 msgid "" "Failed to signal thread termination via inter-thread communication channel.\n" msgstr "" -#: src/microhttpd/daemon.c:2289 +#: src/microhttpd/daemon.c:2301 msgid "Internal server error. This should be impossible.\n" msgstr "" -#: src/microhttpd/daemon.c:2299 src/microhttpd/daemon.c:2337 +#: src/microhttpd/daemon.c:2311 src/microhttpd/daemon.c:2349 msgid "PSK not supported by this server.\n" msgstr "" -#: src/microhttpd/daemon.c:2314 +#: src/microhttpd/daemon.c:2326 msgid "PSK authentication failed: gnutls_malloc failed to allocate memory.\n" msgstr "" -#: src/microhttpd/daemon.c:2323 +#: src/microhttpd/daemon.c:2335 msgid "PSK authentication failed: PSK too long.\n" msgstr "" -#: src/microhttpd/daemon.c:2421 src/microhttpd/daemon.c:6367 -#, c-format -msgid "Socket descriptor larger than FD_SETSIZE: %d > %d\n" -msgstr "" - -#: src/microhttpd/daemon.c:2437 -#, c-format -msgid "Failed to set SO_NOSIGPIPE on accepted socket: %s\n" -msgstr "" - -#: src/microhttpd/daemon.c:2454 +#: src/microhttpd/daemon.c:2395 #, c-format msgid "Accepted connection on socket %d.\n" msgstr "" -#: src/microhttpd/daemon.c:2467 src/microhttpd/daemon.c:2665 +#: src/microhttpd/daemon.c:2408 src/microhttpd/daemon.c:2712 msgid "Server reached connection limit. Closing inbound connection.\n" msgstr "" -#: src/microhttpd/daemon.c:2485 +#: src/microhttpd/daemon.c:2426 msgid "Connection rejected by application. Closing connection.\n" msgstr "" -#: src/microhttpd/daemon.c:2519 src/microhttpd/daemon.c:2539 -#: src/microhttpd/daemon.c:3903 +#: src/microhttpd/daemon.c:2472 src/microhttpd/daemon.c:2685 +#: src/microhttpd/daemon.c:4217 #, c-format msgid "Error allocating memory: %s\n" msgstr "" -#: src/microhttpd/daemon.c:2617 +#: src/microhttpd/daemon.c:2539 +msgid "Failed to initialise TLS session.\n" +msgstr "" + +#: src/microhttpd/daemon.c:2567 #, c-format msgid "Failed to setup TLS credentials: unknown credential type %d.\n" msgstr "" -#: src/microhttpd/daemon.c:2626 +#: src/microhttpd/daemon.c:2577 msgid "Unknown credential type.\n" msgstr "" -#: src/microhttpd/daemon.c:2729 src/microhttpd/daemon.c:4399 -#: src/microhttpd/daemon.c:4432 src/microhttpd/daemon.c:5646 -#: src/microhttpd/daemon.c:5663 src/microhttpd/connection.c:3738 -#: src/microhttpd/response.c:1053 src/microhttpd/response.c:1079 +#: src/microhttpd/daemon.c:2604 +msgid "TLS connection on non-TLS daemon.\n" +msgstr "" + +#: src/microhttpd/daemon.c:2776 src/microhttpd/daemon.c:4734 +#: src/microhttpd/daemon.c:4767 src/microhttpd/daemon.c:6024 +#: src/microhttpd/daemon.c:6043 src/microhttpd/connection.c:3754 +#: src/microhttpd/response.c:1107 src/microhttpd/response.c:1133 #, c-format msgid "Call to epoll_ctl failed: %s\n" msgstr "" -#: src/microhttpd/daemon.c:2756 +#: src/microhttpd/daemon.c:2885 +#, c-format +msgid "" +"New connection socket descriptor (%d) is not less than FD_SETSIZE (%d).\n" +msgstr "" + +#: src/microhttpd/daemon.c:2902 +msgid "Epoll mode supports only non-blocking sockets\n" +msgstr "" + +#: src/microhttpd/daemon.c:2935 msgid "" "Failed to signal new connection via inter-thread communication channel.\n" msgstr "" -#: src/microhttpd/daemon.c:2861 src/microhttpd/daemon.c:3398 -#: src/microhttpd/daemon.c:6612 src/microhttpd/connection.c:747 -#: src/microhttpd/connection.c:766 +#: src/microhttpd/daemon.c:2980 +msgid "Failed to start serving new connection.\n" +msgstr "" + +#: src/microhttpd/daemon.c:3053 src/microhttpd/daemon.c:3703 +#: src/microhttpd/daemon.c:7064 src/microhttpd/connection.c:707 +#: src/microhttpd/connection.c:726 msgid "Failed to remove FD from epoll set.\n" msgstr "" -#: src/microhttpd/daemon.c:2911 +#: src/microhttpd/daemon.c:3109 msgid "Cannot suspend connections without enabling MHD_ALLOW_SUSPEND_RESUME!\n" msgstr "" -#: src/microhttpd/daemon.c:2918 +#: src/microhttpd/daemon.c:3116 msgid "Error: connection scheduled for \"upgrade\" cannot be suspended.\n" msgstr "" -#: src/microhttpd/daemon.c:2942 +#: src/microhttpd/daemon.c:3140 msgid "Cannot resume connections without enabling MHD_ALLOW_SUSPEND_RESUME!\n" msgstr "" -#: src/microhttpd/daemon.c:2957 +#: src/microhttpd/daemon.c:3155 msgid "Failed to signal resume via inter-thread communication channel.\n" msgstr "" -#: src/microhttpd/daemon.c:3092 +#: src/microhttpd/daemon.c:3295 msgid "" "Failed to signal resume of connection via inter-thread communication " "channel.\n" msgstr "" -#: src/microhttpd/daemon.c:3140 +#: src/microhttpd/daemon.c:3349 +msgid "" +"MHD_add_connection() has been called for daemon started without MHD_USE_ITC " +"flag.\n" +"Daemon will not process newly added connection until any activity occurs in " +"already added sockets.\n" +msgstr "" + +#: src/microhttpd/daemon.c:3360 #, c-format msgid "Failed to set nonblocking mode on new client socket: %s\n" msgstr "" -#: src/microhttpd/daemon.c:3153 -msgid "Failed to set noninheritable mode on new client socket.\n" +#: src/microhttpd/daemon.c:3379 +#, c-format +msgid "Failed to suppress SIGPIPE on new client socket: %s\n" msgstr "" -#: src/microhttpd/daemon.c:3162 -msgid "Failed to reset buffering mode on new client socket.\n" +#: src/microhttpd/daemon.c:3405 +msgid "Failed to set noninheritable mode on new client socket.\n" msgstr "" -#: src/microhttpd/daemon.c:3235 +#: src/microhttpd/daemon.c:3526 #, c-format msgid "Error accepting connection: %s\n" msgstr "" -#: src/microhttpd/daemon.c:3253 +#: src/microhttpd/daemon.c:3544 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:3268 +#: src/microhttpd/daemon.c:3559 #, 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:3284 -#, c-format -msgid "Failed to disable TCP Nagle on socket: %s\n" -msgstr "" - -#: src/microhttpd/daemon.c:3295 +#: src/microhttpd/daemon.c:3572 #, c-format msgid "Failed to set nonblocking mode on incoming connection socket: %s\n" msgstr "" -#: src/microhttpd/daemon.c:3308 +#: src/microhttpd/daemon.c:3585 msgid "Failed to set noninheritable mode on incoming connection socket.\n" msgstr "" -#: src/microhttpd/daemon.c:3315 +#: src/microhttpd/daemon.c:3595 +#, c-format +msgid "Failed to suppress SIGPIPE on incoming connection socket: %s\n" +msgstr "" + +#: src/microhttpd/daemon.c:3616 #, c-format msgid "Accepted connection on socket %d\n" msgstr "" -#: src/microhttpd/daemon.c:3356 src/microhttpd/daemon.c:6769 -#: src/microhttpd/daemon.c:6801 src/microhttpd/daemon.c:6903 +#: src/microhttpd/daemon.c:3660 src/microhttpd/daemon.c:7238 +#: src/microhttpd/daemon.c:7270 src/microhttpd/daemon.c:7303 +#: src/microhttpd/daemon.c:7409 msgid "Failed to join a thread.\n" msgstr "" -#: src/microhttpd/daemon.c:3459 +#: src/microhttpd/daemon.c:3769 msgid "Illegal call to MHD_get_timeout.\n" msgstr "" -#: src/microhttpd/daemon.c:3656 +#: src/microhttpd/daemon.c:3970 msgid "" "MHD_run_from_select() called with except_fd_set set to NULL. Such behavior " "is deprecated.\n" msgstr "" -#: src/microhttpd/daemon.c:3736 +#: src/microhttpd/daemon.c:4050 msgid "Could not obtain daemon fdsets.\n" msgstr "" -#: src/microhttpd/daemon.c:3753 +#: src/microhttpd/daemon.c:4067 msgid "Could not add listen socket to fdset.\n" msgstr "" -#: src/microhttpd/daemon.c:3782 +#: src/microhttpd/daemon.c:4096 msgid "Could not add control inter-thread communication channel FD to fdset.\n" msgstr "" -#: src/microhttpd/daemon.c:3840 +#: src/microhttpd/daemon.c:4154 #, c-format msgid "select failed: %s\n" msgstr "" -#: src/microhttpd/daemon.c:3985 src/microhttpd/daemon.c:4133 +#: src/microhttpd/daemon.c:4299 src/microhttpd/daemon.c:4453 #, c-format msgid "poll failed: %s\n" msgstr "" -#: src/microhttpd/daemon.c:4266 src/microhttpd/daemon.c:4499 +#: src/microhttpd/daemon.c:4596 src/microhttpd/daemon.c:4835 #, c-format msgid "Call to epoll_wait failed: %s\n" msgstr "" -#: src/microhttpd/daemon.c:4451 src/microhttpd/daemon.c:4912 +#: src/microhttpd/daemon.c:4786 src/microhttpd/daemon.c:5284 msgid "Failed to remove listen FD from epoll set.\n" msgstr "" -#: src/microhttpd/daemon.c:4921 +#: src/microhttpd/daemon.c:5130 +#, c-format +msgid "Failed to block SIGPIPE on daemon thread: %s\n" +msgstr "" + +#: src/microhttpd/daemon.c:5293 msgid "Failed to signal quiesce via inter-thread communication channel.\n" msgstr "" -#: src/microhttpd/daemon.c:4944 +#: src/microhttpd/daemon.c:5316 msgid "failed to signal quiesce via inter-thread communication channel.\n" msgstr "" -#: src/microhttpd/daemon.c:5058 +#: src/microhttpd/daemon.c:5430 msgid "Warning: Too large timeout value, ignored.\n" msgstr "" -#: src/microhttpd/daemon.c:5103 +#: src/microhttpd/daemon.c:5475 msgid "" "Warning: Zero size, specified for thread pool size, is ignored. Thread pool " "is not used.\n" msgstr "" -#: src/microhttpd/daemon.c:5112 +#: src/microhttpd/daemon.c:5484 msgid "" "Warning: \"1\", specified for thread pool size, is ignored. Thread pool is " "not used.\n" msgstr "" -#: src/microhttpd/daemon.c:5125 +#: src/microhttpd/daemon.c:5498 #, c-format msgid "Specified thread pool size (%u) too big.\n" msgstr "" -#: src/microhttpd/daemon.c:5136 +#: src/microhttpd/daemon.c:5510 msgid "" "MHD_OPTION_THREAD_POOL_SIZE option is specified but " "MHD_USE_INTERNAL_POLLING_THREAD flag is not specified.\n" msgstr "" -#: src/microhttpd/daemon.c:5145 +#: src/microhttpd/daemon.c:5519 msgid "" "Both MHD_OPTION_THREAD_POOL_SIZE option and MHD_USE_THREAD_PER_CONNECTION " "flag are specified.\n" msgstr "" -#: src/microhttpd/daemon.c:5163 src/microhttpd/daemon.c:5176 -#: src/microhttpd/daemon.c:5189 src/microhttpd/daemon.c:5202 -#: src/microhttpd/daemon.c:5254 src/microhttpd/daemon.c:5283 -#: src/microhttpd/daemon.c:5304 src/microhttpd/daemon.c:5326 +#: src/microhttpd/daemon.c:5537 src/microhttpd/daemon.c:5550 +#: src/microhttpd/daemon.c:5563 src/microhttpd/daemon.c:5576 +#: src/microhttpd/daemon.c:5628 src/microhttpd/daemon.c:5657 +#: src/microhttpd/daemon.c:5678 src/microhttpd/daemon.c:5700 #, c-format msgid "MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set.\n" msgstr "" -#: src/microhttpd/daemon.c:5222 +#: src/microhttpd/daemon.c:5596 msgid "Error initializing DH parameters.\n" msgstr "" -#: src/microhttpd/daemon.c:5232 +#: src/microhttpd/daemon.c:5606 msgid "Diffie-Hellman parameters string too long.\n" msgstr "" -#: src/microhttpd/daemon.c:5243 +#: src/microhttpd/daemon.c:5617 msgid "Bad Diffie-Hellman parameters format.\n" msgstr "" -#: src/microhttpd/daemon.c:5271 +#: src/microhttpd/daemon.c:5645 #, c-format msgid "Setting priorities to `%s' failed: %s\n" msgstr "" -#: src/microhttpd/daemon.c:5292 +#: src/microhttpd/daemon.c:5666 msgid "" "MHD_OPTION_HTTPS_CERT_CALLBACK requires building MHD with GnuTLS >= 3.0.\n" msgstr "" -#: src/microhttpd/daemon.c:5314 +#: src/microhttpd/daemon.c:5688 msgid "" "MHD_OPTION_HTTPS_CERT_CALLBACK2 requires building MHD with GnuTLS >= 3.6.3.\n" msgstr "" -#: src/microhttpd/daemon.c:5349 +#: src/microhttpd/daemon.c:5723 msgid "" "MHD_OPTION_LISTEN_SOCKET specified for daemon with MHD_USE_NO_LISTEN_SOCKET " "flag set.\n" msgstr "" -#: src/microhttpd/daemon.c:5385 +#: src/microhttpd/daemon.c:5759 msgid "TCP fastopen is not supported on this platform.\n" msgstr "" -#: src/microhttpd/daemon.c:5404 +#: src/microhttpd/daemon.c:5778 msgid "" "Flag MHD_USE_PEDANTIC_CHECKS is ignored because another behavior is " "specified by MHD_OPTION_STRICT_CLIENT.\n" msgstr "" -#: src/microhttpd/daemon.c:5539 +#: src/microhttpd/daemon.c:5913 #, c-format msgid "MHD HTTPS option %d passed to MHD compiled without GNUtls >= 3.\n" msgstr "" -#: src/microhttpd/daemon.c:5553 +#: src/microhttpd/daemon.c:5927 #, c-format msgid "MHD HTTPS option %d passed to MHD compiled without HTTPS support.\n" msgstr "" -#: src/microhttpd/daemon.c:5560 +#: src/microhttpd/daemon.c:5934 #, c-format msgid "Invalid option %d! (Did you terminate the list with MHD_OPTION_END?).\n" msgstr "" -#: src/microhttpd/daemon.c:5590 +#: src/microhttpd/daemon.c:5964 #, c-format msgid "Call to epoll_create1 failed: %s\n" msgstr "" -#: src/microhttpd/daemon.c:5600 +#: src/microhttpd/daemon.c:5974 msgid "Failed to set noninheritable mode on epoll FD.\n" msgstr "" -#: src/microhttpd/daemon.c:5852 +#: src/microhttpd/daemon.c:6239 msgid "" "Warning: MHD_USE_THREAD_PER_CONNECTION must be used only with " "MHD_USE_INTERNAL_POLLING_THREAD. Flag MHD_USE_INTERNAL_POLLING_THREAD was " "added. Consider setting MHD_USE_INTERNAL_POLLING_THREAD explicitly.\n" msgstr "" -#: src/microhttpd/daemon.c:5900 +#: src/microhttpd/daemon.c:6287 msgid "Using debug build of libmicrohttpd.\n" msgstr "" -#: src/microhttpd/daemon.c:5914 +#: src/microhttpd/daemon.c:6301 #, c-format msgid "Failed to create inter-thread communication channel: %s\n" msgstr "" -#: src/microhttpd/daemon.c:5931 +#: src/microhttpd/daemon.c:6318 msgid "" "file descriptor for inter-thread communication channel exceeds maximum " "value.\n" msgstr "" -#: src/microhttpd/daemon.c:5951 +#: src/microhttpd/daemon.c:6338 msgid "Specified value for NC_SIZE too large.\n" msgstr "" -#: src/microhttpd/daemon.c:5965 +#: src/microhttpd/daemon.c:6352 #, c-format msgid "Failed to allocate memory for nonce-nc map: %s\n" msgstr "" -#: src/microhttpd/daemon.c:5982 +#: src/microhttpd/daemon.c:6369 msgid "MHD failed to initialize nonce-nc mutex.\n" msgstr "" -#: src/microhttpd/daemon.c:6003 +#: src/microhttpd/daemon.c:6390 msgid "MHD thread polling only works with MHD_USE_INTERNAL_POLLING_THREAD.\n" msgstr "" -#: src/microhttpd/daemon.c:6027 +#: src/microhttpd/daemon.c:6414 #, c-format msgid "Failed to create socket for listening: %s\n" msgstr "" -#: src/microhttpd/daemon.c:6048 src/microhttpd/daemon.c:6067 -#: src/microhttpd/daemon.c:6090 src/microhttpd/daemon.c:6128 -#: src/microhttpd/daemon.c:6206 src/microhttpd/daemon.c:6237 +#: src/microhttpd/daemon.c:6435 src/microhttpd/daemon.c:6454 +#: src/microhttpd/daemon.c:6477 src/microhttpd/daemon.c:6515 +#: src/microhttpd/daemon.c:6593 src/microhttpd/daemon.c:6624 #, c-format msgid "setsockopt failed: %s\n" msgstr "" -#: src/microhttpd/daemon.c:6101 +#: src/microhttpd/daemon.c:6488 msgid "Cannot allow listening address reuse: SO_REUSEPORT not defined.\n" msgstr "" -#: src/microhttpd/daemon.c:6137 +#: src/microhttpd/daemon.c:6524 msgid "" "Cannot disallow listening address reuse: SO_EXCLUSIVEADDRUSE not defined.\n" msgstr "" -#: src/microhttpd/daemon.c:6217 +#: src/microhttpd/daemon.c:6604 #, c-format msgid "Failed to bind to port %u: %s\n" msgstr "" -#: src/microhttpd/daemon.c:6248 +#: src/microhttpd/daemon.c:6635 #, c-format msgid "Failed to listen for connections: %s\n" msgstr "" -#: src/microhttpd/daemon.c:6279 +#: src/microhttpd/daemon.c:6666 #, c-format msgid "Failed to get listen port number: %s\n" msgstr "" -#: src/microhttpd/daemon.c:6290 +#: src/microhttpd/daemon.c:6677 msgid "" "Failed to get listen port number (`struct sockaddr_storage` too small!?).\n" msgstr "" -#: src/microhttpd/daemon.c:6331 +#: src/microhttpd/daemon.c:6718 msgid "Unknown address family!\n" msgstr "" -#: src/microhttpd/daemon.c:6344 +#: src/microhttpd/daemon.c:6731 #, c-format msgid "Failed to set nonblocking mode on listening socket: %s\n" msgstr "" -#: src/microhttpd/daemon.c:6387 +#: src/microhttpd/daemon.c:6754 +#, c-format +msgid "Listen socket descriptor (%d) is not less than FD_SETSIZE (%d).\n" +msgstr "" + +#: src/microhttpd/daemon.c:6775 msgid "" "Combining MHD_USE_THREAD_PER_CONNECTION and MHD_USE_EPOLL is not supported.\n" msgstr "" -#: src/microhttpd/daemon.c:6401 src/microhttpd/daemon.c:6411 +#: src/microhttpd/daemon.c:6789 src/microhttpd/daemon.c:6799 msgid "MHD failed to initialize IP connection limit mutex.\n" msgstr "" -#: src/microhttpd/daemon.c:6429 +#: src/microhttpd/daemon.c:6817 msgid "Failed to initialize TLS support.\n" msgstr "" -#: src/microhttpd/daemon.c:6456 +#: src/microhttpd/daemon.c:6850 src/microhttpd/daemon.c:6915 +#: src/microhttpd/daemon.c:7014 +msgid "Failed to initialise mutex.\n" +msgstr "" + +#: src/microhttpd/daemon.c:6868 #, c-format msgid "Failed to create listen thread: %s\n" msgstr "" -#: src/microhttpd/daemon.c:6505 +#: src/microhttpd/daemon.c:6926 #, c-format msgid "Failed to create worker inter-thread communication channel: %s\n" msgstr "" -#: src/microhttpd/daemon.c:6517 +#: src/microhttpd/daemon.c:6939 msgid "" "File descriptor for worker inter-thread communication channel exceeds " "maximum value.\n" msgstr "" -#: src/microhttpd/daemon.c:6542 +#: src/microhttpd/daemon.c:6977 msgid "MHD failed to initialize cleanup connection mutex.\n" msgstr "" -#: src/microhttpd/daemon.c:6556 +#: src/microhttpd/daemon.c:6994 #, c-format msgid "Failed to create pool thread: %s\n" msgstr "" -#: src/microhttpd/daemon.c:6711 src/microhttpd/daemon.c:6744 +#: src/microhttpd/daemon.c:7183 src/microhttpd/daemon.c:7216 msgid "MHD_stop_daemon() called while we have suspended connections.\n" msgstr "" -#: src/microhttpd/daemon.c:6754 src/microhttpd/daemon.c:6847 -#: src/microhttpd/daemon.c:6885 +#: src/microhttpd/daemon.c:7255 src/microhttpd/daemon.c:7353 +#: src/microhttpd/daemon.c:7391 msgid "Failed to signal shutdown via inter-thread communication channel.\n" msgstr "" -#: src/microhttpd/daemon.c:7323 +#: src/microhttpd/daemon.c:7328 +msgid "MHD_stop_daemon() was called twice." +msgstr "" + +#: src/microhttpd/daemon.c:7841 msgid "Failed to initialize winsock.\n" msgstr "" -#: src/microhttpd/daemon.c:7326 +#: src/microhttpd/daemon.c:7844 msgid "Winsock version 2.2 is not available.\n" msgstr "" -#: src/microhttpd/daemon.c:7334 src/microhttpd/daemon.c:7338 +#: src/microhttpd/daemon.c:7852 src/microhttpd/daemon.c:7856 msgid "Failed to initialise multithreading in libgcrypt.\n" msgstr "" -#: src/microhttpd/daemon.c:7344 +#: src/microhttpd/daemon.c:7862 msgid "libgcrypt is too old. MHD was compiled for libgcrypt 1.6.0 or newer.\n" msgstr "" -#: src/microhttpd/mhd_sockets.h:274 +#: src/microhttpd/mhd_sockets.h:333 msgid "Close socket failed.\n" msgstr "" -#: src/microhttpd/connection.c:874 +#: src/microhttpd/connection.c:835 msgid "Closing connection (application reported error generating data).\n" msgstr "" -#: src/microhttpd/connection.c:923 +#: src/microhttpd/connection.c:884 msgid "Closing connection (out of memory).\n" msgstr "" -#: src/microhttpd/connection.c:971 +#: src/microhttpd/connection.c:932 msgid "Closing connection (application error generating response).\n" msgstr "" -#: src/microhttpd/connection.c:1599 +#: src/microhttpd/connection.c:1574 #, c-format msgid "" "Error processing request (HTTP response code is %u (`%s')). Closing " "connection.\n" msgstr "" -#: src/microhttpd/connection.c:1626 src/microhttpd/connection.c:2661 +#: src/microhttpd/connection.c:1601 src/microhttpd/connection.c:2643 msgid "Closing connection (failed to queue response).\n" msgstr "" -#: src/microhttpd/connection.c:1637 src/microhttpd/connection.c:3469 -#: src/microhttpd/connection.c:3578 +#: src/microhttpd/connection.c:1612 src/microhttpd/connection.c:3485 +#: src/microhttpd/connection.c:3594 msgid "Closing connection (failed to create response header).\n" msgstr "" -#: src/microhttpd/connection.c:1683 src/microhttpd/connection.c:2821 -#: src/microhttpd/connection.c:2889 src/microhttpd/connection.c:3242 +#: src/microhttpd/connection.c:1658 src/microhttpd/connection.c:2803 +#: src/microhttpd/connection.c:2871 src/microhttpd/connection.c:3258 #, c-format msgid "In function %s handling connection at state: %s\n" msgstr "" -#: src/microhttpd/connection.c:1900 +#: src/microhttpd/connection.c:1876 msgid "Not enough memory in pool to allocate header record!\n" msgstr "" -#: src/microhttpd/connection.c:1947 +#: src/microhttpd/connection.c:1923 msgid "Not enough memory in pool to parse cookies!\n" msgstr "" -#: src/microhttpd/connection.c:2178 src/microhttpd/connection.c:2380 +#: src/microhttpd/connection.c:2154 src/microhttpd/connection.c:2358 msgid "Application reported internal error, closing connection.\n" msgstr "" -#: src/microhttpd/connection.c:2245 src/microhttpd/connection.c:2324 +#: src/microhttpd/connection.c:2223 src/microhttpd/connection.c:2302 msgid "" "Received malformed HTTP request (bad chunked encoding). Closing connection.\n" msgstr "" -#: src/microhttpd/connection.c:2388 +#: src/microhttpd/connection.c:2366 msgid "libmicrohttpd API violation.\n" msgstr "" -#: src/microhttpd/connection.c:2404 +#: src/microhttpd/connection.c:2382 msgid "" "WARNING: incomplete upload processing and connection not suspended may " "result in hung connection.\n" msgstr "" -#: src/microhttpd/connection.c:2476 +#: src/microhttpd/connection.c:2456 msgid "Received malformed line (no colon). Closing connection.\n" msgstr "" -#: src/microhttpd/connection.c:2637 +#: src/microhttpd/connection.c:2619 msgid "Received HTTP 1.1 request without `Host' header.\n" msgstr "" -#: src/microhttpd/connection.c:2649 +#: src/microhttpd/connection.c:2631 msgid "Closing connection (failed to create response).\n" msgstr "" -#: src/microhttpd/connection.c:2799 +#: src/microhttpd/connection.c:2781 msgid "Socket disconnected while reading request.\n" msgstr "" -#: src/microhttpd/connection.c:2806 +#: src/microhttpd/connection.c:2788 msgid "Connection socket is closed due to error when reading request.\n" msgstr "" -#: src/microhttpd/connection.c:2916 +#: src/microhttpd/connection.c:2898 #, c-format msgid "Failed to send data in request for %s.\n" msgstr "" -#: src/microhttpd/connection.c:2925 +#: src/microhttpd/connection.c:2907 #, c-format msgid "Sent 100 continue response: `%.*s'\n" msgstr "" -#: src/microhttpd/connection.c:2968 +#: src/microhttpd/connection.c:2975 msgid "Connection was closed while sending response headers.\n" msgstr "" -#: src/microhttpd/connection.c:3020 +#: src/microhttpd/connection.c:3028 msgid "Data offset exceeds limit.\n" msgstr "" -#: src/microhttpd/connection.c:3030 +#: src/microhttpd/connection.c:3038 #, c-format msgid "Sent %d-byte DATA response: `%.*s'\n" msgstr "" -#: src/microhttpd/connection.c:3047 +#: src/microhttpd/connection.c:3055 #, c-format msgid "Failed to send data in request for `%s'.\n" msgstr "" -#: src/microhttpd/connection.c:3077 src/microhttpd/connection.c:3107 +#: src/microhttpd/connection.c:3085 src/microhttpd/connection.c:3115 msgid "Connection was closed while sending response body.\n" msgstr "" -#: src/microhttpd/connection.c:3130 +#: src/microhttpd/connection.c:3138 msgid "Internal error.\n" msgstr "" -#: src/microhttpd/connection.c:3204 +#: src/microhttpd/connection.c:3216 msgid "" "Failed to signal end of connection via inter-thread communication channel.\n" msgstr "" -#: src/microhttpd/connection.c:3928 +#: src/microhttpd/connection.c:3944 msgid "Attempted to queue response on wrong thread!\n" msgstr "" -#: src/microhttpd/connection.c:3940 +#: src/microhttpd/connection.c:3956 msgid "" "Attempted 'upgrade' connection on daemon without MHD_ALLOW_UPGRADE option!\n" msgstr "" -#: src/microhttpd/connection.c:3950 +#: src/microhttpd/connection.c:3966 msgid "Application used invalid status code for 'upgrade' response!\n" msgstr "" -#: src/microhttpd/response.c:915 +#: src/microhttpd/response.c:969 msgid "" "Invalid response for upgrade: application failed to set the 'Upgrade' " "header!\n" msgstr "" -#: src/microhttpd/response.c:956 +#: src/microhttpd/response.c:1010 msgid "Failed to make loopback sockets non-blocking.\n" msgstr "" -#: src/microhttpd/response.c:975 +#: src/microhttpd/response.c:1029 msgid "Failed to set SO_NOSIGPIPE on loopback sockets.\n" msgstr "" -#: src/microhttpd/response.c:995 +#: src/microhttpd/response.c:1049 #, c-format msgid "Socketpair descriptor larger than FD_SETSIZE: %d > %d\n" msgstr "" -#: src/microhttpd/response.c:1076 +#: src/microhttpd/response.c:1130 msgid "Error cleaning up while handling epoll error.\n" msgstr "" diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h @@ -130,9 +130,10 @@ typedef intptr_t ssize_t; /** * Current version of the library. - * 0x01093001 = 1.9.30-1. + * @note While it is a hexadecimal number, it is parsed as decimal number. + * Example: 0x01093001 = 1.9.30-1. */ -#define MHD_VERSION 0x00097106 +#define MHD_VERSION 0x00097200 /** * Operational results from MHD calls.