[squid] added upstream fix for #747125

[Jiri Skala]

commit 301781c0bd37a4b8e4d04a5ee93d09395898f203
Author: Jiri Skala <jskala at redhat.com>
Date:   Wed Oct 26 11:32:20 2011 +0200

    added upstream fix for #747125

 squid-3.2-11383.patch |   36 ++++++++++++++++++++++++++++++++++++
 squid.spec            |    7 ++++++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/squid-3.2-11383.patch b/squid-3.2-11383.patch
new file mode 100644
index 0000000..e4ac81c
--- /dev/null
+++ b/squid-3.2-11383.patch
@@ -0,0 +1,36 @@
+------------------------------------------------------------
+revno: 11383
+revision-id: squid3 at treenet.co.nz-20111024022732-fr9admzotjfxamq1
+parent: squid3 at treenet.co.nz-20111024022558-ont2jqqprbf2ag89
+author: Francesco Chemolli <kinkie at squid-cache.org>
+committer: Amos Jeffries <squid3 at 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 at 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 at 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;
+         }
+
diff --git a/squid.spec b/squid.spec
index 1706f5c..36ac5d2 100644
--- a/squid.spec
+++ b/squid.spec
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.2.0.13
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 # See CREDITS for breakdown of non GPLv2+ code
@@ -25,6 +25,7 @@ Source98: perl-requires-squid.sh
 
 # 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-11383.patch
 
 # 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
 
 #patch001 -p0
+%patch001 -p0
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -302,6 +304,9 @@ fi
         /sbin/chkconfig --add squid >/dev/null 2>&1 || :
 
 %changelog
+* Wed Oct 26 2011 Jiri Skala <jskala at redhat.com> - 7:3.2.0.13-3
+- added upstream fix for #747125
+
 * Wed Oct 26 2011 Jiri Skala <jskala at redhat.com> - 7:3.2.0.13-2
 - fixes #747103 - squid does not start if /var/spool/squid is empty
 - fixes #747110 - squid does not start adding "memory_pools off"