diff options
Diffstat (limited to 'src/include/microhttpd.h')
-rw-r--r-- | src/include/microhttpd.h | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h index 999ca590..08a3b5ae 100644 --- a/src/include/microhttpd.h +++ b/src/include/microhttpd.h | |||
@@ -307,7 +307,7 @@ enum MHD_OPTION | |||
307 | MHD_OPTION_CONNECTION_MEMORY_LIMIT = 1, | 307 | MHD_OPTION_CONNECTION_MEMORY_LIMIT = 1, |
308 | 308 | ||
309 | /** | 309 | /** |
310 | * Maximum number of concurrenct connections to | 310 | * Maximum number of concurrent connections to |
311 | * accept (followed by an unsigned int). | 311 | * accept (followed by an unsigned int). |
312 | */ | 312 | */ |
313 | MHD_OPTION_CONNECTION_LIMIT = 2, | 313 | MHD_OPTION_CONNECTION_LIMIT = 2, |
@@ -345,21 +345,40 @@ enum MHD_OPTION | |||
345 | */ | 345 | */ |
346 | MHD_OPTION_PER_IP_CONNECTION_LIMIT = 5, | 346 | MHD_OPTION_PER_IP_CONNECTION_LIMIT = 5, |
347 | 347 | ||
348 | // TODO rename | ||
348 | /** | 349 | /** |
349 | * Filename for the private key (key.pem) to be used by the | 350 | * Filename for the private key (key.pem) to be used by the |
350 | * HTTPS daemon. This option should be followed by an | 351 | * HTTPS daemon. This option should be followed by an |
351 | * "const char*" argument. The memory of the filename must | 352 | * "const char*" argument. The memory of the filename must |
352 | * not be released until the application terminates. | 353 | * not be released until the application terminates. |
354 | * This should be used in conjunction with 'MHD_OPTION_HTTPS_CERT_PATH'. | ||
353 | */ | 355 | */ |
354 | MHD_OPTION_HTTPS_KEY_PATH = 6, | 356 | MHD_OPTION_HTTPS_KEY_PATH = 6, |
355 | 357 | ||
356 | /** | 358 | /** |
357 | * Filename for the certificate (cert.pem) to be used by the | 359 | * Filename for the certificate (cert.pem) to be used by the |
358 | * HTTPS daemon. This option should be followed by an | 360 | * HTTPS daemon. This option should be followed by an |
359 | * "const char*" argument. The memory of the filename must | 361 | * "const char*" argument. The memory of the filename must |
360 | * not be released until the application terminates. | 362 | * not be released until the application terminates. |
363 | * This should be used in conjunction with 'MHD_OPTION_HTTPS_KEY_PATH'. | ||
361 | */ | 364 | */ |
362 | MHD_OPTION_HTTPS_CERT_PATH = 7, | 365 | MHD_OPTION_HTTPS_CERT_PATH = 7, |
366 | |||
367 | /** | ||
368 | * Memory pointer for the private key (key.pem) to be used by the | ||
369 | * HTTPS daemon. This option should be followed by an | ||
370 | * "const char*" argument. | ||
371 | * This should be used in conjunction with 'MHD_OPTION_HTTPS_MEM_CERT'. | ||
372 | */ | ||
373 | MHD_OPTION_HTTPS_MEM_KEY = 8, | ||
374 | |||
375 | /** | ||
376 | * Memory pointer for the certificate (cert.pem) to be used by the | ||
377 | * HTTPS daemon. This option should be followed by an | ||
378 | * "const char*" argument. | ||
379 | * This should be used in conjunction with 'MHD_OPTION_HTTPS_MEM_KEY'. | ||
380 | */ | ||
381 | MHD_OPTION_HTTPS_MEM_CERT = 9, | ||
363 | }; | 382 | }; |
364 | 383 | ||
365 | /** | 384 | /** |
@@ -866,10 +885,10 @@ MHD_post_process (struct MHD_PostProcessor *pp, | |||
866 | 885 | ||
867 | /** | 886 | /** |
868 | * Release PostProcessor resources. | 887 | * Release PostProcessor resources. |
869 | * | 888 | * |
870 | * @return MHD_YES if processing completed nicely, | 889 | * @return MHD_YES if processing completed nicely, |
871 | * MHD_NO if there were spurious characters / formatting | 890 | * MHD_NO if there were spurious characters / formatting |
872 | * problems; it is common to ignore the return | 891 | * problems; it is common to ignore the return |
873 | * value of this function | 892 | * value of this function |
874 | */ | 893 | */ |
875 | int MHD_destroy_post_processor (struct MHD_PostProcessor *pp); | 894 | int MHD_destroy_post_processor (struct MHD_PostProcessor *pp); |