You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ji...@apache.org on 2011/09/30 13:29:48 UTC
svn commit: r1177611 - in /trafficserver/traffic/branches/3.0.x: STATUS
proxy/InkAPI.cc
Author: jim
Date: Fri Sep 30 11:29:48 2011
New Revision: 1177611
URL: http://svn.apache.org/viewvc?rev=1177611&view=rev
Log:
Merge r1158321 from trunk:
TS-916 TSHttpIsInternalRequest() crashes if client connection is terminated prematurely
Author: Manjesh Nilange
Review: leif
Submitted by: zwoop
Reviewed/backported by: jim
Modified:
trafficserver/traffic/branches/3.0.x/STATUS
trafficserver/traffic/branches/3.0.x/proxy/InkAPI.cc
Modified: trafficserver/traffic/branches/3.0.x/STATUS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/STATUS?rev=1177611&r1=1177610&r2=1177611&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/STATUS (original)
+++ trafficserver/traffic/branches/3.0.x/STATUS Fri Sep 30 11:29:48 2011
@@ -38,12 +38,6 @@ A list of all bugs open for the next v3.
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
- *) API: TSHttpIsInternalRequest() crashes if client connection is
- terminated prematurely
- Trunk patch: http://svn.apache.org/viewvc?view=rev&revision=1158321
- Jira: https://issues.apache.org/jira/browse/TS-916
- +1: zwoop, zym, jim
-
*) Cleanup: Valgrind found minor leaks and uninitialized variables
Trunk patches: http://svn.apache.org/viewvc?view=rev&revision=1153595
Jira: https://issues.apache.org/jira/browse/TS-901
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=1177611&r1=1177610&r2=1177611&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/branches/3.0.x/proxy/InkAPI.cc Fri Sep 30 11:29:48 2011
@@ -7135,9 +7135,11 @@ TSHttpIsInternalRequest(TSHttpTxn txnp)
TSHttpSsn ssnp = TSHttpTxnSsnGet(txnp);
HttpClientSession *cs = (HttpClientSession *) ssnp;
- NetVConnection *vc = cs->get_netvc();
+ if (!cs)
+ return TS_ERROR;
- if (!cs || !vc)
+ NetVConnection *vc = cs->get_netvc();
+ if (!vc)
return TS_ERROR;
return vc->get_is_internal_request() ? TS_SUCCESS : TS_ERROR;