git commit: TS-1976: invalid httpport argument passed from traffic_manager

[jp...@apache.org]

Updated Branches:
  refs/heads/master d50a63eee -> 0da423674


TS-1976: invalid httpport argument passed from traffic_manager


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0da42367
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0da42367
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0da42367

Branch: refs/heads/master
Commit: 0da423674025020065d6cc54d7631d5e156f0e6b
Parents: d50a63e
Author: Thach Tran <tr...@gmail.com>
Authored: Tue Jul 30 12:18:55 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Tue Jul 30 12:18:55 2013 -0700

----------------------------------------------------------------------
 CHANGES              | 4 ++++
 mgmt/LocalManager.cc | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0da42367/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index c874551..dc9fc4c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 Changes with Apache Traffic Server 3.3.5
 
 
+  *) [TS-1976] Prevent an invalid httpport argument being passed from
+   traffic_manager to traffic_server
+   Author: Thach Tran <tr...@gmail.com>
+
   *) [TS-2076] Removed proxy.config.http.accept_encoding_filter_enabled, which
    is obsolete.
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0da42367/mgmt/LocalManager.cc
----------------------------------------------------------------------
diff --git a/mgmt/LocalManager.cc b/mgmt/LocalManager.cc
index e8640ed..6d1fc73 100644
--- a/mgmt/LocalManager.cc
+++ b/mgmt/LocalManager.cc
@@ -1030,7 +1030,9 @@ LocalManager::startProxy()
     }
 
     // NUL-terminate for the benefit of strtok and printf.
-    real_proxy_options.append('\0');
+    // XXX TS-1976: a small hack to work around the Vec template's
+    // dislike of storing NUL bytes.
+    real_proxy_options.append("", 1);
 
     Debug("lm", "[LocalManager::startProxy] Launching %s with options '%s'\n",
           absolute_proxy_binary, &real_proxy_options[0]);