svn commit: r1196806 - in /trafficserver/traffic/trunk/proxy: Main.cc http/HttpProxyServerMain.cc

[amc]

Author: amc
Date: Wed Nov  2 21:27:18 2011
New Revision: 1196806

URL: http://svn.apache.org/viewvc?rev=1196806&view=rev
Log:
TS-984 refix with special zwoop assist

Modified:
    trafficserver/traffic/trunk/proxy/Main.cc
    trafficserver/traffic/trunk/proxy/http/HttpProxyServerMain.cc

Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=1196806&r1=1196805&r2=1196806&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Wed Nov  2 21:27:18 2011
@@ -1642,7 +1642,7 @@ main(int argc, char **argv)
   // singleton, which depends on configuration values loaded in this.
   // We want to initialize Machine as early as possible because it
   // has other dependencies. Hopefully not in init_HttpProxyServer().
-  init_HttpProxyServer();
+  HttpConfig::startup();
   /* Set up the machine with the outbound address if that's set,
      or the inbound address if set, otherwise let it default.
   */
@@ -1854,6 +1854,7 @@ main(int argc, char **argv)
     transformProcessor.start();
 #endif
 
+    init_HttpProxyServer();
     if (!http_accept_port_number) {
       TS_ReadConfigInteger(http_accept_port_number, 
"proxy.config.http.server_port");
     }

Modified: trafficserver/traffic/trunk/proxy/http/HttpProxyServerMain.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpProxyServerMain.cc?rev=1196806&r1=1196805&r2=1196806&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpProxyServerMain.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpProxyServerMain.cc Wed Nov  2 
21:27:18 2011
@@ -191,7 +191,7 @@ init_HttpProxyServer(void)
 #ifndef INK_NO_REVERSE
   init_reverse_proxy();
 #endif
-  HttpConfig::startup();
+//  HttpConfig::startup();
   httpSessionManager.init();
   http_pages_init();
   ink_mutex_init(&debug_sm_list_mutex, "HttpSM Debug List");