diff options
Diffstat (limited to 'src/microhttpd/response.c')
-rw-r--r-- | src/microhttpd/response.c | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c index 6e569d77..7b98a45c 100644 --- a/src/microhttpd/response.c +++ b/src/microhttpd/response.c | |||
@@ -80,9 +80,9 @@ | |||
80 | */ | 80 | */ |
81 | static int | 81 | static int |
82 | add_response_entry (struct MHD_Response *response, | 82 | add_response_entry (struct MHD_Response *response, |
83 | enum MHD_ValueKind kind, | 83 | enum MHD_ValueKind kind, |
84 | const char *header, | 84 | const char *header, |
85 | const char *content) | 85 | const char *content) |
86 | { | 86 | { |
87 | struct MHD_HTTP_Header *hdr; | 87 | struct MHD_HTTP_Header *hdr; |
88 | 88 | ||
@@ -280,7 +280,7 @@ MHD_get_response_headers (struct MHD_Response *response, | |||
280 | */ | 280 | */ |
281 | const char * | 281 | const char * |
282 | MHD_get_response_header (struct MHD_Response *response, | 282 | MHD_get_response_header (struct MHD_Response *response, |
283 | const char *key) | 283 | const char *key) |
284 | { | 284 | { |
285 | struct MHD_HTTP_Header *pos; | 285 | struct MHD_HTTP_Header *pos; |
286 | size_t key_size; | 286 | size_t key_size; |
@@ -732,8 +732,8 @@ MHD_create_response_from_data (size_t size, | |||
732 | */ | 732 | */ |
733 | struct MHD_Response * | 733 | struct MHD_Response * |
734 | MHD_create_response_from_buffer (size_t size, | 734 | MHD_create_response_from_buffer (size_t size, |
735 | void *buffer, | 735 | void *buffer, |
736 | enum MHD_ResponseMemoryMode mode) | 736 | enum MHD_ResponseMemoryMode mode) |
737 | { | 737 | { |
738 | return MHD_create_response_from_data (size, | 738 | return MHD_create_response_from_data (size, |
739 | buffer, | 739 | buffer, |
@@ -754,15 +754,15 @@ MHD_create_response_from_buffer (size_t size, | |||
754 | */ | 754 | */ |
755 | _MHD_EXTERN struct MHD_Response * | 755 | _MHD_EXTERN struct MHD_Response * |
756 | MHD_create_response_from_buffer_with_free_callback (size_t size, | 756 | MHD_create_response_from_buffer_with_free_callback (size_t size, |
757 | void *buffer, | 757 | void *buffer, |
758 | MHD_ContentReaderFreeCallback crfc) | 758 | MHD_ContentReaderFreeCallback crfc) |
759 | { | 759 | { |
760 | struct MHD_Response *r; | 760 | struct MHD_Response *r; |
761 | 761 | ||
762 | r = MHD_create_response_from_data (size, | 762 | r = MHD_create_response_from_data (size, |
763 | buffer, | 763 | buffer, |
764 | MHD_YES, | 764 | MHD_YES, |
765 | MHD_NO); | 765 | MHD_NO); |
766 | if (NULL == r) | 766 | if (NULL == r) |
767 | return r; | 767 | return r; |
768 | r->crfc = crfc; | 768 | r->crfc = crfc; |
@@ -997,17 +997,17 @@ MHD_response_execute_upgrade_ (struct MHD_Response *response, | |||
997 | EPOLL_CTL_ADD, | 997 | EPOLL_CTL_ADD, |
998 | connection->socket_fd, | 998 | connection->socket_fd, |
999 | &event)) | 999 | &event)) |
1000 | { | 1000 | { |
1001 | #ifdef HAVE_MESSAGES | 1001 | #ifdef HAVE_MESSAGES |
1002 | MHD_DLOG (daemon, | 1002 | MHD_DLOG (daemon, |
1003 | _("Call to epoll_ctl failed: %s\n"), | 1003 | _("Call to epoll_ctl failed: %s\n"), |
1004 | MHD_socket_last_strerr_ ()); | 1004 | MHD_socket_last_strerr_ ()); |
1005 | #endif | 1005 | #endif |
1006 | MHD_socket_close_chk_ (sv[0]); | 1006 | MHD_socket_close_chk_ (sv[0]); |
1007 | MHD_socket_close_chk_ (sv[1]); | 1007 | MHD_socket_close_chk_ (sv[1]); |
1008 | free (urh); | 1008 | free (urh); |
1009 | return MHD_NO; | 1009 | return MHD_NO; |
1010 | } | 1010 | } |
1011 | 1011 | ||
1012 | /* Second, add our end of the UNIX socketpair() */ | 1012 | /* Second, add our end of the UNIX socketpair() */ |
1013 | event.events = EPOLLIN | EPOLLOUT | EPOLLPRI | EPOLLET; | 1013 | event.events = EPOLLIN | EPOLLOUT | EPOLLPRI | EPOLLET; |
@@ -1016,28 +1016,28 @@ MHD_response_execute_upgrade_ (struct MHD_Response *response, | |||
1016 | EPOLL_CTL_ADD, | 1016 | EPOLL_CTL_ADD, |
1017 | urh->mhd.socket, | 1017 | urh->mhd.socket, |
1018 | &event)) | 1018 | &event)) |
1019 | { | 1019 | { |
1020 | event.events = EPOLLIN | EPOLLOUT | EPOLLPRI; | 1020 | event.events = EPOLLIN | EPOLLOUT | EPOLLPRI; |
1021 | event.data.ptr = &urh->app; | 1021 | event.data.ptr = &urh->app; |
1022 | if (0 != epoll_ctl (daemon->epoll_upgrade_fd, | 1022 | if (0 != epoll_ctl (daemon->epoll_upgrade_fd, |
1023 | EPOLL_CTL_DEL, | 1023 | EPOLL_CTL_DEL, |
1024 | connection->socket_fd, | 1024 | connection->socket_fd, |
1025 | &event)) | 1025 | &event)) |
1026 | MHD_PANIC (_("Error cleaning up while handling epoll error")); | 1026 | MHD_PANIC (_("Error cleaning up while handling epoll error")); |
1027 | #ifdef HAVE_MESSAGES | 1027 | #ifdef HAVE_MESSAGES |
1028 | MHD_DLOG (daemon, | 1028 | MHD_DLOG (daemon, |
1029 | _("Call to epoll_ctl failed: %s\n"), | 1029 | _("Call to epoll_ctl failed: %s\n"), |
1030 | MHD_socket_last_strerr_ ()); | 1030 | MHD_socket_last_strerr_ ()); |
1031 | #endif | 1031 | #endif |
1032 | MHD_socket_close_chk_ (sv[0]); | 1032 | MHD_socket_close_chk_ (sv[0]); |
1033 | MHD_socket_close_chk_ (sv[1]); | 1033 | MHD_socket_close_chk_ (sv[1]); |
1034 | free (urh); | 1034 | free (urh); |
1035 | return MHD_NO; | 1035 | return MHD_NO; |
1036 | } | 1036 | } |
1037 | EDLL_insert (daemon->eready_urh_head, | 1037 | EDLL_insert (daemon->eready_urh_head, |
1038 | daemon->eready_urh_tail, | 1038 | daemon->eready_urh_tail, |
1039 | urh); | 1039 | urh); |
1040 | urh->in_eready_list = true; | 1040 | urh->in_eready_list = true; |
1041 | } | 1041 | } |
1042 | #endif /* EPOLL_SUPPORT */ | 1042 | #endif /* EPOLL_SUPPORT */ |
1043 | if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION) ) | 1043 | if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION) ) |