trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject svn commit: r1228512 - in /trafficserver/traffic/trunk: CHANGES proxy/http/HttpSM.cc
Date Sat, 07 Jan 2012 00:30:38 GMT
Author: zwoop
Date: Sat Jan  7 00:30:38 2012
New Revision: 1228512

URL: http://svn.apache.org/viewvc?rev=1228512&view=rev
Log:
TS-1032 Assertion when upstream connection is established (with event
handled by thread A) and immediately disconnected (handled by thread B).
Author: Uri Shachar.

Modified:
    trafficserver/traffic/trunk/CHANGES
    trafficserver/traffic/trunk/proxy/http/HttpSM.cc

Modified: trafficserver/traffic/trunk/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1228512&r1=1228511&r2=1228512&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Sat Jan  7 00:30:38 2012
@@ -1,5 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.1.2
+  *) [TS-1032] Assertion when upstream connection is established (with event
+   handled by thread A) and immediately disconnected (handled by thread B).
+   Author: Uri Shachar.
+
   *) [TS-1052] trafficserver restart does not work (needs to let the old
    process die). Author: Billy Viera
 

Modified: trafficserver/traffic/trunk/proxy/http/HttpSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpSM.cc?rev=1228512&r1=1228511&r2=1228512&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpSM.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpSM.cc Sat Jan  7 00:30:38 2012
@@ -4474,7 +4474,9 @@ HttpSM::mark_server_down_on_client_abort
       // Check to see if client waited for the threshold
       //  to declare the origin server as down
       ink_hrtime wait = ink_get_hrtime() - milestones.server_first_connect;
-      ink_assert(wait >= 0);
+      if (wait < 0) {
+        wait = 0;
+      }
       if (ink_hrtime_to_sec(wait) > t_state.txn_conf->client_abort_threshold) {
         t_state.current.server->connect_failure = true;
         do_hostdb_update_if_necessary();



Mime
View raw message