aboutsummaryrefslogtreecommitdiff
path: root/src/microhttpd/response.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-07-29 19:23:35 +0200
committerChristian Grothoff <christian@grothoff.org>2019-07-29 19:30:27 +0200
commit40bf201dc53465be1d2805039ef5963a21e44c08 (patch)
treec3cb5639c71dc8d30739c3770d8c7646259a0bc5 /src/microhttpd/response.c
parent1aaff72582b6093f0dcf8c187d125e5fca2d2e8b (diff)
downloadlibmicrohttpd-40bf201dc53465be1d2805039ef5963a21e44c08.tar.gz
libmicrohttpd-40bf201dc53465be1d2805039ef5963a21e44c08.zip
indentation fixes, adding test_upgrade_large.c test for issue reported by Viet
Diffstat (limited to 'src/microhttpd/response.c')
-rw-r--r--src/microhttpd/response.c88
1 files changed, 44 insertions, 44 deletions
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c
index 035e3054..3e9fb053 100644
--- a/src/microhttpd/response.c
+++ b/src/microhttpd/response.c
@@ -80,9 +80,9 @@
80 */ 80 */
81static int 81static int
82add_response_entry (struct MHD_Response *response, 82add_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
@@ -195,7 +195,7 @@ MHD_add_response_footer (struct MHD_Response *response,
195int 195int
196MHD_del_response_header (struct MHD_Response *response, 196MHD_del_response_header (struct MHD_Response *response,
197 const char *header, 197 const char *header,
198 const char *content) 198 const char *content)
199{ 199{
200 struct MHD_HTTP_Header *pos; 200 struct MHD_HTTP_Header *pos;
201 struct MHD_HTTP_Header *prev; 201 struct MHD_HTTP_Header *prev;
@@ -280,7 +280,7 @@ MHD_get_response_headers (struct MHD_Response *response,
280 */ 280 */
281const char * 281const char *
282MHD_get_response_header (struct MHD_Response *response, 282MHD_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;
@@ -558,8 +558,8 @@ free_callback (void *cls)
558 */ 558 */
559struct MHD_Response * 559struct MHD_Response *
560MHD_create_response_from_fd_at_offset (size_t size, 560MHD_create_response_from_fd_at_offset (size_t size,
561 int fd, 561 int fd,
562 off_t offset) 562 off_t offset)
563{ 563{
564 return MHD_create_response_from_fd_at_offset64 (size, 564 return MHD_create_response_from_fd_at_offset64 (size,
565 fd, 565 fd,
@@ -627,7 +627,7 @@ MHD_create_response_from_fd_at_offset64 (uint64_t size,
627 */ 627 */
628struct MHD_Response * 628struct MHD_Response *
629MHD_create_response_from_fd (size_t size, 629MHD_create_response_from_fd (size_t size,
630 int fd) 630 int fd)
631{ 631{
632 return MHD_create_response_from_fd_at_offset64 (size, 632 return MHD_create_response_from_fd_at_offset64 (size,
633 fd, 633 fd,
@@ -732,8 +732,8 @@ MHD_create_response_from_data (size_t size,
732 */ 732 */
733struct MHD_Response * 733struct MHD_Response *
734MHD_create_response_from_buffer (size_t size, 734MHD_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 *
756MHD_create_response_from_buffer_with_free_callback (size_t size, 756MHD_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) )