@@ -123,6 +123,8 @@ class Config(object):

     limitrate = 0

     requester_pays = False

     stop_on_error = False

+    content_disposition = None

+    content_type = None

     ## Creating a singleton

     def __new__(self, configfile = None, access_key=None, secret_key=None):

@@ -55,15 +55,29 @@ __all__.append("sign_url_v2")

 def sign_url_base_v2(**parms):

     """Shared implementation of sign_url methods. Takes a hash of 'bucket', 'object' and 'expiry' as args."""

+    content_disposition=Config.Config().content_disposition

+    content_type=Config.Config().content_type

     parms['expiry']=time_to_epoch(parms['expiry'])

     parms['access_key']=Config.Config().access_key

     parms['host_base']=Config.Config().host_base

     debug("Expiry interpreted as epoch time %s", parms['expiry'])

     signtext = 'GET\n\n\n%(expiry)d\n/%(bucket)s/%(object)s' % parms

+    param_separator = '?'

+    if content_disposition is not None:

+        signtext += param_separator + 'response-content-disposition=' + content_disposition

+        param_separator = '&'

+    if content_type is not None:

+        signtext += param_separator + 'response-content-type=' + content_type

+        param_separator = '&'

     debug("Signing plaintext: %r", signtext)

     parms['sig'] = urllib.quote_plus(sign_string_v2(signtext))

     debug("Urlencoded signature: %s", parms['sig'])

-    return "http://%(bucket)s.%(host_base)s/%(object)s?AWSAccessKeyId=%(access_key)s&Expires=%(expiry)d&Signature=%(sig)s" % parms

+    url = "http://%(bucket)s.%(host_base)s/%(object)s?AWSAccessKeyId=%(access_key)s&Expires=%(expiry)d&Signature=%(sig)s" % parms

+    if content_disposition is not None:

+        url += "&response-content-disposition=" + urllib.quote_plus(content_disposition)

+    if content_type is not None:

+        url += "&response-content-type=" + urllib.quote_plus(content_type)

+    return url

 def sign(key, msg):

     return hmac.new(key, encode_to_s3(msg), sha256).digest()

@@ -557,6 +557,7 @@ if have_wget:

 test_s3cmd("sign string", ['sign', 's3cmd'], must_find_re = ["Signature:"])

 test_s3cmd("signurl time", ['signurl', '%s/copy/etc2/Logo.PNG' % pbucket(2), str(int(time.time()) + 60)], must_find_re = ["http://"])

 test_s3cmd("signurl time offset", ['signurl', '%s/copy/etc2/Logo.PNG' % pbucket(2), '+60'], must_find_re = ["https?://"])

+test_s3cmd("signurl content disposition and type", ['signurl', '%s/copy/etc2/Logo.PNG' % pbucket(2), '+60', '--content-disposition=inline; filename=video.mp4', '--content-type=video/mp4'], must_find_re = [ 'response-content-disposition', 'response-content-type' ] )

 ## ====== Rename within S3

 test_s3cmd("Rename within S3", ['mv', '%s/copy/etc2/Logo.PNG' % pbucket(2), '%s/copy/etc/logo.png' % pbucket(2)],

@@ -2333,6 +2333,8 @@ def main():

     optparser.add_option(      "--requester-pays", dest="requester_pays", action="store_true", help="Set the REQUESTER PAYS flag for operations")

     optparser.add_option("-l", "--long-listing", dest="long_listing", action="store_true", help="Produce long listing [ls]")

     optparser.add_option(      "--stop-on-error", dest="stop_on_error", action="store", type="string", help="stop if error in transfer")

+    optparser.add_option(      "--content-disposition", dest="content_disposition", action="store", help="Provide a Content-Disposition for signed URLs, e.g., \"inline; filename=myvideo.mp4\"")

+    optparser.add_option(      "--content-type", dest="content_type", action="store", help="Provide a Content-Type for signed URLs, e.g., \"video/mp4\"")

     optparser.set_usage(optparser.usage + " COMMAND [parameters]")

     optparser.set_description('S3cmd is a tool for managing objects in '+

@@ -2531,6 +2533,12 @@ def main():

     if options.stop_on_error:

         cfg.stop_on_error = options.stop_on_error

+    if options.content_disposition:

+        cfg.content_disposition = options.content_disposition

+

+    if options.content_type:

+        cfg.content_type = options.content_type

+

     if len(args) < 1:

         optparser.print_help()

         sys.exit(EX_USAGE)