[trafficserver] branch 7.1.x updated: clang-format
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/7.1.x by this push:
new 1d40746 clang-format
1d40746 is described below
commit 1d40746c7bcd0bcd3ab64a58ba76a4a27926fbe4
Author: Bryan Call
AuthorDate: Fri Feb 7 13:30:14 2020 -0800
clang-format
---
proxy/hdrs/HdrTest.cc | 102 +-
1 file changed, 27 insertions(+), 75 deletions(-)
diff --git a/proxy/hdrs/HdrTest.cc b/proxy/hdrs/HdrTest.cc
index 0027c54..800600b 100644
--- a/proxy/hdrs/HdrTest.cc
+++ b/proxy/hdrs/HdrTest.cc
@@ -345,95 +345,47 @@ HdrTest::test_url()
"cheese://bogosity",
-"some.place",
-"some.place/",
-"http://some.place;,
-"http://some.place/;,
-"http://some.place/path;,
-"http://some.place/path;params;,
-"http://some.place/path;params?query;,
-"http://some.place/path;params?query#fragment;,
-"http://some.place/path?query#fragment;,
-"http://some.place/path#fragment;,
+"some.place", "some.place/", "http://some.place;, "http://some.place/;,
"http://some.place/path;,
+"http://some.place/path;params;, "http://some.place/path;params?query;,
"http://some.place/path;params?query#fragment;,
+"http://some.place/path?query#fragment;, "http://some.place/path#fragment;,
-"some.place:80",
-"some.place:80/",
-"http://some.place:80;,
-"http://some.place:80/;,
+"some.place:80", "some.place:80/", "http://some.place:80;,
"http://some.place:80/;,
-"foo@some.place:80",
-"foo@some.place:80/",
-"http://foo@some.place:80;,
-"http://foo@some.place:80/;,
+"foo@some.place:80", "foo@some.place:80/", "http://foo@some.place:80;,
"http://foo@some.place:80/;,
-"foo:bar@some.place:80",
-"foo:bar@some.place:80/",
-"http://foo:bar@some.place:80;,
-"http://foo:bar@some.place:80/;,
+"foo:bar@some.place:80", "foo:bar@some.place:80/",
"http://foo:bar@some.place:80;, "http://foo:bar@some.place:80/;,
// Some address stuff
-"http://172.16.28.101;,
-"http://172.16.28.101:8080;,
-"http://[::];,
-"http://[::1];,
-"http://[fc01:172:16:28::101];,
-"http://[fc01:172:16:28::101]:80;,
-"http://[fc01:172:16:28:BAAD:BEEF:DEAD:101];,
-"http://[fc01:172:16:28:BAAD:BEEF:DEAD:101]:8080;,
-"http://172.16.28.101/some/path;,
-"http://172.16.28.101:8080/some/path;,
-"http://[::1]/some/path;,
-"http://[fc01:172:16:28::101]/some/path;,
-"http://[fc01:172:16:28::101]:80/some/path;,
-"http://[fc01:172:16:28:BAAD:BEEF:DEAD:101]/some/path;,
-"http://[fc01:172:16:28:BAAD:BEEF:DEAD:101]:8080/some/path;,
-"http://172.16.28.101/;,
-"http://[fc01:172:16:28:BAAD:BEEF:DEAD:101]:8080/;,
+"http://172.16.28.101;, "http://172.16.28.101:8080;, "http://[::];,
"http://[::1];, "http://[fc01:172:16:28::101];,
+"http://[fc01:172:16:28::101]:80;,
"http://[fc01:172:16:28:BAAD:BEEF:DEAD:101];,
+"http://[fc01:172:16:28:BAAD:BEEF:DEAD:101]:8080;,
"http://172.16.28.101/some/path;, "http://172.16.28.101:8080/some/path;,
+"http://[::1]/some/path;, "http://[fc01:172:16:28::101]/some/path;,
"http://[fc01:172:16:28::101]:80/some/path;,
+"http://[fc01:172:16:28:BAAD:BEEF:DEAD:101]/some/path;,
"http://[fc01:172:16:28:BAAD:BEEF:DEAD:101]:8080/some/path;,
+"http://172.16.28.101/;,
"http://[fc01:172:16:28:BAAD:BEEF:DEAD:101]:8080/;,
// "foo:@some.place", TODO - foo:@some.place is change to foo@some.place
in the test
-"foo:bar@some.place",
-"foo:bar@some.place/",
-"http://foo:bar@some.place;,
-"http://foo:bar@some.place/;,
-"http://foo:bar@[::1]:8080/;,
-"http://foo@[::1];,
-
-"mms://sm02.tsqa.example.com/0102rally.asf",
-"pnm://foo:bar@some.place:80/path;params?query#fragment",
-"rtsp://foo:bar@some.place:80/path;params?query#fragment",
-"rtspu://foo:bar@some.place:80/path;params?query#fragment",
+"foo:bar@some.place", "foo:bar@some.place/", "http://foo:bar@some.place;,
"http://foo:bar@some.place/;,
+"http://foo:bar@[::1]:8080/;, "http://foo@[::1];,
+
+"mms://sm02.tsqa.example.com/0102rally.asf",
"pnm://foo:bar@some.place:80/path;params?query#fragment",
+"rtsp://foo:bar@some.place:80/path;params?query#fragment",
"rtspu://foo:bar@some.place:80/path;params?query#fragment",
"/finance/external/cbsm/*http://cbs.marketwatch.com/archive/19990713/news/current/net.htx?source=blq/yhoo=yhoo;,
"http://a.b.com/xx.jpg?newpath=http://bob.dave.com;,
-"ht-tp://a.b.com",
-"ht+tp://a.b.com",
-"ht.tp://a.b.com",
+"ht-tp://a.b.com", "ht+tp://a.b.com", "ht.tp://a.b.com",
-"h1ttp://a.b.com",
-"http1://a.b.com",
+"h1ttp://a.b.com", "http1://a.b.com",
};
static const char *bad[] = {
-"http://[1:2:3:4:5:6:7:8:9];,
-"http://1:2:3:4:5:6:7:8:A:B;,
-"http://bob.com[::1];,
-
[trafficserver] branch 7.1.x updated: Change header validation
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/7.1.x by this push:
new 805dd12 Change header validation
805dd12 is described below
commit 805dd12dcbff171a1e9c27063e14bcddbfd61e2a
Author: ZeddYu Lu
AuthorDate: Tue Feb 4 11:20:13 2020 -0800
Change header validation
(cherry picked from commit 5830bc72611e85e7a31098ce86710242f29076dc)
Conflicts:
proxy/hdrs/HTTP.cc
---
proxy/hdrs/HTTP.cc | 22 ++
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/proxy/hdrs/HTTP.cc b/proxy/hdrs/HTTP.cc
index 6566dab..b96ccf8 100644
--- a/proxy/hdrs/HTTP.cc
+++ b/proxy/hdrs/HTTP.cc
@@ -1120,19 +1120,17 @@ http_parser_parse_req(HTTPParser *parser, HdrHeap
*heap, HTTPHdrImpl *hh, const
end= real_end;
parser->m_parsing_http = false;
-
-ParseResult ret = mime_parser_parse(>m_mime_parser, heap,
hh->m_fields_impl, start, end, must_copy_strings, eof);
-// If we're done with the main parse do some validation
-if (ret == PARSE_RESULT_DONE) {
- ret = validate_hdr_host(hh); // check HOST header
-}
-if (ret == PARSE_RESULT_DONE) {
- ret = validate_hdr_content_length(heap, hh);
-}
-return ret;
}
- return mime_parser_parse(>m_mime_parser, heap, hh->m_fields_impl,
start, end, must_copy_strings, eof);
+ ParseResult ret = mime_parser_parse(>m_mime_parser, heap,
hh->m_fields_impl, start, end, must_copy_strings, eof);
+ // If we're done with the main parse do some validation
+ if (ret == PARSE_RESULT_DONE) {
+ret = validate_hdr_host(hh); // check HOST header
+ }
+ if (ret == PARSE_RESULT_DONE) {
+ret = validate_hdr_content_length(heap, hh);
+ }
+ return ret;
}
ParseResult
@@ -1187,7 +1185,7 @@ validate_hdr_content_length(HdrHeap *heap, HTTPHdrImpl
*hh)
if (mime_hdr_field_find(hh->m_fields_impl, MIME_FIELD_TRANSFER_ENCODING,
MIME_LEN_TRANSFER_ENCODING) != nullptr) {
// Delete all Content-Length headers
Debug("http", "Transfer-Encoding header and Content-Length headers the
request, removing all Content-Length headers");
- mime_hdr_field_delete(heap, hh->m_fields_impl, content_length_field);
+ mime_hdr_field_delete(heap, hh->m_fields_impl, content_length_field,
true);
return PARSE_RESULT_DONE;
}
[trafficserver] branch 7.1.x updated (6ef406c -> bc7d467)
This is an automated email from the ASF dual-hosted git repository. bcall pushed a change to branch 7.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from 6ef406c Fixed clang compile issue with override add bc7d467 Fixed how we handle uknown schemes No new revisions were added by this update. Summary of changes: proxy/hdrs/HdrTest.cc | 101 +++--- proxy/hdrs/URL.cc | 49 +--- 2 files changed, 108 insertions(+), 42 deletions(-)
[trafficserver] branch 9.0.x updated: Update inactive_timeout_at in Http2Stream::signal_read_event()
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 200195a Update inactive_timeout_at in Http2Stream::signal_read_event()
200195a is described below
commit 200195a3ce6ba5da47c3c9bb3ac90c1241c056ea
Author: Masaori Koshiba
AuthorDate: Thu Jan 30 16:24:17 2020 +0900
Update inactive_timeout_at in Http2Stream::signal_read_event()
(cherry picked from commit 7d3781092e7aadef386dc8693a735230a15aea12)
---
proxy/http2/Http2Stream.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/proxy/http2/Http2Stream.cc b/proxy/http2/Http2Stream.cc
index f3519c3..daa62ad 100644
--- a/proxy/http2/Http2Stream.cc
+++ b/proxy/http2/Http2Stream.cc
@@ -668,6 +668,7 @@ Http2Stream::signal_read_event(int event)
MUTEX_TRY_LOCK(lock, read_vio.cont->mutex, this_ethread());
if (lock.is_locked()) {
+inactive_timeout_at = Thread::get_hrtime() + inactive_timeout;
this->read_vio.cont->handleEvent(event, >read_vio);
} else {
if (this->_read_vio_event) {
[trafficserver] branch master updated (f78c723 -> 7d37810)
This is an automated email from the ASF dual-hosted git repository. masaori pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from f78c723 Fix localstatedir and runtimedir for Debian layout add 7d37810 Update inactive_timeout_at in Http2Stream::signal_read_event() No new revisions were added by this update. Summary of changes: proxy/http2/Http2Stream.cc | 1 + 1 file changed, 1 insertion(+)
