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 21:36:21 UTC
svn commit: r1147292 - in /trafficserver/traffic/branches/3.0.x: ./ CHANGES
STATUS proxy/InkAPI.cc
Author: igalic
Date: Fri Jul 15 19:36:20 2011
New Revision: 1147292
URL: http://svn.apache.org/viewvc?rev=1147292&view=rev
Log:
Backport TS-875
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 Fri Jul 15 19:36:20 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,1137775,1137844,1137846,1144094,1144096,1144746
+/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1137111,1137775,1137844,1137846,1144094,1144096,1144746,1146414
Modified: trafficserver/traffic/branches/3.0.x/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/CHANGES?rev=1147292&r1=1147291&r2=1147292&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/CHANGES (original)
+++ trafficserver/traffic/branches/3.0.x/CHANGES Fri Jul 15 19:36:20 2011
@@ -1,7 +1,10 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.0.1
- *)i [TS-834] InactivityCop::check_inactivity crash
+ *) [TS-875]: TSFetchRestpGet(), TSFetchPageResptGet() and TSFetchUrl() have
+ incorrect asserts. Author: Manjesh Nilange
+
+ *) [TS-834] InactivityCop::check_inactivity crash
*) [TS-826] TSHttpTxnErrorBodySet() can leak memory.
Author: William Bardwell
Modified: trafficserver/traffic/branches/3.0.x/STATUS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/STATUS?rev=1147292&r1=1147291&r2=1147292&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/STATUS (original)
+++ trafficserver/traffic/branches/3.0.x/STATUS Fri Jul 15 19:36:20 2011
@@ -55,12 +55,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
Jira: https://issues.apache.org/jira/browse/TS-860
+1: zwoop, igalic, amc
- * API: TSFetchRestpGet(), TSFetchPageResptGet() and TSFetchUrl() have
- incorrect asserts.
- Trunk patch: http://svn.apache.org/viewvc?rev=1146414&view=rev
- Jira: https://issues.apache.org/jira/browse/TS-875
- +1: zwoop, jesus, amc
-
RELEASE PROCESS
The Traffic Server release process is documented at
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=1147292&r1=1147291&r2=1147292&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/branches/3.0.x/proxy/InkAPI.cc Fri Jul 15 19:36:20 2011
@@ -7074,9 +7074,7 @@ TSRedirectUrlGet(TSHttpTxn txnp, int *ur
char*
TSFetchRespGet(TSHttpTxn txnp, int *length)
{
- sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_null_ptr((void*)length) == TS_SUCCESS);
-
FetchSM *fetch_sm = (FetchSM*)txnp;
return fetch_sm->resp_get(length);
}
@@ -7084,7 +7082,6 @@ TSFetchRespGet(TSHttpTxn txnp, int *leng
TSReturnCode
TSFetchPageRespGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
{
- sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_null_ptr((void*)bufp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_null_ptr((void*)obj) == TS_SUCCESS);
@@ -7121,7 +7118,9 @@ TSFetchPages(TSFetchUrlParams_t *params)
void
TSFetchUrl(const char* headers, int request_len, unsigned int ip, int port , TSCont contp, TSFetchWakeUpOptions callback_options,TSFetchEvent events)
{
- sdk_assert(sdk_sanity_check_continuation(contp) == TS_SUCCESS);
+ if (callback_options != NO_CALLBACK) {
+ sdk_assert(sdk_sanity_check_continuation(contp) == TS_SUCCESS);
+ }
FetchSM *fetch_sm = FetchSMAllocator.alloc();