trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject svn commit: r937138 - in /incubator/trafficserver/traffic/branches/2.0.x: ./ CHANGES STATUS proxy/mgmt2/tools/SysAPI.cc
Date Fri, 23 Apr 2010 02:29:18 GMT
Author: zwoop
Date: Fri Apr 23 02:29:18 2010
New Revision: 937138

URL: http://svn.apache.org/viewvc?rev=937138&view=rev
Log:
Merged TS-329 from trunk, and updated STATUS and CHANGES

Modified:
    incubator/trafficserver/traffic/branches/2.0.x/   (props changed)
    incubator/trafficserver/traffic/branches/2.0.x/CHANGES
    incubator/trafficserver/traffic/branches/2.0.x/STATUS
    incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/tools/SysAPI.cc

Propchange: incubator/trafficserver/traffic/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 23 02:29:18 2010
@@ -1 +1 @@
-/incubator/trafficserver/traffic/trunk:921639,921965,922056,923986,926907
+/incubator/trafficserver/traffic/trunk:921639,921965,922056,923986,926907,936014

Modified: incubator/trafficserver/traffic/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/CHANGES?rev=937138&r1=937137&r2=937138&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/CHANGES (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/CHANGES Fri Apr 23 02:29:18 2010
@@ -5,6 +5,8 @@ Changes with Apache Traffic Server 2.0.0
 
   *) Minor additions to the SDK (see the docs for details).
 
+  *) Support regexe_map rules in remap.config [TS-80]
+
 
 Changes with Apache Traffic Server 2.0.0-alpha
 

Modified: incubator/trafficserver/traffic/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/STATUS?rev=937138&r1=937137&r2=937138&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/STATUS (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/STATUS Fri Apr 23 02:29:18 2010
@@ -93,6 +93,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     Jira: https://issues.apache.org/jira/browse/TS-283
     +1: sjiang, zwoop, bcall
 
+  * mgmt: Passing NULL as second argument to execv, should be an array
+    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=936014
+    Jira: http://issues.apache.org/jira/browse/TS-319
+    +1: bcall, zwoop, sjiang
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -106,11 +111,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     Jira: https://issues.apache.org/jira/browse/TS-162
     +1: bcall
 
-  * mgmt: Passing NULL as second argument to execv, should be an array
-    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=936014
-    Jira: http://issues.apache.org/jira/browse/TS-319
-    +1: bcall, zwoop, sjiang
-
 RELEASE PROCESS
 
 The Traffic Server release process is documented at

Modified: incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/tools/SysAPI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/tools/SysAPI.cc?rev=937138&r1=937137&r2=937138&view=diff
==============================================================================
--- incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/tools/SysAPI.cc (original)
+++ incubator/trafficserver/traffic/branches/2.0.x/proxy/mgmt2/tools/SysAPI.cc Fri Apr 23
02:29:18 2010
@@ -1706,7 +1706,8 @@ Net_SNMPSetUp(char *sys_location, char *
     snprintf(command_path, sizeof(command_path), "%s/bin/stop_snmp && %s/bin/start_snmp",
ts_path, ts_path);
 
     sleep(30);
-    res = execv(command_path, NULL);
+    char *argv[] = { NULL };
+    res = execv(command_path, argv);
 
     if (res != 0) {
       DPRINTF(("[SysAPI] failed to execute stop_snmp && start_snmp\n"));



Mime
View raw message