rpms/squid
7
0
Fork 0
Code Issues Pull Requests Releases Activity

added upstream fix for #747125

Browse Source
This commit is contained in:
Jiri Skala 2011-10-26 11:32:20 +02:00
parent 38f9f03777
commit 301781c0bd
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
squid-3.2-11383.patch Normal file
View File

@ -0,0 +1,36 @@
------------------------------------------------------------
revno: 11383
revision-id: squid3@treenet.co.nz-20111024022732-fr9admzotjfxamq1
parent: squid3@treenet.co.nz-20111024022558-ont2jqqprbf2ag89
author: Francesco Chemolli <kinkie@squid-cache.org>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: SQUID_3_2
timestamp: Sun 2011-10-23 20:27:32 -0600
message:
Added null pointer guard in HttpStateData::cacheableReply()
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20111024022732-fr9admzotjfxamq1
# target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_2/
# testament_sha1: 5f870712f3239d650a0f5a16197f366f2403c992
# timestamp: 2011-10-24 02:38:50 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\
# /SQUID_3_2
# base_revision_id: squid3@treenet.co.nz-20111024022558-\
# ont2jqqprbf2ag89
#
# Begin patch
=== modified file 'src/http.cc'
--- src/http.cc 2011-10-08 07:44:05 +0000
+++ src/http.cc 2011-10-24 02:27:32 +0000
@@ -382,7 +382,7 @@
* RFC 2068, sec 14.9.4
*/
- if (!request->cache_control->Public()) {
+ if (!request->cache_control || !request->cache_control->Public()) {
if (!REFRESH_OVERRIDE(ignore_auth))
return 0;
}

7
squid.spec
View File

@ -4,7 +4,7 @@
Name: squid Name: squid
Version: 3.2.0.13 Version: 3.2.0.13
Release: 2%{?dist} Release: 3%{?dist}
Summary: The Squid proxy caching server Summary: The Squid proxy caching server
Epoch: 7 Epoch: 7
# See CREDITS for breakdown of non GPLv2+ code # See CREDITS for breakdown of non GPLv2+ code
@ -25,6 +25,7 @@ Source98: perl-requires-squid.sh
# Upstream patches # Upstream patches
#Patch001: http://www.squid-cache.org/Versions/v3/3.2/changesets/squid-3.2-XXXXX.patch #Patch001: http://www.squid-cache.org/Versions/v3/3.2/changesets/squid-3.2-XXXXX.patch
Patch001: http://www.squid-cache.org/Versions/v3/3.2/changesets/squid-3.2-11383.patch
# Local patches # Local patches
# Applying upstream patches first makes it less likely that local patches # Applying upstream patches first makes it less likely that local patches
@ -89,6 +90,7 @@ The squid-sysvinit contains SysV initscritps support.
%setup -q %setup -q
#patch001 -p0 #patch001 -p0
%patch001 -p0
%patch201 -p1 -b .config %patch201 -p1 -b .config
%patch202 -p1 -b .location %patch202 -p1 -b .location
@ -302,6 +304,9 @@ fi
/sbin/chkconfig --add squid >/dev/null 2>&1 || : /sbin/chkconfig --add squid >/dev/null 2>&1 || :
%changelog %changelog
* Wed Oct 26 2011 Jiri Skala <jskala@redhat.com> - 7:3.2.0.13-3
- added upstream fix for #747125
* Wed Oct 26 2011 Jiri Skala <jskala@redhat.com> - 7:3.2.0.13-2 * Wed Oct 26 2011 Jiri Skala <jskala@redhat.com> - 7:3.2.0.13-2
- fixes #747103 - squid does not start if /var/spool/squid is empty - fixes #747103 - squid does not start if /var/spool/squid is empty
- fixes #747110 - squid does not start adding "memory_pools off" - fixes #747110 - squid does not start adding "memory_pools off"