svn commit: r960096 - in /trafficserver/traffic/trunk: iocore/net/Connection.cc iocore/net/SSLNet.cc proxy/Show.h

[jp...@apache.org]

Author: jplevyak
Date: Fri Jul  2 20:13:27 2010
New Revision: 960096

URL: http://svn.apache.org/viewvc?rev=960096&view=rev
Log:
Fix STANDALONE_IOCORE which seems to have been broken recently
Fix potential va_start/va_copy issue in Stat pages

Modified:
    trafficserver/traffic/trunk/iocore/net/Connection.cc
    trafficserver/traffic/trunk/iocore/net/SSLNet.cc
    trafficserver/traffic/trunk/proxy/Show.h

Modified: trafficserver/traffic/trunk/iocore/net/Connection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/Connection.cc?rev=960096&r1=960095&r2=960096&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/Connection.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/Connection.cc Fri Jul  2 20:13:27 2010
@@ -334,6 +334,6 @@ Server::listen(int port_number, bool non
 Lerror:
   if (fd != NO_FD)
     close();
-  MachineFatal("Could not bind or listen to port %d (error: %d)", port_number, res);
+  Error("Could not bind or listen to port %d (error: %d)", port_number, res);
   return res;
 }

Modified: trafficserver/traffic/trunk/iocore/net/SSLNet.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/SSLNet.cc?rev=960096&r1=960095&r2=960096&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/SSLNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/SSLNet.cc Fri Jul  2 20:13:27 2010
@@ -252,7 +252,7 @@ SSLNetProcessor::initSSL(SslConfigParams
   accept_port_number = param->ssl_accept_port_number;
 
   if ((unsigned int) accept_port_number >= 0xFFFF) {
-    MachineFatal("\ncannot listen on port %d.\naccept port cannot be larger that 65535.\n"
+    Error("\ncannot listen on port %d.\naccept port cannot be larger that 65535.\n"
                         "please check your Traffic Server configurations", accept_port_number);
     return (1);
   }

Modified: trafficserver/traffic/trunk/proxy/Show.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Show.h?rev=960096&r1=960095&r2=960096&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Show.h (original)
+++ trafficserver/traffic/trunk/proxy/Show.h Fri Jul  2 20:13:27 2010
@@ -46,10 +46,12 @@ struct ShowCont:Continuation
 
   int show(const char *s, ...)
   {
-    va_list aap;
-      va_start(aap, s);
+    va_list aap, va_scratch;
     int l = ebuf - buf;
+    va_start(aap, s);
+    va_copy(va_scratch, aap);
     int done = vsnprintf(buf, l, s, aap);
+    va_end(va_scratch);
     if (done > l - 256)
     {
       char *start2 = (char *) xrealloc(start, (ebuf - start) * 2);