You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2012/05/07 22:54:46 UTC

git commit: [TS-1049] TS hangs (dead lock) on HTTPS POST requests Author: Wilson Ho Review/Test: zwoop, niq, igalic Backport: briang

Updated Branches:
  refs/heads/3.0.x a3d0dfda5 -> cb40d2c28


[TS-1049] TS hangs (dead lock) on HTTPS POST requests
Author: Wilson Ho
Review/Test: zwoop, niq, igalic
Backport: briang


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/cb40d2c2
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/cb40d2c2
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/cb40d2c2

Branch: refs/heads/3.0.x
Commit: cb40d2c285082955f3aeab60186a0dfaf085b7c9
Parents: a3d0dfd
Author: Brian Geffon <br...@apache.org>
Authored: Mon May 7 13:28:15 2012 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Mon May 7 13:28:15 2012 -0700

----------------------------------------------------------------------
 CHANGES                         |    3 +++
 STATUS                          |    9 ---------
 iocore/net/SSLNetVConnection.cc |    1 +
 3 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/cb40d2c2/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 13e05f9..894e18c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.0.5
+  *) [TS-1049] TS dead locks on HTTPS POST requires.  
+	Author: Wilson Ho
+
   *) [TS-1111] fix crash in RangeTransform::handle_event  
 
   *) [TS-1109] stack dump may crash too

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/cb40d2c2/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index ed486eb..81fad7d 100644
--- a/STATUS
+++ b/STATUS
@@ -42,15 +42,6 @@ A list of all bugs open for the next v3.0.5 release can be found at
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
 
-  *) HttpSM: TS can hang on HTTPS POST requests.
-   Trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1228988
-   Jira: https://issues.apache.org/jira/browse/TS-1049
-   +1: zwoop, niq, igalic
-   niq comments:  This patch combines the bugfix with no-op stylistic
-                  changes.  Not a big deal for a simple change, but in
-                  general it risks complicating review.
-   igalic agrees niq.
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/cb40d2c2/iocore/net/SSLNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index f541341..7630c60 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -175,6 +175,7 @@ SSLNetVConnection::net_read_io(NetHandler * nh, EThread * lthread)
   MIOBufferAccessor & buf = s->vio.buffer;
   MUTEX_TRY_LOCK_FOR(lock, s->vio.mutex, lthread, s->vio._cont);
   if (!lock) {
+    readReschedule(nh);
     return;
   }
   // If it is not enabled, lower its priority.  This allows