diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 12:29:22 +0200 | 
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 12:29:22 +0200 | 
| commit | 286a905842dc0bec6d21a614ec4a97c5f19d5bc4 (patch) | |
| tree | ec4a3bff9e0a47f1def3cebd2cd2212406df258a /cgit.c | |
| parent | Merge branch 'ml/head-include' (diff) | |
| parent | cgit.h: keep config flags sorted (diff) | |
| download | cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.tar.gz cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.tar.bz2 cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.zip | |
Merge branch 'lh/embedded'
Conflicts:
	cgitrc.5.txt
	ui-shared.c
Diffstat (limited to '')
| -rw-r--r-- | cgit.c | 4 | 
1 files changed, 4 insertions, 0 deletions
| @@ -51,6 +51,8 @@ void config_cb(const char *name, const char *value)  			ctx.cfg.virtual_root = "";  	} else if (!strcmp(name, "nocache"))  		ctx.cfg.nocache = atoi(value); +	else if (!strcmp(name, "noheader")) +		ctx.cfg.noheader = atoi(value);  	else if (!strcmp(name, "snapshots"))  		ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);  	else if (!strcmp(name, "enable-index-links")) @@ -73,6 +75,8 @@ void config_cb(const char *name, const char *value)  		ctx.cfg.cache_static_ttl = atoi(value);  	else if (!strcmp(name, "cache-dynamic-ttl"))  		ctx.cfg.cache_dynamic_ttl = atoi(value); +	else if (!strcmp(name, "embedded")) +		ctx.cfg.embedded = atoi(value);  	else if (!strcmp(name, "max-message-length"))  		ctx.cfg.max_msg_len = atoi(value);  	else if (!strcmp(name, "max-repodesc-length")) | 
