diff options
Diffstat (limited to 'src/microhttpd/daemon.c')
| -rw-r--r-- | src/microhttpd/daemon.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index a9164341..b02978b9 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
| @@ -6737,16 +6737,17 @@ MHD_start_daemon_va (unsigned int flags, | |||
| 6737 | return NULL; | 6737 | return NULL; |
| 6738 | 6738 | ||
| 6739 | /* Check for invalid combinations of flags. */ | 6739 | /* Check for invalid combinations of flags. */ |
| 6740 | if ( ((0 != (*pflags & MHD_USE_POLL)) && (0 != (*pflags & MHD_USE_EPOLL))) || | 6740 | if ((0 != (*pflags & MHD_USE_POLL)) && (0 != (*pflags & MHD_USE_EPOLL))) |
| 6741 | ((0 != (*pflags & MHD_USE_EPOLL)) && (0 != (*pflags | 6741 | return NULL; |
| 6742 | & | 6742 | if ((0 != (*pflags & MHD_USE_EPOLL)) && |
| 6743 | MHD_USE_THREAD_PER_CONNECTION))) | 6743 | (0 != (*pflags & MHD_USE_THREAD_PER_CONNECTION))) |
| 6744 | || | 6744 | return NULL; |
| 6745 | ((0 != (*pflags & MHD_USE_POLL)) && | 6745 | if ((0 != (*pflags & MHD_USE_POLL)) && |
| 6746 | (0 == (*pflags & (MHD_USE_INTERNAL_POLLING_THREAD | 6746 | (0 == (*pflags & (MHD_USE_INTERNAL_POLLING_THREAD |
| 6747 | | MHD_USE_THREAD_PER_CONNECTION)))) || | 6747 | | MHD_USE_THREAD_PER_CONNECTION)))) |
| 6748 | ((0 != (*pflags & MHD_USE_AUTO)) && (0 != (*pflags & (MHD_USE_POLL | 6748 | return NULL; |
| 6749 | | MHD_USE_EPOLL)))) ) | 6749 | if ((0 != (*pflags & MHD_USE_AUTO)) && |
| 6750 | (0 != (*pflags & (MHD_USE_POLL | MHD_USE_EPOLL)))) | ||
| 6750 | return NULL; | 6751 | return NULL; |
| 6751 | 6752 | ||
| 6752 | if (0 != (*pflags & MHD_USE_AUTO)) | 6753 | if (0 != (*pflags & MHD_USE_AUTO)) |