diff options
Diffstat (limited to 'src/daemon/response.c')
-rw-r--r-- | src/daemon/response.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/src/daemon/response.c b/src/daemon/response.c index 7d9ae17c..db846674 100644 --- a/src/daemon/response.c +++ b/src/daemon/response.c | |||
@@ -352,6 +352,7 @@ struct MHD_Response *MHD_create_response_from_fd (size_t size, | |||
352 | * right away, the data maybe released anytime after | 352 | * right away, the data maybe released anytime after |
353 | * this call returns | 353 | * this call returns |
354 | * @return NULL on error (i.e. invalid arguments, out of memory) | 354 | * @return NULL on error (i.e. invalid arguments, out of memory) |
355 | * @deprecated use MHD_create_response_from_buffer instead | ||
355 | */ | 356 | */ |
356 | struct MHD_Response * | 357 | struct MHD_Response * |
357 | MHD_create_response_from_data (size_t size, | 358 | MHD_create_response_from_data (size_t size, |
@@ -382,7 +383,7 @@ MHD_create_response_from_data (size_t size, | |||
382 | return NULL; | 383 | return NULL; |
383 | } | 384 | } |
384 | memcpy (tmp, data, size); | 385 | memcpy (tmp, data, size); |
385 | must_free = 1; | 386 | must_free = MHD_YES; |
386 | data = tmp; | 387 | data = tmp; |
387 | } | 388 | } |
388 | retVal->crc = NULL; | 389 | retVal->crc = NULL; |
@@ -395,6 +396,28 @@ MHD_create_response_from_data (size_t size, | |||
395 | return retVal; | 396 | return retVal; |
396 | } | 397 | } |
397 | 398 | ||
399 | |||
400 | /** | ||
401 | * Create a response object. The response object can be extended with | ||
402 | * header information and then be used any number of times. | ||
403 | * | ||
404 | * @param size size of the data portion of the response | ||
405 | * @param buffer size bytes containing the response's data portion | ||
406 | * @param mode flags for buffer management | ||
407 | * @return NULL on error (i.e. invalid arguments, out of memory) | ||
408 | */ | ||
409 | struct MHD_Response * | ||
410 | MHD_create_response_from_buffer (size_t size, | ||
411 | void *buffer, | ||
412 | enum MHD_ResponseMemoryMode mode) | ||
413 | { | ||
414 | return MHD_create_response_from_data (size, | ||
415 | buffer, | ||
416 | mode == MHD_RESPMEM_MUST_FREE, | ||
417 | mode == MHD_RESPMEM_MUST_COPY); | ||
418 | } | ||
419 | |||
420 | |||
398 | /** | 421 | /** |
399 | * Destroy a response object and associated resources. Note that | 422 | * Destroy a response object and associated resources. Note that |
400 | * libmicrohttpd may keep some of the resources around if the response | 423 | * libmicrohttpd may keep some of the resources around if the response |