rpms/squid/F-11 squid-3.0.STABLE19-3-9986.patch, NONE, 1.1 .cvsignore, 1.47, 1.48 sources, 1.50, 1.51 squid.spec, 1.128, 1.129
Henrik Nordström
hno at fedoraproject.org
Sat Sep 19 02:25:11 UTC 2009
- Previous message (by thread): rpms/squid/F-11 .cvsignore, 1.46, 1.47 sources, 1.49, 1.50 squid.spec, 1.127, 1.128
- Next message (by thread): rpms/ntl/devel .cvsignore, 1.5, 1.6 ntl.spec, 1.19, 1.20 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: hno
Update of /cvs/pkgs/rpms/squid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4865
Modified Files:
.cvsignore sources squid.spec
Added Files:
squid-3.0.STABLE19-3-9986.patch
Log Message:
Rediffed the patch for Squid Bug #2624 invalid IMS responses
squid-3.0.STABLE19-3-9986.patch:
client_side_reply.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE squid-3.0.STABLE19-3-9986.patch ---
diff -up squid-3.0.STABLE19/src/client_side_reply.cc.3-9987 squid-3.0.STABLE19/src/client_side_reply.cc
--- squid-3.0.STABLE19/src/client_side_reply.cc.3-9987 2009-09-06 13:29:37.000000000 +0200
+++ squid-3.0.STABLE19/src/client_side_reply.cc 2009-09-19 04:17:12.000000000 +0200
@@ -366,7 +366,7 @@ clientReplyContext::handleIMSReply(Store
// if client sent IMS
- if (http->request->flags.ims) {
+ if (http->request->flags.ims && !old_entry->modifiedSince(http->request)) {
// forward the 304 from origin
debugs(88, 3, "handleIMSReply: origin replied 304, revalidating existing entry and forwarding 304 to client");
sendClientUpstreamResponse();
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore 19 Sep 2009 02:15:18 -0000 1.47
+++ .cvsignore 19 Sep 2009 02:25:11 -0000 1.48
@@ -1,3 +1,2 @@
squid-3.0.STABLE19.tar.bz2
squid-3.0.STABLE19.tar.bz2.asc
-squid-3-9986.patch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources 19 Sep 2009 02:15:18 -0000 1.50
+++ sources 19 Sep 2009 02:25:11 -0000 1.51
@@ -1,3 +1,2 @@
edf0f2baf06d342652f06d131f8a6082 squid-3.0.STABLE19.tar.bz2
5b514327921dec32896353eeb222b509 squid-3.0.STABLE19.tar.bz2.asc
-9f17f856c17eb19b77e91bbf6834b59e squid-3-9986.patch
Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/squid.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -r1.128 -r1.129
--- squid.spec 19 Sep 2009 02:15:18 -0000 1.128
+++ squid.spec 19 Sep 2009 02:25:11 -0000 1.129
@@ -4,7 +4,7 @@
Name: squid
Version: 3.0.STABLE19
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The Squid proxy caching server
Epoch: 7
License: GPLv2+
@@ -23,10 +23,11 @@ Source98: perl-requires-squid.sh
# Upstream patches
#Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
-Patch001: http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-9986.patch
-# External patches
+# Backported patches
+# http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-9986.patch
+Patch101: squid-3.0.STABLE19-3-9986.patch
# Local patches
# Applying upstream patches first makes it less likely that local patches
@@ -62,7 +63,7 @@ lookup program (dnsserver), a program fo
%prep
%setup -q
-%patch001 -p0 -b .3-9987
+%patch101 -p1 -b .3-9986
%patch201 -p1 -b .config
%patch202 -p1 -b .location
%patch203 -p1 -b .build
@@ -344,7 +345,7 @@ fi
chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
%changelog
-* Sat Sep 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 7:3.0.STABLE19-2
+* Sat Sep 19 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 7:3.0.STABLE19-3
- Patch for Squid Bug #2626: Invalid response for IMS request
* Fri Sep 11 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.0.STABLE19-1
- Previous message (by thread): rpms/squid/F-11 .cvsignore, 1.46, 1.47 sources, 1.49, 1.50 squid.spec, 1.127, 1.128
- Next message (by thread): rpms/ntl/devel .cvsignore, 1.5, 1.6 ntl.spec, 1.19, 1.20 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list