summaryrefslogtreecommitdiffabout
path: root/cgit.c
authorLars Hjemli <hjemli@gmail.com>2009-02-19 22:24:15 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-02-19 22:24:15 (UTC)
commit3ff58ddd51bcbcbc9b7649bad1a39aa98af4b49f (patch) (unidiff)
tree4ff1b54dfb2fc025771f39528165e9e46d93a0e0 /cgit.c
parent488a214a81a25c6397c56822ed1713f51dddc520 (diff)
downloadcgit-3ff58ddd51bcbcbc9b7649bad1a39aa98af4b49f.zip
cgit-3ff58ddd51bcbcbc9b7649bad1a39aa98af4b49f.tar.gz
cgit-3ff58ddd51bcbcbc9b7649bad1a39aa98af4b49f.tar.bz2
Add support for HEAD requests
This is a quick 'n dirty hack which makes cgit honor HEAD requests. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'cgit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c
index 411e421..dc1c2e4 100644
--- a/cgit.c
+++ b/cgit.c
@@ -369,119 +369,122 @@ static void cgit_parse_args(int argc, const char **argv)
369{ 369{
370 int i; 370 int i;
371 int scan = 0; 371 int scan = 0;
372 372
373 for (i = 1; i < argc; i++) { 373 for (i = 1; i < argc; i++) {
374 if (!strncmp(argv[i], "--cache=", 8)) { 374 if (!strncmp(argv[i], "--cache=", 8)) {
375 ctx.cfg.cache_root = xstrdup(argv[i]+8); 375 ctx.cfg.cache_root = xstrdup(argv[i]+8);
376 } 376 }
377 if (!strcmp(argv[i], "--nocache")) { 377 if (!strcmp(argv[i], "--nocache")) {
378 ctx.cfg.nocache = 1; 378 ctx.cfg.nocache = 1;
379 } 379 }
380 if (!strncmp(argv[i], "--query=", 8)) { 380 if (!strncmp(argv[i], "--query=", 8)) {
381 ctx.qry.raw = xstrdup(argv[i]+8); 381 ctx.qry.raw = xstrdup(argv[i]+8);
382 } 382 }
383 if (!strncmp(argv[i], "--repo=", 7)) { 383 if (!strncmp(argv[i], "--repo=", 7)) {
384 ctx.qry.repo = xstrdup(argv[i]+7); 384 ctx.qry.repo = xstrdup(argv[i]+7);
385 } 385 }
386 if (!strncmp(argv[i], "--page=", 7)) { 386 if (!strncmp(argv[i], "--page=", 7)) {
387 ctx.qry.page = xstrdup(argv[i]+7); 387 ctx.qry.page = xstrdup(argv[i]+7);
388 } 388 }
389 if (!strncmp(argv[i], "--head=", 7)) { 389 if (!strncmp(argv[i], "--head=", 7)) {
390 ctx.qry.head = xstrdup(argv[i]+7); 390 ctx.qry.head = xstrdup(argv[i]+7);
391 ctx.qry.has_symref = 1; 391 ctx.qry.has_symref = 1;
392 } 392 }
393 if (!strncmp(argv[i], "--sha1=", 7)) { 393 if (!strncmp(argv[i], "--sha1=", 7)) {
394 ctx.qry.sha1 = xstrdup(argv[i]+7); 394 ctx.qry.sha1 = xstrdup(argv[i]+7);
395 ctx.qry.has_sha1 = 1; 395 ctx.qry.has_sha1 = 1;
396 } 396 }
397 if (!strncmp(argv[i], "--ofs=", 6)) { 397 if (!strncmp(argv[i], "--ofs=", 6)) {
398 ctx.qry.ofs = atoi(argv[i]+6); 398 ctx.qry.ofs = atoi(argv[i]+6);
399 } 399 }
400 if (!strncmp(argv[i], "--scan-tree=", 12)) { 400 if (!strncmp(argv[i], "--scan-tree=", 12)) {
401 scan++; 401 scan++;
402 scan_tree(argv[i] + 12); 402 scan_tree(argv[i] + 12);
403 } 403 }
404 } 404 }
405 if (scan) { 405 if (scan) {
406 qsort(cgit_repolist.repos, cgit_repolist.count, 406 qsort(cgit_repolist.repos, cgit_repolist.count,
407 sizeof(struct cgit_repo), cmp_repos); 407 sizeof(struct cgit_repo), cmp_repos);
408 print_repolist(&cgit_repolist); 408 print_repolist(&cgit_repolist);
409 exit(0); 409 exit(0);
410 } 410 }
411} 411}
412 412
413static int calc_ttl() 413static int calc_ttl()
414{ 414{
415 if (!ctx.repo) 415 if (!ctx.repo)
416 return ctx.cfg.cache_root_ttl; 416 return ctx.cfg.cache_root_ttl;
417 417
418 if (!ctx.qry.page) 418 if (!ctx.qry.page)
419 return ctx.cfg.cache_repo_ttl; 419 return ctx.cfg.cache_repo_ttl;
420 420
421 if (ctx.qry.has_symref) 421 if (ctx.qry.has_symref)
422 return ctx.cfg.cache_dynamic_ttl; 422 return ctx.cfg.cache_dynamic_ttl;
423 423
424 if (ctx.qry.has_sha1) 424 if (ctx.qry.has_sha1)
425 return ctx.cfg.cache_static_ttl; 425 return ctx.cfg.cache_static_ttl;
426 426
427 return ctx.cfg.cache_repo_ttl; 427 return ctx.cfg.cache_repo_ttl;
428} 428}
429 429
430int main(int argc, const char **argv) 430int main(int argc, const char **argv)
431{ 431{
432 const char *cgit_config_env = getenv("CGIT_CONFIG"); 432 const char *cgit_config_env = getenv("CGIT_CONFIG");
433 const char *method = getenv("REQUEST_METHOD");
433 const char *path; 434 const char *path;
434 char *qry; 435 char *qry;
435 int err, ttl; 436 int err, ttl;
436 437
437 prepare_context(&ctx); 438 prepare_context(&ctx);
438 cgit_repolist.length = 0; 439 cgit_repolist.length = 0;
439 cgit_repolist.count = 0; 440 cgit_repolist.count = 0;
440 cgit_repolist.repos = NULL; 441 cgit_repolist.repos = NULL;
441 442
442 if (getenv("SCRIPT_NAME")) 443 if (getenv("SCRIPT_NAME"))
443 ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); 444 ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));
444 if (getenv("QUERY_STRING")) 445 if (getenv("QUERY_STRING"))
445 ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); 446 ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
446 cgit_parse_args(argc, argv); 447 cgit_parse_args(argc, argv);
447 parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, 448 parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
448 config_cb); 449 config_cb);
449 ctx.repo = NULL; 450 ctx.repo = NULL;
450 http_parse_querystring(ctx.qry.raw, querystring_cb); 451 http_parse_querystring(ctx.qry.raw, querystring_cb);
451 452
452 /* If virtual-root isn't specified in cgitrc, lets pretend 453 /* If virtual-root isn't specified in cgitrc, lets pretend
453 * that virtual-root equals SCRIPT_NAME. 454 * that virtual-root equals SCRIPT_NAME.
454 */ 455 */
455 if (!ctx.cfg.virtual_root) 456 if (!ctx.cfg.virtual_root)
456 ctx.cfg.virtual_root = ctx.cfg.script_name; 457 ctx.cfg.virtual_root = ctx.cfg.script_name;
457 458
458 /* If no url parameter is specified on the querystring, lets 459 /* If no url parameter is specified on the querystring, lets
459 * use PATH_INFO as url. This allows cgit to work with virtual 460 * use PATH_INFO as url. This allows cgit to work with virtual
460 * urls without the need for rewriterules in the webserver (as 461 * urls without the need for rewriterules in the webserver (as
461 * long as PATH_INFO is included in the cache lookup key). 462 * long as PATH_INFO is included in the cache lookup key).
462 */ 463 */
463 path = getenv("PATH_INFO"); 464 path = getenv("PATH_INFO");
464 if (!ctx.qry.url && path) { 465 if (!ctx.qry.url && path) {
465 if (path[0] == '/') 466 if (path[0] == '/')
466 path++; 467 path++;
467 ctx.qry.url = xstrdup(path); 468 ctx.qry.url = xstrdup(path);
468 if (ctx.qry.raw) { 469 if (ctx.qry.raw) {
469 qry = ctx.qry.raw; 470 qry = ctx.qry.raw;
470 ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); 471 ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry));
471 free(qry); 472 free(qry);
472 } else 473 } else
473 ctx.qry.raw = ctx.qry.url; 474 ctx.qry.raw = ctx.qry.url;
474 cgit_parse_url(ctx.qry.url); 475 cgit_parse_url(ctx.qry.url);
475 } 476 }
476 477
477 ttl = calc_ttl(); 478 ttl = calc_ttl();
478 ctx.page.expires += ttl*60; 479 ctx.page.expires += ttl*60;
480 if (method && !strcmp(method, "HEAD"))
481 ctx.cfg.nocache = 1;
479 if (ctx.cfg.nocache) 482 if (ctx.cfg.nocache)
480 ctx.cfg.cache_size = 0; 483 ctx.cfg.cache_size = 0;
481 err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, 484 err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,
482 ctx.qry.raw, ttl, process_request, &ctx); 485 ctx.qry.raw, ttl, process_request, &ctx);
483 if (err) 486 if (err)
484 cgit_print_error(fmt("Error processing page: %s (%d)", 487 cgit_print_error(fmt("Error processing page: %s (%d)",
485 strerror(err), err)); 488 strerror(err), err));
486 return err; 489 return err;
487} 490}