http: remove multi-/ from URL when searching for paths (fixes #1764)

diff --git a/src/http.c b/src/http.c
index d5898c3ca7d8743cd32e3b08545b2e44f63e7627..07d52cf4b176aea351d1bef7944a66ed1f51419b 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -69,19 +69,34 @@ static http_path_t *
 http_resolve(http_connection_t *hc, char **remainp, char **argsp)
 {
   http_path_t *hp;
-  char *v;
+  int n = 0;
+  char *v, *path = tvh_strdupa(hc->hc_url);
+
+  /* Canocalize path (or at least remove excess slashes) */
+  v  = path;
+  while (*v && *v != '?') {
+    if (*v == '/' && v[1] == '/') {
+      int l = strlen(v+1);
+      memmove(v, v+1, l);
+      v[l] = 0;
+      n++;
+    } else
+      v++;
+  }
+
   LIST_FOREACH(hp, &http_paths, hp_link) {
-    if(!strncmp(hc->hc_url, hp->hp_path, hp->hp_len)) {
-      if(hc->hc_url[hp->hp_len] == 0 || hc->hc_url[hp->hp_len] == '/' ||
-        hc->hc_url[hp->hp_len] == '?')
-       break;
+    if(!strncmp(path, hp->hp_path, hp->hp_len)) {
+      if(path[hp->hp_len] == 0 ||
+         path[hp->hp_len] == '/' ||
+              path[hp->hp_len] == '?')
+        break;
     }
   }
-
+  
   if(hp == NULL)
     return NULL;
 
-  v = hc->hc_url + hp->hp_len;
+  v = hc->hc_url + n + hp->hp_len;
 
   *remainp = NULL;
   *argsp = NULL;