You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2021/11/08 18:46:34 UTC
[trafficserver] branch 9.1.x updated (68d952c -> fc42c27)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a change to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.
from 68d952c Exports all symbols for missing_mangled_definition.so test plugin (#8444)
new c873b4d fix the scheme of h2 0rtt tests (#7957)
new fc42c27 UnixNetVConnection: add check for nh in fail block (#8479)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
iocore/net/UnixNetVConnection.cc | 8 ++++++--
tests/gold_tests/tls/early_h2_get.txt | Bin 77 -> 77 bytes
tests/gold_tests/tls/early_h2_multi1.txt | Bin 172 -> 172 bytes
tests/gold_tests/tls/early_h2_multi2.txt | Bin 170 -> 170 bytes
tests/gold_tests/tls/early_h2_post.txt | Bin 77 -> 77 bytes
tests/gold_tests/tls/h2_early_gen.py | 2 +-
6 files changed, 7 insertions(+), 3 deletions(-)
[trafficserver] 01/02: fix the scheme of h2 0rtt tests (#7957)
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit c873b4d9f9e402ba82aa6047f5de92b110f412ac
Author: Fei Deng <du...@gmail.com>
AuthorDate: Mon Jun 21 12:00:32 2021 -0500
fix the scheme of h2 0rtt tests (#7957)
(cherry picked from commit ac25f04363b30b093d3674420c84e275aea59605)
---
tests/gold_tests/tls/early_h2_get.txt | Bin 77 -> 77 bytes
tests/gold_tests/tls/early_h2_multi1.txt | Bin 172 -> 172 bytes
tests/gold_tests/tls/early_h2_multi2.txt | Bin 170 -> 170 bytes
tests/gold_tests/tls/early_h2_post.txt | Bin 77 -> 77 bytes
tests/gold_tests/tls/h2_early_gen.py | 2 +-
5 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/gold_tests/tls/early_h2_get.txt b/tests/gold_tests/tls/early_h2_get.txt
index 6f535e8..9c937a6 100644
Binary files a/tests/gold_tests/tls/early_h2_get.txt and b/tests/gold_tests/tls/early_h2_get.txt differ
diff --git a/tests/gold_tests/tls/early_h2_multi1.txt b/tests/gold_tests/tls/early_h2_multi1.txt
index 71c3350..b7fb851 100644
Binary files a/tests/gold_tests/tls/early_h2_multi1.txt and b/tests/gold_tests/tls/early_h2_multi1.txt differ
diff --git a/tests/gold_tests/tls/early_h2_multi2.txt b/tests/gold_tests/tls/early_h2_multi2.txt
index cdd633a..c1a5498 100644
Binary files a/tests/gold_tests/tls/early_h2_multi2.txt and b/tests/gold_tests/tls/early_h2_multi2.txt differ
diff --git a/tests/gold_tests/tls/early_h2_post.txt b/tests/gold_tests/tls/early_h2_post.txt
index ecee5c7..2fee7c1 100644
Binary files a/tests/gold_tests/tls/early_h2_post.txt and b/tests/gold_tests/tls/early_h2_post.txt differ
diff --git a/tests/gold_tests/tls/h2_early_gen.py b/tests/gold_tests/tls/h2_early_gen.py
index aef85a9..8326552 100755
--- a/tests/gold_tests/tls/h2_early_gen.py
+++ b/tests/gold_tests/tls/h2_early_gen.py
@@ -127,7 +127,7 @@ def make_headers_frame(method, path='', stream_id=0x01):
headers.append((':path', '/early_post'))
headers.extend([
- (':scheme', 'http'),
+ (':scheme', 'https'),
(':authority', '127.0.0.1'),
('host', '127.0.0.1'),
('accept', '*/*')
[trafficserver] 02/02: UnixNetVConnection: add check for nh in fail
block (#8479)
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit fc42c273f80eb916b3172084b3507c38f6b58244
Author: Brian Olsen <bn...@gmail.com>
AuthorDate: Mon Nov 8 08:07:16 2021 -0700
UnixNetVConnection: add check for nh in fail block (#8479)
(cherry picked from commit 6663d7b3de53c8e7ee85eae39db0fa4164638ed8)
---
iocore/net/UnixNetVConnection.cc | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index 696850a..9d9aa6b 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -690,7 +690,7 @@ UnixNetVConnection::do_io_close(int alerrno /* = -1 */)
if (nh) {
nh->free_netevent(this);
} else {
- free(t);
+ this->free(t);
}
}
}
@@ -1307,7 +1307,11 @@ fail:
if (fd != NO_FD) {
con.fd = NO_FD;
}
- nh->free_netevent(this);
+ if (nullptr != nh) {
+ nh->free_netevent(this);
+ } else {
+ this->free(t);
+ }
return CONNECT_FAILURE;
}