diff options
Diffstat (limited to 'src/lib/daemon_select.c')
-rw-r--r-- | src/lib/daemon_select.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/daemon_select.c b/src/lib/daemon_select.c index 764f8008..07bd4e93 100644 --- a/src/lib/daemon_select.c +++ b/src/lib/daemon_select.c | |||
@@ -319,7 +319,7 @@ MHD_daemon_get_fdset2 (struct MHD_Daemon *daemon, | |||
319 | MHD_socket *max_fd, | 319 | MHD_socket *max_fd, |
320 | unsigned int fd_setsize) | 320 | unsigned int fd_setsize) |
321 | { | 321 | { |
322 | if ( (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_model) || | 322 | if ( (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_mode) || |
323 | (MHD_ELS_POLL == daemon->event_loop_syscall) ) | 323 | (MHD_ELS_POLL == daemon->event_loop_syscall) ) |
324 | return MHD_SC_CONFIGURATION_MISSMATCH_FOR_GET_FDSET; | 324 | return MHD_SC_CONFIGURATION_MISSMATCH_FOR_GET_FDSET; |
325 | 325 | ||
@@ -437,7 +437,7 @@ internal_run_from_select (struct MHD_Daemon *daemon, | |||
437 | read_fd_set)) ) | 437 | read_fd_set)) ) |
438 | (void) MHD_accept_connection_ (daemon); | 438 | (void) MHD_accept_connection_ (daemon); |
439 | 439 | ||
440 | if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model) | 440 | if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode) |
441 | { | 441 | { |
442 | /* do not have a thread per connection, process all connections now */ | 442 | /* do not have a thread per connection, process all connections now */ |
443 | prev = daemon->connections_tail; | 443 | prev = daemon->connections_tail; |
@@ -608,7 +608,7 @@ MHD_daemon_run_from_select (struct MHD_Daemon *daemon, | |||
608 | const fd_set *write_fd_set, | 608 | const fd_set *write_fd_set, |
609 | const fd_set *except_fd_set) | 609 | const fd_set *except_fd_set) |
610 | { | 610 | { |
611 | if ( (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_model) || | 611 | if ( (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_mode) || |
612 | (MHD_ELS_POLL == daemon->event_loop_syscall) ) | 612 | (MHD_ELS_POLL == daemon->event_loop_syscall) ) |
613 | return MHD_SC_CONFIGURATION_MISSMATCH_FOR_RUN_SELECT; | 613 | return MHD_SC_CONFIGURATION_MISSMATCH_FOR_RUN_SELECT; |
614 | if (MHD_ELS_EPOLL == daemon->event_loop_syscall) | 614 | if (MHD_ELS_EPOLL == daemon->event_loop_syscall) |
@@ -671,10 +671,10 @@ MHD_daemon_select_ (struct MHD_Daemon *daemon, | |||
671 | sc = MHD_SC_OK; | 671 | sc = MHD_SC_OK; |
672 | if ( (! daemon->disallow_suspend_resume) && | 672 | if ( (! daemon->disallow_suspend_resume) && |
673 | (MHD_resume_suspended_connections_ (daemon)) && | 673 | (MHD_resume_suspended_connections_ (daemon)) && |
674 | (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model) ) | 674 | (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode) ) |
675 | may_block = MHD_NO; | 675 | may_block = MHD_NO; |
676 | 676 | ||
677 | if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model) | 677 | if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode) |
678 | { | 678 | { |
679 | 679 | ||
680 | /* single-threaded, go over everything */ | 680 | /* single-threaded, go over everything */ |
@@ -766,7 +766,7 @@ MHD_daemon_select_ (struct MHD_Daemon *daemon, | |||
766 | timeout.tv_sec = 0; | 766 | timeout.tv_sec = 0; |
767 | tv = &timeout; | 767 | tv = &timeout; |
768 | } | 768 | } |
769 | else if ( (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model) && | 769 | else if ( (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode) && |
770 | (MHD_SC_OK == | 770 | (MHD_SC_OK == |
771 | MHD_daemon_get_timeout (daemon, | 771 | MHD_daemon_get_timeout (daemon, |
772 | <imeout)) ) | 772 | <imeout)) ) |