[BACK]Return to base.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / lighttpd / src

Diff for /embedaddon/lighttpd/src/base.h between versions 1.1 and 1.1.1.2

version 1.1, 2013/10/14 10:32:47 version 1.1.1.2, 2014/06/15 20:20:06
Line 222  typedef struct { Line 222  typedef struct {
   
 #ifdef HAVE_FAM_H  #ifdef HAVE_FAM_H
         int    dir_version;          int    dir_version;
         int    dir_ndx;  
 #endif  #endif
   
         buffer *content_type;          buffer *content_type;
Line 235  typedef struct { Line 234  typedef struct {
 #ifdef HAVE_FAM_H  #ifdef HAVE_FAM_H
         splay_tree *dirs; /* the nodes of the tree are fam_dir_entry */          splay_tree *dirs; /* the nodes of the tree are fam_dir_entry */
   
        FAMConnection *fam;        FAMConnection fam;
         int    fam_fcce_ndx;          int    fam_fcce_ndx;
 #endif  #endif
         buffer *hash_key;  /* temp-store for the hash-key */          buffer *hash_key;  /* temp-store for the hash-key */
Line 320  typedef struct { Line 319  typedef struct {
         off_t *global_bytes_per_second_cnt_ptr; /*  */          off_t *global_bytes_per_second_cnt_ptr; /*  */
   
 #ifdef USE_OPENSSL  #ifdef USE_OPENSSL
        SSL_CTX *ssl_ctx;        SSL_CTX *ssl_ctx; /* not patched */
         /* SNI per host: with COMP_SERVER_SOCKET, COMP_HTTP_SCHEME, COMP_HTTP_HOST */
         EVP_PKEY *ssl_pemfile_pkey;
         X509 *ssl_pemfile_x509;
         STACK_OF(X509_NAME) *ssl_ca_file_cert_names;
 #endif  #endif
 } specific_config;  } specific_config;
   
Line 530  typedef struct server_socket { Line 533  typedef struct server_socket {
         int       fd;          int       fd;
         int       fde_ndx;          int       fde_ndx;
   
         buffer *ssl_pemfile;  
         buffer *ssl_ca_file;  
         buffer *ssl_cipher_list;  
         buffer *ssl_dh_file;  
         buffer *ssl_ec_curve;  
         unsigned short ssl_use_sslv2;  
         unsigned short ssl_use_sslv3;  
         unsigned short use_ipv6;  
         unsigned short is_ssl;          unsigned short is_ssl;
   
         buffer *srv_token;          buffer *srv_token;
Removed from v.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>