aboutsummaryrefslogtreecommitdiff
path: root/src/microhttpd
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2015-12-08 10:59:54 +0000
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2015-12-08 10:59:54 +0000
commit90f4046de07129f148c3923410b0258b5b03c4d4 (patch)
tree5d27bf30691e9f5ec5cf6f97b9cec805980f806e /src/microhttpd
parent6cf9fb3719c5d5486ec966807fa6ad6d3c10ef7a (diff)
downloadlibmicrohttpd-90f4046de07129f148c3923410b0258b5b03c4d4.tar.gz
libmicrohttpd-90f4046de07129f148c3923410b0258b5b03c4d4.zip
Use real system default value of FD_SETSIZE instead of guessing
Diffstat (limited to 'src/microhttpd')
-rw-r--r--src/microhttpd/Makefile.am1
-rw-r--r--src/microhttpd/daemon.c6
2 files changed, 6 insertions, 1 deletions
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index ecd949b2..b22560c3 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -64,6 +64,7 @@ libmicrohttpd_la_SOURCES = \
64 memorypool.c memorypool.h \ 64 memorypool.c memorypool.h \
65 mhd_mono_clock.c mhd_mono_clock.h \ 65 mhd_mono_clock.c mhd_mono_clock.h \
66 mhd_limits.h mhd_byteorder.h \ 66 mhd_limits.h mhd_byteorder.h \
67 sysfdsetsize.c sysfdsetsize.h \
67 response.c response.h 68 response.c response.h
68libmicrohttpd_la_CPPFLAGS = \ 69libmicrohttpd_la_CPPFLAGS = \
69 $(AM_CPPFLAGS) $(MHD_LIB_CPPFLAGS) \ 70 $(AM_CPPFLAGS) $(MHD_LIB_CPPFLAGS) \
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 1d74825d..14009c92 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -52,6 +52,10 @@
52#include <sys/sendfile.h> 52#include <sys/sendfile.h>
53#endif 53#endif
54 54
55#ifndef _MHD_FD_SETSIZE_IS_DEFAULT
56#include "sysfdsetsize.h"
57#endif /* !_MHD_FD_SETSIZE_IS_DEFAULT */
58
55#ifdef _WIN32 59#ifdef _WIN32
56#ifndef WIN32_LEAN_AND_MEAN 60#ifndef WIN32_LEAN_AND_MEAN
57#define WIN32_LEAN_AND_MEAN 1 61#define WIN32_LEAN_AND_MEAN 1
@@ -677,7 +681,7 @@ MHD_get_fdset (struct MHD_Daemon *daemon,
677{ 681{
678 return MHD_get_fdset2(daemon, read_fd_set, 682 return MHD_get_fdset2(daemon, read_fd_set,
679 write_fd_set, except_fd_set, 683 write_fd_set, except_fd_set,
680 max_fd, MHD_SYS_DEFAULT_FD_SETSIZE); 684 max_fd, _MHD_SYS_DEFAULT_FD_SETSIZE);
681} 685}
682 686
683/** 687/**