svn commit: r1156039 - in /trafficserver/traffic/trunk/proxy: MuxVC.cc http/HttpPages.cc http/HttpSM.cc

[zym]

Author: zym
Date: Wed Aug 10 06:19:01 2011
New Revision: 1156039

URL: http://svn.apache.org/viewvc?rev=1156039&view=rev
Log:
Revert "TS-813: no need for xmalloc"

we need the xmalloc. not in the critical path so far.

Modified:
    trafficserver/traffic/trunk/proxy/MuxVC.cc
    trafficserver/traffic/trunk/proxy/http/HttpPages.cc
    trafficserver/traffic/trunk/proxy/http/HttpSM.cc

Modified: trafficserver/traffic/trunk/proxy/MuxVC.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/MuxVC.cc?rev=1156039&r1=1156038&r2=1156039&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/MuxVC.cc (original)
+++ trafficserver/traffic/trunk/proxy/MuxVC.cc Wed Aug 10 06:19:01 2011
@@ -2843,7 +2843,8 @@ MuxPagesHandler::handle_callback(int eve
       StatPageData data;
 
       data.data = response;
-      data.type = const_cast<char*>("text/html");
+      data.type = (char *) xmalloc(10);
+      snprintf(data.type, 10, "text/html");
       data.length = response_length;
       response = NULL;
 

Modified: trafficserver/traffic/trunk/proxy/http/HttpPages.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpPages.cc?rev=1156039&r1=1156038&r2=1156039&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpPages.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpPages.cc Wed Aug 10 06:19:01 2011
@@ -447,7 +447,8 @@ HttpPagesHandler::handle_callback(int ev
       StatPageData data;
 
       data.data = response;
-      data.type = const_cast<char*>("text/html");
+      data.type = (char *) xmalloc(10);
+      snprintf(data.type, 10, "text/html");
       data.length = response_length;
       response = NULL;
 

Modified: trafficserver/traffic/trunk/proxy/http/HttpSM.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpSM.cc?rev=1156039&r1=1156038&r2=1156039&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpSM.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpSM.cc Wed Aug 10 06:19:01 2011
@@ -2152,7 +2152,8 @@ HttpSM::state_handle_stat_page(int event
       if (spd->type)
         t_state.internal_msg_buffer_type = spd->type;
       else {
-        t_state.internal_msg_buffer_type = const_cast<char*>("text/html");
+        t_state.internal_msg_buffer_type = (char *) xmalloc(10);
+        snprintf(t_state.internal_msg_buffer_type, 10, "text/html");
       }
       t_state.internal_msg_buffer_size = spd->length;
       t_state.internal_msg_buffer_fast_allocator_size = -1;