diff options
Diffstat (limited to 'src/microhttpd/daemon.c')
-rw-r--r-- | src/microhttpd/daemon.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index 8d39c7ac..0b7902e7 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
@@ -7877,6 +7877,19 @@ MHD_start_daemon_va (unsigned int flags, | |||
7877 | #endif | 7877 | #endif |
7878 | goto free_and_fail; | 7878 | goto free_and_fail; |
7879 | } | 7879 | } |
7880 | if (MHD_D_IS_USING_SELECT_ (daemon) && | ||
7881 | (! MHD_D_DOES_SCKT_FIT_FDSET_ (listen_fd, daemon)) ) | ||
7882 | { | ||
7883 | #ifdef HAVE_MESSAGES | ||
7884 | MHD_DLOG (daemon, | ||
7885 | _ ("Listen socket descriptor (%d) is not " \ | ||
7886 | "less than daemon FD_SETSIZE value (%d).\n"), | ||
7887 | (int) listen_fd, | ||
7888 | (int) MHD_D_GET_FD_SETSIZE_ (daemon)); | ||
7889 | #endif | ||
7890 | MHD_socket_close_chk_ (listen_fd); | ||
7891 | goto free_and_fail; | ||
7892 | } | ||
7880 | daemon->listen_is_unix = _MHD_NO; | 7893 | daemon->listen_is_unix = _MHD_NO; |
7881 | 7894 | ||
7882 | /* Apply the socket options according to listening_address_reuse. */ | 7895 | /* Apply the socket options according to listening_address_reuse. */ |
@@ -8254,19 +8267,6 @@ MHD_start_daemon_va (unsigned int flags, | |||
8254 | } | 8267 | } |
8255 | else | 8268 | else |
8256 | daemon->listen_nonblk = true; | 8269 | daemon->listen_nonblk = true; |
8257 | if (MHD_D_IS_USING_SELECT_ (daemon) && | ||
8258 | (! MHD_D_DOES_SCKT_FIT_FDSET_ (listen_fd, daemon)) ) | ||
8259 | { | ||
8260 | #ifdef HAVE_MESSAGES | ||
8261 | MHD_DLOG (daemon, | ||
8262 | _ ("Listen socket descriptor (%d) is not " \ | ||
8263 | "less than daemon FD_SETSIZE value (%d).\n"), | ||
8264 | (int) listen_fd, | ||
8265 | (int) MHD_D_GET_FD_SETSIZE_ (daemon)); | ||
8266 | #endif | ||
8267 | MHD_socket_close_chk_ (listen_fd); | ||
8268 | goto free_and_fail; | ||
8269 | } | ||
8270 | } | 8270 | } |
8271 | else | 8271 | else |
8272 | { | 8272 | { |