aboutsummaryrefslogtreecommitdiffstats
path: root/cgit.c
diff options
context:
space:
mode:
Diffstat (limited to 'cgit.c')
-rw-r--r--cgit.c33
1 files changed, 23 insertions, 10 deletions
diff --git a/cgit.c b/cgit.c
index 7b228af..a92383d 100644
--- a/cgit.c
+++ b/cgit.c
@@ -215,6 +215,11 @@ static void querystring_cb(const char *name, const char *value)
215 } 215 }
216} 216}
217 217
218char *xstrdupn(const char *str)
219{
220 return (str ? xstrdup(str) : NULL);
221}
222
218static void prepare_context(struct cgit_context *ctx) 223static void prepare_context(struct cgit_context *ctx)
219{ 224{
220 memset(ctx, 0, sizeof(ctx)); 225 memset(ctx, 0, sizeof(ctx));
@@ -245,6 +250,15 @@ static void prepare_context(struct cgit_context *ctx)
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.path_info = xstrdupn(getenv("PATH_INFO"));
257 ctx->env.query_string = xstrdupn(getenv("QUERY_STRING"));
258 ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD"));
259 ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME"));
260 ctx->env.server_name = xstrdupn(getenv("SERVER_NAME"));
261 ctx->env.server_port = xstrdupn(getenv("SERVER_PORT"));
248 ctx->page.mimetype = "text/html"; 262 ctx->page.mimetype = "text/html";
249 ctx->page.charset = PAGE_ENCODING; 263 ctx->page.charset = PAGE_ENCODING;
250 ctx->page.filename = NULL; 264 ctx->page.filename = NULL;
@@ -253,6 +267,12 @@ static void prepare_context(struct cgit_context *ctx)
253 ctx->page.expires = ctx->page.modified; 267 ctx->page.expires = ctx->page.modified;
254 ctx->page.etag = NULL; 268 ctx->page.etag = NULL;
255 memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list)); 269 memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list));
270 if (ctx->env.script_name)
271 ctx->cfg.script_name = ctx->env.script_name;
272 if (ctx->env.query_string)
273 ctx->qry.raw = ctx->env.query_string;
274 if (!ctx->env.cgit_config)
275 ctx->env.cgit_config = CGIT_CONFIG;
256} 276}
257 277
258struct refmatch { 278struct refmatch {
@@ -477,8 +497,6 @@ static int calc_ttl()
477 497
478int main(int argc, const char **argv) 498int main(int argc, const char **argv)
479{ 499{
480 const char *cgit_config_env = getenv("CGIT_CONFIG");
481 const char *method = getenv("REQUEST_METHOD");
482 const char *path; 500 const char *path;
483 char *qry; 501 char *qry;
484 int err, ttl; 502 int err, ttl;
@@ -488,13 +506,8 @@ int main(int argc, const char **argv)
488 cgit_repolist.count = 0; 506 cgit_repolist.count = 0;
489 cgit_repolist.repos = NULL; 507 cgit_repolist.repos = NULL;
490 508
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); 509 cgit_parse_args(argc, argv);
496 parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, 510 parse_configfile(ctx.env.cgit_config, config_cb);
497 config_cb);
498 ctx.repo = NULL; 511 ctx.repo = NULL;
499 http_parse_querystring(ctx.qry.raw, querystring_cb); 512 http_parse_querystring(ctx.qry.raw, querystring_cb);
500 513
@@ -509,7 +522,7 @@ int main(int argc, const char **argv)
509 * urls without the need for rewriterules in the webserver (as 522 * urls without the need for rewriterules in the webserver (as
510 * long as PATH_INFO is included in the cache lookup key). 523 * long as PATH_INFO is included in the cache lookup key).
511 */ 524 */
512 path = getenv("PATH_INFO"); 525 path = ctx.env.path_info;
513 if (!ctx.qry.url && path) { 526 if (!ctx.qry.url && path) {
514 if (path[0] == '/') 527 if (path[0] == '/')
515 path++; 528 path++;
@@ -525,7 +538,7 @@ int main(int argc, const char **argv)
525 538
526 ttl = calc_ttl(); 539 ttl = calc_ttl();
527 ctx.page.expires += ttl*60; 540 ctx.page.expires += ttl*60;
528 if (method && !strcmp(method, "HEAD")) 541 if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))
529 ctx.cfg.nocache = 1; 542 ctx.cfg.nocache = 1;
530 if (ctx.cfg.nocache) 543 if (ctx.cfg.nocache)
531 ctx.cfg.cache_size = 0; 544 ctx.cfg.cache_size = 0;