diff options
| author | dank@chromium.org <dank@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-26 18:48:09 +0000 |
|---|---|---|
| committer | dank@chromium.org <dank@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-26 18:48:09 +0000 |
| commit | 777ecfee6764687c961dbb5b9bfd076615315e2e (patch) | |
| tree | ff6318ec00e6ac0f93edd8832ffe963fe46583e8 /third_party/tlslite | |
| parent | 412747c740cc9f85bff1a4eeb97413bdc303cef0 (diff) | |
| download | chromium_src-777ecfee6764687c961dbb5b9bfd076615315e2e.zip chromium_src-777ecfee6764687c961dbb5b9bfd076615315e2e.tar.gz chromium_src-777ecfee6764687c961dbb5b9bfd076615315e2e.tar.bz2 | |
Rediff the tlslite patch (it was against wrong baseline)
Apply it when installing on Linux
Link to bug report describing the problem it fixes
This solves a hang on Linux running url_request_unittest
Review URL: http://codereview.chromium.org/12477
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6037 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tlslite')
| -rw-r--r-- | third_party/tlslite/README.google | 5 | ||||
| -rw-r--r-- | third_party/tlslite/google.patch | 22 |
2 files changed, 14 insertions, 13 deletions
diff --git a/third_party/tlslite/README.google b/third_party/tlslite/README.google index e5cf9bc..945aacf 100644 --- a/third_party/tlslite/README.google +++ b/third_party/tlslite/README.google @@ -4,4 +4,7 @@ The code is public domain. tlslite/TLSRecordLayer.py was changed to force the socket to be closed when the SSL connection is closed. This is is necessary at this point since WinHTTP does -not seem to react to the SSL close notify. +not seem to react to the SSL close notify. It's also needed to prevent a hang +on Linux. See also +http://sourceforge.net/mailarchive/forum.php?thread_name=41C9B18B.2010201%40ag.com&forum_name=tlslite-users +The change is in google.patch. diff --git a/third_party/tlslite/google.patch b/third_party/tlslite/google.patch index f5a7401..94afa20 100644 --- a/third_party/tlslite/google.patch +++ b/third_party/tlslite/google.patch @@ -1,18 +1,16 @@ ---- tlslite/TLSRecordLayer.py 2008-02-27 15:45:16.159680300 -0800 -+++ tlslite_google/TLSRecordLayer.py 2008-02-29 14:54:36.515625000 -0800 -@@ -324,8 +324,10 @@ +diff -u tlslite-0.3.8/tlslite/TLSRecordLayer.py chromium//tlslite/TLSRecordLayer.py +--- tlslite-0.3.8/tlslite/TLSRecordLayer.py 2005-02-21 21:31:41.000000000 -0800 ++++ chromium/tlslite/TLSRecordLayer.py 2008-11-25 21:58:04.000000000 -0800 +@@ -322,6 +322,12 @@ + AlertDescription.close_notify, AlertLevel.warning)): + yield result alert = None - # Forcing a shutdown as WinHTTP does not seem to be - # responsive to the close notify. ++ # Forcing a shutdown as the OS does not seem to be ++ # responsive to the close notify. + prevCloseSocket = self.closeSocket - self.closeSocket = True - self._shutdown(True) ++ self.closeSocket = True ++ self._shutdown(True) + self.closeSocket = prevCloseSocket while not alert: for result in self._getMsg((ContentType.alert, \ ContentType.application_data)): -@@ -1124,4 +1126,3 @@ - imac_sha.digest()).digest() - - return stringToBytes(md5Str + shaStr) -- |