diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-02-10 17:13:03 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-02-10 17:13:03 +0100 |
commit | 154d0fd6a11b813c006e775fc01ab665c5e75317 (patch) | |
tree | 9d5225e5f1c010d03fa6befbd9c0ab6a347abbf6 | |
parent | f6ee589dc9adca8fdb1838fa472a7ccc64bc293c (diff) | |
download | libmicrohttpd-154d0fd6a11b813c006e775fc01ab665c5e75317.tar.gz libmicrohttpd-154d0fd6a11b813c006e775fc01ab665c5e75317.zip |
adjusting digest auth to previous regression fix, releasing 0.9.63v0.9.63
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | po/libmicrohttpd.pot | 266 | ||||
-rw-r--r-- | src/include/microhttpd.h | 2 | ||||
-rw-r--r-- | src/microhttpd/digestauth.c | 14 |
5 files changed, 150 insertions, 141 deletions
@@ -1,3 +1,6 @@ | |||
1 | Sun 10 Feb 2019 05:03:44 PM CET | ||
2 | Releasing libmicrohttpd 0.9.63. -CG | ||
3 | |||
1 | Sat 09 Feb 2019 01:51:02 PM CET | 4 | Sat 09 Feb 2019 01:51:02 PM CET |
2 | Extended test_get to test URI logging and query string parsing | 5 | Extended test_get to test URI logging and query string parsing |
3 | to avoid regression fixed in previous patch in the future. -CG | 6 | to avoid regression fixed in previous patch in the future. -CG |
diff --git a/configure.ac b/configure.ac index cfe7af90..62f5ed5e 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -22,15 +22,15 @@ | |||
22 | # | 22 | # |
23 | AC_PREREQ([2.64]) | 23 | AC_PREREQ([2.64]) |
24 | LT_PREREQ([2.4.0]) | 24 | LT_PREREQ([2.4.0]) |
25 | AC_INIT([GNU Libmicrohttpd],[0.9.62],[libmicrohttpd@gnu.org]) | 25 | AC_INIT([GNU Libmicrohttpd],[0.9.63],[libmicrohttpd@gnu.org]) |
26 | AC_CONFIG_AUX_DIR([build-aux]) | 26 | AC_CONFIG_AUX_DIR([build-aux]) |
27 | AM_INIT_AUTOMAKE([silent-rules] [subdir-objects]) | 27 | AM_INIT_AUTOMAKE([silent-rules] [subdir-objects]) |
28 | AC_CONFIG_HEADERS([MHD_config.h]) | 28 | AC_CONFIG_HEADERS([MHD_config.h]) |
29 | AC_CONFIG_MACRO_DIR([m4]) | 29 | AC_CONFIG_MACRO_DIR([m4]) |
30 | 30 | ||
31 | LIB_VERSION_CURRENT=61 | 31 | LIB_VERSION_CURRENT=62 |
32 | LIB_VERSION_REVISION=0 | 32 | LIB_VERSION_REVISION=0 |
33 | LIB_VERSION_AGE=49 | 33 | LIB_VERSION_AGE=50 |
34 | AC_SUBST(LIB_VERSION_CURRENT) | 34 | AC_SUBST(LIB_VERSION_CURRENT) |
35 | AC_SUBST(LIB_VERSION_REVISION) | 35 | AC_SUBST(LIB_VERSION_REVISION) |
36 | AC_SUBST(LIB_VERSION_AGE) | 36 | AC_SUBST(LIB_VERSION_AGE) |
diff --git a/po/libmicrohttpd.pot b/po/libmicrohttpd.pot index 9825d043..7906e9ec 100644 --- a/po/libmicrohttpd.pot +++ b/po/libmicrohttpd.pot | |||
@@ -6,9 +6,9 @@ | |||
6 | #, fuzzy | 6 | #, fuzzy |
7 | msgid "" | 7 | msgid "" |
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: GNU libmicrohttpd 0.9.62\n" | 9 | "Project-Id-Version: GNU libmicrohttpd 0.9.63\n" |
10 | "Report-Msgid-Bugs-To: libmicrohttpd@gnu.org\n" | 10 | "Report-Msgid-Bugs-To: libmicrohttpd@gnu.org\n" |
11 | "POT-Creation-Date: 2018-12-08 23:11+0100\n" | 11 | "POT-Creation-Date: 2019-02-10 17:12+0100\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
@@ -37,53 +37,53 @@ msgstr "" | |||
37 | msgid "Failed to close FD.\n" | 37 | msgid "Failed to close FD.\n" |
38 | msgstr "" | 38 | msgstr "" |
39 | 39 | ||
40 | #: src/microhttpd/digestauth.c:563 | 40 | #: src/microhttpd/digestauth.c:599 |
41 | msgid "" | 41 | msgid "" |
42 | "Stale nonce received. If this happens a lot, you should probably increase " | 42 | "Stale nonce received. If this happens a lot, you should probably increase " |
43 | "the size of the nonce array.\n" | 43 | "the size of the nonce array.\n" |
44 | msgstr "" | 44 | msgstr "" |
45 | 45 | ||
46 | #: src/microhttpd/digestauth.c:755 | 46 | #: src/microhttpd/digestauth.c:792 |
47 | msgid "Failed to allocate memory for copy of URI arguments\n" | 47 | msgid "Failed to allocate memory for copy of URI arguments\n" |
48 | msgstr "" | 48 | msgstr "" |
49 | 49 | ||
50 | #: src/microhttpd/digestauth.c:893 | 50 | #: src/microhttpd/digestauth.c:932 |
51 | msgid "Authentication failed, invalid timestamp format.\n" | 51 | msgid "Authentication failed, invalid timestamp format.\n" |
52 | msgstr "" | 52 | msgstr "" |
53 | 53 | ||
54 | #: src/microhttpd/digestauth.c:956 | 54 | #: src/microhttpd/digestauth.c:995 |
55 | msgid "Authentication failed, invalid format.\n" | 55 | msgid "Authentication failed, invalid format.\n" |
56 | msgstr "" | 56 | msgstr "" |
57 | 57 | ||
58 | #: src/microhttpd/digestauth.c:966 | 58 | #: src/microhttpd/digestauth.c:1005 |
59 | msgid "Authentication failed, invalid nc format.\n" | 59 | msgid "Authentication failed, invalid nc format.\n" |
60 | msgstr "" | 60 | msgstr "" |
61 | 61 | ||
62 | #: src/microhttpd/digestauth.c:992 | 62 | #: src/microhttpd/digestauth.c:1031 |
63 | msgid "Failed to allocate memory for auth header processing\n" | 63 | msgid "Failed to allocate memory for auth header processing\n" |
64 | msgstr "" | 64 | msgstr "" |
65 | 65 | ||
66 | #: src/microhttpd/digestauth.c:1049 | 66 | #: src/microhttpd/digestauth.c:1090 |
67 | msgid "Authentication failed, URI does not match.\n" | 67 | msgid "Authentication failed, URI does not match.\n" |
68 | msgstr "" | 68 | msgstr "" |
69 | 69 | ||
70 | #: src/microhttpd/digestauth.c:1069 | 70 | #: src/microhttpd/digestauth.c:1109 |
71 | msgid "Authentication failed, arguments do not match.\n" | 71 | msgid "Authentication failed, arguments do not match.\n" |
72 | msgstr "" | 72 | msgstr "" |
73 | 73 | ||
74 | #: src/microhttpd/digestauth.c:1224 | 74 | #: src/microhttpd/digestauth.c:1264 |
75 | msgid "digest size missmatch" | 75 | msgid "digest size missmatch" |
76 | msgstr "" | 76 | msgstr "" |
77 | 77 | ||
78 | #: src/microhttpd/digestauth.c:1314 | 78 | #: src/microhttpd/digestauth.c:1356 |
79 | msgid "Could not register nonce (is the nonce array size zero?).\n" | 79 | msgid "Could not register nonce (is the nonce array size zero?).\n" |
80 | msgstr "" | 80 | msgstr "" |
81 | 81 | ||
82 | #: src/microhttpd/digestauth.c:1339 | 82 | #: src/microhttpd/digestauth.c:1381 |
83 | msgid "Failed to allocate memory for auth response header\n" | 83 | msgid "Failed to allocate memory for auth response header\n" |
84 | msgstr "" | 84 | msgstr "" |
85 | 85 | ||
86 | #: src/microhttpd/digestauth.c:1375 | 86 | #: src/microhttpd/digestauth.c:1417 |
87 | msgid "Failed to add Digest auth header\n" | 87 | msgid "Failed to add Digest auth header\n" |
88 | msgstr "" | 88 | msgstr "" |
89 | 89 | ||
@@ -126,7 +126,7 @@ msgid "" | |||
126 | "unsupported.\n" | 126 | "unsupported.\n" |
127 | msgstr "" | 127 | msgstr "" |
128 | 128 | ||
129 | #: src/microhttpd/daemon.c:1279 src/microhttpd/daemon.c:6454 | 129 | #: src/microhttpd/daemon.c:1279 src/microhttpd/daemon.c:6469 |
130 | msgid "" | 130 | msgid "" |
131 | "Initiated daemon shutdown while \"upgraded\" connection was not closed.\n" | 131 | "Initiated daemon shutdown while \"upgraded\" connection was not closed.\n" |
132 | msgstr "" | 132 | msgstr "" |
@@ -180,7 +180,7 @@ msgstr "" | |||
180 | msgid "PSK authentication failed: gnutls_malloc failed to allocate memory\n" | 180 | msgid "PSK authentication failed: gnutls_malloc failed to allocate memory\n" |
181 | msgstr "" | 181 | msgstr "" |
182 | 182 | ||
183 | #: src/microhttpd/daemon.c:2318 src/microhttpd/daemon.c:6104 | 183 | #: src/microhttpd/daemon.c:2318 src/microhttpd/daemon.c:6113 |
184 | #, c-format | 184 | #, c-format |
185 | msgid "Socket descriptor larger than FD_SETSIZE: %d > %d\n" | 185 | msgid "Socket descriptor larger than FD_SETSIZE: %d > %d\n" |
186 | msgstr "" | 186 | msgstr "" |
@@ -190,7 +190,7 @@ msgstr "" | |||
190 | msgid "Failed to set SO_NOSIGPIPE on accepted socket: %s\n" | 190 | msgid "Failed to set SO_NOSIGPIPE on accepted socket: %s\n" |
191 | msgstr "" | 191 | msgstr "" |
192 | 192 | ||
193 | #: src/microhttpd/daemon.c:2351 src/microhttpd/daemon.c:3155 | 193 | #: src/microhttpd/daemon.c:2351 src/microhttpd/daemon.c:3164 |
194 | #, c-format | 194 | #, c-format |
195 | msgid "Accepted connection on socket %d\n" | 195 | msgid "Accepted connection on socket %d\n" |
196 | msgstr "" | 196 | msgstr "" |
@@ -204,7 +204,7 @@ msgid "Connection rejected by application. Closing connection.\n" | |||
204 | msgstr "" | 204 | msgstr "" |
205 | 205 | ||
206 | #: src/microhttpd/daemon.c:2414 src/microhttpd/daemon.c:2434 | 206 | #: src/microhttpd/daemon.c:2414 src/microhttpd/daemon.c:2434 |
207 | #: src/microhttpd/daemon.c:3741 | 207 | #: src/microhttpd/daemon.c:3750 |
208 | #, c-format | 208 | #, c-format |
209 | msgid "Error allocating memory: %s\n" | 209 | msgid "Error allocating memory: %s\n" |
210 | msgstr "" | 210 | msgstr "" |
@@ -218,9 +218,9 @@ msgstr "" | |||
218 | msgid "Unknown credential type" | 218 | msgid "Unknown credential type" |
219 | msgstr "" | 219 | msgstr "" |
220 | 220 | ||
221 | #: src/microhttpd/daemon.c:2607 src/microhttpd/daemon.c:4231 | 221 | #: src/microhttpd/daemon.c:2607 src/microhttpd/daemon.c:4240 |
222 | #: src/microhttpd/daemon.c:4264 src/microhttpd/daemon.c:5409 | 222 | #: src/microhttpd/daemon.c:4273 src/microhttpd/daemon.c:5418 |
223 | #: src/microhttpd/daemon.c:5426 src/microhttpd/connection.c:3867 | 223 | #: src/microhttpd/daemon.c:5435 src/microhttpd/connection.c:3857 |
224 | #: src/microhttpd/response.c:968 src/microhttpd/response.c:994 | 224 | #: src/microhttpd/response.c:968 src/microhttpd/response.c:994 |
225 | #, c-format | 225 | #, c-format |
226 | msgid "Call to epoll_ctl failed: %s\n" | 226 | msgid "Call to epoll_ctl failed: %s\n" |
@@ -230,9 +230,9 @@ msgstr "" | |||
230 | msgid "Failed to signal new connection via inter-thread communication channel." | 230 | msgid "Failed to signal new connection via inter-thread communication channel." |
231 | msgstr "" | 231 | msgstr "" |
232 | 232 | ||
233 | #: src/microhttpd/daemon.c:2737 src/microhttpd/daemon.c:3239 | 233 | #: src/microhttpd/daemon.c:2737 src/microhttpd/daemon.c:3248 |
234 | #: src/microhttpd/daemon.c:6350 src/microhttpd/connection.c:992 | 234 | #: src/microhttpd/daemon.c:6359 src/microhttpd/connection.c:979 |
235 | #: src/microhttpd/connection.c:1011 | 235 | #: src/microhttpd/connection.c:998 |
236 | msgid "Failed to remove FD from epoll set\n" | 236 | msgid "Failed to remove FD from epoll set\n" |
237 | msgstr "" | 237 | msgstr "" |
238 | 238 | ||
@@ -266,474 +266,478 @@ msgstr "" | |||
266 | msgid "Failed to set noninheritable mode on new client socket.\n" | 266 | msgid "Failed to set noninheritable mode on new client socket.\n" |
267 | msgstr "" | 267 | msgstr "" |
268 | 268 | ||
269 | #: src/microhttpd/daemon.c:3093 | 269 | #: src/microhttpd/daemon.c:3029 |
270 | msgid "Failed to reset buffering mode on new client socket.\n" | ||
271 | msgstr "" | ||
272 | |||
273 | #: src/microhttpd/daemon.c:3102 | ||
270 | #, c-format | 274 | #, c-format |
271 | msgid "Error accepting connection: %s\n" | 275 | msgid "Error accepting connection: %s\n" |
272 | msgstr "" | 276 | msgstr "" |
273 | 277 | ||
274 | #: src/microhttpd/daemon.c:3110 | 278 | #: src/microhttpd/daemon.c:3119 |
275 | msgid "" | 279 | msgid "" |
276 | "Hit process or system resource limit at FIRST connection. This is really bad " | 280 | "Hit process or system resource limit at FIRST connection. This is really bad " |
277 | "as there is no sane way to proceed. Will try busy waiting for system " | 281 | "as there is no sane way to proceed. Will try busy waiting for system " |
278 | "resources to become magically available.\n" | 282 | "resources to become magically available.\n" |
279 | msgstr "" | 283 | msgstr "" |
280 | 284 | ||
281 | #: src/microhttpd/daemon.c:3124 | 285 | #: src/microhttpd/daemon.c:3133 |
282 | #, c-format | 286 | #, c-format |
283 | msgid "" | 287 | msgid "" |
284 | "Hit process or system resource limit at %u connections, temporarily " | 288 | "Hit process or system resource limit at %u connections, temporarily " |
285 | "suspending accept(). Consider setting a lower MHD_OPTION_CONNECTION_LIMIT.\n" | 289 | "suspending accept(). Consider setting a lower MHD_OPTION_CONNECTION_LIMIT.\n" |
286 | msgstr "" | 290 | msgstr "" |
287 | 291 | ||
288 | #: src/microhttpd/daemon.c:3136 | 292 | #: src/microhttpd/daemon.c:3145 |
289 | #, c-format | 293 | #, c-format |
290 | msgid "Failed to set nonblocking mode on incoming connection socket: %s\n" | 294 | msgid "Failed to set nonblocking mode on incoming connection socket: %s\n" |
291 | msgstr "" | 295 | msgstr "" |
292 | 296 | ||
293 | #: src/microhttpd/daemon.c:3148 | 297 | #: src/microhttpd/daemon.c:3157 |
294 | msgid "Failed to set noninheritable mode on incoming connection socket.\n" | 298 | msgid "Failed to set noninheritable mode on incoming connection socket.\n" |
295 | msgstr "" | 299 | msgstr "" |
296 | 300 | ||
297 | #: src/microhttpd/daemon.c:3196 src/microhttpd/daemon.c:6496 | 301 | #: src/microhttpd/daemon.c:3205 src/microhttpd/daemon.c:6511 |
298 | #: src/microhttpd/daemon.c:6528 src/microhttpd/daemon.c:6628 | 302 | #: src/microhttpd/daemon.c:6543 src/microhttpd/daemon.c:6643 |
299 | msgid "Failed to join a thread\n" | 303 | msgid "Failed to join a thread\n" |
300 | msgstr "" | 304 | msgstr "" |
301 | 305 | ||
302 | #: src/microhttpd/daemon.c:3300 | 306 | #: src/microhttpd/daemon.c:3309 |
303 | msgid "Illegal call to MHD_get_timeout\n" | 307 | msgid "Illegal call to MHD_get_timeout\n" |
304 | msgstr "" | 308 | msgstr "" |
305 | 309 | ||
306 | #: src/microhttpd/daemon.c:3497 | 310 | #: src/microhttpd/daemon.c:3506 |
307 | msgid "" | 311 | msgid "" |
308 | "MHD_run_from_select() called with except_fd_set set to NULL. Such behavior " | 312 | "MHD_run_from_select() called with except_fd_set set to NULL. Such behavior " |
309 | "is deprecated.\n" | 313 | "is deprecated.\n" |
310 | msgstr "" | 314 | msgstr "" |
311 | 315 | ||
312 | #: src/microhttpd/daemon.c:3577 | 316 | #: src/microhttpd/daemon.c:3586 |
313 | msgid "Could not obtain daemon fdsets" | 317 | msgid "Could not obtain daemon fdsets" |
314 | msgstr "" | 318 | msgstr "" |
315 | 319 | ||
316 | #: src/microhttpd/daemon.c:3594 | 320 | #: src/microhttpd/daemon.c:3603 |
317 | msgid "Could not add listen socket to fdset" | 321 | msgid "Could not add listen socket to fdset" |
318 | msgstr "" | 322 | msgstr "" |
319 | 323 | ||
320 | #: src/microhttpd/daemon.c:3622 | 324 | #: src/microhttpd/daemon.c:3631 |
321 | msgid "Could not add control inter-thread communication channel FD to fdset" | 325 | msgid "Could not add control inter-thread communication channel FD to fdset" |
322 | msgstr "" | 326 | msgstr "" |
323 | 327 | ||
324 | #: src/microhttpd/daemon.c:3678 | 328 | #: src/microhttpd/daemon.c:3687 |
325 | #, c-format | 329 | #, c-format |
326 | msgid "select failed: %s\n" | 330 | msgid "select failed: %s\n" |
327 | msgstr "" | 331 | msgstr "" |
328 | 332 | ||
329 | #: src/microhttpd/daemon.c:3823 src/microhttpd/daemon.c:3970 | 333 | #: src/microhttpd/daemon.c:3832 src/microhttpd/daemon.c:3979 |
330 | #, c-format | 334 | #, c-format |
331 | msgid "poll failed: %s\n" | 335 | msgid "poll failed: %s\n" |
332 | msgstr "" | 336 | msgstr "" |
333 | 337 | ||
334 | #: src/microhttpd/daemon.c:4100 src/microhttpd/daemon.c:4331 | 338 | #: src/microhttpd/daemon.c:4109 src/microhttpd/daemon.c:4340 |
335 | #, c-format | 339 | #, c-format |
336 | msgid "Call to epoll_wait failed: %s\n" | 340 | msgid "Call to epoll_wait failed: %s\n" |
337 | msgstr "" | 341 | msgstr "" |
338 | 342 | ||
339 | #: src/microhttpd/daemon.c:4283 src/microhttpd/daemon.c:4740 | 343 | #: src/microhttpd/daemon.c:4292 src/microhttpd/daemon.c:4749 |
340 | msgid "Failed to remove listen FD from epoll set\n" | 344 | msgid "Failed to remove listen FD from epoll set\n" |
341 | msgstr "" | 345 | msgstr "" |
342 | 346 | ||
343 | #: src/microhttpd/daemon.c:4748 | 347 | #: src/microhttpd/daemon.c:4757 |
344 | msgid "Failed to signal quiesce via inter-thread communication channel" | 348 | msgid "Failed to signal quiesce via inter-thread communication channel" |
345 | msgstr "" | 349 | msgstr "" |
346 | 350 | ||
347 | #: src/microhttpd/daemon.c:4770 | 351 | #: src/microhttpd/daemon.c:4779 |
348 | msgid "failed to signal quiesce via inter-thread communication channel" | 352 | msgid "failed to signal quiesce via inter-thread communication channel" |
349 | msgstr "" | 353 | msgstr "" |
350 | 354 | ||
351 | #: src/microhttpd/daemon.c:4878 | 355 | #: src/microhttpd/daemon.c:4887 |
352 | msgid "Warning: Too large timeout value, ignored.\n" | 356 | msgid "Warning: Too large timeout value, ignored.\n" |
353 | msgstr "" | 357 | msgstr "" |
354 | 358 | ||
355 | #: src/microhttpd/daemon.c:4919 | 359 | #: src/microhttpd/daemon.c:4928 |
356 | msgid "" | 360 | msgid "" |
357 | "Warning: Zero size, specified for thread pool size, is ignored. Thread pool " | 361 | "Warning: Zero size, specified for thread pool size, is ignored. Thread pool " |
358 | "is not used.\n" | 362 | "is not used.\n" |
359 | msgstr "" | 363 | msgstr "" |
360 | 364 | ||
361 | #: src/microhttpd/daemon.c:4927 | 365 | #: src/microhttpd/daemon.c:4936 |
362 | msgid "" | 366 | msgid "" |
363 | "Warning: \"1\", specified for thread pool size, is ignored. Thread pool is " | 367 | "Warning: \"1\", specified for thread pool size, is ignored. Thread pool is " |
364 | "not used.\n" | 368 | "not used.\n" |
365 | msgstr "" | 369 | msgstr "" |
366 | 370 | ||
367 | #: src/microhttpd/daemon.c:4939 | 371 | #: src/microhttpd/daemon.c:4948 |
368 | #, c-format | 372 | #, c-format |
369 | msgid "Specified thread pool size (%u) too big\n" | 373 | msgid "Specified thread pool size (%u) too big\n" |
370 | msgstr "" | 374 | msgstr "" |
371 | 375 | ||
372 | #: src/microhttpd/daemon.c:4950 | 376 | #: src/microhttpd/daemon.c:4959 |
373 | msgid "" | 377 | msgid "" |
374 | "MHD_OPTION_THREAD_POOL_SIZE option is specified but " | 378 | "MHD_OPTION_THREAD_POOL_SIZE option is specified but " |
375 | "MHD_USE_INTERNAL_POLLING_THREAD flag is not specified.\n" | 379 | "MHD_USE_INTERNAL_POLLING_THREAD flag is not specified.\n" |
376 | msgstr "" | 380 | msgstr "" |
377 | 381 | ||
378 | #: src/microhttpd/daemon.c:4959 | 382 | #: src/microhttpd/daemon.c:4968 |
379 | msgid "" | 383 | msgid "" |
380 | "Both MHD_OPTION_THREAD_POOL_SIZE option and MHD_USE_THREAD_PER_CONNECTION " | 384 | "Both MHD_OPTION_THREAD_POOL_SIZE option and MHD_USE_THREAD_PER_CONNECTION " |
381 | "flag are specified.\n" | 385 | "flag are specified.\n" |
382 | msgstr "" | 386 | msgstr "" |
383 | 387 | ||
384 | #: src/microhttpd/daemon.c:4976 src/microhttpd/daemon.c:4988 | 388 | #: src/microhttpd/daemon.c:4985 src/microhttpd/daemon.c:4997 |
385 | #: src/microhttpd/daemon.c:5000 src/microhttpd/daemon.c:5012 | 389 | #: src/microhttpd/daemon.c:5009 src/microhttpd/daemon.c:5021 |
386 | #: src/microhttpd/daemon.c:5053 src/microhttpd/daemon.c:5081 | 390 | #: src/microhttpd/daemon.c:5062 src/microhttpd/daemon.c:5090 |
387 | #: src/microhttpd/daemon.c:5100 | 391 | #: src/microhttpd/daemon.c:5109 |
388 | #, c-format | 392 | #, c-format |
389 | msgid "MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set\n" | 393 | msgid "MHD HTTPS option %d passed to MHD but MHD_USE_TLS not set\n" |
390 | msgstr "" | 394 | msgstr "" |
391 | 395 | ||
392 | #: src/microhttpd/daemon.c:5031 | 396 | #: src/microhttpd/daemon.c:5040 |
393 | msgid "Error initializing DH parameters\n" | 397 | msgid "Error initializing DH parameters\n" |
394 | msgstr "" | 398 | msgstr "" |
395 | 399 | ||
396 | #: src/microhttpd/daemon.c:5043 | 400 | #: src/microhttpd/daemon.c:5052 |
397 | msgid "Bad Diffie-Hellman parameters format\n" | 401 | msgid "Bad Diffie-Hellman parameters format\n" |
398 | msgstr "" | 402 | msgstr "" |
399 | 403 | ||
400 | #: src/microhttpd/daemon.c:5070 | 404 | #: src/microhttpd/daemon.c:5079 |
401 | #, c-format | 405 | #, c-format |
402 | msgid "Setting priorities to `%s' failed: %s\n" | 406 | msgid "Setting priorities to `%s' failed: %s\n" |
403 | msgstr "" | 407 | msgstr "" |
404 | 408 | ||
405 | #: src/microhttpd/daemon.c:5089 | 409 | #: src/microhttpd/daemon.c:5098 |
406 | msgid "" | 410 | msgid "" |
407 | "MHD_OPTION_HTTPS_CERT_CALLBACK requires building MHD with GnuTLS >= 3.0\n" | 411 | "MHD_OPTION_HTTPS_CERT_CALLBACK requires building MHD with GnuTLS >= 3.0\n" |
408 | msgstr "" | 412 | msgstr "" |
409 | 413 | ||
410 | #: src/microhttpd/daemon.c:5123 | 414 | #: src/microhttpd/daemon.c:5132 |
411 | msgid "" | 415 | msgid "" |
412 | "MHD_OPTION_LISTEN_SOCKET specified for daemon with MHD_USE_NO_LISTEN_SOCKET " | 416 | "MHD_OPTION_LISTEN_SOCKET specified for daemon with MHD_USE_NO_LISTEN_SOCKET " |
413 | "flag set.\n" | 417 | "flag set.\n" |
414 | msgstr "" | 418 | msgstr "" |
415 | 419 | ||
416 | #: src/microhttpd/daemon.c:5172 | 420 | #: src/microhttpd/daemon.c:5181 |
417 | msgid "" | 421 | msgid "" |
418 | "Flag MHD_USE_PEDANTIC_CHECKS is ignored because another behavior is " | 422 | "Flag MHD_USE_PEDANTIC_CHECKS is ignored because another behavior is " |
419 | "specified by MHD_OPTION_STRICT_CLIENT.\n" | 423 | "specified by MHD_OPTION_STRICT_CLIENT.\n" |
420 | msgstr "" | 424 | msgstr "" |
421 | 425 | ||
422 | #: src/microhttpd/daemon.c:5304 | 426 | #: src/microhttpd/daemon.c:5313 |
423 | #, c-format | 427 | #, c-format |
424 | msgid "MHD HTTPS option %d passed to MHD compiled without GNUtls >= 3\n" | 428 | msgid "MHD HTTPS option %d passed to MHD compiled without GNUtls >= 3\n" |
425 | msgstr "" | 429 | msgstr "" |
426 | 430 | ||
427 | #: src/microhttpd/daemon.c:5317 | 431 | #: src/microhttpd/daemon.c:5326 |
428 | #, c-format | 432 | #, c-format |
429 | msgid "MHD HTTPS option %d passed to MHD compiled without HTTPS support\n" | 433 | msgid "MHD HTTPS option %d passed to MHD compiled without HTTPS support\n" |
430 | msgstr "" | 434 | msgstr "" |
431 | 435 | ||
432 | #: src/microhttpd/daemon.c:5323 | 436 | #: src/microhttpd/daemon.c:5332 |
433 | #, c-format | 437 | #, c-format |
434 | msgid "Invalid option %d! (Did you terminate the list with MHD_OPTION_END?)\n" | 438 | msgid "Invalid option %d! (Did you terminate the list with MHD_OPTION_END?)\n" |
435 | msgstr "" | 439 | msgstr "" |
436 | 440 | ||
437 | #: src/microhttpd/daemon.c:5353 | 441 | #: src/microhttpd/daemon.c:5362 |
438 | #, c-format | 442 | #, c-format |
439 | msgid "Call to epoll_create1 failed: %s\n" | 443 | msgid "Call to epoll_create1 failed: %s\n" |
440 | msgstr "" | 444 | msgstr "" |
441 | 445 | ||
442 | #: src/microhttpd/daemon.c:5363 | 446 | #: src/microhttpd/daemon.c:5372 |
443 | msgid "Failed to set noninheritable mode on epoll FD.\n" | 447 | msgid "Failed to set noninheritable mode on epoll FD.\n" |
444 | msgstr "" | 448 | msgstr "" |
445 | 449 | ||
446 | #: src/microhttpd/daemon.c:5606 | 450 | #: src/microhttpd/daemon.c:5615 |
447 | msgid "" | 451 | msgid "" |
448 | "Warning: MHD_USE_THREAD_PER_CONNECTION must be used only with " | 452 | "Warning: MHD_USE_THREAD_PER_CONNECTION must be used only with " |
449 | "MHD_USE_INTERNAL_POLLING_THREAD. Flag MHD_USE_INTERNAL_POLLING_THREAD was " | 453 | "MHD_USE_INTERNAL_POLLING_THREAD. Flag MHD_USE_INTERNAL_POLLING_THREAD was " |
450 | "added. Consider setting MHD_USE_INTERNAL_POLLING_THREAD explicitly.\n" | 454 | "added. Consider setting MHD_USE_INTERNAL_POLLING_THREAD explicitly.\n" |
451 | msgstr "" | 455 | msgstr "" |
452 | 456 | ||
453 | #: src/microhttpd/daemon.c:5654 | 457 | #: src/microhttpd/daemon.c:5663 |
454 | msgid "Using debug build of libmicrohttpd.\n" | 458 | msgid "Using debug build of libmicrohttpd.\n" |
455 | msgstr "" | 459 | msgstr "" |
456 | 460 | ||
457 | #: src/microhttpd/daemon.c:5668 | 461 | #: src/microhttpd/daemon.c:5677 |
458 | #, c-format | 462 | #, c-format |
459 | msgid "Failed to create inter-thread communication channel: %s\n" | 463 | msgid "Failed to create inter-thread communication channel: %s\n" |
460 | msgstr "" | 464 | msgstr "" |
461 | 465 | ||
462 | #: src/microhttpd/daemon.c:5684 | 466 | #: src/microhttpd/daemon.c:5693 |
463 | msgid "" | 467 | msgid "" |
464 | "file descriptor for inter-thread communication channel exceeds maximum " | 468 | "file descriptor for inter-thread communication channel exceeds maximum " |
465 | "value\n" | 469 | "value\n" |
466 | msgstr "" | 470 | msgstr "" |
467 | 471 | ||
468 | #: src/microhttpd/daemon.c:5704 | 472 | #: src/microhttpd/daemon.c:5713 |
469 | msgid "Specified value for NC_SIZE too large\n" | 473 | msgid "Specified value for NC_SIZE too large\n" |
470 | msgstr "" | 474 | msgstr "" |
471 | 475 | ||
472 | #: src/microhttpd/daemon.c:5718 | 476 | #: src/microhttpd/daemon.c:5727 |
473 | #, c-format | 477 | #, c-format |
474 | msgid "Failed to allocate memory for nonce-nc map: %s\n" | 478 | msgid "Failed to allocate memory for nonce-nc map: %s\n" |
475 | msgstr "" | 479 | msgstr "" |
476 | 480 | ||
477 | #: src/microhttpd/daemon.c:5735 | 481 | #: src/microhttpd/daemon.c:5744 |
478 | msgid "MHD failed to initialize nonce-nc mutex\n" | 482 | msgid "MHD failed to initialize nonce-nc mutex\n" |
479 | msgstr "" | 483 | msgstr "" |
480 | 484 | ||
481 | #: src/microhttpd/daemon.c:5755 | 485 | #: src/microhttpd/daemon.c:5764 |
482 | msgid "MHD thread pooling only works with MHD_USE_INTERNAL_POLLING_THREAD\n" | 486 | msgid "MHD thread pooling only works with MHD_USE_INTERNAL_POLLING_THREAD\n" |
483 | msgstr "" | 487 | msgstr "" |
484 | 488 | ||
485 | #: src/microhttpd/daemon.c:5779 | 489 | #: src/microhttpd/daemon.c:5788 |
486 | #, c-format | 490 | #, c-format |
487 | msgid "Failed to create socket for listening: %s\n" | 491 | msgid "Failed to create socket for listening: %s\n" |
488 | msgstr "" | 492 | msgstr "" |
489 | 493 | ||
490 | #: src/microhttpd/daemon.c:5800 src/microhttpd/daemon.c:5819 | 494 | #: src/microhttpd/daemon.c:5809 src/microhttpd/daemon.c:5828 |
491 | #: src/microhttpd/daemon.c:5842 src/microhttpd/daemon.c:5879 | 495 | #: src/microhttpd/daemon.c:5851 src/microhttpd/daemon.c:5888 |
492 | #: src/microhttpd/daemon.c:5956 src/microhttpd/daemon.c:5987 | 496 | #: src/microhttpd/daemon.c:5965 src/microhttpd/daemon.c:5996 |
493 | #, c-format | 497 | #, c-format |
494 | msgid "setsockopt failed: %s\n" | 498 | msgid "setsockopt failed: %s\n" |
495 | msgstr "" | 499 | msgstr "" |
496 | 500 | ||
497 | #: src/microhttpd/daemon.c:5852 | 501 | #: src/microhttpd/daemon.c:5861 |
498 | msgid "Cannot allow listening address reuse: SO_REUSEPORT not defined\n" | 502 | msgid "Cannot allow listening address reuse: SO_REUSEPORT not defined\n" |
499 | msgstr "" | 503 | msgstr "" |
500 | 504 | ||
501 | #: src/microhttpd/daemon.c:5887 | 505 | #: src/microhttpd/daemon.c:5896 |
502 | msgid "" | 506 | msgid "" |
503 | "Cannot disallow listening address reuse: SO_EXCLUSIVEADDRUSE not defined\n" | 507 | "Cannot disallow listening address reuse: SO_EXCLUSIVEADDRUSE not defined\n" |
504 | msgstr "" | 508 | msgstr "" |
505 | 509 | ||
506 | #: src/microhttpd/daemon.c:5967 | 510 | #: src/microhttpd/daemon.c:5976 |
507 | #, c-format | 511 | #, c-format |
508 | msgid "Failed to bind to port %u: %s\n" | 512 | msgid "Failed to bind to port %u: %s\n" |
509 | msgstr "" | 513 | msgstr "" |
510 | 514 | ||
511 | #: src/microhttpd/daemon.c:5998 | 515 | #: src/microhttpd/daemon.c:6007 |
512 | #, c-format | 516 | #, c-format |
513 | msgid "Failed to listen for connections: %s\n" | 517 | msgid "Failed to listen for connections: %s\n" |
514 | msgstr "" | 518 | msgstr "" |
515 | 519 | ||
516 | #: src/microhttpd/daemon.c:6025 | 520 | #: src/microhttpd/daemon.c:6034 |
517 | #, c-format | 521 | #, c-format |
518 | msgid "Failed to get listen port number: %s\n" | 522 | msgid "Failed to get listen port number: %s\n" |
519 | msgstr "" | 523 | msgstr "" |
520 | 524 | ||
521 | #: src/microhttpd/daemon.c:6035 | 525 | #: src/microhttpd/daemon.c:6044 |
522 | msgid "" | 526 | msgid "" |
523 | "Failed to get listen port number (`struct sockaddr_storage` too small!?)\n" | 527 | "Failed to get listen port number (`struct sockaddr_storage` too small!?)\n" |
524 | msgstr "" | 528 | msgstr "" |
525 | 529 | ||
526 | #: src/microhttpd/daemon.c:6068 | 530 | #: src/microhttpd/daemon.c:6077 |
527 | msgid "Unknown address family!\n" | 531 | msgid "Unknown address family!\n" |
528 | msgstr "" | 532 | msgstr "" |
529 | 533 | ||
530 | #: src/microhttpd/daemon.c:6081 | 534 | #: src/microhttpd/daemon.c:6090 |
531 | #, c-format | 535 | #, c-format |
532 | msgid "Failed to set nonblocking mode on listening socket: %s\n" | 536 | msgid "Failed to set nonblocking mode on listening socket: %s\n" |
533 | msgstr "" | 537 | msgstr "" |
534 | 538 | ||
535 | #: src/microhttpd/daemon.c:6123 | 539 | #: src/microhttpd/daemon.c:6132 |
536 | msgid "" | 540 | msgid "" |
537 | "Combining MHD_USE_THREAD_PER_CONNECTION and MHD_USE_EPOLL is not supported.\n" | 541 | "Combining MHD_USE_THREAD_PER_CONNECTION and MHD_USE_EPOLL is not supported.\n" |
538 | msgstr "" | 542 | msgstr "" |
539 | 543 | ||
540 | #: src/microhttpd/daemon.c:6137 src/microhttpd/daemon.c:6150 | 544 | #: src/microhttpd/daemon.c:6146 src/microhttpd/daemon.c:6159 |
541 | msgid "MHD failed to initialize IP connection limit mutex\n" | 545 | msgid "MHD failed to initialize IP connection limit mutex\n" |
542 | msgstr "" | 546 | msgstr "" |
543 | 547 | ||
544 | #: src/microhttpd/daemon.c:6169 | 548 | #: src/microhttpd/daemon.c:6178 |
545 | msgid "Failed to initialize TLS support\n" | 549 | msgid "Failed to initialize TLS support\n" |
546 | msgstr "" | 550 | msgstr "" |
547 | 551 | ||
548 | #: src/microhttpd/daemon.c:6196 | 552 | #: src/microhttpd/daemon.c:6205 |
549 | #, c-format | 553 | #, c-format |
550 | msgid "Failed to create listen thread: %s\n" | 554 | msgid "Failed to create listen thread: %s\n" |
551 | msgstr "" | 555 | msgstr "" |
552 | 556 | ||
553 | #: src/microhttpd/daemon.c:6244 | 557 | #: src/microhttpd/daemon.c:6253 |
554 | #, c-format | 558 | #, c-format |
555 | msgid "Failed to create worker inter-thread communication channel: %s\n" | 559 | msgid "Failed to create worker inter-thread communication channel: %s\n" |
556 | msgstr "" | 560 | msgstr "" |
557 | 561 | ||
558 | #: src/microhttpd/daemon.c:6255 | 562 | #: src/microhttpd/daemon.c:6264 |
559 | msgid "" | 563 | msgid "" |
560 | "File descriptor for worker inter-thread communication channel exceeds " | 564 | "File descriptor for worker inter-thread communication channel exceeds " |
561 | "maximum value\n" | 565 | "maximum value\n" |
562 | msgstr "" | 566 | msgstr "" |
563 | 567 | ||
564 | #: src/microhttpd/daemon.c:6280 | 568 | #: src/microhttpd/daemon.c:6289 |
565 | msgid "MHD failed to initialize cleanup connection mutex\n" | 569 | msgid "MHD failed to initialize cleanup connection mutex\n" |
566 | msgstr "" | 570 | msgstr "" |
567 | 571 | ||
568 | #: src/microhttpd/daemon.c:6294 | 572 | #: src/microhttpd/daemon.c:6303 |
569 | #, c-format | 573 | #, c-format |
570 | msgid "Failed to create pool thread: %s\n" | 574 | msgid "Failed to create pool thread: %s\n" |
571 | msgstr "" | 575 | msgstr "" |
572 | 576 | ||
573 | #: src/microhttpd/daemon.c:6441 src/microhttpd/daemon.c:6472 | 577 | #: src/microhttpd/daemon.c:6456 src/microhttpd/daemon.c:6487 |
574 | msgid "MHD_stop_daemon() called while we have suspended connections.\n" | 578 | msgid "MHD_stop_daemon() called while we have suspended connections.\n" |
575 | msgstr "" | 579 | msgstr "" |
576 | 580 | ||
577 | #: src/microhttpd/daemon.c:6481 src/microhttpd/daemon.c:6610 | 581 | #: src/microhttpd/daemon.c:6496 src/microhttpd/daemon.c:6625 |
578 | msgid "Failed to signal shutdown via inter-thread communication channel" | 582 | msgid "Failed to signal shutdown via inter-thread communication channel" |
579 | msgstr "" | 583 | msgstr "" |
580 | 584 | ||
581 | #: src/microhttpd/daemon.c:6573 | 585 | #: src/microhttpd/daemon.c:6588 |
582 | msgid "Failed to signal shutdown via inter-thread communication channel." | 586 | msgid "Failed to signal shutdown via inter-thread communication channel." |
583 | msgstr "" | 587 | msgstr "" |
584 | 588 | ||
585 | #: src/microhttpd/daemon.c:7040 | 589 | #: src/microhttpd/daemon.c:7055 |
586 | msgid "Failed to initialize winsock\n" | 590 | msgid "Failed to initialize winsock\n" |
587 | msgstr "" | 591 | msgstr "" |
588 | 592 | ||
589 | #: src/microhttpd/daemon.c:7043 | 593 | #: src/microhttpd/daemon.c:7058 |
590 | msgid "Winsock version 2.2 is not available\n" | 594 | msgid "Winsock version 2.2 is not available\n" |
591 | msgstr "" | 595 | msgstr "" |
592 | 596 | ||
593 | #: src/microhttpd/daemon.c:7051 src/microhttpd/daemon.c:7055 | 597 | #: src/microhttpd/daemon.c:7066 src/microhttpd/daemon.c:7070 |
594 | msgid "Failed to initialise multithreading in libgcrypt\n" | 598 | msgid "Failed to initialise multithreading in libgcrypt\n" |
595 | msgstr "" | 599 | msgstr "" |
596 | 600 | ||
597 | #: src/microhttpd/daemon.c:7060 | 601 | #: src/microhttpd/daemon.c:7075 |
598 | msgid "libgcrypt is too old. MHD was compiled for libgcrypt 1.6.0 or newer\n" | 602 | msgid "libgcrypt is too old. MHD was compiled for libgcrypt 1.6.0 or newer\n" |
599 | msgstr "" | 603 | msgstr "" |
600 | 604 | ||
601 | #: src/microhttpd/mhd_sockets.h:248 | 605 | #: src/microhttpd/mhd_sockets.h:261 |
602 | msgid "Close socket failed.\n" | 606 | msgid "Close socket failed.\n" |
603 | msgstr "" | 607 | msgstr "" |
604 | 608 | ||
605 | #: src/microhttpd/connection.c:1117 | 609 | #: src/microhttpd/connection.c:1104 |
606 | msgid "Closing connection (application reported error generating data)\n" | 610 | msgid "Closing connection (application reported error generating data)\n" |
607 | msgstr "" | 611 | msgstr "" |
608 | 612 | ||
609 | #: src/microhttpd/connection.c:1170 | 613 | #: src/microhttpd/connection.c:1157 |
610 | msgid "Closing connection (out of memory)\n" | 614 | msgid "Closing connection (out of memory)\n" |
611 | msgstr "" | 615 | msgstr "" |
612 | 616 | ||
613 | #: src/microhttpd/connection.c:1217 | 617 | #: src/microhttpd/connection.c:1204 |
614 | msgid "Closing connection (application error generating response)\n" | 618 | msgid "Closing connection (application error generating response)\n" |
615 | msgstr "" | 619 | msgstr "" |
616 | 620 | ||
617 | #: src/microhttpd/connection.c:1799 | 621 | #: src/microhttpd/connection.c:1786 |
618 | #, c-format | 622 | #, c-format |
619 | msgid "" | 623 | msgid "" |
620 | "Error processing request (HTTP response code is %u (`%s')). Closing " | 624 | "Error processing request (HTTP response code is %u (`%s')). Closing " |
621 | "connection.\n" | 625 | "connection.\n" |
622 | msgstr "" | 626 | msgstr "" |
623 | 627 | ||
624 | #: src/microhttpd/connection.c:1825 src/microhttpd/connection.c:2810 | 628 | #: src/microhttpd/connection.c:1812 src/microhttpd/connection.c:2800 |
625 | msgid "Closing connection (failed to queue response)\n" | 629 | msgid "Closing connection (failed to queue response)\n" |
626 | msgstr "" | 630 | msgstr "" |
627 | 631 | ||
628 | #: src/microhttpd/connection.c:1835 src/microhttpd/connection.c:3579 | 632 | #: src/microhttpd/connection.c:1822 src/microhttpd/connection.c:3569 |
629 | #: src/microhttpd/connection.c:3702 | 633 | #: src/microhttpd/connection.c:3692 |
630 | msgid "Closing connection (failed to create response header)\n" | 634 | msgid "Closing connection (failed to create response header)\n" |
631 | msgstr "" | 635 | msgstr "" |
632 | 636 | ||
633 | #: src/microhttpd/connection.c:1881 src/microhttpd/connection.c:2960 | 637 | #: src/microhttpd/connection.c:1868 src/microhttpd/connection.c:2950 |
634 | #: src/microhttpd/connection.c:3028 src/microhttpd/connection.c:3344 | 638 | #: src/microhttpd/connection.c:3018 src/microhttpd/connection.c:3334 |
635 | #, c-format | 639 | #, c-format |
636 | msgid "In function %s handling connection at state: %s\n" | 640 | msgid "In function %s handling connection at state: %s\n" |
637 | msgstr "" | 641 | msgstr "" |
638 | 642 | ||
639 | #: src/microhttpd/connection.c:2093 | 643 | #: src/microhttpd/connection.c:2080 |
640 | msgid "Not enough memory in pool to allocate header record!\n" | 644 | msgid "Not enough memory in pool to allocate header record!\n" |
641 | msgstr "" | 645 | msgstr "" |
642 | 646 | ||
643 | #: src/microhttpd/connection.c:2135 | 647 | #: src/microhttpd/connection.c:2122 |
644 | msgid "Not enough memory in pool to parse cookies!\n" | 648 | msgid "Not enough memory in pool to parse cookies!\n" |
645 | msgstr "" | 649 | msgstr "" |
646 | 650 | ||
647 | #: src/microhttpd/connection.c:2356 src/microhttpd/connection.c:2541 | 651 | #: src/microhttpd/connection.c:2346 src/microhttpd/connection.c:2531 |
648 | msgid "Application reported internal error, closing connection.\n" | 652 | msgid "Application reported internal error, closing connection.\n" |
649 | msgstr "" | 653 | msgstr "" |
650 | 654 | ||
651 | #: src/microhttpd/connection.c:2409 src/microhttpd/connection.c:2486 | 655 | #: src/microhttpd/connection.c:2399 src/microhttpd/connection.c:2476 |
652 | msgid "" | 656 | msgid "" |
653 | "Received malformed HTTP request (bad chunked encoding). Closing connection.\n" | 657 | "Received malformed HTTP request (bad chunked encoding). Closing connection.\n" |
654 | msgstr "" | 658 | msgstr "" |
655 | 659 | ||
656 | #: src/microhttpd/connection.c:2549 | 660 | #: src/microhttpd/connection.c:2539 |
657 | msgid "libmicrohttpd API violation" | 661 | msgid "libmicrohttpd API violation" |
658 | msgstr "" | 662 | msgstr "" |
659 | 663 | ||
660 | #: src/microhttpd/connection.c:2564 | 664 | #: src/microhttpd/connection.c:2554 |
661 | msgid "" | 665 | msgid "" |
662 | "WARNING: incomplete upload processing and connection not suspended may " | 666 | "WARNING: incomplete upload processing and connection not suspended may " |
663 | "result in hung connection.\n" | 667 | "result in hung connection.\n" |
664 | msgstr "" | 668 | msgstr "" |
665 | 669 | ||
666 | #: src/microhttpd/connection.c:2634 | 670 | #: src/microhttpd/connection.c:2624 |
667 | msgid "Received malformed line (no colon). Closing connection.\n" | 671 | msgid "Received malformed line (no colon). Closing connection.\n" |
668 | msgstr "" | 672 | msgstr "" |
669 | 673 | ||
670 | #: src/microhttpd/connection.c:2788 | 674 | #: src/microhttpd/connection.c:2778 |
671 | msgid "Received HTTP 1.1 request without `Host' header.\n" | 675 | msgid "Received HTTP 1.1 request without `Host' header.\n" |
672 | msgstr "" | 676 | msgstr "" |
673 | 677 | ||
674 | #: src/microhttpd/connection.c:2799 | 678 | #: src/microhttpd/connection.c:2789 |
675 | msgid "Closing connection (failed to create response)\n" | 679 | msgid "Closing connection (failed to create response)\n" |
676 | msgstr "" | 680 | msgstr "" |
677 | 681 | ||
678 | #: src/microhttpd/connection.c:2939 | 682 | #: src/microhttpd/connection.c:2929 |
679 | msgid "Socket disconnected while reading request.\n" | 683 | msgid "Socket disconnected while reading request.\n" |
680 | msgstr "" | 684 | msgstr "" |
681 | 685 | ||
682 | #: src/microhttpd/connection.c:2945 | 686 | #: src/microhttpd/connection.c:2935 |
683 | msgid "Connection socket is closed due to error when reading request.\n" | 687 | msgid "Connection socket is closed due to error when reading request.\n" |
684 | msgstr "" | 688 | msgstr "" |
685 | 689 | ||
686 | #: src/microhttpd/connection.c:3054 | 690 | #: src/microhttpd/connection.c:3044 |
687 | #, c-format | 691 | #, c-format |
688 | msgid "Failed to send data in request for %s.\n" | 692 | msgid "Failed to send data in request for %s.\n" |
689 | msgstr "" | 693 | msgstr "" |
690 | 694 | ||
691 | #: src/microhttpd/connection.c:3063 | 695 | #: src/microhttpd/connection.c:3053 |
692 | #, c-format | 696 | #, c-format |
693 | msgid "Sent 100 continue response: `%.*s'\n" | 697 | msgid "Sent 100 continue response: `%.*s'\n" |
694 | msgstr "" | 698 | msgstr "" |
695 | 699 | ||
696 | #: src/microhttpd/connection.c:3087 | 700 | #: src/microhttpd/connection.c:3077 |
697 | msgid "Connection was closed while sending response headers.\n" | 701 | msgid "Connection was closed while sending response headers.\n" |
698 | msgstr "" | 702 | msgstr "" |
699 | 703 | ||
700 | #: src/microhttpd/connection.c:3128 | 704 | #: src/microhttpd/connection.c:3118 |
701 | msgid "Data offset exceeds limit" | 705 | msgid "Data offset exceeds limit" |
702 | msgstr "" | 706 | msgstr "" |
703 | 707 | ||
704 | #: src/microhttpd/connection.c:3137 | 708 | #: src/microhttpd/connection.c:3127 |
705 | #, c-format | 709 | #, c-format |
706 | msgid "Sent %d-byte DATA response: `%.*s'\n" | 710 | msgid "Sent %d-byte DATA response: `%.*s'\n" |
707 | msgstr "" | 711 | msgstr "" |
708 | 712 | ||
709 | #: src/microhttpd/connection.c:3154 | 713 | #: src/microhttpd/connection.c:3144 |
710 | #, c-format | 714 | #, c-format |
711 | msgid "Failed to send data in request for `%s'.\n" | 715 | msgid "Failed to send data in request for `%s'.\n" |
712 | msgstr "" | 716 | msgstr "" |
713 | 717 | ||
714 | #: src/microhttpd/connection.c:3182 src/microhttpd/connection.c:3210 | 718 | #: src/microhttpd/connection.c:3172 src/microhttpd/connection.c:3200 |
715 | msgid "Connection was closed while sending response body.\n" | 719 | msgid "Connection was closed while sending response body.\n" |
716 | msgstr "" | 720 | msgstr "" |
717 | 721 | ||
718 | #: src/microhttpd/connection.c:3233 | 722 | #: src/microhttpd/connection.c:3223 |
719 | msgid "Internal error\n" | 723 | msgid "Internal error\n" |
720 | msgstr "" | 724 | msgstr "" |
721 | 725 | ||
722 | #: src/microhttpd/connection.c:3306 | 726 | #: src/microhttpd/connection.c:3296 |
723 | msgid "" | 727 | msgid "" |
724 | "Failed to signal end of connection via inter-thread communication channel" | 728 | "Failed to signal end of connection via inter-thread communication channel" |
725 | msgstr "" | 729 | msgstr "" |
726 | 730 | ||
727 | #: src/microhttpd/connection.c:4053 | 731 | #: src/microhttpd/connection.c:4043 |
728 | msgid "Attempted to queue response on wrong thread!\n" | 732 | msgid "Attempted to queue response on wrong thread!\n" |
729 | msgstr "" | 733 | msgstr "" |
730 | 734 | ||
731 | #: src/microhttpd/connection.c:4064 | 735 | #: src/microhttpd/connection.c:4054 |
732 | msgid "" | 736 | msgid "" |
733 | "Attempted 'upgrade' connection on daemon without MHD_ALLOW_UPGRADE option!\n" | 737 | "Attempted 'upgrade' connection on daemon without MHD_ALLOW_UPGRADE option!\n" |
734 | msgstr "" | 738 | msgstr "" |
735 | 739 | ||
736 | #: src/microhttpd/connection.c:4073 | 740 | #: src/microhttpd/connection.c:4063 |
737 | msgid "Application used invalid status code for 'upgrade' response!\n" | 741 | msgid "Application used invalid status code for 'upgrade' response!\n" |
738 | msgstr "" | 742 | msgstr "" |
739 | 743 | ||
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h index 9049bab5..42f406ed 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 0x00096204 | 129 | #define MHD_VERSION 0x00096300 |
130 | 130 | ||
131 | /** | 131 | /** |
132 | * MHD-internal return code for "YES". | 132 | * MHD-internal return code for "YES". |
diff --git a/src/microhttpd/digestauth.c b/src/microhttpd/digestauth.c index d4e23fef..c66bcadf 100644 --- a/src/microhttpd/digestauth.c +++ b/src/microhttpd/digestauth.c | |||
@@ -862,6 +862,7 @@ digest_auth_check_all (struct MHD_Connection *connection, | |||
862 | uint32_t t; | 862 | uint32_t t; |
863 | size_t left; /* number of characters left in 'header' for 'uri' */ | 863 | size_t left; /* number of characters left in 'header' for 'uri' */ |
864 | uint64_t nci; | 864 | uint64_t nci; |
865 | char *qmark; | ||
865 | 866 | ||
866 | VLA_CHECK_LEN_DIGEST(da->digest_size); | 867 | VLA_CHECK_LEN_DIGEST(da->digest_size); |
867 | header = MHD_lookup_connection_value (connection, | 868 | header = MHD_lookup_connection_value (connection, |
@@ -1072,15 +1073,17 @@ digest_auth_check_all (struct MHD_Connection *connection, | |||
1072 | uri, | 1073 | uri, |
1073 | hentity, | 1074 | hentity, |
1074 | da); | 1075 | da); |
1075 | 1076 | qmark = strchr (uri, | |
1077 | '?'); | ||
1078 | if (NULL != qmark) | ||
1079 | *qmark = '\0'; | ||
1076 | 1080 | ||
1077 | /* Need to unescape URI before comparing with connection->url */ | 1081 | /* Need to unescape URI before comparing with connection->url */ |
1078 | daemon->unescape_callback (daemon->unescape_callback_cls, | 1082 | daemon->unescape_callback (daemon->unescape_callback_cls, |
1079 | connection, | 1083 | connection, |
1080 | uri); | 1084 | uri); |
1081 | if (0 != strncmp (uri, | 1085 | if (0 != strcmp (uri, |
1082 | connection->url, | 1086 | connection->url)) |
1083 | strlen (connection->url))) | ||
1084 | { | 1087 | { |
1085 | #ifdef HAVE_MESSAGES | 1088 | #ifdef HAVE_MESSAGES |
1086 | MHD_DLOG (daemon, | 1089 | MHD_DLOG (daemon, |
@@ -1091,8 +1094,7 @@ digest_auth_check_all (struct MHD_Connection *connection, | |||
1091 | } | 1094 | } |
1092 | 1095 | ||
1093 | { | 1096 | { |
1094 | const char *args = strchr (uri, | 1097 | const char *args = qmark; |
1095 | '?'); | ||
1096 | 1098 | ||
1097 | if (NULL == args) | 1099 | if (NULL == args) |
1098 | args = ""; | 1100 | args = ""; |