trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject git commit: Backport TS-1065
Date Sat, 25 Feb 2012 19:53:58 GMT
Updated Branches:
  refs/heads/3.0.x 2f9ccb0e2 -> 098d24231


Backport TS-1065


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

Branch: refs/heads/3.0.x
Commit: 098d242313bf6f0f0824332f67c7505cce6021da
Parents: 2f9ccb0
Author: Brian Geffon <briang@apache.org>
Authored: Sat Feb 25 11:52:06 2012 -0800
Committer: Brian Geffon <briang@apache.org>
Committed: Sat Feb 25 11:52:06 2012 -0800

----------------------------------------------------------------------
 CHANGES           |    3 +++
 STATUS            |    5 -----
 cop/TrafficCop.cc |    7 ++++++-
 3 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/098d2423/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 33bb15d..f013999 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.0.4
+  
+  *) [TS-1065] Traffic Cop: segment fault when TRACE_LOG_COP is enabled
+   Author: Conan Wang
 
   *) [TS-948] do not reload bad remap.config
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/098d2423/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index cfc44b5..be492dd 100644
--- a/STATUS
+++ b/STATUS
@@ -41,11 +41,6 @@ A list of all bugs open for the next v3.0.4 release can be found at
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
 
-  *) Traffic Cop: segment fault when TRACE_LOG_COP is enabled
-   Trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1225724
-   Jira: https://issues.apache.org/jira/browse/TS-1065
-   +1: igalic, zwoop, briang
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/098d2423/cop/TrafficCop.cc
----------------------------------------------------------------------
diff --git a/cop/TrafficCop.cc b/cop/TrafficCop.cc
index bdec725..84215de 100644
--- a/cop/TrafficCop.cc
+++ b/cop/TrafficCop.cc
@@ -161,8 +161,13 @@ cop_log(int priority, const char *format, ...)
       break;
     }
 
-    vfprintf(trace_file, format, args);
+    va_list args_tmp;
+    va_copy(args_tmp, args);
+
+    vfprintf(trace_file, format, args_tmp);
     fflush(trace_file);
+
+    va_end(args_tmp);
   }
 #endif
 


Mime
View raw message