Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.zx2c4.com/cgit.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2009-08-11 12:12:53 +0400
committerLars Hjemli <hjemli@gmail.com>2009-08-11 12:12:53 +0400
commit2c742d1a925486a47f74710325b3076a7742a9f9 (patch)
treee16e8de4c65cb659a5b487ac3f8a7d7254fef395
parentfcc6056230e367e276dcb5a292d45e272cc6e7e6 (diff)
parent80550bbe028b551550395653d32a0ba50db540ef (diff)
Merge branch 'lh/embedded'
-rw-r--r--cgit.c37
-rw-r--r--cgit.h14
-rw-r--r--ui-shared.c51
3 files changed, 63 insertions, 39 deletions
diff --git a/cgit.c b/cgit.c
index bf46b5a..66dd140 100644
--- a/cgit.c
+++ b/cgit.c
@@ -215,6 +215,11 @@ static void querystring_cb(const char *name, const char *value)
}
}
+char *xstrdupn(const char *str)
+{
+ return (str ? xstrdup(str) : NULL);
+}
+
static void prepare_context(struct cgit_context *ctx)
{
memset(ctx, 0, sizeof(ctx));
@@ -245,6 +250,16 @@ static void prepare_context(struct cgit_context *ctx)
ctx->cfg.summary_branches = 10;
ctx->cfg.summary_log = 10;
ctx->cfg.summary_tags = 10;
+ ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG"));
+ ctx->env.http_host = xstrdupn(getenv("HTTP_HOST"));
+ ctx->env.https = xstrdupn(getenv("HTTPS"));
+ ctx->env.no_http = xstrdupn(getenv("NO_HTTP"));
+ ctx->env.path_info = xstrdupn(getenv("PATH_INFO"));
+ ctx->env.query_string = xstrdupn(getenv("QUERY_STRING"));
+ ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD"));
+ ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME"));
+ ctx->env.server_name = xstrdupn(getenv("SERVER_NAME"));
+ ctx->env.server_port = xstrdupn(getenv("SERVER_PORT"));
ctx->page.mimetype = "text/html";
ctx->page.charset = PAGE_ENCODING;
ctx->page.filename = NULL;
@@ -253,6 +268,12 @@ static void prepare_context(struct cgit_context *ctx)
ctx->page.expires = ctx->page.modified;
ctx->page.etag = NULL;
memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list));
+ if (ctx->env.script_name)
+ ctx->cfg.script_name = ctx->env.script_name;
+ if (ctx->env.query_string)
+ ctx->qry.raw = ctx->env.query_string;
+ if (!ctx->env.cgit_config)
+ ctx->env.cgit_config = CGIT_CONFIG;
}
struct refmatch {
@@ -425,6 +446,9 @@ static void cgit_parse_args(int argc, const char **argv)
if (!strcmp(argv[i], "--nocache")) {
ctx.cfg.nocache = 1;
}
+ if (!strcmp(argv[i], "--nohttp")) {
+ ctx.env.no_http = "1";
+ }
if (!strncmp(argv[i], "--query=", 8)) {
ctx.qry.raw = xstrdup(argv[i]+8);
}
@@ -477,8 +501,6 @@ static int calc_ttl()
int main(int argc, const char **argv)
{
- const char *cgit_config_env = getenv("CGIT_CONFIG");
- const char *method = getenv("REQUEST_METHOD");
const char *path;
char *qry;
int err, ttl;
@@ -488,13 +510,8 @@ int main(int argc, const char **argv)
cgit_repolist.count = 0;
cgit_repolist.repos = NULL;
- if (getenv("SCRIPT_NAME"))
- ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));
- if (getenv("QUERY_STRING"))
- ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
cgit_parse_args(argc, argv);
- parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
- config_cb);
+ parse_configfile(ctx.env.cgit_config, config_cb);
ctx.repo = NULL;
http_parse_querystring(ctx.qry.raw, querystring_cb);
@@ -509,7 +526,7 @@ int main(int argc, const char **argv)
* 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");
+ path = ctx.env.path_info;
if (!ctx.qry.url && path) {
if (path[0] == '/')
path++;
@@ -525,7 +542,7 @@ int main(int argc, const char **argv)
ttl = calc_ttl();
ctx.page.expires += ttl*60;
- if (method && !strcmp(method, "HEAD"))
+ if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))
ctx.cfg.nocache = 1;
if (ctx.cfg.nocache)
ctx.cfg.cache_size = 0;
diff --git a/cgit.h b/cgit.h
index 4c854ea..d90ccdc 100644
--- a/cgit.h
+++ b/cgit.h
@@ -207,7 +207,21 @@ struct cgit_page {
char *statusmsg;
};
+struct cgit_environment {
+ char *cgit_config;
+ char *http_host;
+ char *https;
+ char *no_http;
+ char *path_info;
+ char *query_string;
+ char *request_method;
+ char *script_name;
+ char *server_name;
+ char *server_port;
+};
+
struct cgit_context {
+ struct cgit_environment env;
struct cgit_query qry;
struct cgit_config cfg;
struct cgit_repo *repo;
diff --git a/ui-shared.c b/ui-shared.c
index 015c52b..cf06511 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -36,10 +36,7 @@ void cgit_print_error(char *msg)
char *cgit_httpscheme()
{
- char *https;
-
- https = getenv("HTTPS");
- if (https != NULL && strcmp(https, "on") == 0)
+ if (ctx.env.https && !strcmp(ctx.env.https, "on"))
return "https://";
else
return "http://";
@@ -47,22 +44,13 @@ char *cgit_httpscheme()
char *cgit_hosturl()
{
- char *host, *port;
-
- host = getenv("HTTP_HOST");
- if (host) {
- host = xstrdup(host);
- } else {
- host = getenv("SERVER_NAME");
- if (!host)
- return NULL;
- port = getenv("SERVER_PORT");
- if (port && atoi(port) != 80)
- host = xstrdup(fmt("%s:%d", host, atoi(port)));
- else
- host = xstrdup(host);
- }
- return host;
+ if (ctx.env.http_host)
+ return ctx.env.http_host;
+ if (!ctx.env.server_name)
+ return NULL;
+ if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80)
+ return ctx.env.server_name;
+ return xstrdup(fmt("%s:%s", ctx.env.server_name, ctx.env.server_port));
}
char *cgit_rooturl()
@@ -467,9 +455,7 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
void cgit_print_http_headers(struct cgit_context *ctx)
{
- const char *method = getenv("REQUEST_METHOD");
-
- if (ctx->cfg.embedded)
+ if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
return;
if (ctx->page.status)
@@ -489,14 +475,17 @@ void cgit_print_http_headers(struct cgit_context *ctx)
if (ctx->page.etag)
htmlf("ETag: \"%s\"\n", ctx->page.etag);
html("\n");
- if (method && !strcmp(method, "HEAD"))
+ if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))
exit(0);
}
void cgit_print_docstart(struct cgit_context *ctx)
{
- if (ctx->cfg.embedded)
+ if (ctx->cfg.embedded) {
+ if (ctx->cfg.header)
+ html_include(ctx->cfg.header);
return;
+ }
char *host = cgit_hosturl();
html(cgit_doctype);
@@ -534,7 +523,13 @@ void cgit_print_docstart(struct cgit_context *ctx)
void cgit_print_docend()
{
- html("</div>");
+ html("</div> <!-- class=content -->\n");
+ if (ctx.cfg.embedded) {
+ html("</div> <!-- id=cgit -->\n");
+ if (ctx.cfg.footer)
+ html_include(ctx.cfg.footer);
+ return;
+ }
if (ctx.cfg.footer)
html_include(ctx.cfg.footer);
else {
@@ -543,9 +538,7 @@ void cgit_print_docend()
cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time);
html("</div>\n");
}
- html("</div>");
- if (ctx.cfg.embedded)
- return;
+ html("</div> <!-- id=cgit -->\n");
html("</body>\n</html>\n");
}