[trafficserver] 03/03: esi/combo_handler plugin doesn't register

[zw...@apache.org]

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

zwoop pushed a commit to branch 7.1.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

commit cebaa9c17c29973c323c9e937f0cdea6a7bec1d6
Author: Daniel Xu <dl...@yahoo.com>
AuthorDate: Fri Feb 24 10:08:32 2017 -0600

    esi/combo_handler plugin doesn't register
    
    The plugin doesn't call TSPluginRegister. The causes ATS to crash upon
    startup if combo_handler is enabled.
    
    (cherry picked from commit 2724f48bd08a63558d88c5fbeeb0ba6a762c545f)
---
 plugins/esi/combo_handler.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plugins/esi/combo_handler.cc b/plugins/esi/combo_handler.cc
index 7ffa361..788498c 100644
--- a/plugins/esi/combo_handler.cc
+++ b/plugins/esi/combo_handler.cc
@@ -210,6 +210,16 @@ pthread_key_t threadKey = 0;
 void
 TSPluginInit(int argc, const char *argv[])
 {
+  TSPluginRegistrationInfo info;
+  info.plugin_name   = "combo_handler";
+  info.vendor_name   = "Apache Software Foundation";
+  info.support_email = "dev@trafficserver.apache.org";
+
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
+    TSError("[combo_handler][%s] plugin registration failed.", __FUNCTION__);
+    return;
+  }
+
   if ((argc > 1) && (strcmp(argv[1], "-") != 0)) {
     COMBO_HANDLER_PATH = argv[1];
     if (COMBO_HANDLER_PATH == "/") {

-- 
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.