|
diff --git a/cgit.c b/cgit.c index bf46b5a..66dd140 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -212,12 +212,17 @@ static void querystring_cb(const char *name, const char *value) |
212 | ctx.qry.showmsg = atoi(value); |
212 | ctx.qry.showmsg = atoi(value); |
213 | } else if (!strcmp(name, "period")) { |
213 | } else if (!strcmp(name, "period")) { |
214 | ctx.qry.period = xstrdup(value); |
214 | ctx.qry.period = xstrdup(value); |
215 | } |
215 | } |
216 | } |
216 | } |
217 | |
217 | |
| |
218 | char *xstrdupn(const char *str) |
| |
219 | { |
| |
220 | return (str ? xstrdup(str) : NULL); |
| |
221 | } |
| |
222 | |
218 | static void prepare_context(struct cgit_context *ctx) |
223 | static void prepare_context(struct cgit_context *ctx) |
219 | { |
224 | { |
220 | memset(ctx, 0, sizeof(ctx)); |
225 | memset(ctx, 0, sizeof(ctx)); |
221 | ctx->cfg.agefile = "info/web/last-modified"; |
226 | ctx->cfg.agefile = "info/web/last-modified"; |
222 | ctx->cfg.nocache = 0; |
227 | ctx->cfg.nocache = 0; |
223 | ctx->cfg.cache_size = 0; |
228 | ctx->cfg.cache_size = 0; |
@@ -242,20 +247,36 @@ static void prepare_context(struct cgit_context *ctx) |
242 | ctx->cfg.root_title = "Git repository browser"; |
247 | ctx->cfg.root_title = "Git repository browser"; |
243 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
248 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
244 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
249 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
245 | ctx->cfg.summary_branches = 10; |
250 | ctx->cfg.summary_branches = 10; |
246 | ctx->cfg.summary_log = 10; |
251 | ctx->cfg.summary_log = 10; |
247 | ctx->cfg.summary_tags = 10; |
252 | ctx->cfg.summary_tags = 10; |
| |
253 | ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG")); |
| |
254 | ctx->env.http_host = xstrdupn(getenv("HTTP_HOST")); |
| |
255 | ctx->env.https = xstrdupn(getenv("HTTPS")); |
| |
256 | ctx->env.no_http = xstrdupn(getenv("NO_HTTP")); |
| |
257 | ctx->env.path_info = xstrdupn(getenv("PATH_INFO")); |
| |
258 | ctx->env.query_string = xstrdupn(getenv("QUERY_STRING")); |
| |
259 | ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD")); |
| |
260 | ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME")); |
| |
261 | ctx->env.server_name = xstrdupn(getenv("SERVER_NAME")); |
| |
262 | ctx->env.server_port = xstrdupn(getenv("SERVER_PORT")); |
248 | ctx->page.mimetype = "text/html"; |
263 | ctx->page.mimetype = "text/html"; |
249 | ctx->page.charset = PAGE_ENCODING; |
264 | ctx->page.charset = PAGE_ENCODING; |
250 | ctx->page.filename = NULL; |
265 | ctx->page.filename = NULL; |
251 | ctx->page.size = 0; |
266 | ctx->page.size = 0; |
252 | ctx->page.modified = time(NULL); |
267 | ctx->page.modified = time(NULL); |
253 | ctx->page.expires = ctx->page.modified; |
268 | ctx->page.expires = ctx->page.modified; |
254 | ctx->page.etag = NULL; |
269 | ctx->page.etag = NULL; |
255 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); |
270 | memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); |
| |
271 | if (ctx->env.script_name) |
| |
272 | ctx->cfg.script_name = ctx->env.script_name; |
| |
273 | if (ctx->env.query_string) |
| |
274 | ctx->qry.raw = ctx->env.query_string; |
| |
275 | if (!ctx->env.cgit_config) |
| |
276 | ctx->env.cgit_config = CGIT_CONFIG; |
256 | } |
277 | } |
257 | |
278 | |
258 | struct refmatch { |
279 | struct refmatch { |
259 | char *req_ref; |
280 | char *req_ref; |
260 | char *first_ref; |
281 | char *first_ref; |
261 | int match; |
282 | int match; |
@@ -422,12 +443,15 @@ static void cgit_parse_args(int argc, const char **argv) |
422 | if (!strncmp(argv[i], "--cache=", 8)) { |
443 | if (!strncmp(argv[i], "--cache=", 8)) { |
423 | ctx.cfg.cache_root = xstrdup(argv[i]+8); |
444 | ctx.cfg.cache_root = xstrdup(argv[i]+8); |
424 | } |
445 | } |
425 | if (!strcmp(argv[i], "--nocache")) { |
446 | if (!strcmp(argv[i], "--nocache")) { |
426 | ctx.cfg.nocache = 1; |
447 | ctx.cfg.nocache = 1; |
427 | } |
448 | } |
| |
449 | if (!strcmp(argv[i], "--nohttp")) { |
| |
450 | ctx.env.no_http = "1"; |
| |
451 | } |
428 | if (!strncmp(argv[i], "--query=", 8)) { |
452 | if (!strncmp(argv[i], "--query=", 8)) { |
429 | ctx.qry.raw = xstrdup(argv[i]+8); |
453 | ctx.qry.raw = xstrdup(argv[i]+8); |
430 | } |
454 | } |
431 | if (!strncmp(argv[i], "--repo=", 7)) { |
455 | if (!strncmp(argv[i], "--repo=", 7)) { |
432 | ctx.qry.repo = xstrdup(argv[i]+7); |
456 | ctx.qry.repo = xstrdup(argv[i]+7); |
433 | } |
457 | } |
@@ -474,30 +498,23 @@ static int calc_ttl() |
474 | |
498 | |
475 | return ctx.cfg.cache_repo_ttl; |
499 | return ctx.cfg.cache_repo_ttl; |
476 | } |
500 | } |
477 | |
501 | |
478 | int main(int argc, const char **argv) |
502 | int main(int argc, const char **argv) |
479 | { |
503 | { |
480 | const char *cgit_config_env = getenv("CGIT_CONFIG"); |
| |
481 | const char *method = getenv("REQUEST_METHOD"); |
| |
482 | const char *path; |
504 | const char *path; |
483 | char *qry; |
505 | char *qry; |
484 | int err, ttl; |
506 | int err, ttl; |
485 | |
507 | |
486 | prepare_context(&ctx); |
508 | prepare_context(&ctx); |
487 | cgit_repolist.length = 0; |
509 | cgit_repolist.length = 0; |
488 | cgit_repolist.count = 0; |
510 | cgit_repolist.count = 0; |
489 | cgit_repolist.repos = NULL; |
511 | cgit_repolist.repos = NULL; |
490 | |
512 | |
491 | if (getenv("SCRIPT_NAME")) |
| |
492 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); |
| |
493 | if (getenv("QUERY_STRING")) |
| |
494 | ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); |
| |
495 | cgit_parse_args(argc, argv); |
513 | cgit_parse_args(argc, argv); |
496 | parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, |
514 | parse_configfile(ctx.env.cgit_config, config_cb); |
497 | config_cb); |
| |
498 | ctx.repo = NULL; |
515 | ctx.repo = NULL; |
499 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
516 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
500 | |
517 | |
501 | /* If virtual-root isn't specified in cgitrc, lets pretend |
518 | /* If virtual-root isn't specified in cgitrc, lets pretend |
502 | * that virtual-root equals SCRIPT_NAME. |
519 | * that virtual-root equals SCRIPT_NAME. |
503 | */ |
520 | */ |
@@ -506,13 +523,13 @@ int main(int argc, const char **argv) |
506 | |
523 | |
507 | /* If no url parameter is specified on the querystring, lets |
524 | /* If no url parameter is specified on the querystring, lets |
508 | * use PATH_INFO as url. This allows cgit to work with virtual |
525 | * use PATH_INFO as url. This allows cgit to work with virtual |
509 | * urls without the need for rewriterules in the webserver (as |
526 | * urls without the need for rewriterules in the webserver (as |
510 | * long as PATH_INFO is included in the cache lookup key). |
527 | * long as PATH_INFO is included in the cache lookup key). |
511 | */ |
528 | */ |
512 | path = getenv("PATH_INFO"); |
529 | path = ctx.env.path_info; |
513 | if (!ctx.qry.url && path) { |
530 | if (!ctx.qry.url && path) { |
514 | if (path[0] == '/') |
531 | if (path[0] == '/') |
515 | path++; |
532 | path++; |
516 | ctx.qry.url = xstrdup(path); |
533 | ctx.qry.url = xstrdup(path); |
517 | if (ctx.qry.raw) { |
534 | if (ctx.qry.raw) { |
518 | qry = ctx.qry.raw; |
535 | qry = ctx.qry.raw; |
@@ -522,13 +539,13 @@ int main(int argc, const char **argv) |
522 | ctx.qry.raw = ctx.qry.url; |
539 | ctx.qry.raw = ctx.qry.url; |
523 | cgit_parse_url(ctx.qry.url); |
540 | cgit_parse_url(ctx.qry.url); |
524 | } |
541 | } |
525 | |
542 | |
526 | ttl = calc_ttl(); |
543 | ttl = calc_ttl(); |
527 | ctx.page.expires += ttl*60; |
544 | ctx.page.expires += ttl*60; |
528 | if (method && !strcmp(method, "HEAD")) |
545 | if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD")) |
529 | ctx.cfg.nocache = 1; |
546 | ctx.cfg.nocache = 1; |
530 | if (ctx.cfg.nocache) |
547 | if (ctx.cfg.nocache) |
531 | ctx.cfg.cache_size = 0; |
548 | ctx.cfg.cache_size = 0; |
532 | err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, |
549 | err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, |
533 | ctx.qry.raw, ttl, process_request, &ctx); |
550 | ctx.qry.raw, ttl, process_request, &ctx); |
534 | if (err) |
551 | if (err) |
|