diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/squid/patches/patch-src_HttpHeaderTools_cc | |
parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/squid/patches/patch-src_HttpHeaderTools_cc')
-rw-r--r-- | package/squid/patches/patch-src_HttpHeaderTools_cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/squid/patches/patch-src_HttpHeaderTools_cc b/package/squid/patches/patch-src_HttpHeaderTools_cc index 3b456ebf5..e05cd9340 100644 --- a/package/squid/patches/patch-src_HttpHeaderTools_cc +++ b/package/squid/patches/patch-src_HttpHeaderTools_cc @@ -1,6 +1,6 @@ ---- squid-3.0.STABLE15.orig/src/HttpHeaderTools.cc 2009-05-06 13:11:40.000000000 +0200 -+++ squid-3.0.STABLE15/src/HttpHeaderTools.cc 2009-06-15 18:29:41.000000000 +0200 -@@ -356,7 +356,7 @@ httpHeaderParseQuotedString (const char +--- squid-3.0.STABLE20.orig/src/HttpHeaderTools.cc 2009-10-29 11:05:45.000000000 +0100 ++++ squid-3.0.STABLE20/src/HttpHeaderTools.cc 2009-12-11 23:14:13.000000000 +0100 +@@ -357,7 +357,7 @@ httpHeaderParseQuotedString (const char pos = start + 1; while (1) { |