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

« back to all changes in this revision

Viewing changes to src/base.h

  • Committer: Bazaar Package Importer
  • Author(s): Jeremie Corbier
  • Date: 2006-09-22 19:16:08 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20060922191608-i9jngvf1wtf3j5rd
Tags: 1.4.12~20060907-1ubuntu1
Merge from debian unstable:
-> Keep the additional dependency on libterm-readline-perl-perl.

Show diffs side-by-side

added added

removed removed

Lines of Context:
86
86
                T_CONFIG_BOOLEAN, 
87
87
                T_CONFIG_ARRAY, 
88
88
                T_CONFIG_LOCAL, 
89
 
                T_CONFIG_DEPRECATED
 
89
                T_CONFIG_DEPRECATED,
 
90
                T_CONFIG_UNSUPPORTED
90
91
} config_values_type_t;
91
92
 
92
93
typedef enum { T_CONFIG_SCOPE_UNSET, 
206
207
        
207
208
        time_t stat_ts;
208
209
        
 
210
#ifdef HAVE_LSTAT
 
211
        char is_symlink;
 
212
#endif
 
213
 
209
214
#ifdef HAVE_FAM_H
210
215
        int    dir_version;
211
216
        int    dir_ndx;
257
262
        /* server wide */
258
263
        buffer *ssl_pemfile;
259
264
        buffer *ssl_ca_file;
 
265
        buffer *ssl_cipher_list;
 
266
        unsigned short ssl_use_sslv2;
 
267
 
260
268
        unsigned short use_ipv6;
261
269
        unsigned short is_ssl;
262
270
        unsigned short allow_http11;
399
407
        
400
408
#ifdef USE_OPENSSL
401
409
        SSL *ssl;
 
410
        int is_ssl_error_want;
402
411
#endif
403
412
} connection;
404
413
 
483
492
        
484
493
        buffer *ssl_pemfile;
485
494
        buffer *ssl_ca_file;
 
495
        buffer *ssl_cipher_list;
 
496
        unsigned short ssl_use_sslv2;
486
497
        unsigned short use_ipv6;
487
498
        unsigned short is_ssl;
488
499
        
566
577
        
567
578
        server_config  srvconf;
568
579
        
569
 
        int config_deprecated;
 
580
        short int config_deprecated;
 
581
        short int config_unsupported;
570
582
        
571
583
        connections *conns;
572
584
        connections *joblist;