]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #16658 from rzarzynski/wip-rgw-20795
authorYuri Weinstein <yweinste@redhat.com>
Tue, 20 Nov 2018 22:00:57 +0000 (14:00 -0800)
committerGitHub <noreply@github.com>
Tue, 20 Nov 2018 22:00:57 +0000 (14:00 -0800)
rgw: Swift's TempURL can handle temp_url_expires written in ISO8601.

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
1  2 
src/rgw/rgw_swift_auth.cc
src/rgw/rgw_swift_auth.h

Simple merge
index 9f57b2985b9c608989d3644684f020888d08a98e,0fb95d741ec5baa9dac8ec2bffd4582c877b23a4..5bfd2749a57c49d0576212978f9c273e796f9182
@@@ -43,9 -43,9 +43,10 @@@ class TempURLEngine : public rgw::auth:
    const TempURLApplier::Factory* const apl_factory;
  
    /* Helper methods. */
 -  void get_owner_info(const req_state* s,
 +  void get_owner_info(const DoutPrefixProvider* dpp, 
 +                      const req_state* s,
                        RGWUserInfo& owner_info) const;
+   std::string convert_from_iso8601(std::string expires) const;
    bool is_applicable(const req_state* s) const noexcept;
    bool is_expired(const std::string& expires) const;