You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2011/07/15 01:28:54 UTC
svn commit: r1146919 - in /trafficserver/traffic/branches/3.0.x: ./ CHANGES
STATUS proxy/InkAPI.cc
Author: igalic
Date: Thu Jul 14 23:28:54 2011
New Revision: 1146919
URL: http://svn.apache.org/viewvc?rev=1146919&view=rev
Log:
Backport TS-826
Modified:
trafficserver/traffic/branches/3.0.x/ (props changed)
trafficserver/traffic/branches/3.0.x/CHANGES
trafficserver/traffic/branches/3.0.x/STATUS
trafficserver/traffic/branches/3.0.x/proxy/InkAPI.cc
Propchange: trafficserver/traffic/branches/3.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 14 23:28:54 2011
@@ -1,4 +1,4 @@
/incubator/trafficserver/traffic/branches/dev:891823-915885
/trafficserver/traffic/branches/ts-291:965529-991993
/trafficserver/traffic/branches/wccp:1021790-1040544
-/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1137111,1137844,1137846,1144096,1144746
+/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1137111,1137775,1137844,1137846,1144096,1144746
Modified: trafficserver/traffic/branches/3.0.x/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/CHANGES?rev=1146919&r1=1146918&r2=1146919&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/CHANGES (original)
+++ trafficserver/traffic/branches/3.0.x/CHANGES Thu Jul 14 23:28:54 2011
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.0.1
+ *) [TS-826] TSHttpTxnErrorBodySet() can leak memory.
+ Author: William Bardwell
+
*) [TS-833] Continuation::handleEvent deadbeef fix. This fixes most of the
dns related crashes
Modified: trafficserver/traffic/branches/3.0.x/STATUS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/STATUS?rev=1146919&r1=1146918&r2=1146919&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/STATUS (original)
+++ trafficserver/traffic/branches/3.0.x/STATUS Thu Jul 14 23:28:54 2011
@@ -45,11 +45,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
Jira: https://issues.apache.org/jira/browse/TS-842
+1: igalic, zwoop
- * API: TSHttpTxnErrorBodySet() can leak memory.
- Trunk patch: http://svn.apache.org/viewvc?rev=1137775&view=rev
- Jira: https://issues.apache.org/jira/browse/TS-826
- +1: zwoop, zym, jesus
-
* Build: build fails with --as-needed --no-copy-dt-needed-entries
Trunk patch: http://svn.apache.org/viewvc?rev=1142523&view=rev
Jira: https://issues.apache.org/jira/browse/TS-868
Modified: trafficserver/traffic/branches/3.0.x/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/proxy/InkAPI.cc?rev=1146919&r1=1146918&r2=1146919&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/branches/3.0.x/proxy/InkAPI.cc Thu Jul 14 23:28:54 2011
@@ -5232,11 +5232,15 @@ TSHttpTxnErrorBodySet(TSHttpTxn txnp, ch
sdk_assert(buflength > 0);
HttpSM *sm = (HttpSM *) txnp;
+ HttpTransact::State *s = &(sm->t_state);
+
+ if (s->internal_msg_buffer)
+ HttpTransact::free_internal_msg_buffer(s->internal_msg_buffer, s->internal_msg_buffer_fast_allocator_size);
- sm->t_state.internal_msg_buffer = buf;
- sm->t_state.internal_msg_buffer_type = mimetype;
- sm->t_state.internal_msg_buffer_size = buflength;
- sm->t_state.internal_msg_buffer_fast_allocator_size = -1;
+ s->internal_msg_buffer = buf;
+ s->internal_msg_buffer_type = mimetype;
+ s->internal_msg_buffer_size = buflength;
+ s->internal_msg_buffer_fast_allocator_size = -1;
}
void