Skip to content

Commit 1b3cb0e

Browse files
author
Siem
committedFeb 2, 2015
Corrected some of the changed files
1 parent 3687db9 commit 1b3cb0e

File tree

1 file changed

+26
-67
lines changed

1 file changed

+26
-67
lines changed
 

‎squid-3-5-1.patch

+26-67
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -rupN orig/squid-3.5.1-20150118-r13728/acinclude/os-deps.m4 squid-3.5.1-20150118-r13728/acinclude/os-deps.m4
2-
--- orig/squid-3.5.1-20150118-r13728/acinclude/os-deps.m4 2015-01-19 00:26:56.000000000 +0100
3-
+++ squid-3.5.1-20150118-r13728/acinclude/os-deps.m4 2015-01-29 00:18:27.158415900 +0100
1+
diff -rupN orig/squid-3.5.1-20150124-r13741/acinclude/os-deps.m4 squid-3.5.1-20150124-r13741/acinclude/os-deps.m4
2+
--- orig/squid-3.5.1-20150124-r13741/acinclude/os-deps.m4 2015-01-19 00:26:56.000000000 +0100
3+
+++ squid-3.5.1-20150124-r13741/acinclude/os-deps.m4 2015-01-29 00:18:27.158415900 +0100
44
@@ -240,7 +240,7 @@ SQUID_STATE_SAVE(maxfd)
55
int main(int argc, char **argv) {
66
FILE *fp;
@@ -82,9 +82,9 @@ diff -rupN orig/squid-3.5.1-20150118-r13728/acinclude/os-deps.m4 squid-3.5.1-201
8282
if (getsockopt(fd, SOL_SOCKET, SO_RCVBUF, (char *)&val, &len) < 0) return 1;
8383
WSACleanup();
8484
#else
85-
diff -rupN orig/squid-3.5.1-20150118-r13728/compat/osdetect.h squid-3.5.1-20150118-r13728/compat/osdetect.h
86-
--- orig/squid-3.5.1-20150118-r13728/compat/osdetect.h 2015-01-19 00:26:56.000000000 +0100
87-
+++ squid-3.5.1-20150118-r13728/compat/osdetect.h 2015-01-29 00:20:08.313329500 +0100
85+
diff -rupN orig/squid-3.5.1-20150124-r13741/compat/osdetect.h squid-3.5.1-20150124-r13741/compat/osdetect.h
86+
--- orig/squid-3.5.1-20150124-r13741/compat/osdetect.h 2015-01-19 00:26:56.000000000 +0100
87+
+++ squid-3.5.1-20150124-r13741/compat/osdetect.h 2015-01-29 00:20:08.313329500 +0100
8888
@@ -72,9 +72,8 @@
8989
#elif defined(__DragonFly__)
9090
#define _SQUID_DRAGONFLY_ 1
@@ -96,9 +96,9 @@ diff -rupN orig/squid-3.5.1-20150118-r13728/compat/osdetect.h squid-3.5.1-201501
9696

9797
#elif defined(__MINGW32__) || defined(__MINGW__)
9898
#define _SQUID_MINGW_ 1
99-
diff -rupN orig/squid-3.5.1-20150118-r13728/configure.ac squid-3.5.1-20150118-r13728/configure.ac
100-
--- orig/squid-3.5.1-20150118-r13728/configure.ac 2015-01-19 00:27:17.000000000 +0100
101-
+++ squid-3.5.1-20150118-r13728/configure.ac 2015-01-29 02:14:19.920514300 +0100
99+
diff -rupN orig/squid-3.5.1-20150124-r13741/configure.ac squid-3.5.1-20150124-r13741/configure.ac
100+
--- orig/squid-3.5.1-20150124-r13741/configure.ac 2015-01-19 00:27:17.000000000 +0100
101+
+++ squid-3.5.1-20150124-r13741/configure.ac 2015-01-29 02:14:19.920514300 +0100
102102
@@ -100,7 +100,7 @@ if test "x$squid_host_os" != "xmingw" ;
103103
case "$CXX" in
104104
*clang++*) ;; #do nothing
@@ -130,9 +130,9 @@ diff -rupN orig/squid-3.5.1-20150118-r13728/configure.ac squid-3.5.1-20150118-r1
130130
EUILIB="-liphlpapi"
131131
;;
132132
*)
133-
diff -rupN orig/squid-3.5.1-20150118-r13728/src/comm.cc squid-3.5.1-20150118-r13728/src/comm.cc
134-
--- orig/squid-3.5.1-20150118-r13728/src/comm.cc 2015-01-19 00:26:56.000000000 +0100
135-
+++ squid-3.5.1-20150118-r13728/src/comm.cc 2015-01-29 00:28:29.955192700 +0100
133+
diff -rupN orig/squid-3.5.1-20150124-r13741/src/comm.cc squid-3.5.1-20150124-r13741/src/comm.cc
134+
--- orig/squid-3.5.1-20150124-r13741/src/comm.cc 2015-01-19 00:26:56.000000000 +0100
135+
+++ squid-3.5.1-20150124-r13741/src/comm.cc 2015-01-29 00:28:29.955192700 +0100
136136
@@ -1089,18 +1089,12 @@ commSetNonBlocking(int fd)
137137
#if _SQUID_WINDOWS_
138138
int nonblocking = TRUE;
@@ -162,9 +162,9 @@ diff -rupN orig/squid-3.5.1-20150118-r13728/src/comm.cc squid-3.5.1-20150118-r13
162162
fd_table[fd].flags.nonblocking = true;
163163

