]>
Commit | Line | Data |
---|---|---|
032ce163 | 1 | --- ./src/squid.h.org Thu Feb 22 22:39:14 2001\r |
2 | +++ ./src/squid.h Sun Feb 3 16:43:40 2002\r | |
3 | @@ -45,10 +45,24 @@\r | |
4 | */\r | |
5 | #define CHANGE_FD_SETSIZE 1\r | |
6 | \r | |
7 | -/* Cannot increase FD_SETSIZE on Linux */\r | |
8 | +/*\r | |
9 | + * Cannot increase FD_SETSIZE on Linux, but we can increase __FD_SETSIZE\r | |
10 | + * with glibc 2.2 (or later? remains to be seen). We do this by including\r | |
11 | + * bits/types.h which defines __FD_SETSIZE first, then we redefine\r | |
12 | + * FD_SETSIZE. Ofcourse a user program may NEVER include bits/whatever.h\r | |
13 | + * directly, so this is a dirty hack!\r | |
14 | + */\r | |
15 | #if defined(_SQUID_LINUX_)\r | |
16 | -#undef CHANGE_FD_SETSIZE\r | |
17 | -#define CHANGE_FD_SETSIZE 0\r | |
18 | +# undef CHANGE_FD_SETSIZE\r | |
19 | +# define CHANGE_FD_SETSIZE 1\r | |
20 | +# include <features.h>\r | |
21 | +# if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)\r | |
22 | +# if SQUID_MAXFD > DEFAULT_FD_SETSIZE\r | |
23 | +# include <bits/types.h>\r | |
24 | +# undef __FD_SETSIZE\r | |
25 | +# define __FD_SETSIZE SQUID_MAXFD\r | |
26 | +# endif\r | |
27 | +# endif\r | |
28 | #endif\r | |
29 | \r | |
30 | /*\r | |
31 | --- ./configure.in.org Sun Feb 3 16:07:10 2002\r | |
32 | +++ ./configure.in Sun Feb 3 16:30:31 2002\r | |
33 | @@ -1436,7 +1436,7 @@\r | |
34 | exit(0);\r | |
35 | }\r | |
36 | ],\r | |
37 | -SQUID_MAXFD=`cat conftestval`,\r | |
38 | +SQUID_MAXFD=4096,\r | |
39 | SQUID_MAXFD=256,\r | |
40 | SQUID_MAXFD=256)\r | |
41 | AC_MSG_RESULT($SQUID_MAXFD)\r |