Imported Upstream version 1.4.12~20060907upstream/1.4.12_20060907

1 files changed, 13 insertions, 2 deletions

diff --git a/src/base.h b/src/base.h
index 0b5ca76..654f2ed 100644
--- a/src/base.h
+++ b/src/base.h
@@ -86,7 +86,8 @@ typedef enum { T_CONFIG_UNSET,
 		T_CONFIG_BOOLEAN, 
 		T_CONFIG_ARRAY, 
 		T_CONFIG_LOCAL, 
-		T_CONFIG_DEPRECATED
+		T_CONFIG_DEPRECATED,
+		T_CONFIG_UNSUPPORTED
 } config_values_type_t;
 
 typedef enum { T_CONFIG_SCOPE_UNSET, 
@@ -206,6 +207,10 @@ typedef struct {
 	
 	time_t stat_ts;
 	
+#ifdef HAVE_LSTAT
+	char is_symlink;
+#endif
+
 #ifdef HAVE_FAM_H
 	int    dir_version;
 	int    dir_ndx;
@@ -257,6 +262,9 @@ typedef struct {
 	/* server wide */
 	buffer *ssl_pemfile;
 	buffer *ssl_ca_file;
+	buffer *ssl_cipher_list;
+	unsigned short ssl_use_sslv2;
+
 	unsigned short use_ipv6;
 	unsigned short is_ssl;
 	unsigned short allow_http11;
@@ -484,6 +492,8 @@ typedef struct {
 	
 	buffer *ssl_pemfile;
 	buffer *ssl_ca_file;
+	buffer *ssl_cipher_list;
+	unsigned short ssl_use_sslv2;
 	unsigned short use_ipv6;
 	unsigned short is_ssl;
 	
@@ -567,7 +577,8 @@ typedef struct server {
 	
 	server_config  srvconf;
 	
-	int config_deprecated;
+	short int config_deprecated;
+	short int config_unsupported;
 	
 	connections *conns;
 	connections *joblist;