RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1942 from scrapy/backport-1.1-pr1938 

[backport][1.1] Set SNI properly when using CONNECT (PR #1938)
This commit is contained in:
Paul Tremberth 2016-04-20 17:01:34 +02:00
parent bd6b3c0608 352d0d36ee
commit f70d538d10
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scrapy/core/downloader/handlers/http11.py
View File

@ -122,7 +122,15 @@ class TunnelingTCP4ClientEndpoint(TCP4ClientEndpoint):
"""
self._protocol.dataReceived = self._protocolDataReceived
if TunnelingTCP4ClientEndpoint._responseMatcher.match(bytes):
self._protocol.transport.startTLS(self._contextFactory,
try:
# this sets proper Server Name Indication extension
# but is only available for Twisted>=14.0
sslOptions = self._contextFactory.creatorForNetloc(
self._tunneledHost, self._tunneledPort)
except AttributeError:
# fall back to non-SNI SSL context factory
sslOptions = self._contextFactory
self._protocol.transport.startTLS(sslOptions,
self._protocolFactory)
self._tunnelReadyDeferred.callback(self._protocol)
else: