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

Fix HTTP Pool key for HTTPS proxy tunneled connections (CONNECT method)

This commit is contained in:
Paul Tremberth 2016-04-06 20:02:50 +02:00
parent f70d538d10
commit 7d3a529dbc
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,7 +135,8 @@ class TunnelingTCP4ClientEndpoint(TCP4ClientEndpoint):
self._tunnelReadyDeferred.callback(self._protocol)
else:
self._tunnelReadyDeferred.errback(
TunnelError('Could not open CONNECT tunnel.'))
TunnelError('Could not open CONNECT tunnel with proxy %s:%s' % (
self._host, self._port)))
def connectFailed(self, reason):
"""Propagates the errback to the appropriate deferred."""
@ -201,6 +202,14 @@ class TunnelingAgent(Agent):
self._contextFactory, self._connectTimeout,
self._bindAddress)
def _requestWithEndpoint(self, key, endpoint, method, parsedURI,
headers, bodyProducer, requestPath):
# proxy host and port are required for HTTP pool `key`
# otherwise, same remote host connection request could reuse
# a cached tunneled connection to a different proxy
key = key + self._proxyConf
return super(TunnelingAgent, self)._requestWithEndpoint(key, endpoint, method, parsedURI,
headers, bodyProducer, requestPath)
class ScrapyAgent(object):