diff options
Diffstat (limited to 'src/include/microhttpd.h')
-rw-r--r-- | src/include/microhttpd.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h index ec08318d..621ce705 100644 --- a/src/include/microhttpd.h +++ b/src/include/microhttpd.h | |||
@@ -27,7 +27,7 @@ | |||
27 | * All symbols defined in this header start with MHD. MHD is a | 27 | * All symbols defined in this header start with MHD. MHD is a |
28 | * micro-httpd library. As such, it does not have any API for logging | 28 | * micro-httpd library. As such, it does not have any API for logging |
29 | * errors. Also, it may not support all of the HTTP features directly, | 29 | * errors. Also, it may not support all of the HTTP features directly, |
30 | * where applicable, portions of HTTP may have to be handled by | 30 | * where applicable, portions of HTTP may have to be handled by |
31 | * clients of the library (the library is supposed to handle | 31 | * clients of the library (the library is supposed to handle |
32 | * everything that it must handle, such as basic connection | 32 | * everything that it must handle, such as basic connection |
33 | * management; however, detailed interpretations of headers | 33 | * management; however, detailed interpretations of headers |
@@ -255,7 +255,7 @@ enum MHD_FLAG | |||
255 | }; | 255 | }; |
256 | 256 | ||
257 | /** | 257 | /** |
258 | * MHD options. Passed in the varargs portion | 258 | * MHD options. Passed in the varargs portion |
259 | * of MHD_start_daemon. | 259 | * of MHD_start_daemon. |
260 | */ | 260 | */ |
261 | enum MHD_OPTION | 261 | enum MHD_OPTION |
@@ -280,7 +280,7 @@ enum MHD_OPTION | |||
280 | MHD_OPTION_CONNECTION_LIMIT = 2, | 280 | MHD_OPTION_CONNECTION_LIMIT = 2, |
281 | 281 | ||
282 | /** | 282 | /** |
283 | * After how many seconds of inactivity should a | 283 | * After how many seconds of inactivity should a |
284 | * connection automatically be timed out? (followed | 284 | * connection automatically be timed out? (followed |
285 | * by an unsigned int; use zero for no timeout). | 285 | * by an unsigned int; use zero for no timeout). |
286 | */ | 286 | */ |
@@ -371,7 +371,7 @@ typedef int | |||
371 | * @param upload_data the data being uploaded (excluding HEADERS, | 371 | * @param upload_data the data being uploaded (excluding HEADERS, |
372 | * for a POST that fits into memory and that is encoded | 372 | * for a POST that fits into memory and that is encoded |
373 | * with a supported encoding, the POST data will NOT be | 373 | * with a supported encoding, the POST data will NOT be |
374 | * given in upload_data and is instead available as | 374 | * given in upload_data and is instead available as |
375 | * part of MHD_get_connection_values; very large POST | 375 | * part of MHD_get_connection_values; very large POST |
376 | * data *will* be made available incrementally in | 376 | * data *will* be made available incrementally in |
377 | * upload_data) | 377 | * upload_data) |
@@ -490,15 +490,13 @@ MHD_get_fdset (struct MHD_Daemon *daemon, | |||
490 | * (only needed if connection timeout is used). The | 490 | * (only needed if connection timeout is used). The |
491 | * returned value is how long select should at most | 491 | * returned value is how long select should at most |
492 | * block, not the timeout value set for connections. | 492 | * block, not the timeout value set for connections. |
493 | * | 493 | * |
494 | * @param timeout set to the timeout (in milliseconds) | 494 | * @param timeout set to the timeout (in milliseconds) |
495 | * @return MHD_YES on success, MHD_NO if timeouts are | 495 | * @return MHD_YES on success, MHD_NO if timeouts are |
496 | * not used (or no connections exist that would | 496 | * not used (or no connections exist that would |
497 | * necessiate the use of a timeout right now). | 497 | * necessiate the use of a timeout right now). |
498 | */ | 498 | */ |
499 | int | 499 | int MHD_get_timeout (struct MHD_Daemon *daemon, unsigned long long *timeout); |
500 | MHD_get_timeout(struct MHD_Daemon * daemon, | ||
501 | unsigned long long * timeout); | ||
502 | 500 | ||
503 | 501 | ||
504 | /** | 502 | /** |
@@ -594,7 +592,8 @@ MHD_queue_response (struct MHD_Connection *connection, | |||
594 | * @return NULL on error (i.e. invalid arguments, out of memory) | 592 | * @return NULL on error (i.e. invalid arguments, out of memory) |
595 | */ | 593 | */ |
596 | struct MHD_Response *MHD_create_response_from_callback (size_t size, | 594 | struct MHD_Response *MHD_create_response_from_callback (size_t size, |
597 | unsigned int block_size, | 595 | unsigned int |
596 | block_size, | ||
598 | MHD_ContentReaderCallback | 597 | MHD_ContentReaderCallback |
599 | crc, void *crc_cls, | 598 | crc, void *crc_cls, |
600 | MHD_ContentReaderFreeCallback | 599 | MHD_ContentReaderFreeCallback |