diff options
Diffstat (limited to 'src/microhttpd/daemon.c')
-rw-r--r-- | src/microhttpd/daemon.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 29ce1ccc..b1cb5146 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -815,20 +815,20 @@ urh_from_fdset (struct MHD_UpgradeResponseHandle *urh, | |||
815 | 815 | ||
816 | if (MHD_INVALID_SOCKET != conn_sckt) | 816 | if (MHD_INVALID_SOCKET != conn_sckt) |
817 | { | 817 | { |
818 | if (FD_ISSET (conn_sckt, rs)) | 818 | if (FD_ISSET (conn_sckt, (fd_set *) _MHD_DROP_CONST (rs))) |
819 | urh->app.celi |= MHD_EPOLL_STATE_READ_READY; | 819 | urh->app.celi |= MHD_EPOLL_STATE_READ_READY; |
820 | if (FD_ISSET (conn_sckt, ws)) | 820 | if (FD_ISSET (conn_sckt, (fd_set *) _MHD_DROP_CONST (ws))) |
821 | urh->app.celi |= MHD_EPOLL_STATE_WRITE_READY; | 821 | urh->app.celi |= MHD_EPOLL_STATE_WRITE_READY; |
822 | if (FD_ISSET (conn_sckt, es)) | 822 | if (FD_ISSET (conn_sckt, (fd_set *) _MHD_DROP_CONST (es))) |
823 | urh->app.celi |= MHD_EPOLL_STATE_ERROR; | 823 | urh->app.celi |= MHD_EPOLL_STATE_ERROR; |
824 | } | 824 | } |
825 | if ((MHD_INVALID_SOCKET != mhd_sckt)) | 825 | if ((MHD_INVALID_SOCKET != mhd_sckt)) |
826 | { | 826 | { |
827 | if (FD_ISSET (mhd_sckt, rs)) | 827 | if (FD_ISSET (mhd_sckt, (fd_set *) _MHD_DROP_CONST (rs))) |
828 | urh->mhd.celi |= MHD_EPOLL_STATE_READ_READY; | 828 | urh->mhd.celi |= MHD_EPOLL_STATE_READ_READY; |
829 | if (FD_ISSET (mhd_sckt, ws)) | 829 | if (FD_ISSET (mhd_sckt, (fd_set *) _MHD_DROP_CONST (ws))) |
830 | urh->mhd.celi |= MHD_EPOLL_STATE_WRITE_READY; | 830 | urh->mhd.celi |= MHD_EPOLL_STATE_WRITE_READY; |
831 | if (FD_ISSET (mhd_sckt, es)) | 831 | if (FD_ISSET (mhd_sckt, (fd_set *) _MHD_DROP_CONST (es))) |
832 | urh->mhd.celi |= MHD_EPOLL_STATE_ERROR; | 832 | urh->mhd.celi |= MHD_EPOLL_STATE_ERROR; |
833 | } | 833 | } |
834 | } | 834 | } |
@@ -4299,7 +4299,7 @@ internal_run_from_select (struct MHD_Daemon *daemon, | |||
4299 | will trigger select again and will be processed */ | 4299 | will trigger select again and will be processed */ |
4300 | if ( (MHD_ITC_IS_VALID_ (daemon->itc)) && | 4300 | if ( (MHD_ITC_IS_VALID_ (daemon->itc)) && |
4301 | (FD_ISSET (MHD_itc_r_fd_ (daemon->itc), | 4301 | (FD_ISSET (MHD_itc_r_fd_ (daemon->itc), |
4302 | read_fd_set)) ) | 4302 | (fd_set *) _MHD_DROP_CONST (read_fd_set))) ) |
4303 | MHD_itc_clear_ (daemon->itc); | 4303 | MHD_itc_clear_ (daemon->itc); |
4304 | 4304 | ||
4305 | /* Process externally added connection if any */ | 4305 | /* Process externally added connection if any */ |
@@ -4310,7 +4310,7 @@ internal_run_from_select (struct MHD_Daemon *daemon, | |||
4310 | if ( (MHD_INVALID_SOCKET != (ds = daemon->listen_fd)) && | 4310 | if ( (MHD_INVALID_SOCKET != (ds = daemon->listen_fd)) && |
4311 | (! daemon->was_quiesced) && | 4311 | (! daemon->was_quiesced) && |
4312 | (FD_ISSET (ds, | 4312 | (FD_ISSET (ds, |
4313 | read_fd_set)) ) | 4313 | (fd_set *) _MHD_DROP_CONST (read_fd_set))) ) |
4314 | (void) MHD_accept_connection (daemon); | 4314 | (void) MHD_accept_connection (daemon); |
4315 | 4315 | ||
4316 | if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) | 4316 | if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) |
@@ -4325,11 +4325,11 @@ internal_run_from_select (struct MHD_Daemon *daemon, | |||
4325 | continue; | 4325 | continue; |
4326 | call_handlers (pos, | 4326 | call_handlers (pos, |
4327 | FD_ISSET (ds, | 4327 | FD_ISSET (ds, |
4328 | read_fd_set), | 4328 | (fd_set *) _MHD_DROP_CONST (read_fd_set)), |
4329 | FD_ISSET (ds, | 4329 | FD_ISSET (ds, |
4330 | write_fd_set), | 4330 | (fd_set *) _MHD_DROP_CONST (write_fd_set)), |
4331 | FD_ISSET (ds, | 4331 | FD_ISSET (ds, |
4332 | except_fd_set)); | 4332 | (fd_set *) _MHD_DROP_CONST (except_fd_set))); |
4333 | } | 4333 | } |
4334 | } | 4334 | } |
4335 | 4335 | ||