You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/08/06 22:23:38 UTC

[3/3] git commit: Merge branch 'master' into 3.3.x

Merge branch 'master' into 3.3.x

* master:
  Updated with TS-2099
  TS-2051: Fix SSL crash due to excess READ_COMPLETE events.


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

Branch: refs/heads/3.3.x
Commit: cd64eddc446728defc75de1566c1b2a0b953528d
Parents: 5dec267 c612971
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Aug 6 14:23:28 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Aug 6 14:23:28 2013 -0600

----------------------------------------------------------------------
 CHANGES                         |  5 +++++
 iocore/net/SSLNetVConnection.cc | 18 +++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------