Fix an issue where the mixer lagging too much behind CEF would cause us to display...

[nageru] / httpd.cpp

diff --git a/httpd.cpp b/httpd.cpp
index 638c9853dde735e6282030aac990f2481841e6de..fe2c929969de53db70e179a5f5200db201732631 100644 (file)
--- a/httpd.cpp
+++ b/httpd.cpp
@@ -22,7 +22,7 @@ using namespace std;
 
 HTTPD::HTTPD()
 {
-       global_metrics.register_int_metric("num_connected_clients", &metric_num_connected_clients, Metrics::TYPE_GAUGE);
+       global_metrics.add("num_connected_clients", &metric_num_connected_clients, Metrics::TYPE_GAUGE);
 }
 
 HTTPD::~HTTPD()
@@ -88,6 +88,18 @@ int HTTPD::answer_to_connection(MHD_Connection *connection,
                MHD_destroy_response(response);  // Only decreases the refcount; actual free is after the request is done.
                return ret;
        }
+       if (endpoints.count(url)) {
+               pair<string, string> contents_and_type = endpoints[url].callback();
+               MHD_Response *response = MHD_create_response_from_buffer(
+                       contents_and_type.first.size(), &contents_and_type.first[0], MHD_RESPMEM_MUST_COPY);
+               MHD_add_response_header(response, "Content-type", contents_and_type.second.c_str());
+               if (endpoints[url].cors_policy == ALLOW_ALL_ORIGINS) {
+                       MHD_add_response_header(response, "Access-Control-Allow-Origin", "*");
+               }
+               int ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
+               MHD_destroy_response(response);  // Only decreases the refcount; actual free is after the request is done.
+               return ret;
+       }
 
        HTTPD::Stream *stream = new HTTPD::Stream(this, framing);
        stream->add_data(header.data(), header.size(), Stream::DATA_TYPE_HEADER);