From: Aron Xu <aron@debian.org>
Date: Mon, 5 Nov 2018 09:13:03 +0000 (+0000)
Subject: fix-traffic_via
X-Git-Tag: archive/raspbian/8.0.2+ds-1+rpi1~1^2^2^2^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d218c174f8de5b9ef64db524ec7b2a308e4372e5;p=trafficserver.git

fix-traffic_via


Gbp-Pq: Name 0012-fix-traffic_via.patch
---

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 ]
deleted file mode 100644
index f574eb27..00000000
--- a/src/traffic_via/tests/[u c s f p eS;tNc   p s ]	
+++ /dev/null
@@ -1,13 +0,0 @@
-Via header is [u c s f p eS;tNc   p s ], Length is 25
-Via Header Details:
-Request headers received from client                   :unknown
-Result of Traffic Server cache lookup for URL          :no cache lookup
-Response information received from origin server       :no server connection needed
-Result of document write-to-cache:                     :no cache write performed
-Proxy operation result                                 :unknown
-Error codes (if any)                                   :server related error
-Tunnel info                                            :tunneling due to no forward
-Cache Type                                             :unknown
-Cache Lookup Result                                    :cache miss or no cache lookup
-Parent proxy connection status                         :no parent proxy or unknown
-Origin server connection status                        :no server connection needed
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 ]
new file mode 100644
index 00000000..95cf7a7d
--- /dev/null
+++ b/src/traffic_via/tests/[u c s f p eS;tNc  p s ]	
@@ -0,0 +1,13 @@
+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
+Response information received from origin server       :no server connection needed
+Result of document write-to-cache:                     :no cache write performed
+Proxy operation result                                 :unknown
+Error codes (if any)                                   :server related error
+Tunnel info                                            :tunneling due to no forward
+Cache Type                                             :unknown
+Cache Lookup Result                                    :cache miss or no cache lookup
+Parent proxy connection status                         :no parent proxy or unknown
+Origin server connection status                        :no server connection needed
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 cCH p s ]
deleted file mode 100644
index e7b47996..00000000
--- a/src/traffic_via/tests/[uIcRs f p eN;t cCH p s ]	
+++ /dev/null
@@ -1,13 +0,0 @@
-Via header is [uIcRs f p eN;t cCH p s ], Length is 25
-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")
-Response information received from origin server       :no server connection needed
-Result of document write-to-cache:                     :no cache write performed
-Proxy operation result                                 :unknown
-Error codes (if any)                                   :no error
-Tunnel info                                            :no tunneling
-Cache Type                                             :cache
-Cache Lookup Result                                    :cache hit
-Parent proxy connection status                         :no parent proxy or unknown
-Origin server connection status                        :no server connection needed
diff --git a/src/traffic_via/tests/[uIcRs f p eN;t cCHp s ] b/src/traffic_via/tests/[uIcRs f p eN;t cCHp s ]
new file mode 100644
index 00000000..a5f3238c
--- /dev/null
+++ b/src/traffic_via/tests/[uIcRs f p eN;t cCHp s ]	
@@ -0,0 +1,13 @@
+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")
+Response information received from origin server       :no server connection needed
+Result of document write-to-cache:                     :no cache write performed
+Proxy operation result                                 :unknown
+Error codes (if any)                                   :no error
+Tunnel info                                            :no tunneling
+Cache Type                                             :cache
+Cache Lookup Result                                    :cache hit
+Parent proxy connection status                         :no parent proxy or unknown
+Origin server connection status                        :no server connection needed
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 cCN p s ]
deleted file mode 100644
index d3d3860b..00000000
--- a/src/traffic_via/tests/[uIcRs f p eN;t cCN p s ]	
+++ /dev/null
@@ -1,13 +0,0 @@
-Via header is [uIcRs f p eN;t cCN p s ], Length is 25
-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")
-Response information received from origin server       :no server connection needed
-Result of document write-to-cache:                     :no cache write performed
-Proxy operation result                                 :unknown
-Error codes (if any)                                   :no error
-Tunnel info                                            :no tunneling
-Cache Type                                             :cache
-Cache Lookup Result                                    :conditional hit (client sent conditional, doc fresh in cache, returned 304)
-Parent proxy connection status                         :no parent proxy or unknown
-Origin server connection status                        :no server connection needed
diff --git a/src/traffic_via/tests/[uIcRs f p eN;t cCNp s ] b/src/traffic_via/tests/[uIcRs f p eN;t cCNp s ]
new file mode 100644
index 00000000..6af0055e
--- /dev/null
+++ b/src/traffic_via/tests/[uIcRs f p eN;t cCNp s ]	
@@ -0,0 +1,13 @@
+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")
+Response information received from origin server       :no server connection needed
+Result of document write-to-cache:                     :no cache write performed
+Proxy operation result                                 :unknown
+Error codes (if any)                                   :no error
+Tunnel info                                            :no tunneling
+Cache Type                                             :cache
+Cache Lookup Result                                    :conditional hit (client sent conditional, doc fresh in cache, returned 304)
+Parent proxy connection status                         :no parent proxy or unknown
+Origin server connection status                        :no server connection needed
diff --git a/src/traffic_via/tests/[uScMsSf pSeN;t cCM p sS] b/src/traffic_via/tests/[uScMsSf pSeN;t cCM p sS]
deleted file mode 100644
index e4bee740..00000000
--- a/src/traffic_via/tests/[uScMsSf pSeN;t cCM p sS]	
+++ /dev/null
@@ -1,13 +0,0 @@
-Via header is [uScMsSf pSeN;t cCM p sS], Length is 25
-Via Header Details:
-Request headers received from client                   :simple request (not conditional)
-Result of Traffic Server cache lookup for URL          :miss (a cache "MISS")
-Response information received from origin server       :connection opened successfully
-Result of document write-to-cache:                     :no cache write performed
-Proxy operation result                                 :served or connection opened successfully
-Error codes (if any)                                   :no error
-Tunnel info                                            :no tunneling
-Cache Type                                             :cache
-Cache Lookup Result                                    :cache miss (url not in cache)
-Parent proxy connection status                         :no parent proxy or unknown
-Origin server connection status                        :connection opened successfully
diff --git a/src/traffic_via/tests/[uScMsSf pSeN;t cCMp sS] b/src/traffic_via/tests/[uScMsSf pSeN;t cCMp sS]
new file mode 100644
index 00000000..1e494c63
--- /dev/null
+++ b/src/traffic_via/tests/[uScMsSf pSeN;t cCMp sS]	
@@ -0,0 +1,13 @@
+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")
+Response information received from origin server       :connection opened successfully
+Result of document write-to-cache:                     :no cache write performed
+Proxy operation result                                 :served or connection opened successfully
+Error codes (if any)                                   :no error
+Tunnel info                                            :no tunneling
+Cache Type                                             :cache
+Cache Lookup Result                                    :cache miss (url not in cache)
+Parent proxy connection status                         :no parent proxy or unknown
+Origin server connection status                        :connection opened successfully
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 cCH p s ]
deleted file mode 100644
index e587c1a2..00000000
--- a/src/traffic_via/tests/[uScRs f p eN;t cCH p s ]	
+++ /dev/null
@@ -1,13 +0,0 @@
-Via header is [uScRs f p eN;t cCH p s ], Length is 25
-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")
-Response information received from origin server       :no server connection needed
-Result of document write-to-cache:                     :no cache write performed
-Proxy operation result                                 :unknown
-Error codes (if any)                                   :no error
-Tunnel info                                            :no tunneling
-Cache Type                                             :cache
-Cache Lookup Result                                    :cache hit
-Parent proxy connection status                         :no parent proxy or unknown
-Origin server connection status                        :no server connection needed
diff --git a/src/traffic_via/tests/[uScRs f p eN;t cCHp s ] b/src/traffic_via/tests/[uScRs f p eN;t cCHp s ]
new file mode 100644
index 00000000..d7d394c6
--- /dev/null
+++ b/src/traffic_via/tests/[uScRs f p eN;t cCHp s ]	
@@ -0,0 +1,13 @@
+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")
+Response information received from origin server       :no server connection needed
+Result of document write-to-cache:                     :no cache write performed
+Proxy operation result                                 :unknown
+Error codes (if any)                                   :no error
+Tunnel info                                            :no tunneling
+Cache Type                                             :cache
+Cache Lookup Result                                    :cache hit
+Parent proxy connection status                         :no parent proxy or unknown
+Origin server connection status                        :no server connection needed
diff --git a/src/traffic_via/tests/long rubbish via code 2 b/src/traffic_via/tests/long rubbish via code 2
deleted file mode 100644
index b8f47efa..00000000
--- a/src/traffic_via/tests/long rubbish via code 2	
+++ /dev/null
@@ -1,17 +0,0 @@
-traffic_via: Invalid VIA header character: l
-traffic_via: Invalid VIA header character: o
-traffic_via: Invalid VIA header character: n
-traffic_via: Invalid VIA header character: g
-traffic_via: Invalid VIA header character: r
-traffic_via: Invalid VIA header character: b
-traffic_via: Invalid VIA header character: b
-traffic_via: Invalid VIA header character: i
-traffic_via: Invalid VIA header character: h
-traffic_via: Invalid VIA header character: v
-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 Details:
-Error codes (if any)                                   :unknown
diff --git a/src/traffic_via/tests/long rubbish via code2 b/src/traffic_via/tests/long rubbish via code2
new file mode 100644
index 00000000..d3abd3d9
--- /dev/null
+++ b/src/traffic_via/tests/long rubbish via code2	
@@ -0,0 +1,17 @@
+traffic_via: Invalid VIA header character: l
+traffic_via: Invalid VIA header character: o
+traffic_via: Invalid VIA header character: n
+traffic_via: Invalid VIA header character: g
+traffic_via: Invalid VIA header character: r
+traffic_via: Invalid VIA header character: b
+traffic_via: Invalid VIA header character: b
+traffic_via: Invalid VIA header character: i
+traffic_via: Invalid VIA header character: h
+traffic_via: Invalid VIA header character: v
+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 code2, Length is 22
+Via Header Details:
+Error codes (if any)                                   :Invalid sequence
diff --git a/src/traffic_via/tests/rubbish b/src/traffic_via/tests/rubbish
index 51066c11..348f372e 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 db55da36..b755f2c6 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");