diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-09-03 22:32:29 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-09-03 22:32:29 +0000 |
commit | 352a07b01018a4379f4fd83b8277730f044afede (patch) | |
tree | e2e7624f083b3ae8a9adee3f9c36e216bc2a885e /src/microhttpd/mhd_sockets.c | |
parent | 6fa19ae05f226451db78316919908c44d6444ac4 (diff) | |
download | libmicrohttpd-352a07b01018a4379f4fd83b8277730f044afede.tar.gz libmicrohttpd-352a07b01018a4379f4fd83b8277730f044afede.zip |
-first, crazy-pants version of test and implementation of HTTPS upgrade; FLUSH API still needs to change dramatically, neither the ioctl nor the busy waiting are really acceptable here
Diffstat (limited to 'src/microhttpd/mhd_sockets.c')
-rw-r--r-- | src/microhttpd/mhd_sockets.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/microhttpd/mhd_sockets.c b/src/microhttpd/mhd_sockets.c index 1023017f..1187a2cd 100644 --- a/src/microhttpd/mhd_sockets.c +++ b/src/microhttpd/mhd_sockets.c | |||
@@ -337,16 +337,21 @@ MHD_add_to_fd_set_ (MHD_socket fd, | |||
337 | MHD_socket *max_fd, | 337 | MHD_socket *max_fd, |
338 | unsigned int fd_setsize) | 338 | unsigned int fd_setsize) |
339 | { | 339 | { |
340 | if (NULL == set || MHD_INVALID_SOCKET == fd) | 340 | if ( (NULL == set) || |
341 | (MHD_INVALID_SOCKET == fd) ) | ||
341 | return 0; | 342 | return 0; |
342 | if (!MHD_SCKT_FD_FITS_FDSET_SETSIZE_(fd, set, fd_setsize)) | 343 | if (! MHD_SCKT_FD_FITS_FDSET_SETSIZE_ (fd, |
344 | set, | ||
345 | fd_setsize)) | ||
343 | return 0; | 346 | return 0; |
344 | MHD_SCKT_ADD_FD_TO_FDSET_SETSIZE_(fd, set, fd_setsize); | 347 | MHD_SCKT_ADD_FD_TO_FDSET_SETSIZE_(fd, |
348 | set, | ||
349 | fd_setsize); | ||
345 | if ( (NULL != max_fd) && | 350 | if ( (NULL != max_fd) && |
346 | ((fd > *max_fd) || (MHD_INVALID_SOCKET == *max_fd)) ) | 351 | ( (fd > *max_fd) || |
352 | (MHD_INVALID_SOCKET == *max_fd) ) ) | ||
347 | *max_fd = fd; | 353 | *max_fd = fd; |
348 | 354 | return ! 0; | |
349 | return !0; | ||
350 | } | 355 | } |
351 | 356 | ||
352 | 357 | ||