← Back to branch summary

~ubuntu-branches/ubuntu/hardy/lighttpd/hardy

« back to all changes in this revision

Viewing changes to src/configfile.c

  • Committer: Bazaar Package Importer
  • Author(s): Michele Angrisano
  • Date: 2007-07-28 20:33:22 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20070728203322-ut5ym6udh0xjxkma
Tags: 1.4.16-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add fam/gamin stat cache engine support.
  - Replace Depends: on perl with Depends: on libterm-readline-perl-perl.
  - Make sure that upgrades succeed, even if we can't restart lighttpd.
  - Clean environment in init.d script.
  - Update maintainer field in debian/control.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/configfile.c
89
89
                { "server.core-files",           NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 45 */
90
90
                { "ssl.cipher-list",             NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER },      /* 46 */
91
91
                { "ssl.use-sslv2",               NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION }, /* 47 */
92
 
 
 
92
                { "etag.use-inode",             NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 48 */
 
93
                { "etag.use-mtime",             NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 49 */
 
94
                { "etag.use-size",             NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_SERVER }, /* 50 */
93
95
                { "server.host",                 "use server.bind instead", T_CONFIG_DEPRECATED, T_CONFIG_SCOPE_UNSET },
94
96
                { "server.docroot",              "use server.document-root instead", T_CONFIG_DEPRECATED, T_CONFIG_SCOPE_UNSET },
95
97
                { "server.virtual-root",         "load mod_simple_vhost and use simple-vhost.server-root instead", T_CONFIG_DEPRECATED, T_CONFIG_SCOPE_UNSET },
162
164
#endif
163
165
                s->kbytes_per_second = 0;
164
166
                s->allow_http11  = 1;
 
167
                s->etag_use_inode = 1;
 
168
                s->etag_use_mtime = 1;
 
169
                s->etag_use_size  = 1;
165
170
                s->range_requests = 1;
166
171
                s->force_lowercase_filenames = 0;
167
172
                s->global_kbytes_per_second = 0;
206
211
 
207
212
                cv[46].destination = s->ssl_cipher_list;
208
213
                cv[47].destination = &(s->ssl_use_sslv2);
 
214
                cv[48].destination = &(s->etag_use_inode);
 
215
                cv[49].destination = &(s->etag_use_mtime);
 
216
                cv[50].destination = &(s->etag_use_size);
209
217
 
210
218
                srv->config_storage[i] = s;
211
219
 
280
288
        PATCH(ssl_ca_file);
281
289
        PATCH(ssl_cipher_list);
282
290
        PATCH(ssl_use_sslv2);
283
 
 
284
 
 
 
291
        PATCH(etag_use_inode);
 
292
        PATCH(etag_use_mtime);
 
293
        PATCH(etag_use_size);
 
294
 
285
295
        return 0;
286
296
}
287
297
 
323
333
                                PATCH(max_read_idle);
324
334
                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("mimetype.use-xattr"))) {
325
335
                                PATCH(use_xattr);
 
336
                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("etag.use-inode"))) {
 
337
                                PATCH(etag_use_inode);
 
338
                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("etag.use-mtime"))) {
 
339
                                PATCH(etag_use_mtime);
 
340
                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("etag.use-size"))) {
 
341
                                PATCH(etag_use_size);
326
342
                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.pemfile"))) {
327
343
                                PATCH(ssl_pemfile);
328
344
                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("ssl.ca-file"))) {
365
381
                }
366
382
        }
367
383
 
 
384
                con->etag_flags = (con->conf.etag_use_mtime ? ETAG_USE_MTIME : 0) |
 
385
                                  (con->conf.etag_use_inode ? ETAG_USE_INODE : 0) |
 
386
                                  (con->conf.etag_use_size  ? ETAG_USE_SIZE  : 0);
 
387
 
368
388
        return 0;
369
389
}
370
390
#undef PATCH