]> git.cameronkatri.com Git - cgit.git/commit
parsing: don't clear existing state with empty input
authorJohn Keeping <john@keeping.me.uk>
Sat, 14 Oct 2017 12:02:53 +0000 (13:02 +0100)
committerJason A. Donenfeld <Jason@zx2c4.com>
Sat, 14 Oct 2017 12:31:18 +0000 (14:31 +0200)
commit9d751e7eec4f4bc7292be46f2af774fe1adf336a
tree332b2ed294743969237886944f6b263d8ed0acc6
parent1649afdc9b2febe9ab7e1abe1956c5dcaff93aa1
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