diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | src/daemon/connection.c | 6 | ||||
-rw-r--r-- | src/include/microhttpd.h | 2 |
3 files changed, 9 insertions, 5 deletions
@@ -1,10 +1,14 @@ | |||
1 | Sat Jan 26 21:26:48 CET 2013 | ||
2 | Fixing regression introduced Jan 6 (test on data_size instead | ||
3 | of total_size. -CG | ||
4 | |||
1 | Fri Jan 11 23:21:55 CET 2013 | 5 | Fri Jan 11 23:21:55 CET 2013 |
2 | Also return MHD_YES from MHD_destroy_post_processor if | 6 | Also return MHD_YES from MHD_destroy_post_processor if |
3 | we did not get '\r\n' in the upload. -CG | 7 | we did not get '\r\n' in the upload. -CG |
4 | 8 | ||
5 | Sun Jan 6 21:10:13 CET 2013 | 9 | Sun Jan 6 21:10:13 CET 2013 |
6 | Enable use of "MHD_create_response_from_callback" with | 10 | Enable use of "MHD_create_response_from_callback" with |
7 | body size of zeor. -CG | 11 | body size of zero. -CG |
8 | 12 | ||
9 | Tue Dec 25 16:16:30 CET 2012 | 13 | Tue Dec 25 16:16:30 CET 2012 |
10 | Releasing libmicrohttpd 0.9.24. -CG | 14 | Releasing libmicrohttpd 0.9.24. -CG |
diff --git a/src/daemon/connection.c b/src/daemon/connection.c index 727300a6..926de72e 100644 --- a/src/daemon/connection.c +++ b/src/daemon/connection.c | |||
@@ -370,7 +370,7 @@ try_ready_normal_body (struct MHD_Connection *connection) | |||
370 | response = connection->response; | 370 | response = connection->response; |
371 | if (NULL == response->crc) | 371 | if (NULL == response->crc) |
372 | return MHD_YES; | 372 | return MHD_YES; |
373 | if (0 == response->data_size) | 373 | if (0 == response->total_size) |
374 | return MHD_YES; /* 0-byte response is always ready */ | 374 | return MHD_YES; /* 0-byte response is always ready */ |
375 | if ( (response->data_start <= | 375 | if ( (response->data_start <= |
376 | connection->response_write_position) && | 376 | connection->response_write_position) && |
@@ -479,7 +479,7 @@ try_ready_chunked_body (struct MHD_Connection *connection) | |||
479 | else | 479 | else |
480 | { | 480 | { |
481 | /* buffer not in range, try to fill it */ | 481 | /* buffer not in range, try to fill it */ |
482 | if (0 == response->data_size) | 482 | if (0 == response->total_size) |
483 | ret = 0; /* response must be empty, don't bother calling crc */ | 483 | ret = 0; /* response must be empty, don't bother calling crc */ |
484 | else | 484 | else |
485 | ret = response->crc (response->crc_cls, | 485 | ret = response->crc (response->crc_cls, |
@@ -496,7 +496,7 @@ try_ready_chunked_body (struct MHD_Connection *connection) | |||
496 | return MHD_NO; | 496 | return MHD_NO; |
497 | } | 497 | } |
498 | if ( (MHD_CONTENT_READER_END_OF_STREAM == ret) || | 498 | if ( (MHD_CONTENT_READER_END_OF_STREAM == ret) || |
499 | (0 == response->data_size) ) | 499 | (0 == response->total_size) ) |
500 | { | 500 | { |
501 | /* end of message, signal other side! */ | 501 | /* end of message, signal other side! */ |
502 | strcpy (connection->write_buffer, "0\r\n"); | 502 | strcpy (connection->write_buffer, "0\r\n"); |
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h index ca75228a..a1458e7a 100644 --- a/src/include/microhttpd.h +++ b/src/include/microhttpd.h | |||
@@ -1026,7 +1026,7 @@ typedef void | |||
1026 | * POST data. | 1026 | * POST data. |
1027 | * | 1027 | * |
1028 | * @param cls user-specified closure | 1028 | * @param cls user-specified closure |
1029 | * @param kind type of the value | 1029 | * @param kind type of the value, always MHD_POSTDATA_KIND when called from MHD |
1030 | * @param key 0-terminated key for the value | 1030 | * @param key 0-terminated key for the value |
1031 | * @param filename name of the uploaded file, NULL if not known | 1031 | * @param filename name of the uploaded file, NULL if not known |
1032 | * @param content_type mime-type of the data, NULL if not known | 1032 | * @param content_type mime-type of the data, NULL if not known |