- updated to 3.5.16

diff --git a/squid.spec b/squid.spec
index da6835cf716c274ced03c1a018839844912e656f..e02b2a7a0d60019caf0069f95a9d3cbe7b4d497a 100644 (file)
--- a/squid.spec
+++ b/squid.spec
@@ -16,13 +16,13 @@ Summary(ru.UTF-8):  Squid - кэш объектов Internet
 Summary(uk.UTF-8):     Squid - кеш об'єктів Internet
 Summary(zh_CN.UTF-8):  SQUID 高速缓冲代理服务器
 Name:          squid
-Version:       3.5.15
+Version:       3.5.16
 Release:       1
 Epoch:         7
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       http://www.squid-cache.org/Versions/v3/3.5/%{name}-%{version}.tar.xz
-# Source0-md5: 997084b40aaed7d0fa9db11904638ea9
+# Source0-md5: 557b1011a880ec3291797367e2ca4c45
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       http://squid-docs.sourceforge.net/latest/zip-files/book-full-html.zip

diff --git a/squidv3-vary-headers-shm-hack.patch b/squidv3-vary-headers-shm-hack.patch
index 202b7b2fcff3f40eaf88cb356099302259945235..b1b9db89b0e81c4350d58112f98e1822ecd1f5f2 100644 (file)
--- a/squidv3-vary-headers-shm-hack.patch
+++ b/squidv3-vary-headers-shm-hack.patch
@@ -92,10 +92,10 @@ diff -urNp squid-3.5.1.orig/src/client_side.cc squid-3.5.1/src/client_side.cc
 diff -urNp squid-3.5.1.orig/src/http.cc squid-3.5.1/src/http.cc
 --- squid-3.5.1.orig/src/http.cc       2015-01-13 12:52:01.000000000 +0000
 +++ squid-3.5.1/src/http.cc    2015-01-28 20:48:48.962000000 +0000
-@@ -926,6 +926,12 @@ HttpStateData::haveParsedReplyHeaders()
+@@ -937,6 +937,12 @@ HttpStateData::haveParsedReplyHeaders()
              varyFailure = true;
          } else {
-             entry->mem_obj->vary_headers = xstrdup(vary);
+             entry->mem_obj->vary_headers = vary;
 +            /* XXX: Currently we are losing vary_headers when
 +             * saving objects to shm, so we now add them as header
 +             * and remove on preparing client reply.