[PATCH] parsing: don't clear existing state with empty input

[PATCH] parsing: don't clear existing state with empty input

[john]

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 at sanctum.geek.nz>
Signed-off-by: John Keeping <john at keeping.me.uk>
---
This is still a bit of a mess, but I'm not really sure what we should be
doing when both PATH_INFO and query parameters are provided.  At least
this change fixes the particular case Tom reported and I think it also
makes sure that any links we generate will be handled correctly.

 parsing.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/parsing.c b/parsing.c
index b8d7f10..fd1ea99 100644
--- a/parsing.c
+++ b/parsing.c
@@ -20,11 +20,10 @@ void cgit_parse_url(const char *url)
 	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;
-- 
2.14.1.555.g1b9dbff880.dirty

[PATCH] parsing: don't clear existing state with empty input

[Jason]

Looks reasonable to me. Thanks for reporting, Tom, and thanks for the
patch John. Applied.