From 2506fed8e877d9a22b549fd9a034e8c40b04cf03 Mon Sep 17 00:00:00 2001 From: trollkotze Date: Tue, 26 Mar 2024 20:56:58 +0100 Subject: [PATCH] Don't double-apply CORS header in POST /control-vectors --- examples/server/server.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/server/server.cpp b/examples/server/server.cpp index f89a7edc2..33ceda319 100644 --- a/examples/server/server.cpp +++ b/examples/server/server.cpp @@ -3202,8 +3202,6 @@ int main(int argc, char ** argv) { }; const auto handle_set_control_vectors = [&ctx_server, &res_error, &handle_get_control_vectors](const httplib::Request & req, httplib::Response & res) { - res.set_header("Access-Control-Allow-Origin", req.get_header_value("Origin")); - json data = json::parse(req.body); std::vector vec_params; @@ -3215,12 +3213,14 @@ int main(int argc, char ** argv) { } } else { std::cerr << "No vectors passed\n"; + res.set_header("Access-Control-Allow-Origin", req.get_header_value("Origin")); res_error(res, format_error_response("No vectors passed", ERROR_TYPE_SERVER)); return; } const auto cvec = llama_control_vector_load(vec_params); if (cvec.n_embd == -1) { std::cerr << "Could not load control vector\n"; + res.set_header("Access-Control-Allow-Origin", req.get_header_value("Origin")); res_error(res, format_error_response("Could not load control vector", ERROR_TYPE_SERVER)); return; } @@ -3239,6 +3239,7 @@ int main(int argc, char ** argv) { ctx_server.params.control_vector_layer_end); if (err) { std::cerr << "Could not apply control vector\n"; + res.set_header("Access-Control-Allow-Origin", req.get_header_value("Origin")); res_error(res, format_error_response("Could not apply control vector", ERROR_TYPE_SERVER)); return; }