parameters are ignored if s3 custom URL is provided

[dannysauer]

django-storages/storages/backends/s3boto3.py

Lines 554 to 578 in 770332b

	def url(self, name, parameters=None, expire=None, http_method=None):
	# Preserve the trailing slash after normalizing the path.
	name = self._normalize_name(self._clean_name(name))
	if expire is None:
	expire = self.querystring_expire
	if self.custom_domain:
	url = "{}//{}/{}".format(
	self.url_protocol, self.custom_domain, filepath_to_uri(name))
	if self.querystring_auth and self.cloudfront_signer:
	expiration = datetime.utcnow() + timedelta(seconds=expire)
	return self.cloudfront_signer.generate_presigned_url(url, date_less_than=expiration)
	return url
	params = parameters.copy() if parameters else {}
	params['Bucket'] = self.bucket.name
	params['Key'] = name
	url = self.bucket.meta.client.generate_presigned_url('get_object', Params=params,
	ExpiresIn=expire, HttpMethod=http_method)
	if self.querystring_auth:
	return url
	return self._strip_signing_parameters(url)

If additional parameters are passed in to the url method when a custom_url is in use (like when S3 is behind CloudFront), they're ignored on the generated URL. They're already passed in as a dict, so they could easily be passed in to urllib.parse.urlunparse instead of using a format string when the URL is built (which might be a good fix anyway).

[jschneier]

Resolved by #1054