You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ki...@apache.org on 2018/10/13 22:37:23 UTC
[trafficserver] branch master updated: Fix traffic_via problem with
string length
This is an automated email from the ASF dual-hosted git repository.
kichan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 0b944b3 Fix traffic_via problem with string length
0b944b3 is described below
commit 0b944b3262d150e0108477b54d40b294afb3ee2f
Author: Kit Chan <ki...@apache.org>
AuthorDate: Sat Oct 13 14:46:07 2018 -0700
Fix traffic_via problem with string length
---
.../tests/{[u c s f p eS;tNc p s ] => [u c s f p eS;tNc p s ]} | 2 +-
.../tests/{[uIcRs f p eN;t cCH p s ] => [uIcRs f p eN;t cCHp s ]} | 2 +-
.../tests/{[uIcRs f p eN;t cCN p s ] => [uIcRs f p eN;t cCNp s ]} | 2 +-
.../tests/{[uScMsSf pSeN;t cCM p sS] => [uScMsSf pSeN;t cCMp sS]} | 2 +-
.../tests/{[uScRs f p eN;t cCH p s ] => [uScRs f p eN;t cCHp s ]} | 2 +-
.../tests/{long rubbish via code 2 => long rubbish via code2} | 4 ++--
src/traffic_via/tests/rubbish | 2 +-
src/traffic_via/traffic_via.cc | 4 ++--
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/traffic_via/tests/[u c s f p eS;tNc p s ] b/src/traffic_via/tests/[u c s f p eS;tNc p s ]
similarity index 94%
rename from src/traffic_via/tests/[u c s f p eS;tNc p s ]
rename to src/traffic_via/tests/[u c s f p eS;tNc p s ]
index f574eb2..95cf7a7 100644
--- a/src/traffic_via/tests/[u c s f p eS;tNc p s ]
+++ b/src/traffic_via/tests/[u c s f p eS;tNc p s ]
@@ -1,4 +1,4 @@
-Via header is [u c s f p eS;tNc p s ], Length is 25
+Via header is [u c s f p eS;tNc p s ], Length is 24
Via Header Details:
Request headers received from client :unknown
Result of Traffic Server cache lookup for URL :no cache lookup
diff --git a/src/traffic_via/tests/[uIcRs f p eN;t cCH p s ] b/src/traffic_via/tests/[uIcRs f p eN;t cCHp s ]
similarity index 93%
rename from src/traffic_via/tests/[uIcRs f p eN;t cCH p s ]
rename to src/traffic_via/tests/[uIcRs f p eN;t cCHp s ]
index e7b4799..a5f3238 100644
--- a/src/traffic_via/tests/[uIcRs f p eN;t cCH p s ]
+++ b/src/traffic_via/tests/[uIcRs f p eN;t cCHp s ]
@@ -1,4 +1,4 @@
-Via header is [uIcRs f p eN;t cCH p s ], Length is 25
+Via header is [uIcRs f p eN;t cCHp s ], Length is 24
Via Header Details:
Request headers received from client :IMS
Result of Traffic Server cache lookup for URL :in cache, fresh Ram hit (a cache "HIT")
diff --git a/src/traffic_via/tests/[uIcRs f p eN;t cCN p s ] b/src/traffic_via/tests/[uIcRs f p eN;t cCNp s ]
similarity index 94%
rename from src/traffic_via/tests/[uIcRs f p eN;t cCN p s ]
rename to src/traffic_via/tests/[uIcRs f p eN;t cCNp s ]
index d3d3860..6af0055 100644
--- a/src/traffic_via/tests/[uIcRs f p eN;t cCN p s ]
+++ b/src/traffic_via/tests/[uIcRs f p eN;t cCNp s ]
@@ -1,4 +1,4 @@
-Via header is [uIcRs f p eN;t cCN p s ], Length is 25
+Via header is [uIcRs f p eN;t cCNp s ], Length is 24
Via Header Details:
Request headers received from client :IMS
Result of Traffic Server cache lookup for URL :in cache, fresh Ram hit (a cache "HIT")
diff --git a/src/traffic_via/tests/[uScMsSf pSeN;t cCM p sS] b/src/traffic_via/tests/[uScMsSf pSeN;t cCMp sS]
similarity index 94%
rename from src/traffic_via/tests/[uScMsSf pSeN;t cCM p sS]
rename to src/traffic_via/tests/[uScMsSf pSeN;t cCMp sS]
index e4bee74..1e494c6 100644
--- a/src/traffic_via/tests/[uScMsSf pSeN;t cCM p sS]
+++ b/src/traffic_via/tests/[uScMsSf pSeN;t cCMp sS]
@@ -1,4 +1,4 @@
-Via header is [uScMsSf pSeN;t cCM p sS], Length is 25
+Via header is [uScMsSf pSeN;t cCMp sS], Length is 24
Via Header Details:
Request headers received from client :simple request (not conditional)
Result of Traffic Server cache lookup for URL :miss (a cache "MISS")
diff --git a/src/traffic_via/tests/[uScRs f p eN;t cCH p s ] b/src/traffic_via/tests/[uScRs f p eN;t cCHp s ]
similarity index 94%
rename from src/traffic_via/tests/[uScRs f p eN;t cCH p s ]
rename to src/traffic_via/tests/[uScRs f p eN;t cCHp s ]
index e587c1a..d7d394c 100644
--- a/src/traffic_via/tests/[uScRs f p eN;t cCH p s ]
+++ b/src/traffic_via/tests/[uScRs f p eN;t cCHp s ]
@@ -1,4 +1,4 @@
-Via header is [uScRs f p eN;t cCH p s ], Length is 25
+Via header is [uScRs f p eN;t cCHp s ], Length is 24
Via Header Details:
Request headers received from client :simple request (not conditional)
Result of Traffic Server cache lookup for URL :in cache, fresh Ram hit (a cache "HIT")
diff --git a/src/traffic_via/tests/long rubbish via code 2 b/src/traffic_via/tests/long rubbish via code2
similarity index 83%
rename from src/traffic_via/tests/long rubbish via code 2
rename to src/traffic_via/tests/long rubbish via code2
index b8f47ef..d3abd3d 100644
--- a/src/traffic_via/tests/long rubbish via code 2
+++ b/src/traffic_via/tests/long rubbish via code2
@@ -12,6 +12,6 @@ traffic_via: Invalid VIA header character: i
traffic_via: Invalid VIA header character: a
traffic_via: Invalid VIA header character: o
traffic_via: Invalid VIA header character: d
-Via header is long rubbish via code 2, Length is 23
+Via header is long rubbish via code2, Length is 22
Via Header Details:
-Error codes (if any) :unknown
+Error codes (if any) :Invalid sequence
diff --git a/src/traffic_via/tests/rubbish b/src/traffic_via/tests/rubbish
index 51066c1..348f372 100644
--- a/src/traffic_via/tests/rubbish
+++ b/src/traffic_via/tests/rubbish
@@ -1,4 +1,4 @@
Via header is rubbish, Length is 7
-Invalid VIA header. VIA header length should be 6 or 23 characters
+Invalid VIA header. VIA header length should be 6 or 22 characters
Valid via header format is [u<client-stuff>c<cache-lookup-stuff>s<server-stuff>f<cache-fill-stuff>p<proxy-stuff>e<error-codes>:t<tunneling-info>c<cache type><cache-lookup-result>p<parent-proxy-conn-info>s<server-conn-info>]
diff --git a/src/traffic_via/traffic_via.cc b/src/traffic_via/traffic_via.cc
index db55da3..b755f2c 100644
--- a/src/traffic_via/traffic_via.cc
+++ b/src/traffic_via/traffic_via.cc
@@ -238,13 +238,13 @@ decodeViaHeader(const char *str)
++viaHdrLength;
}
- if (viaHdrLength == 23 || viaHdrLength == 6) {
+ if (viaHdrLength == 22 || viaHdrLength == 6) {
// Decode via header
printViaHeader(Via);
return TS_ERR_OKAY;
}
// Invalid header size, come out.
- printf("\nInvalid VIA header. VIA header length should be 6 or 23 characters\n");
+ printf("\nInvalid VIA header. VIA header length should be 6 or 22 characters\n");
printf("Valid via header format is "
"[u<client-stuff>c<cache-lookup-stuff>s<server-stuff>f<cache-fill-stuff>p<proxy-stuff>e<error-codes>:t<tunneling-info>c<"
"cache type><cache-lookup-result>p<parent-proxy-conn-info>s<server-conn-info>]\n");