+++ /dev/null
-Index: src/fs/diskd/store_dir_diskd.c
-===================================================================
-RCS file: /server/cvs-server/squid/squid/src/fs/diskd/store_dir_diskd.c,v
-retrieving revision 1.24.2.16
-retrieving revision 1.24.2.17
-diff -c -r1.24.2.16 -r1.24.2.17
-*** src/fs/diskd/store_dir_diskd.c 2001/03/14 22:31:41 1.24.2.16
---- src/fs/diskd/store_dir_diskd.c 2001/04/04 07:01:13 1.24.2.17
-***************
-*** 417,423 ****
- #else
- x = ipcCreate(IPC_FIFO,
- #endif
-! SQUID_PREFIX "/libexec/squid/diskd",
- args,
- "diskd",
- &rfd,
---- 417,423 ----
- #else
- x = ipcCreate(IPC_FIFO,
- #endif
-! Config.Program.diskd,
- args,
- "diskd",
- &rfd,
-Index: src/Makefile.in
-===================================================================
-RCS file: /server/cvs-server/squid/squid/src/Makefile.in,v
-retrieving revision 1.195.2.3
-retrieving revision 1.195.2.4
-diff -c -r1.195.2.3 -r1.195.2.4
-*** src/Makefile.in 2001/02/10 14:41:26 1.195.2.3
---- src/Makefile.in 2001/04/04 07:01:12 1.195.2.4
-***************
-*** 31,36 ****
---- 31,37 ----
- OPT_PINGER_EXE = pinger$(exec_suffix)
- PINGER_EXE = @OPT_PINGER_EXE@
- CACHEMGR_EXE = cachemgr$(cgi_suffix)
-+ DISKD_EXE = diskd$(exec_suffix)
-
- DEFAULT_PREFIX = $(prefix)
- DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
-***************
-*** 43,48 ****
---- 44,50 ----
- DEFAULT_SWAP_DIR = $(localstatedir)/cache
- DEFAULT_PINGER = $(libexecdir)/$(PINGER_EXE)
- DEFAULT_UNLINKD = $(libexecdir)/$(UNLINKD_EXE)
-+ DEFAULT_DISKD = $(libexecdir)/$(DISKD_EXE)
- DEFAULT_ICON_DIR = $(sysconfdir)/icons
- DEFAULT_ERROR_DIR = $(sysconfdir)/errors
- DEFAULT_MIB_PATH = $(sysconfdir)/mib.txt
-***************
-*** 266,271 ****
---- 268,274 ----
- s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\
- s%@DEFAULT_UNLINKD@%$(DEFAULT_UNLINKD)%g;\
- s%@DEFAULT_PINGER@%$(DEFAULT_PINGER)%g;\
-+ s%@DEFAULT_DISKD@%$(DEFAULT_DISKD)%g;\
- s%@DEFAULT_CACHE_LOG@%$(DEFAULT_CACHE_LOG)%g;\
- s%@DEFAULT_ACCESS_LOG@%$(DEFAULT_ACCESS_LOG)%g;\
- s%@DEFAULT_STORE_LOG@%$(DEFAULT_STORE_LOG)%g;\
-Index: src/cf.data.pre
-===================================================================
-RCS file: /server/cvs-server/squid/squid/src/cf.data.pre,v
-retrieving revision 1.199.2.6
-retrieving revision 1.199.2.7
-diff -c -r1.199.2.6 -r1.199.2.7
-*** src/cf.data.pre 2001/03/01 21:49:25 1.199.2.6
---- src/cf.data.pre 2001/04/04 07:01:12 1.199.2.7
-***************
-*** 1042,1047 ****
---- 1042,1056 ----
- Example: dns_nameservers 10.0.0.1 192.172.0.4
- DOC_END
-
-+ NAME: diskd_program
-+ TYPE: string
-+ DEFAULT: @DEFAULT_DISKD@
-+ LOC: Config.Program.diskd
-+ DOC_START
-+ Specify the location of the diskd executable.
-+ Note that this is only useful if you have compiled in
-+ diskd as one of the store io modules.
-+ DOC_END
-
- NAME: unlinkd_program
- IFDEF: USE_UNLINKD
-Index: src/structs.h
-===================================================================
-RCS file: /server/cvs-server/squid/squid/src/structs.h,v
-retrieving revision 1.361.2.13
-retrieving revision 1.361.2.14
-diff -c -r1.361.2.13 -r1.361.2.14
-*** src/structs.h 2001/03/01 21:49:26 1.361.2.13
---- src/structs.h 2001/04/04 07:01:12 1.361.2.14
-***************
-*** 323,328 ****
---- 323,329 ----
- #if USE_UNLINKD
- char *unlinkd;
- #endif
-+ char *diskd;
- } Program;
- #if USE_DNSSERVERS
- int dnsChildren;
+++ /dev/null
-Index: src/store_dir.c
-===================================================================
-RCS file: /server/cvs-server/squid/squid/src/store_dir.c,v
-retrieving revision 1.115.2.13
-retrieving revision 1.115.2.15
-diff -c -r1.115.2.13 -r1.115.2.15
-*** src/store_dir.c 2001/03/13 19:11:52 1.115.2.13
---- src/store_dir.c 2001/03/28 16:34:41 1.115.2.15
-***************
-*** 477,482 ****
---- 477,483 ----
- struct statvfs sfs;
- if (statvfs(path, &sfs)) {
- debug(50, 1) ("%s: %s\n", path, xstrerror());
-+ *blksize = 2048;
- return 1;
- }
- *blksize = (int) sfs.f_frsize;
-***************
-*** 484,493 ****
---- 485,500 ----
- struct statfs sfs;
- if (statfs(path, &sfs)) {
- debug(50, 1) ("%s: %s\n", path, xstrerror());
-+ *blksize = 2048;
- return 1;
- }
- *blksize = (int) sfs.f_bsize;
- #endif
-+ /*
-+ * Sanity check; make sure we have a meaningful value.
-+ */
-+ if (*blksize < 512)
-+ *blksize = 2048;
- return 0;
- }
-
+++ /dev/null
-Index: src/neighbors.c
-===================================================================
-RCS file: /server/cvs-server/squid/squid/src/neighbors.c,v
-retrieving revision 1.288.2.2
-retrieving revision 1.288.2.3
-diff -c -r1.288.2.2 -r1.288.2.3
-*** src/neighbors.c 2001/01/12 00:51:50 1.288.2.2
---- src/neighbors.c 2001/03/25 18:12:57 1.288.2.3
-***************
-*** 272,278 ****
- if (p->rr_count < 0)
- p->rr_count = 0;
- p->rr_lastcount = p->rr_count;
-! eventAdd("peerClearRR", peerClearRR, p, 5 * 60, 0);
- }
-
- peer *
---- 272,278 ----
- if (p->rr_count < 0)
- p->rr_count = 0;
- p->rr_lastcount = p->rr_count;
-! eventAdd("peerClearRR", peerClearRR, p, 5 * 60.0, 0);
- }
-
- peer *
+++ /dev/null
-Index: src/htcp.c
-===================================================================
-RCS file: /server/cvs-server/squid/squid/src/htcp.c,v
-retrieving revision 1.32.2.2
-retrieving revision 1.32.2.4
-diff -c -r1.32.2.2 -r1.32.2.4
-*** src/htcp.c 2001/01/12 00:51:48 1.32.2.2
---- src/htcp.c 2001/04/01 16:52:45 1.32.2.4
-***************
-*** 747,754 ****
- hdr.msg_id = ntohl(hdr.msg_id);
- debug(31, 3) ("htcpHandleData: sz = %d\n", sz);
- debug(31, 3) ("htcpHandleData: length = %d\n", (int) hdr.length);
-! if (hdr.opcode > HTCP_END) {
-! debug(31, 0) ("htcpHandleData: opcode %d out of range\n",
- (int) hdr.opcode);
- return;
- }
---- 747,755 ----
- hdr.msg_id = ntohl(hdr.msg_id);
- debug(31, 3) ("htcpHandleData: sz = %d\n", sz);
- debug(31, 3) ("htcpHandleData: length = %d\n", (int) hdr.length);
-! if (hdr.opcode >= HTCP_END) {
-! debug(31, 0) ("htcpHandleData: client %s, opcode %d out of range\n",
-! inet_ntoa(from->sin_addr),
- (int) hdr.opcode);
- return;
- }
-***************
-*** 783,788 ****
---- 784,793 ----
- break;
- case HTCP_SET:
- htcpHandleSet(&hdr, buf, sz, from);
-+ break;
-+ case HTCP_CLR:
-+ debug(31, 1) ("htcpHandleData: client %s, CLR not supported\n",
-+ inet_ntoa(from->sin_addr));
- break;
- default:
- assert(0);
+++ /dev/null
-Index: src/main.c
-===================================================================
-RCS file: /server/cvs-server/squid/squid/src/main.c,v
-retrieving revision 1.322.2.3
-retrieving revision 1.322.2.4
-diff -c -r1.322.2.3 -r1.322.2.4
-*** src/main.c 2001/01/12 00:51:50 1.322.2.3
---- src/main.c 2001/03/28 23:25:51 1.322.2.4
-***************
-*** 909,914 ****
---- 909,923 ----
- if (WIFEXITED(status))
- if (WEXITSTATUS(status) == 0)
- exit(0);
-+ if (WIFSIGNALED(status)) {
-+ switch (WTERMSIG(status)) {
-+ case SIGKILL:
-+ exit(0);
-+ break;
-+ default:
-+ break;
-+ }
-+ }
- squid_signal(SIGINT, SIG_DFL, SA_RESTART);
- sleep(3);
- }
+++ /dev/null
-Index: src/store.c
-===================================================================
-RCS file: /server/cvs-server/squid/squid/src/store.c,v
-retrieving revision 1.531.2.4
-retrieving revision 1.531.2.5
-diff -c -r1.531.2.4 -r1.531.2.5
-*** src/store.c 2001/02/22 20:53:31 1.531.2.4
---- src/store.c 2001/03/23 20:19:44 1.531.2.5
-***************
-*** 1033,1039 ****
- * squid_curtime because it results in a negative served_date.
- */
- if (age > squid_curtime - served_date)
-! if (squid_curtime < age)
- served_date = squid_curtime - age;
- entry->expires = reply->expires;
- entry->lastmod = reply->last_modified;
---- 1033,1039 ----
- * squid_curtime because it results in a negative served_date.
- */
- if (age > squid_curtime - served_date)
-! if (squid_curtime > age)
- served_date = squid_curtime - age;
- entry->expires = reply->expires;
- entry->lastmod = reply->last_modified;
projects / packages / squid.git / commitdiff