diff options
| author | rouslan@chromium.org <rouslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-13 00:01:18 +0000 |
|---|---|---|
| committer | rouslan@chromium.org <rouslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-13 00:01:18 +0000 |
| commit | 86c7da8916a47d2f0f5e8c934801326c51162bff (patch) | |
| tree | fa4a6f706e06242f37095b2fa5bf546d17949719 /third_party/tlslite | |
| parent | 6a8ce8a7a75e4d2f01915367ff52b8c224db4855 (diff) | |
| download | chromium_src-86c7da8916a47d2f0f5e8c934801326c51162bff.zip chromium_src-86c7da8916a47d2f0f5e8c934801326c51162bff.tar.gz chromium_src-86c7da8916a47d2f0f5e8c934801326c51162bff.tar.bz2 | |
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
Diffstat (limited to 'third_party/tlslite')
| -rw-r--r-- | third_party/tlslite/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/tlslite/patches/ignore_write_failure.patch | 15 | ||||
| -rw-r--r-- | third_party/tlslite/tlslite/tlsrecordlayer.py | 4 |
3 files changed, 1 insertions, 20 deletions
diff --git a/third_party/tlslite/README.chromium b/third_party/tlslite/README.chromium index 5487bfc8..029c2db 100644 --- a/third_party/tlslite/README.chromium +++ b/third_party/tlslite/README.chromium @@ -33,5 +33,3 @@ Local Modifications: - patches/dhe_rsa.patch: Implement DHE_RSA-based cipher suites. - patches/req_cert_types.patch: Add a reqCertTypes parameter to populate the certificate_types field of CertificateRequest. -- patches/ignore_write_failure.patch: Don't invalidate sessions on write - failures. diff --git a/third_party/tlslite/patches/ignore_write_failure.patch b/third_party/tlslite/patches/ignore_write_failure.patch deleted file mode 100644 index 169e4d5..0000000 --- a/third_party/tlslite/patches/ignore_write_failure.patch +++ /dev/null @@ -1,15 +0,0 @@ -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): diff --git a/third_party/tlslite/tlslite/tlsrecordlayer.py b/third_party/tlslite/tlslite/tlsrecordlayer.py index 370dc9a..8b92221 100644 --- a/third_party/tlslite/tlslite/tlsrecordlayer.py +++ b/third_party/tlslite/tlslite/tlsrecordlayer.py @@ -286,9 +286,7 @@ class TLSRecordLayer(object): except GeneratorExit: raise except Exception: - # Don't invalidate the session on write failure if abrupt closes are - # okay. - self._shutdown(self.ignoreAbruptClose) + self._shutdown(False) raise def close(self): |