rpms/squid/devel squid-2.5.STABLE12-fd-config.patch,1.1,1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Dec 6 13:35:42 UTC 2005
Author: stransky
Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19881
Modified Files:
squid-2.5.STABLE12-fd-config.patch
Log Message:
fix in FD patch
squid-2.5.STABLE12-fd-config.patch:
configure | 28 ++++++++++
configure.in | 10 +++
include/autoconf.h.in | 5 +
src/bit_array.h | 58 ++++++++++++++++++++++
src/cf.data.pre | 9 +++
src/comm.c | 14 ++---
src/comm_select.c | 131 +++++++++++++++++++++++++++++++++++++++-----------
src/delay_pools.c | 12 ++--
src/fd.c | 10 +--
src/globals.h | 1
src/ident.c | 2
src/ipc.c | 2
src/main.c | 19 +++++--
src/mem.c | 4 -
src/snmp_agent.c | 2
src/squid.h | 14 +++++
src/stat.c | 6 +-
src/structs.h | 3 +
src/tools.c | 12 +++-
19 files changed, 280 insertions(+), 62 deletions(-)
Index: squid-2.5.STABLE12-fd-config.patch
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid-2.5.STABLE12-fd-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squid-2.5.STABLE12-fd-config.patch 2 Dec 2005 12:22:59 -0000 1.1
+++ squid-2.5.STABLE12-fd-config.patch 6 Dec 2005 13:35:39 -0000 1.2
@@ -1,5 +1,5 @@
--- squid-2.5.STABLE12/configure.in.fdc 2005-10-22 11:56:01.000000000 +0200
-+++ squid-2.5.STABLE12/configure.in 2005-12-01 14:21:45.000000000 +0100
++++ squid-2.5.STABLE12/configure.in 2005-12-06 14:07:43.000000000 +0100
@@ -445,6 +445,16 @@
fi
])
@@ -18,7 +18,7 @@
dnl
dnl AC_ARG_ENABLE(mem-gen-trace,
--- squid-2.5.STABLE12/include/autoconf.h.in.fdc 2005-09-13 02:12:34.000000000 +0200
-+++ squid-2.5.STABLE12/include/autoconf.h.in 2005-12-01 14:21:45.000000000 +0100
++++ squid-2.5.STABLE12/include/autoconf.h.in 2005-12-06 14:07:43.000000000 +0100
@@ -125,6 +125,11 @@
#undef DELAY_POOLS
@@ -31,8 +31,8 @@
* If you want to log User-Agent request header values, define this.
* By default, they are written to useragent.log in the Squid log
* directory.
---- squid-2.5.STABLE12/configure.fdc 2005-12-01 14:21:45.000000000 +0100
-+++ squid-2.5.STABLE12/configure 2005-12-01 14:21:45.000000000 +0100
+--- squid-2.5.STABLE12/configure.fdc 2005-12-06 14:07:43.000000000 +0100
++++ squid-2.5.STABLE12/configure 2005-12-06 14:07:43.000000000 +0100
@@ -2168,6 +2168,34 @@
fi
@@ -68,8 +68,8 @@
# Check whether --enable-useragent-log or --disable-useragent-log was given.
---- squid-2.5.STABLE12/src/cf.data.pre.fdc 2005-12-01 14:21:45.000000000 +0100
-+++ squid-2.5.STABLE12/src/cf.data.pre 2005-12-01 14:26:43.000000000 +0100
+--- squid-2.5.STABLE12/src/cf.data.pre.fdc 2005-12-06 14:07:43.000000000 +0100
++++ squid-2.5.STABLE12/src/cf.data.pre 2005-12-06 14:07:43.000000000 +0100
@@ -4161,4 +4161,13 @@
If set to "off" then such HTTP errors will cause the request
or response to be rejected.
@@ -84,34 +84,38 @@
+ The maximum number of open file descriptors.
+DOC_END
EOF
---- squid-2.5.STABLE12/src/tools.c.fdc 2005-12-01 14:21:45.000000000 +0100
-+++ squid-2.5.STABLE12/src/tools.c 2005-12-01 14:21:45.000000000 +0100
-@@ -685,9 +685,9 @@
+--- squid-2.5.STABLE12/src/tools.c.fdc 2005-12-06 14:07:43.000000000 +0100
++++ squid-2.5.STABLE12/src/tools.c 2005-12-06 14:09:02.000000000 +0100
+@@ -685,9 +685,11 @@
if (getrlimit(RLIMIT_NOFILE, &rl) < 0) {
debug(50, 0) ("setrlimit: RLIMIT_NOFILE: %s\n", xstrerror());
} else {
- rl.rlim_cur = Squid_MaxFD;
-+ rl.rlim_cur = SQUID_NUMFD;
++ rl.rlim_max = rl.rlim_cur = SQUID_NUMFD;
++/*
if (rl.rlim_cur > rl.rlim_max)
- Squid_MaxFD = rl.rlim_cur = rl.rlim_max;
+ rl.rlim_cur = rl.rlim_max;
++*/
if (setrlimit(RLIMIT_NOFILE, &rl) < 0) {
snprintf(tmp_error_buf, ERROR_BUF_SZ,
"setrlimit: RLIMIT_NOFILE: %s", xstrerror());
-@@ -698,9 +698,9 @@
+@@ -698,9 +700,11 @@
if (getrlimit(RLIMIT_OFILE, &rl) < 0) {
debug(50, 0) ("setrlimit: RLIMIT_NOFILE: %s\n", xstrerror());
} else {
- rl.rlim_cur = Squid_MaxFD;
-+ rl.rlim_cur = SQUID_NUMFD;
++ rl.rlim_max = rl.rlim_cur = SQUID_NUMFD;
++/*
if (rl.rlim_cur > rl.rlim_max)
- Squid_MaxFD = rl.rlim_cur = rl.rlim_max;
+ rl.rlim_cur = rl.rlim_max;
++*/
if (setrlimit(RLIMIT_OFILE, &rl) < 0) {
snprintf(tmp_error_buf, ERROR_BUF_SZ,
"setrlimit: RLIMIT_OFILE: %s", xstrerror());
--- squid-2.5.STABLE12/src/structs.h.fdc 2005-09-03 11:14:43.000000000 +0200
-+++ squid-2.5.STABLE12/src/structs.h 2005-12-01 14:21:45.000000000 +0100
++++ squid-2.5.STABLE12/src/structs.h 2005-12-06 14:07:43.000000000 +0100
@@ -714,6 +714,9 @@
char *store_dir_select_algorithm;
int sleep_after_fork; /* microseconds */
@@ -122,8 +126,8 @@
};
struct _SquidConfig2 {
---- /dev/null 2005-12-01 10:11:45.057668024 +0100
-+++ squid-2.5.STABLE12/src/bit_array.h 2005-12-01 14:21:45.000000000 +0100
+--- /dev/null 2005-12-06 14:01:02.632036776 +0100
++++ squid-2.5.STABLE12/src/bit_array.h 2005-12-06 14:07:43.000000000 +0100
@@ -0,0 +1,58 @@
+/* */
+
@@ -184,7 +188,7 @@
+
+#endif //__BIT_ARRAY_H__
--- squid-2.5.STABLE12/src/fd.c.fdc 2003-12-14 13:30:36.000000000 +0100
-+++ squid-2.5.STABLE12/src/fd.c 2005-12-01 14:21:45.000000000 +0100
++++ squid-2.5.STABLE12/src/fd.c 2005-12-06 14:07:43.000000000 +0100
@@ -55,7 +55,7 @@
{
if (fd < Biggest_FD)
@@ -226,7 +230,7 @@
/* perhaps this should be fatal()? -DW */
debug(51, 0) ("WARNING: This machine has a serious shortage of filedescriptors.\n");
--- squid-2.5.STABLE12/src/mem.c.fdc 2001-09-07 20:02:45.000000000 +0200
-+++ squid-2.5.STABLE12/src/mem.c 2005-12-01 14:21:45.000000000 +0100
++++ squid-2.5.STABLE12/src/mem.c 2005-12-06 14:07:43.000000000 +0100
@@ -224,13 +224,13 @@
memDataInit(MEM_HTTP_HDR_CONTENT_RANGE, "HttpHdrContRange", sizeof(HttpHdrContRange), 0);
memDataInit(MEM_INTLIST, "intlist", sizeof(intlist), 0);
@@ -244,7 +248,7 @@
memDataInit(MEM_WORDLIST, "wordlist", sizeof(wordlist), 0);
memDataInit(MEM_CLIENT_INFO, "ClientInfo", sizeof(ClientInfo), 0);
--- squid-2.5.STABLE12/src/comm_select.c.fdc 2003-05-11 19:30:13.000000000 +0200
-+++ squid-2.5.STABLE12/src/comm_select.c 2005-12-01 14:21:45.000000000 +0100
++++ squid-2.5.STABLE12/src/comm_select.c 2005-12-06 14:07:43.000000000 +0100
@@ -66,10 +66,10 @@
#if !HAVE_POLL
static struct timeval zero_tv;
@@ -556,7 +560,7 @@
}
}
--- squid-2.5.STABLE12/src/globals.h.fdc 2005-06-14 00:26:21.000000000 +0200
-+++ squid-2.5.STABLE12/src/globals.h 2005-12-01 14:21:45.000000000 +0100
++++ squid-2.5.STABLE12/src/globals.h 2005-12-06 14:07:43.000000000 +0100
@@ -72,7 +72,6 @@
extern int NDnsServersAlloc; /* 0 */
extern int NHttpSockets; /* 0 */
@@ -566,7 +570,7 @@
extern int debugLevels[MAX_DEBUG_SECTIONS];
extern int do_mallinfo; /* 0 */
--- squid-2.5.STABLE12/src/ident.c.fdc 2001-04-14 02:03:23.000000000 +0200
-+++ squid-2.5.STABLE12/src/ident.c 2005-12-01 14:21:45.000000000 +0100
++++ squid-2.5.STABLE12/src/ident.c 2005-12-06 14:07:43.000000000 +0100
@@ -238,7 +238,7 @@
identInit(void)
{
@@ -577,7 +581,7 @@
}
--- squid-2.5.STABLE12/src/snmp_agent.c.fdc 2004-06-01 00:39:00.000000000 +0200
-+++ squid-2.5.STABLE12/src/snmp_agent.c 2005-12-01 14:21:45.000000000 +0100
++++ squid-2.5.STABLE12/src/snmp_agent.c 2005-12-06 14:07:43.000000000 +0100
@@ -289,7 +289,7 @@
break;
case PERF_SYS_CURUNUSED_FD:
@@ -588,7 +592,7 @@
break;
case PERF_SYS_CURRESERVED_FD:
--- squid-2.5.STABLE12/src/comm.c.fdc 2005-09-10 12:17:55.000000000 +0200
-+++ squid-2.5.STABLE12/src/comm.c 2005-12-01 14:21:45.000000000 +0100
++++ squid-2.5.STABLE12/src/comm.c 2005-12-06 14:07:43.000000000 +0100
@@ -239,7 +239,7 @@
}
@@ -644,7 +648,7 @@
comm_write_pool = memPoolCreate("CommWriteStateData", sizeof(CommWriteStateData));
conn_close_pool = memPoolCreate("close_handler", sizeof(close_handler));
--- squid-2.5.STABLE12/src/ipc.c.fdc 2001-10-17 22:25:02.000000000 +0200
-+++ squid-2.5.STABLE12/src/ipc.c 2005-12-01 14:21:45.000000000 +0100
++++ squid-2.5.STABLE12/src/ipc.c 2005-12-06 14:07:43.000000000 +0100
@@ -276,7 +276,7 @@
close(t2);
close(t3);
@@ -655,7 +659,7 @@
#if HAVE_SETSID
setsid();
--- squid-2.5.STABLE12/src/main.c.fdc 2005-06-27 23:24:28.000000000 +0200
-+++ squid-2.5.STABLE12/src/main.c 2005-12-01 14:21:45.000000000 +0100
++++ squid-2.5.STABLE12/src/main.c 2005-12-06 14:09:21.000000000 +0100
@@ -350,6 +350,9 @@
#else
idnsShutdown();
@@ -704,6 +708,23 @@
#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_)
if ((WIN32_init_err = WIN32_Subsystem_Init()))
+@@ -680,6 +687,8 @@
+ return 0;
+ #endif
+
++ setMaxFD();
++
+ /* send signal to running copy and exit */
+ if (opt_send_signal != -1) {
+ /* chroot if configured to run inside chroot */
+@@ -705,7 +714,6 @@
+ }
+ if (!opt_no_daemon)
+ watch_child(argv);
+- setMaxFD();
+
+ /* init comm module */
+ comm_init();
@@ -977,6 +985,9 @@
#endif
releaseServerSockets();
@@ -715,7 +736,7 @@
#if USE_UNLINKD
unlinkdClose();
--- squid-2.5.STABLE12/src/stat.c.fdc 2005-03-29 11:52:00.000000000 +0200
-+++ squid-2.5.STABLE12/src/stat.c 2005-12-01 14:21:45.000000000 +0100
++++ squid-2.5.STABLE12/src/stat.c 2005-12-06 14:07:43.000000000 +0100
@@ -451,7 +451,7 @@
"Remote Address",
"Description");
@@ -744,7 +765,7 @@
/* add special cases here as they arrive */
--- squid-2.5.STABLE12/src/delay_pools.c.fdc 2005-10-20 19:30:31.000000000 +0200
-+++ squid-2.5.STABLE12/src/delay_pools.c 2005-12-01 14:21:45.000000000 +0100
++++ squid-2.5.STABLE12/src/delay_pools.c 2005-12-06 14:07:43.000000000 +0100
@@ -89,7 +89,7 @@
typedef union _delayPool delayPool;
@@ -796,8 +817,8 @@
static delay_id
--- squid-2.5.STABLE12/src/squid.h.fdc 2005-03-26 03:50:53.000000000 +0100
-+++ squid-2.5.STABLE12/src/squid.h 2005-12-01 14:21:45.000000000 +0100
-@@ -400,6 +401,20 @@
++++ squid-2.5.STABLE12/src/squid.h 2005-12-06 14:07:43.000000000 +0100
+@@ -400,6 +400,20 @@
#include "cache_snmp.h"
#endif
More information about the fedora-cvs-commits
mailing list