Author: dzeus Date: Tue Nov 14 17:43:57 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fixed
---- Files affected:
SOURCES:
squid_hit_miss_mark.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/squid_hit_miss_mark.patch
diff -u SOURCES/squid_hit_miss_mark.patch:1.3
SOURCES/squid_hit_miss_mark.patch:1.4
--- SOURCES/squid_hit_miss_mark.patch:1.3 Mon Nov 13 21:24:57 2006
+++ SOURCES/squid_hit_miss_mark.patch Tue Nov 14 18:43:52 2006
@@ -1,26 +1,25 @@
-diff -urN squid-2.6.STABLE5.orig/src/client_side.c
squid-2.6.STABLE5/src/client_side.c
--- squid-2.6.STABLE5.orig/src/client_side.c 2006-09-30 23:10:48.000000000
+0200
-+++ squid-2.6.STABLE5/src/client_side.c 2006-11-13 21:13:45.241328717
+0100
-@@ -2948,6 +2948,9 @@
- memBufAppend(&mb, body_buf, body_size);
- }
- /* write */
-+ { int tos=isTcpHit(http->log_type) ? 0 : 8;
-+ setsockopt(fd,SOL_IP,IP_TOS,&tos,4);
-+ }
- comm_write_mbuf(http->conn->fd, mb, clientWriteComplete, http);
- /* clean up */
- aborted:
-@@ -3000,6 +3003,9 @@
++++ squid-2.6.STABLE5/src/client_side.c 2006-11-14 18:26:59.459231147
+0100
+@@ -3000,6 +3000,9 @@
if (!http->request->range) {
/* Avoid copying to MemBuf for non-range requests */
http->out.offset += size;
-+ { int tos=isTcpHit(http->log_type) ? 0 : 8;
-+ setsockopt(fd,SOL_IP,IP_TOS,&tos,4);
-+ }
++ { int tos=isTcpHit(http->log_type) ? 0 : 8;
++ setsockopt(fd,SOL_IP,IP_TOS,&tos,4);
++ }
comm_write(fd, buf, size, clientWriteBodyComplete, http, NULL);
/* NULL because clientWriteBodyComplete frees it */
return;
+@@ -3034,6 +3037,9 @@
+ memBufAppend(&mb, buf, size);
+ }
+ /* write */
++ { int tos=isTcpHit(http->log_type) ? 0 : 8;
++ setsockopt(fd,SOL_IP,IP_TOS,&tos,4);
++ }
+ comm_write_mbuf(fd, mb, clientWriteComplete, http);
+ /* if we don't do it, who will? */
+ memFree(buf, MEM_CLIENT_SOCK_BUF);
diff -urN squid-2.6.STABLE5.orig/src/defines.h squid-2.6.STABLE5/src/defines.h
--- squid-2.6.STABLE5.orig/src/defines.h 2006-08-19 14:40:31.000000000
+0200
+++ squid-2.6.STABLE5/src/defines.h 2006-11-13 21:15:47.563667677 +0100
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/squid_hit_miss_mark.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
