author | Lars Hjemli <hjemli@gmail.com> | 2011-03-05 12:47:04 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-03-05 12:50:40 (UTC) |
commit | d0cb8413ffd5319c623d832802abe6a6d5795679 (patch) (unidiff) | |
tree | bb040f593116313a355840bed4a14d4bff0ca4fd /cgit.c | |
parent | fc384b16fb9787380746000d3cea2d53fccc548e (diff) | |
download | cgit-d0cb8413ffd5319c623d832802abe6a6d5795679.zip cgit-d0cb8413ffd5319c623d832802abe6a6d5795679.tar.gz cgit-d0cb8413ffd5319c623d832802abe6a6d5795679.tar.bz2 |
Avoid trailing slash in virtual-root
When setting virtual-root from cgitrc, care is taken to avoid trailing
slashes. But when no virtual-root setting is specified, SCRIPT_FILE
from the web server is used without similar checks. This patch fixes the
inconsistency, which could lead to double-slashes in generated links.
Noticed-by: Wouter Van Hemel <wouter@duodecim.org>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -674,20 +674,21 @@ int main(int argc, const char **argv) | |||
674 | cgit_repolist.repos = NULL; | 674 | cgit_repolist.repos = NULL; |
675 | 675 | ||
676 | cgit_parse_args(argc, argv); | 676 | cgit_parse_args(argc, argv); |
677 | parse_configfile(ctx.env.cgit_config, config_cb); | 677 | parse_configfile(ctx.env.cgit_config, config_cb); |
678 | ctx.repo = NULL; | 678 | ctx.repo = NULL; |
679 | http_parse_querystring(ctx.qry.raw, querystring_cb); | 679 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
680 | 680 | ||
681 | /* If virtual-root isn't specified in cgitrc, lets pretend | 681 | /* If virtual-root isn't specified in cgitrc, lets pretend |
682 | * that virtual-root equals SCRIPT_NAME. | 682 | * that virtual-root equals SCRIPT_NAME, minus any possibly |
683 | * trailing slashes. | ||
683 | */ | 684 | */ |
684 | if (!ctx.cfg.virtual_root) | 685 | if (!ctx.cfg.virtual_root) |
685 | ctx.cfg.virtual_root = ctx.cfg.script_name; | 686 | ctx.cfg.virtual_root = trim_end(ctx.cfg.script_name, '/'); |
686 | 687 | ||
687 | /* If no url parameter is specified on the querystring, lets | 688 | /* If no url parameter is specified on the querystring, lets |
688 | * use PATH_INFO as url. This allows cgit to work with virtual | 689 | * use PATH_INFO as url. This allows cgit to work with virtual |
689 | * urls without the need for rewriterules in the webserver (as | 690 | * urls without the need for rewriterules in the webserver (as |
690 | * long as PATH_INFO is included in the cache lookup key). | 691 | * long as PATH_INFO is included in the cache lookup key). |
691 | */ | 692 | */ |
692 | path = ctx.env.path_info; | 693 | path = ctx.env.path_info; |
693 | if (!ctx.qry.url && path) { | 694 | if (!ctx.qry.url && path) { |