Attachment #392620 for bug #442874

Lines 18-25 class File: Link Here

(-)a/Cache.py (-1 / +3 lines)
18	size = -1	18	size = -1
19	mtime = -1	19	mtime = -1
20		20
21	def __init__( self, path ):	21	def __init__( self, path, uniqueName ):
22		22
		23	if Params.FLAT and uniqueName:
		24	path = uniqueName
23	sep = path.find( '?' )	25	sep = path.find( '?' )
24	if sep != -1:	26	if sep != -1:
25	path = path[ :sep ] + path[ sep: ].replace( '/', '%2F' )	27	path = path[ :sep ] + path[ sep: ].replace( '/', '%2F' )

Lines 60-66 class HttpProtocol( Cache.File ): Link Here

(-)a/Protocol.py (-2 / +2 lines)
60		60
61	def __init__( self, request ):	61	def __init__( self, request ):
62		62
63	Cache.File.__init__( self, '%s:%i/%s' % request.url() )	63	Cache.File.__init__( self, '%s:%i/%s' % request.url(), request.__args.get('X-unique-cache-name') )
64		64
65	if Params.STATIC and self.full():	65	if Params.STATIC and self.full():
66	print 'Static mode; serving file directly from cache'	66	print 'Static mode; serving file directly from cache'
Lines 215-221 class FtpProtocol( Cache.File ): Link Here
215		215
216	def __init__( self, request ):	216	def __init__( self, request ):
217		217
218	Cache.File.__init__( self, '%s:%i/%s' % request.url() )	218	Cache.File.__init__( self, '%s:%i/%s' % request.url(), request.__args.get('X-unique-cache-name') )
219		219
220	if Params.STATIC and self.full():	220	if Params.STATIC and self.full():
221	self.__socket = None	221	self.__socket = None

Return to bug 442874