summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-03-24 09:00:57 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2010-03-24 09:00:57 +0100
commit754a8c96ce4bd80f284efc08d8f8e1b0d2f3bf9a (patch)
treef8f0b4c2c63fbdd83ff825b5d1ede127b7fca852
parentffe25f05ef5b5d4928fc11eeeead837fbc6b4c66 (diff)
squid: don't use susv3 legacy functions
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/squid/squid-susv3-legacy.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/package/squid/squid-susv3-legacy.patch b/package/squid/squid-susv3-legacy.patch
new file mode 100644
index 000000000..c3343bd2a
--- /dev/null
+++ b/package/squid/squid-susv3-legacy.patch
@@ -0,0 +1,49 @@
+[PATCH] replace susv3 legacy functions with modern equivalents
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/ESIVarState.cc | 6 +++---
+ src/HttpHeaderTools.cc | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+Index: squid-3.0.STABLE21/src/ESIVarState.cc
+===================================================================
+--- squid-3.0.STABLE21.orig/src/ESIVarState.cc
++++ squid-3.0.STABLE21/src/ESIVarState.cc
+@@ -207,7 +207,7 @@ ESIVariableUserAgent::getProductVersion
+ {
+ char const *t;
+ int len;
+- t = index (s,'/');
++ t = strchr (s,'/');
+
+ if (!t || !*(++t))
+ return xstrdup ("");
+@@ -382,12 +382,12 @@ ESIVariableUserAgent::ESIVariableUserAge
+
+ if ((t = strstr (s, "MSIE"))) {
+ browser = ESI_BROWSER_MSIE;
+- t = index (t, ' ');
++ t = strchr (t, ' ');
+
+ if (!t)
+ browserversion = xstrdup ("");
+ else {
+- t1 = index (t, ';');
++ t1 = strchr (t, ';');
+
+ if (!t1)
+ browserversion = xstrdup (t + 1);
+Index: squid-3.0.STABLE21/src/HttpHeaderTools.cc
+===================================================================
+--- squid-3.0.STABLE21.orig/src/HttpHeaderTools.cc
++++ squid-3.0.STABLE21/src/HttpHeaderTools.cc
+@@ -357,7 +357,7 @@ httpHeaderParseQuotedString (const char
+ pos = start + 1;
+
+ while (1) {
+- if (!(end = index (pos,'"'))) {
++ if (!(end = strchr (pos,'"'))) {
+ debugs(66, 2, "failed to parse a quoted-string header field near '" << start << "'");
+ return 0;
+ }