Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/v/cloud_io/tests/db_s3_imposter_fixture.cc
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ struct db_s3_imposter_fixture::handler : ss::httpd::handler_base {
rep->set_status(ss::http::reply::status_type::bad_request);
}

rep->done("xml");
rep->set_content_type("xml");
co_return std::move(rep);
}

Expand Down
5 changes: 2 additions & 3 deletions src/v/http/tests/utils.cc
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,15 @@ ss::future<std::unique_ptr<ss::http::reply>> flexible_function_handler::handle(
.then([this](std::unique_ptr<ss::http::reply> rep) {
if (
_content_type_overrides.contains(rep->get_header("Content-Type"))) {
rep->done();
// content type already set via override; nothing to do
Comment thread
travisdowns marked this conversation as resolved.
} else if (_content_type == "xml") {
// Because `application/xml` is not implemented as a mapping
// in `http/mime_types.cc`, in order to construct a reply with
// the `Content-Type` header set to `application/xml`, we
// need to hard code a path here.
rep->set_content_type("application/xml");
rep->done();
} else {
rep->done(_content_type);
rep->set_content_type(_content_type);
}
return ss::make_ready_future<std::unique_ptr<ss::http::reply>>(
std::move(rep));
Expand Down
1 change: 0 additions & 1 deletion src/v/redpanda/admin/server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,6 @@ class rpc_handler : public ss::httpd::handler_base {
std::current_exception());
rep = serde::pb::rpc::internal_exception().handle(std::move(rep));
}
rep->done();
co_return rep;
}

Expand Down
Loading