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 2015/02/24 18:48:45 UTC

[1/3] trafficserver git commit: Fix indentation / style

Repository: trafficserver
Updated Branches:
  refs/heads/master 6041b439a -> 7b7ada184


Fix indentation / style


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

Branch: refs/heads/master
Commit: 7b7ada1845b2a337a01948cf82d60cda43aa5492
Parents: ec1e752
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri Feb 20 16:56:48 2015 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Feb 24 10:42:08 2015 -0700

----------------------------------------------------------------------
 CHANGES | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7b7ada18/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index da388b9..8e23725 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,7 +12,7 @@ Changes with Apache Traffic Server 5.3.0
   *) [TS-3358] Add access checking to the management API.
 
   *) [TS-3400] Use common FNV hash code everywhere.
-  
+
   *) [TS-3379] Show which AF was specified to bind, on success as well as
    error.
 
@@ -22,11 +22,12 @@ Changes with Apache Traffic Server 5.3.0
 
   *) [TS-3397] Bug with ink_strlcpy and non-null terminated strings.
 
-  *) [TS-3398] Enhance header_rewrite to support METHOD as a condition
+  *) [TS-3398] Enhance header_rewrite to support METHOD as a condition.
 
-  *) [TS-3394] Return an error on a non-http response
+  *) [TS-3394] Return an error on a non-http response.
 
-  *) [TS-3390] TrafficServer segfaults on shutdown because of uninitialized SPDY sessions
+  *) [TS-3390] TrafficServer segfaults on shutdown because of uninitialized
+   SPDY sessions.
 
   *) [TS-3389] Refine error returns in SSL loading.
 
@@ -40,9 +41,10 @@ Changes with Apache Traffic Server 5.3.0
 
   *) [TS-3375] Memory leak and error handling in SSL loading.
 
-  *) [TS-3380] Fix the detection of new openssl calls to enable compilation against libressl.
+  *) [TS-3380] Fix the detection of new openssl calls to enable compilation
+   against libressl.
 
-  *) [TS-3364] Add command line config validation support to traffic_server
+  *) [TS-3364] Add command line config validation support to traffic_server.
 
   *) [TS-3377] Fix bad file descriptor handling that caused disks in
    storage.config to be marked bad.


[3/3] trafficserver git commit: TS-3379 Show which AF was specified to bind, on success as well as error

Posted by zw...@apache.org.
TS-3379 Show which AF was specified to bind, on success as well as error


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

Branch: refs/heads/master
Commit: e77ccdb6222210993d7917123a246e865b3abf79
Parents: 6041b43
Author: Leif Hedstrom <zw...@apache.org>
Authored: Sat Feb 7 22:04:32 2015 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Feb 24 10:42:08 2015 -0700

----------------------------------------------------------------------
 mgmt/LocalManager.cc | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e77ccdb6/mgmt/LocalManager.cc
----------------------------------------------------------------------
diff --git a/mgmt/LocalManager.cc b/mgmt/LocalManager.cc
index 8d9ba0c..9032334 100644
--- a/mgmt/LocalManager.cc
+++ b/mgmt/LocalManager.cc
@@ -1006,7 +1006,7 @@ LocalManager::listenForProxy()
     return;
 
   // We are not already bound, bind the port
-  for ( int i = 0, n = lmgmt->m_proxy_ports.length() ; i < n ; ++i ) {
+  for (int i = 0, n = lmgmt->m_proxy_ports.length() ; i < n ; ++i ) {
     HttpProxyPort& p = lmgmt->m_proxy_ports[i];
     if (ts::NO_FD == p.m_fd) {
       this->bindProxyPort(p);
@@ -1019,11 +1019,24 @@ LocalManager::listenForProxy()
     if (found) {
       backlog = config_backlog;
     }
+    const char* af_family;
+
+    switch (p.m_family) {
+    case AF_INET6:
+      af_family = "IPv6";
+      break;
+    case AF_INET:
+      af_family = "IPv4";
+      break;
+    default:
+      af_family = "Unknown";
+    }
 
     if ((listen(p.m_fd, backlog)) < 0) {
-      mgmt_fatal(stderr, errno, "[LocalManager::listenForProxy] Unable to listen on socket: %d\n", p.m_port);
+      mgmt_fatal(stderr, errno, "[LocalManager::listenForProxy] Unable to listen on port: %d (%s)\n",
+                 p.m_port, af_family);
     }
-    mgmt_log(stderr, "[LocalManager::listenForProxy] Listening on port: %d\n", p.m_port);
+    mgmt_log(stderr, "[LocalManager::listenForProxy] Listening on port: %d (%s)\n", p.m_port, af_family);
   }
   return;
 }


[2/3] trafficserver git commit: Add TS-3379

Posted by zw...@apache.org.
Add TS-3379


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

Branch: refs/heads/master
Commit: ec1e752a05ef808fa0b25859d0b61ce7fddd9fa0
Parents: e77ccdb
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri Feb 20 16:56:18 2015 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Feb 24 10:42:08 2015 -0700

----------------------------------------------------------------------
 CHANGES | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ec1e752a/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 3dd3142..da388b9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,9 @@ Changes with Apache Traffic Server 5.3.0
   *) [TS-3358] Add access checking to the management API.
 
   *) [TS-3400] Use common FNV hash code everywhere.
+  
+  *) [TS-3379] Show which AF was specified to bind, on success as well as
+   error.
 
   *) [TS-3334] Restore default for proxy.config.proxy_name.