Commit 86c7da89 authored by rouslan@chromium.org's avatar rouslan@chromium.org

Revert of Add tests for session cache and false start behavior....

Revert of Add tests for session cache and false start behavior. (https://codereview.chromium.org/301283004/)

Reason for revert:
This patch may have broken http://build.chromium.org/p/chromium.mac/builders/Mac%2010.7%20Tests%20%28dbg%29%281%29/builds/24391, but we're not confident. The failure is in libjingle_unittests, e.g. ChromeAsyncSocketTest.DoubleSSLConnect. Sorry for the inconvenience. 

Original issue's description:
> Add tests for session cache and false start behavior.
> 
> False start should not disable the session cache, but if we never process the
> server Finished message, the session cannot be resumed.
> 
> BUG=none
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=276815

TBR=davidben@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/332523008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276857 0039d316-1c4b-4281-b951-d872f2087c98
parent 6a8ce8a7
This diff is collapsed.
...@@ -33,5 +33,3 @@ Local Modifications: ...@@ -33,5 +33,3 @@ Local Modifications:
- patches/dhe_rsa.patch: Implement DHE_RSA-based cipher suites. - patches/dhe_rsa.patch: Implement DHE_RSA-based cipher suites.
- patches/req_cert_types.patch: Add a reqCertTypes parameter to populate the - patches/req_cert_types.patch: Add a reqCertTypes parameter to populate the
certificate_types field of CertificateRequest. certificate_types field of CertificateRequest.
- patches/ignore_write_failure.patch: Don't invalidate sessions on write
failures.
diff --git a/third_party/tlslite/tlslite/tlsrecordlayer.py b/third_party/tlslite/tlslite/tlsrecordlayer.py
index 8b92221..370dc9a 100644
--- a/third_party/tlslite/tlslite/tlsrecordlayer.py
+++ b/third_party/tlslite/tlslite/tlsrecordlayer.py
@@ -286,7 +286,9 @@ class TLSRecordLayer(object):
except GeneratorExit:
raise
except Exception:
- self._shutdown(False)
+ # Don't invalidate the session on write failure if abrupt closes are
+ # okay.
+ self._shutdown(self.ignoreAbruptClose)
raise
def close(self):
...@@ -286,9 +286,7 @@ class TLSRecordLayer(object): ...@@ -286,9 +286,7 @@ class TLSRecordLayer(object):
except GeneratorExit: except GeneratorExit:
raise raise
except Exception: except Exception:
# Don't invalidate the session on write failure if abrupt closes are self._shutdown(False)
# okay.
self._shutdown(self.ignoreAbruptClose)
raise raise
def close(self): def close(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment