small changes

Author: apolyakov

runtime-light/server/http/http-server-state.h

@@ -38,6 +38,7 @@ namespace headers {
 
 inline constexpr std::string_view HOST = "host";
 inline constexpr std::string_view COOKIE = "cookie";
+inline constexpr std::string_view SERVER = "server";
 inline constexpr std::string_view LOCATION = "location";
 inline constexpr std::string_view SET_COOKIE = "set-cookie";
 inline constexpr std::string_view CONNECTION = "connection";
@@ -46,7 +47,6 @@ inline constexpr std::string_view CONTENT_LENGTH = "content-length";
 inline constexpr std::string_view AUTHORIZATION = "authorization";
 inline constexpr std::string_view ACCEPT_ENCODING = "accept-encoding";
 inline constexpr std::string_view CONTENT_ENCODING = "content-encoding";
-inline constexpr std::string_view SERVER = "server";
 
 } // namespace headers
 
@@ -74,20 +74,8 @@ struct HttpServerInstanceState final : private vk::not_copyable {
   kphp::stl::multimap<kphp::stl::string<kphp::memory::script_allocator>, kphp::stl::string<kphp::memory::script_allocator>, kphp::memory::script_allocator>
       headers_;
 
-  // Setup default headers
-  void headers_init() noexcept {
-    constexpr std::string_view DEFAULT_SERVER_NAME = "nginx/0.3.33";
-    constexpr std::string_view DEFAULT_CONTENT_TYPE = "text/html; charset=windows-1251";
-    // add 'server' header
-    add_header(kphp::http::headers::SERVER, DEFAULT_SERVER_NAME, false);
-    // add 'content-type' header
-    add_header(kphp::http::headers::CONTENT_TYPE, DEFAULT_CONTENT_TYPE, false);
-  }
-
 public:
-  HttpServerInstanceState() noexcept {
-    headers_init();
-  }
+  HttpServerInstanceState() noexcept = default;
 
   const auto& headers() const noexcept {
     return headers_;

runtime-light/server/http/init-functions.cpp

@@ -349,12 +349,12 @@ void init_server(kphp::component::stream&& request_stream, kphp::stl::vector<std
 
   // ==================================
   // prepare some response headers
-
   auto& static_SB{RuntimeContext::get().static_SB};
   // add connection kind header
   const auto connection_kind{http_server_instance_st.connection_kind == connection_kind::keep_alive ? CONNECTION_KEEP_ALIVE : CONNECTION_CLOSE};
   static_SB.clean() << headers::CONNECTION.data() << ": " << connection_kind.data();
   kphp::http::header({static_SB.c_str(), static_SB.size()}, true, status::NO_STATUS);
+
   kphp::log::info("http server initialized with: "
                   "server addr -> {}, "
                   "server port -> {}, "

runtime-light/state/instance-state.cpp

@@ -21,6 +21,7 @@
 #include "runtime-light/coroutine/task.h"
 #include "runtime-light/k2-platform/k2-api.h"
 #include "runtime-light/server/cli/init-functions.h"
+#include "runtime-light/server/http/http-server-state.h"
 #include "runtime-light/server/http/init-functions.h"
 #include "runtime-light/server/rpc/init-functions.h"
 #include "runtime-light/state/component-state.h"
@@ -150,6 +151,15 @@ kphp::coro::task<> InstanceState::run_instance_prologue() noexcept {
     superglobals.v$d$PHP_SAPI = string{sapi_name.data(), sapi_name.size()};
   }
 
+  if constexpr (kind == image_kind::cli || kind == image_kind::server) {
+    // TODO set these headers in CLI and HTTP modes only
+    static constexpr std::string_view DEFAULT_SERVER_NAME{"nginx/0.3.33"};
+    static constexpr std::string_view DEFAULT_CONTENT_TYPE{"text/html; charset=windows-1251"};
+
+    http_server_instance_state.add_header(kphp::http::headers::SERVER, DEFAULT_SERVER_NAME, false);
+    http_server_instance_state.add_header(kphp::http::headers::CONTENT_TYPE, DEFAULT_CONTENT_TYPE, false);
+  }
+
   // specific initialization
   if constexpr (kind == image_kind::cli) {
     co_await init_cli_instance();