mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 08:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Lars Hjemli 2011-03-05 14:01:59 +01:00
commit 1b09cbd303
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,4 +1,4 @@
CGIT_VERSION = v0.8.3.4 CGIT_VERSION = v0.8.3.5
CGIT_SCRIPT_NAME = cgit.cgi CGIT_SCRIPT_NAME = cgit.cgi
CGIT_SCRIPT_PATH = /var/www/htdocs/cgit CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
@ -241,4 +241,4 @@ clean-doc:
rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo
get-git: get-git:
curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git curl $(GIT_URL) | tar -xjf - && rm -rf git && mv git-$(GIT_VER) git

5
cgit.c
View File

@ -752,10 +752,11 @@ int main(int argc, const char **argv)
http_parse_querystring(ctx.qry.raw, querystring_cb); http_parse_querystring(ctx.qry.raw, querystring_cb);
/* If virtual-root isn't specified in cgitrc, lets pretend /* If virtual-root isn't specified in cgitrc, lets pretend
* that virtual-root equals SCRIPT_NAME. * that virtual-root equals SCRIPT_NAME, minus any possibly
* trailing slashes.
*/ */
if (!ctx.cfg.virtual_root) if (!ctx.cfg.virtual_root)
ctx.cfg.virtual_root = ctx.cfg.script_name; ctx.cfg.virtual_root = trim_end(ctx.cfg.script_name, '/');
/* If no url parameter is specified on the querystring, lets /* If no url parameter is specified on the querystring, lets
* use PATH_INFO as url. This allows cgit to work with virtual * use PATH_INFO as url. This allows cgit to work with virtual

2
html.c
View File

@ -277,7 +277,7 @@ char *convert_query_hexchar(char *txt)
d1 = hextoint(*(txt+1)); d1 = hextoint(*(txt+1));
d2 = hextoint(*(txt+2)); d2 = hextoint(*(txt+2));
if (d1<0 || d2<0) { if (d1<0 || d2<0) {
memmove(txt, txt+3, n-3); memmove(txt, txt+3, n-2);
return txt-1; return txt-1;
} else { } else {
*txt = d1 * 16 + d2; *txt = d1 * 16 + d2;

2
ui-shared.c
View File

@ -574,7 +574,7 @@ void cgit_print_http_headers(struct cgit_context *ctx)
else if (ctx->page.mimetype) else if (ctx->page.mimetype)
htmlf("Content-Type: %s\n", ctx->page.mimetype); htmlf("Content-Type: %s\n", ctx->page.mimetype);
if (ctx->page.size) if (ctx->page.size)
htmlf("Content-Length: %ld\n", ctx->page.size); htmlf("Content-Length: %zd\n", ctx->page.size);
if (ctx->page.filename) if (ctx->page.filename)
htmlf("Content-Disposition: inline; filename=\"%s\"\n", htmlf("Content-Disposition: inline; filename=\"%s\"\n",
ctx->page.filename); ctx->page.filename);