author | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 10:29:22 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 10:29:22 (UTC) |
commit | 286a905842dc0bec6d21a614ec4a97c5f19d5bc4 (patch) (unidiff) | |
tree | ec4a3bff9e0a47f1def3cebd2cd2212406df258a /cgit.h | |
parent | 542f6a433034935a1aa895f7ef3273968915a5d1 (diff) | |
parent | 7a8b3b4104aa5924163efd5f2af0de10b7fb5171 (diff) | |
download | cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.zip cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.tar.gz cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.tar.bz2 |
Merge branch 'lh/embedded'
Conflicts:
cgitrc.5.txt
ui-shared.c
-rw-r--r-- | cgit.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -135,59 +135,61 @@ struct cgit_config { | |||
135 | char *clone_prefix; | 135 | char *clone_prefix; |
136 | char *css; | 136 | char *css; |
137 | char *favicon; | 137 | char *favicon; |
138 | char *footer; | 138 | char *footer; |
139 | char *head_include; | 139 | char *head_include; |
140 | char *header; | 140 | char *header; |
141 | char *index_header; | 141 | char *index_header; |
142 | char *index_info; | 142 | char *index_info; |
143 | char *logo; | 143 | char *logo; |
144 | char *logo_link; | 144 | char *logo_link; |
145 | char *module_link; | 145 | char *module_link; |
146 | char *repo_group; | 146 | char *repo_group; |
147 | char *robots; | 147 | char *robots; |
148 | char *root_title; | 148 | char *root_title; |
149 | char *root_desc; | 149 | char *root_desc; |
150 | char *root_readme; | 150 | char *root_readme; |
151 | char *script_name; | 151 | char *script_name; |
152 | char *virtual_root; | 152 | char *virtual_root; |
153 | int cache_size; | 153 | int cache_size; |
154 | int cache_dynamic_ttl; | 154 | int cache_dynamic_ttl; |
155 | int cache_max_create_time; | 155 | int cache_max_create_time; |
156 | int cache_repo_ttl; | 156 | int cache_repo_ttl; |
157 | int cache_root_ttl; | 157 | int cache_root_ttl; |
158 | int cache_static_ttl; | 158 | int cache_static_ttl; |
159 | int embedded; | ||
159 | int enable_index_links; | 160 | int enable_index_links; |
160 | int enable_log_filecount; | 161 | int enable_log_filecount; |
161 | int enable_log_linecount; | 162 | int enable_log_linecount; |
162 | int local_time; | 163 | int local_time; |
163 | int max_repo_count; | 164 | int max_repo_count; |
164 | int max_commit_count; | 165 | int max_commit_count; |
165 | int max_lock_attempts; | 166 | int max_lock_attempts; |
166 | int max_msg_len; | 167 | int max_msg_len; |
167 | int max_repodesc_len; | 168 | int max_repodesc_len; |
168 | int max_stats; | 169 | int max_stats; |
169 | int nocache; | 170 | int nocache; |
171 | int noheader; | ||
170 | int renamelimit; | 172 | int renamelimit; |
171 | int snapshots; | 173 | int snapshots; |
172 | int summary_branches; | 174 | int summary_branches; |
173 | int summary_log; | 175 | int summary_log; |
174 | int summary_tags; | 176 | int summary_tags; |
175 | }; | 177 | }; |
176 | 178 | ||
177 | struct cgit_page { | 179 | struct cgit_page { |
178 | time_t modified; | 180 | time_t modified; |
179 | time_t expires; | 181 | time_t expires; |
180 | size_t size; | 182 | size_t size; |
181 | char *mimetype; | 183 | char *mimetype; |
182 | char *charset; | 184 | char *charset; |
183 | char *filename; | 185 | char *filename; |
184 | char *etag; | 186 | char *etag; |
185 | char *title; | 187 | char *title; |
186 | int status; | 188 | int status; |
187 | char *statusmsg; | 189 | char *statusmsg; |
188 | }; | 190 | }; |
189 | 191 | ||
190 | struct cgit_context { | 192 | struct cgit_context { |
191 | struct cgit_query qry; | 193 | struct cgit_query qry; |
192 | struct cgit_config cfg; | 194 | struct cgit_config cfg; |
193 | struct cgit_repo *repo; | 195 | struct cgit_repo *repo; |