| -rw-r--r-- | cgit.c | 19 |
1 files changed, 10 insertions, 9 deletions
@@ -441,13 +441,15 @@ int main(int argc, const char **argv) - /* If virtual-root isn't specified in cgitrc and no url - * parameter is specified on the querystring, lets pretend - * that virtualroot equals SCRIPT_NAME and use PATH_INFO as - * url. This allows cgit to work with virtual urls without - * the need for rewriterules in the webserver (as long as - * PATH_INFO is included in the cache lookup key). + /* If virtual-root isn't specified in cgitrc, lets pretend + * that virtual-root equals SCRIPT_NAME. */ - if (!ctx.cfg.virtual_root && !ctx.qry.url) { + if (!ctx.cfg.virtual_root) ctx.cfg.virtual_root = ctx.cfg.script_name; + + /* If no url parameter is specified on the querystring, lets + * use PATH_INFO as url. This allows cgit to work with virtual + * urls without the need for rewriterules in the webserver (as + * long as PATH_INFO is included in the cache lookup key). + */ path = getenv("PATH_INFO"); - if (path) { + if (!ctx.qry.url && path) { if (path[0] == '/') @@ -463,3 +465,2 @@ int main(int argc, const char **argv) } - } |