trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject svn commit: r1131080 - in /trafficserver/traffic/trunk: CHANGES iocore/net/Socks.cc
Date Fri, 03 Jun 2011 15:49:00 GMT
Author: zwoop
Date: Fri Jun  3 15:49:00 2011
New Revision: 1131080

URL: http://svn.apache.org/viewvc?rev=1131080&view=rev
Log:
TS-818 Assertion/abort when starting TS with SOCKS proxy enabled

Author: Yakov Markovitch
Review: leif

Modified:
    trafficserver/traffic/trunk/CHANGES
    trafficserver/traffic/trunk/iocore/net/Socks.cc

Modified: trafficserver/traffic/trunk/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1131080&r1=1131079&r2=1131080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Fri Jun  3 15:49:00 2011
@@ -1,6 +1,12 @@
                                                          -*- coding: utf-8 -*-
 
 Changes with Apache Traffic Server 3.1.0
+  *) [TS-818] Assertion/abort when starting TS with SOCKS proxy enabled.
+   Author: Yakov Markovitch
+
+  *) [TS-815] make sure that a missing yacc/bison|flex/lex is *fatal* when
+   building with wccp. Author: Arno Toll.
+
   *) [TS-798] We add broken remap rules when we encounter parse errors of
    remap.config.
 

Modified: trafficserver/traffic/trunk/iocore/net/Socks.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/Socks.cc?rev=1131080&r1=1131079&r2=1131080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/Socks.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/Socks.cc Fri Jun  3 15:49:00 2011
@@ -431,11 +431,6 @@ SocksEntry::mainEvent(int event, void *d
   return ret;
 }
 
-#define SOCKS_REG_STAT(stat)						\
-  RecRegisterRawStat(net_rsb, RECT_PROCESS,				\
-		     "proxy.process.socks." #stat, RECD_INT, RECP_NULL,	\
-		     socks_##stat##_stat, RecRawStatSyncSum)
-
 void
 loadSocksConfiguration(socks_conf_struct * socks_conf_stuff)
 {
@@ -514,9 +509,6 @@ loadSocksConfiguration(socks_conf_struct
     goto error;
   }
   Debug("Socks", "Socks Turned on");
-  SOCKS_REG_STAT(connections_successful);
-  SOCKS_REG_STAT(connections_unsuccessful);
-  SOCKS_REG_STAT(connections_currently_open);
   ::close(socks_config_fd);
 
   return;



Mime
View raw message