diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2016-04-14 20:40:33 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2016-04-14 20:40:33 +0000 |
| commit | 60f3c419013efd374b4edb4e0accd134de5cd50e (patch) | |
| tree | 3e8d75d5de6c02d58914457781667bac1dda2660 | |
| parent | 83a41f79faf4a55f59c7c9359f4f57ac0399b3b6 (diff) | |
| download | mandoc-60f3c419013efd374b4edb4e0accd134de5cd50e.tar.gz mandoc-60f3c419013efd374b4edb4e0accd134de5cd50e.tar.zst mandoc-60f3c419013efd374b4edb4e0accd134de5cd50e.zip | |
do not rewrite short queries
| -rw-r--r-- | cgi.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $Id: cgi.c,v 1.120 2016/04/13 15:38:45 schwarze Exp $ */ +/* $Id: cgi.c,v 1.121 2016/04/14 20:40:33 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014, 2015, 2016 Ingo Schwarze <schwarze@usta.de> @@ -55,6 +55,7 @@ struct req { struct query q; char **p; /* array of available manpaths */ size_t psz; /* number of available manpaths */ + int isquery; /* QUERY_STRING used, not PATH_INFO */ }; static void catman(const struct req *, const char *); @@ -188,6 +189,7 @@ http_parse(struct req *req, const char *qs) char *key, *val; size_t keysz, valsz; + req->isquery = 1; req->q.manpath = NULL; req->q.arch = NULL; req->q.sec = NULL; @@ -568,7 +570,7 @@ pg_searchres(const struct req *req, struct manpage *r, size_t sz) return; } - if (1 == sz) { + if (req->isquery && sz == 1) { /* * If we have just one result, then jump there now * without any delay. @@ -1085,6 +1087,7 @@ path_parse(struct req *req, const char *path) { int dir_done; + req->isquery = 0; req->q.equal = 1; req->q.manpath = mandoc_strdup(path); |