From 02b3726eb01fe8919196cb5ce2a3aea75068ca97 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Thu, 11 Jan 2018 13:16:31 +0100 Subject: [PATCH] rgw: drop dump_uri_from_state() which isn't used anymore. Signed-off-by: Radoslaw Zarzynski --- src/rgw/rgw_rest.cc | 25 ------------------------- src/rgw/rgw_rest.h | 1 - 2 files changed, 26 deletions(-) diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc index 400be38bbf316..d7cc33225bb68 100644 --- a/src/rgw/rgw_rest.cc +++ b/src/rgw/rgw_rest.cc @@ -439,31 +439,6 @@ void dump_bucket_from_state(struct req_state *s) } } -void dump_uri_from_state(struct req_state *s) -{ - if (strcmp(s->info.request_uri.c_str(), "/") == 0) { - - string location = "http://"; - string server = s->info.env->get("SERVER_NAME", ""); - location.append(server); - location += "/"; - if (!s->bucket_name.empty()) { - if (!s->bucket_tenant.empty()) { - location += s->bucket_tenant; - location += ":"; - } - location += s->bucket_name; - location += "/"; - if (!s->object.empty()) { - location += s->object.name; - dump_header(s, "Location", location); - } - } - } else { - dump_header_quoted(s, "Location", s->info.request_uri); - } -} - void dump_redirect(struct req_state * const s, const std::string& redirect) { return dump_header_if_nonempty(s, "Location", redirect); diff --git a/src/rgw/rgw_rest.h b/src/rgw/rgw_rest.h index 495827791a2a6..e1ef6d1535c18 100644 --- a/src/rgw/rgw_rest.h +++ b/src/rgw/rgw_rest.h @@ -733,7 +733,6 @@ extern void list_all_buckets_end(struct req_state *s); extern void dump_time(struct req_state *s, const char *name, real_time *t); extern std::string dump_time_to_str(const real_time& t); extern void dump_bucket_from_state(struct req_state *s); -extern void dump_uri_from_state(struct req_state *s); extern void dump_redirect(struct req_state *s, const string& redirect); extern bool is_valid_url(const char *url); extern void dump_access_control(struct req_state *s, const char *origin, -- 2.39.5