Skip to content

Commit 698ef79

Browse files
committed
remove pieces of code from future
1 parent 6c31664 commit 698ef79

File tree

3 files changed

+0
-26
lines changed

3 files changed

+0
-26
lines changed

src/Server/HTTPHandlerFactory.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,6 @@ static inline auto createHandlersFactoryFromConfig(
203203
handler->addFiltersFromConfig(config, prefix + "." + key);
204204
main_handler_factory->addHandler(std::move(handler));
205205
}
206-
else if (handler_type == "merges")
207-
{
208-
auto handler = createWebUIHandlerFactory<MergesWebUIRequestHandler>(server, config, prefix + "." + key, common_headers_override);
209-
handler->addFiltersFromConfig(config, prefix + "." + key);
210-
main_handler_factory->addHandler(std::move(handler));
211-
}
212206
else if (handler_type == "js")
213207
{
214208
// NOTE: JavaScriptWebUIRequestHandler only makes sense for paths other then /js/uplot.js, /js/lz-string.js

src/Server/WebUIRequestHandler.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,6 @@ void BinaryWebUIRequestHandler::handleRequest(HTTPServerRequest & request, HTTPS
7272
handle(request, response, {reinterpret_cast<const char *>(gresource_binary_htmlData), gresource_binary_htmlSize}, http_response_headers_override);
7373
}
7474

75-
void MergesWebUIRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event &)
76-
{
77-
handle(request, response, {reinterpret_cast<const char *>(gresource_merges_htmlData), gresource_merges_htmlSize}, http_response_headers_override);
78-
}
79-
8075
void JavaScriptWebUIRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event &)
8176
{
8277
if (request.getURI() == "/js/uplot.js")

src/Server/WebUIRequestHandler.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,6 @@ class BinaryWebUIRequestHandler : public HTTPRequestHandler
6161
std::unordered_map<String, String> http_response_headers_override;
6262
};
6363

64-
class MergesWebUIRequestHandler : public HTTPRequestHandler
65-
{
66-
public:
67-
explicit MergesWebUIRequestHandler(IServer &) {}
68-
explicit MergesWebUIRequestHandler(IServer & server_, const std::unordered_map<String, String> & http_response_headers_override_)
69-
: MergesWebUIRequestHandler(server_)
70-
{
71-
http_response_headers_override = http_response_headers_override_;
72-
}
73-
void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
74-
private:
75-
/// Overrides for response headers.
76-
std::unordered_map<String, String> http_response_headers_override;
77-
};
78-
7964
class JavaScriptWebUIRequestHandler : public HTTPRequestHandler
8065
{
8166
private:

0 commit comments

Comments
 (0)