You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2018/09/12 18:04:14 UTC
[trafficserver] branch 8.0.x updated (0b703a4 -> 9305278)
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a change to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.
from 0b703a4 PR #3724: Backport to ATS 8. Cherry-pick from 079a40277a450ead4eecb4f5cf00a448ac7db025
new a9ae8ad Corrects IPv4 multicast ip address check
new 35b5c94 Fix inconsistent links in docs.
new 9305278 Disable the HttpSM half open logic if the underlying transport is TLS
The 3 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:
doc/admin-guide/files/records.config.en.rst | 2 +-
include/tscore/ink_inet.h | 2 +-
proxy/http/Http1ClientSession.h | 7 +++++++
proxy/http/Http1ClientTransaction.cc | 7 ++++++-
4 files changed, 15 insertions(+), 3 deletions(-)
[trafficserver] 03/03: Disable the HttpSM half open logic if the
underlying transport is TLS
Posted by bc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 9305278f547ad4b8fb69b33dacc9f1d21829a734
Author: Susan Hinrichs <sh...@apache.org>
AuthorDate: Thu Sep 6 16:34:29 2018 -0500
Disable the HttpSM half open logic if the underlying transport is TLS
(cherry picked from commit 422e81057070d405a1aa24575d36383e8a7c8d2e)
---
proxy/http/Http1ClientSession.h | 7 +++++++
proxy/http/Http1ClientTransaction.cc | 7 ++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/proxy/http/Http1ClientSession.h b/proxy/http/Http1ClientSession.h
index 6591202..4221002 100644
--- a/proxy/http/Http1ClientSession.h
+++ b/proxy/http/Http1ClientSession.h
@@ -76,6 +76,13 @@ public:
void do_io_shutdown(ShutdownHowTo_t howto) override;
void reenable(VIO *vio) override;
+ bool
+ allow_half_open()
+ {
+ // Only allow half open connections if the not over TLS
+ return (client_vc && dynamic_cast<SSLNetVConnection *>(client_vc) == nullptr);
+ }
+
void
set_half_close_flag(bool flag) override
{
diff --git a/proxy/http/Http1ClientTransaction.cc b/proxy/http/Http1ClientTransaction.cc
index 2d4edb0..5c5f175 100644
--- a/proxy/http/Http1ClientTransaction.cc
+++ b/proxy/http/Http1ClientTransaction.cc
@@ -71,5 +71,10 @@ Http1ClientTransaction::transaction_done()
bool
Http1ClientTransaction::allow_half_open() const
{
- return current_reader ? current_reader->t_state.txn_conf->allow_half_open > 0 : true;
+ bool config_allows_it = (current_reader) ? current_reader->t_state.txn_conf->allow_half_open > 0 : true;
+ if (config_allows_it) {
+ // Check with the session to make sure the underlying transport allows the half open scenario
+ return static_cast<Http1ClientSession *>(parent)->allow_half_open();
+ }
+ return false;
}
[trafficserver] 02/03: Fix inconsistent links in docs.
Posted by bc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 35b5c94cbdcbd39efe5b3460232ed01cef89a9ec
Author: Susan Hinrichs <sh...@apache.org>
AuthorDate: Thu Sep 6 09:36:03 2018 -0500
Fix inconsistent links in docs.
(cherry picked from commit 385c2f5d759ceba57ebb9a9a917fa845f1f1082b)
---
doc/admin-guide/files/records.config.en.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/admin-guide/files/records.config.en.rst b/doc/admin-guide/files/records.config.en.rst
index 57d6e5b..de434e1 100644
--- a/doc/admin-guide/files/records.config.en.rst
+++ b/doc/admin-guide/files/records.config.en.rst
@@ -3084,7 +3084,7 @@ SSL Termination
Configures the pair of the AEAD algorithm and hash algorithm to be
used with HKDF provided by OpenSSL which |TS| will use for TLSv1.3
connections. For the list of algorithms and instructions, see
- The ``-ciphersuites`` section of `OpenSSL Ciphers <https://www.openssl.org/docs/man1.1.1/man1/ciphers.html>`_.
+ The ``-ciphersuites`` section of `OpenSSL Ciphers <https://www.openssl.org/docs/manmaster/man1/ciphers.html>`_.
The current default value with OpenSSL is:
[trafficserver] 01/03: Corrects IPv4 multicast ip address check
Posted by bc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit a9ae8ad3bc2f3a69dbb94421bf13d16e51587518
Author: Derek Dagit <de...@oath.com>
AuthorDate: Thu Aug 23 11:36:51 2018 -0500
Corrects IPv4 multicast ip address check
(cherry picked from commit bb0275ea2ea9c0f86080b4a1596038f898eb39ac)
---
include/tscore/ink_inet.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/tscore/ink_inet.h b/include/tscore/ink_inet.h
index d5d810d..4cbf14c 100644
--- a/include/tscore/ink_inet.h
+++ b/include/tscore/ink_inet.h
@@ -620,7 +620,7 @@ ats_is_ip_loopback(IpEndpoint const *ip)
inline bool
ats_is_ip_multicast(sockaddr const *ip)
{
- return ip && ((AF_INET == ip->sa_family && 0xe == *ats_ip_addr8_cast(ip)) ||
+ return ip && ((AF_INET == ip->sa_family && 0xe == (ats_ip_addr8_cast(ip)[0] >> 4)) ||
(AF_INET6 == ip->sa_family && IN6_IS_ADDR_MULTICAST(&ats_ip6_addr_cast(ip))));
}
/// Check for multicast.