Merge branch 'admin-refactor' into ph3-devel

b6cd41ea · Philipp Schafft · 0db820c9 · cf217560 · b6cd41ea · b6cd41ea
Commit b6cd41ea authored May 07, 2018 by Philipp Schafft 🦁
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 148 additions and 292 deletions

src/admin.c src/admin.c +140 -288

src/connection.c src/connection.c +8 -4

No files found.
--- a/src/admin.c
+++ b/src/admin.c
--- a/src/connection.c
+++ b/src/connection.c
@@ -914,11 +914,15 @@ static void _handle_get_request(client_t *client, char *uri) {

    stats_event_inc(NULL, "client_connections");

-    /* Dispatch all admin requests */
-    if ((strcmp(uri, "/admin.cgi") == 0) ||
-        (strncmp(uri, "/admin/", 7) == 0)) {
+    /* Dispatch legacy admin.cgi requests */
+    if (strcmp(uri, "/admin.cgi") == 0) {
        ICECAST_LOG_DEBUG("Client %p requesting admin interface.", client);
-        admin_handle_request(client, uri);
+        admin_handle_request(client, uri + 1);
+        return;
+    } /* Dispatch all admin requests */
+    else if (strncmp(uri, "/admin/", 7) == 0) {
+        ICECAST_LOG_DEBUG("Client %p requesting admin interface.", client);
+        admin_handle_request(client, uri + 7);
        return;
    }