From 71ec7a873e1e84be9fb887f8f5e36401941db412 Mon Sep 17 00:00:00 2001
From: Dale Mellor <github-0gjbnf@rdmp.org>
Date: Tue, 5 Apr 2022 13:25:10 +0100
Subject: [PATCH] Remove query string before matching route

As the query part of a URL is not constant, it cannot be matched exactly against route components and the server always fails to route requests with queries in them.

* server.rs: add extra filter in match_to_route function.
---
 src/server.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server.rs b/src/server.rs
index 59ddad1..1d44d1b 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -208,7 +208,8 @@ fn read_all(readable: &mut impl Read) -> io::Result<Vec<u8>> {
 
 fn matches_to_route(route: String, path: String) -> (bool, HashMap<String, String>) {
     let route = route.split('/').filter(|el| el != &"");
-    let path = path.split('/').filter(|el| el != &"");
+    let path = path.split('?').next().unwrap()
+                   .split('/').filter(|el| el != &"");
 
     if route.clone().count() != path.clone().count() {
         return (false, HashMap::new());