Author: John Keeping <john@keeping.me.uk>
parsing: don't clear existing state with empty input Since commit c699866 (parsing: clear query path before starting, 2017-02-19), we clear the "page" variable simply by calling cgit_parse_url() even if the URL is empty. This breaks a URL like: .../cgit?p=about which is generated when using the "root-readme" configuration option. This happens because "page" is set to "about" when parsing the query string before we handle the path (which is empty, but non-null). It turns out that this is not the only case which is broken, but specifying repository and page via query options has been broken since before the commit mentioned above, for example: .../cgit?r=git&p=log Fix both of these by allowing the previous state to persist if PATH_INFO is empty, falling back to the query parameters if no path has been requested. Reported-by: Tom Ryder <tom@sanctum.geek.nz> Signed-off-by: John Keeping <john@keeping.me.uk>
parsing.c | 3 +--
diff --git a/parsing.c b/parsing.c
index b8d7f10de6a619ae598a2a28eecb36bf2e5ec7af..fd1ea9967cb68adc13f2efb555815a2e5da63812 100644
--- a/parsing.c
+++ b/parsing.c
@@ -20,11 +20,10 @@ {
char *c, *cmd, *p;
struct cgit_repo *repo;
- ctx.repo = NULL;
- ctx.qry.page = NULL;
if (!url || url[0] == '\0')
return;
+ ctx.qry.page = NULL;
ctx.repo = cgit_get_repoinfo(url);
if (ctx.repo) {
ctx.qry.repo = ctx.repo->url;