Merge pull request #10664 from dachary/wip-16958-jewel

jewel: Bug when using port 443s in rgw. Reviewed-by: Casey Bodley <cbodley@redhat.com>
ceph · Aug 25, 2016 · 49022d4 · 49022d4
2 parents f7afbbf + 22c9df1
commit 49022d4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
@@ -3661,7 +3661,7 @@ int RGW_Auth_S3::authorize_v4(RGWRados *store, struct req_state *s)
     }
     string token_value = string(t);
     if (using_qs && (token == "host")) {
-      if (!port.empty() && port != "80") {
+      if (!port.empty() && port != "80" && port != "0") {
         token_value = token_value + ":" + port;
       } else if (!secure_port.empty() && secure_port != "443") {
         token_value = token_value + ":" + secure_port;