164164
return 0;
165-
diff -rupN orig/squid-3.5.1-20150118-r13728/src/dns_internal.cc squid-3.5.1-20150118-r13728/src/dns_internal.cc
166-
--- orig/squid-3.5.1-20150118-r13728/src/dns_internal.cc 2015-01-19 00:26:56.000000000 +0100
167-
+++ squid-3.5.1-20150118-r13728/src/dns_internal.cc 2015-01-29 00:30:18.583487500 +0100
165+
diff -rupN orig/squid-3.5.1-20150124-r13741/src/dns_internal.cc squid-3.5.1-20150124-r13741/src/dns_internal.cc
166+
--- orig/squid-3.5.1-20150124-r13741/src/dns_internal.cc 2015-01-19 00:26:56.000000000 +0100
167+
+++ squid-3.5.1-20150124-r13741/src/dns_internal.cc 2015-01-29 00:30:18.583487500 +0100
168168
@@ -389,10 +389,6 @@ idnsParseResolvConf(void)
169169
return false;
170170
}
@@ -176,65 +176,24 @@ diff -rupN orig/squid-3.5.1-20150118-r13728/src/dns_internal.cc squid-3.5.1-2015
176176
char buf[RESOLV_BUFSZ];
177177
const char *t = NULL;
178178
while (fgets(buf, RESOLV_BUFSZ, fp)) {
179-
diff -rupN orig/squid-3.5.1-20150118-r13728/src/fs/ufs/UFSSwapDir.cc squid-3.5.1-20150118-r13728/src/fs/ufs/UFSSwapDir.cc
180-
--- orig/squid-3.5.1-20150118-r13728/src/fs/ufs/UFSSwapDir.cc 2015-01-19 00:26:56.000000000 +0100
181-
+++ squid-3.5.1-20150118-r13728/src/fs/ufs/UFSSwapDir.cc 2015-01-29 01:55:30.091813500 +0100
182-
@@ -33,6 +33,7 @@
183-
184-
#include <cerrno>
185-
#include <cmath>
186-
+#include <stdlib.h>
187-
#if HAVE_SYS_STAT_H
188-
#include <sys/stat.h>
189-
#endif
190-
@@ -1042,7 +1043,7 @@ Fs::Ufs::UFSSwapDir::CleanEvent(void *un
191-
* value. j equals the total number of UFS level 2
192-
* swap directories
193-
*/
194-
- swap_index = (int) (squid_random() % j);
195-
+ swap_index = (int) (rand() % j);
179+
diff -rupN orig/squid-3.5.1-20150124-r13741/src/tools.cc squid-3.5.1-20150124-r13741/src/tools.cc
180+
--- orig/squid-3.5.1-20150124-r13741/src/tools.cc 2015-01-24 06:25:32.000000000 +0100
181+
+++ squid-3.5.1-20150124-r13741/src/tools.cc 2015-02-02 23:24:13.883773400 +0100
182+
@@ -896,7 +896,7 @@ setSystemLimits(void)
196183
}
197-
198-
/* if the rebuild is finished, start cleaning directories. */
199-
diff -rupN orig/squid-3.5.1-20150118-r13728/src/tools.cc squid-3.5.1-20150118-r13728/src/tools.cc
200-
--- orig/squid-3.5.1-20150118-r13728/src/tools.cc 2015-01-19 00:26:56.000000000 +0100
201-
+++ squid-3.5.1-20150118-r13728/src/tools.cc 2015-01-29 17:45:26.309521400 +0100
202-
@@ -897,32 +897,32 @@ setSystemLimits(void)
203184
#endif /* HAVE_SETRLIMIT */
204185

205-
#if HAVE_SETRLIMIT && defined(RLIMIT_DATA)
206-
- if (getrlimit(RLIMIT_DATA, &rl) < 0) {
207-
+/* if (getrlimit(RLIMIT_DATA, &rl) < 0) {
186+
-#if HAVE_SETRLIMIT && defined(RLIMIT_DATA)
187+
+#if HAVE_SETRLIMIT && defined(RLIMIT_DATA) && !_SQUID_CYGWIN_
188+
if (getrlimit(RLIMIT_DATA, &rl) < 0) {
208189
debugs(50, DBG_CRITICAL, "getrlimit: RLIMIT_DATA: " << xstrerror());
209190
} else if (rl.rlim_max > rl.rlim_cur) {
210-
- rl.rlim_cur = rl.rlim_max; /* set it to the max */
211-
+ rl.rlim_cur = rl.rlim_max;
212-
213-
if (setrlimit(RLIMIT_DATA, &rl) < 0) {
214-
snprintf(tmp_error_buf, ERROR_BUF_SZ, "setrlimit: RLIMIT_DATA: %s", xstrerror());
215-
fatal_dump(tmp_error_buf);
216-
}
217-
- }
218-
+ }*/
219-
#endif /* RLIMIT_DATA */
220-
if (Config.max_filedescriptors > Squid_MaxFD) {
191+
@@ -912,7 +912,7 @@ setSystemLimits(void)
221192
debugs(50, DBG_IMPORTANT, "NOTICE: Could not increase the number of filedescriptors");
222193
}
223194

