diff --git a/http.c b/http.c
index 97f617f4..2c50a735 100644
--- a/http.c
+++ b/http.c
@@ -86,10 +86,10 @@ http_resolve(http_connection_t *hc, char **remainp)
 
   v = hc->hc_url + hp->hp_len;
 
-  if(*v != 0 && *v != '/')
+  if(*v != 0 && *v != '/' && *v != '?')
     return NULL;
 
-  if(*v == '/')
+  if(*v == '/' || *v == '?')
     v++;
 
   *remainp = v;