From: Casey Bodley Date: Fri, 6 Sep 2019 18:44:59 +0000 (-0400) Subject: rgw: fix dns name comparison for virtual hosting X-Git-Tag: v12.2.13~121^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1685316a8dd9fce6f22a2edad8d07dae4f820138;p=ceph.git rgw: fix dns name comparison for virtual hosting Fixes: https://tracker.ceph.com/issues/41692 Signed-off-by: Casey Bodley (cherry picked from commit 60b2dbe67af4a919df0d1b802c1fe21909c48d4c) --- diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc index c30f4331b9d..afd9bbdf708 100644 --- a/src/rgw/rgw_rest.cc +++ b/src/rgw/rgw_rest.cc @@ -289,10 +289,11 @@ static bool str_ends_with_nocase(const string& s, const string& suffix, size_t * *pos = p; } - return boost::algorithm::iends_with(suffix, s); + return boost::algorithm::iends_with(s, suffix); } -static bool rgw_find_host_in_domains(const string& host, string *domain, string *subdomain, set valid_hostnames_set) +static bool rgw_find_host_in_domains(const string& host, string *domain, string *subdomain, + const set& valid_hostnames_set) { set::iterator iter; /** TODO, Future optimization