[trafficserver] branch master updated (c98bc04 -> d59fafc)

[rr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rrm pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.


    from c98bc04  Link with libluajit for the lua plugin
     new 86ae514  Logs parse error if ssl_server_name.yaml fails to load
     new d59fafc  Warns on empty ssl_server_name.yaml configuration file

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/SSLSNIConfig.cc  | 4 +++-
 iocore/net/YamlSNIConfig.cc | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

[trafficserver] 01/02: Logs parse error if ssl_server_name.yaml fails to load

[rr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rrm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit 86ae51499aa4c99efe4b4665bfda06b5acdd1171
Author: Randall Meyer <ra...@yahoo.com>
AuthorDate: Tue Jun 26 14:39:49 2018 -0700

    Logs parse error if ssl_server_name.yaml fails to load
---
 iocore/net/SSLSNIConfig.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/iocore/net/SSLSNIConfig.cc b/iocore/net/SSLSNIConfig.cc
index 71ff860..1dd5036 100644
--- a/iocore/net/SSLSNIConfig.cc
+++ b/iocore/net/SSLSNIConfig.cc
@@ -153,7 +153,9 @@ SNIConfigParams::Initialize()
 
   ts::Errata zret = Y_sni.loader(sni_filename);
   if (!zret.isOK()) {
-    Note("failed to reload ssl_server_name.yaml");
+    std::stringstream errMsg;
+    errMsg << zret;
+    Error("failed to load ssl_server_name.yaml: %s", errMsg.str().c_str());
     return 1;
   }
 

[trafficserver] 02/02: Warns on empty ssl_server_name.yaml configuration file

[rr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rrm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit d59fafcbcae24ad7d6e5d033e78208531071a8a0
Author: Randall Meyer <ra...@yahoo.com>
AuthorDate: Tue Jun 26 16:27:40 2018 -0700

    Warns on empty ssl_server_name.yaml configuration file
---
 iocore/net/YamlSNIConfig.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/iocore/net/YamlSNIConfig.cc b/iocore/net/YamlSNIConfig.cc
index 5d20ccd..06f8c6f 100644
--- a/iocore/net/YamlSNIConfig.cc
+++ b/iocore/net/YamlSNIConfig.cc
@@ -36,6 +36,11 @@ YamlSNIConfig::loader(const char *cfgFilename)
 {
   try {
     YAML::Node config = YAML::LoadFile(cfgFilename);
+    if (config.IsNull()) {
+      Warning("%s is empty", cfgFilename);
+      return ts::Errata();
+    }
+
     if (!config.IsSequence()) {
       return ts::Errata::Message(1, 1, "expected sequence");
     }