RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-20 18:15:07 +00:00
Code Issues Activity Actions

WebServer: Convert document_root_path from DeprecatedString to String

Browse source
This commit is contained in:
Ben Wiederhake 2023-05-20 00:45:49 +02:00 • committed by Andreas Kling
parent e795641d99
commit f0586d74d7
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Services/WebServer/Configuration.cpp
View file

@ -11,7 +11,7 @@ namespace WebServer {
static Configuration* s_configuration = nullptr; static Configuration* s_configuration = nullptr;
Configuration::Configuration(DeprecatedString document_root_path, Optional<HTTP::HttpRequest::BasicAuthenticationCredentials> credentials) Configuration::Configuration(String document_root_path, Optional<HTTP::HttpRequest::BasicAuthenticationCredentials> credentials)
: m_document_root_path(move(document_root_path)) : m_document_root_path(move(document_root_path))
, m_credentials(move(credentials)) , m_credentials(move(credentials))
{ {

6
Userland/Services/WebServer/Configuration.h
View file

@ -15,15 +15,15 @@ namespace WebServer {
class Configuration { class Configuration {
public: public:
Configuration(DeprecatedString document_root_path, Optional<HTTP::HttpRequest::BasicAuthenticationCredentials> credentials = {}); Configuration(String document_root_path, Optional<HTTP::HttpRequest::BasicAuthenticationCredentials> credentials = {});
DeprecatedString const& document_root_path() const { return m_document_root_path; } String const& document_root_path() const { return m_document_root_path; }
Optional<HTTP::HttpRequest::BasicAuthenticationCredentials> const& credentials() const { return m_credentials; } Optional<HTTP::HttpRequest::BasicAuthenticationCredentials> const& credentials() const { return m_credentials; }
static Configuration const& the(); static Configuration const& the();
private: private:
DeprecatedString m_document_root_path; String m_document_root_path;
Optional<HTTP::HttpRequest::BasicAuthenticationCredentials> m_credentials; Optional<HTTP::HttpRequest::BasicAuthenticationCredentials> m_credentials;
}; };

2
Userland/Services/WebServer/main.cpp
View file

@ -68,7 +68,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
if (!username.is_empty() && !password.is_empty()) if (!username.is_empty() && !password.is_empty())
credentials = HTTP::HttpRequest::BasicAuthenticationCredentials { username, password }; credentials = HTTP::HttpRequest::BasicAuthenticationCredentials { username, password };
WebServer::Configuration configuration(real_document_root_path.to_deprecated_string(), credentials); WebServer::Configuration configuration(real_document_root_path, credentials);
Core::EventLoop loop; Core::EventLoop loop;