224-
#if HAVE_SETRLIMIT && defined(RLIMIT_VMEM)
225-
- if (getrlimit(RLIMIT_VMEM, &rl) < 0) {
226-
+/* if (getrlimit(RLIMIT_VMEM, &rl) < 0) {
195+
-#if HAVE_SETRLIMIT && defined(RLIMIT_VMEM)
196+
+#if HAVE_SETRLIMIT && defined(RLIMIT_VMEM) && !_SQUID_CYGWIN_
197+
if (getrlimit(RLIMIT_VMEM, &rl) < 0) {
227198
debugs(50, DBG_CRITICAL, "getrlimit: RLIMIT_VMEM: " << xstrerror());
228199
} else if (rl.rlim_max > rl.rlim_cur) {
229-
- rl.rlim_cur = rl.rlim_max; /* set it to the max */
230-
+ rl.rlim_cur = rl.rlim_max;
231-
232-
if (setrlimit(RLIMIT_VMEM, &rl) < 0) {
233-
snprintf(tmp_error_buf, ERROR_BUF_SZ, "setrlimit: RLIMIT_VMEM: %s", xstrerror());
234-
fatal_dump(tmp_error_buf);
235-
}
236-
- }
237-
+ }*/
238-
#endif /* RLIMIT_VMEM */
239-
}
240-

0 commit comments

Comments
 (0)