merged [1051], [1052], [1053], [1054], [1057], [1060], [1061], [1062]

added ssl.use-sslv2 and ssl.cipher-list


git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.11-ssl-fixes@1279 152afb58-edef-0310-8abb-c4023f1b3aa9

1 files changed, 5 insertions, 0 deletions

diff --git a/src/base.h b/src/base.h
index 0b5ca767..c270282e 100644
--- a/src/base.h
+++ b/src/base.h
@@ -257,6 +257,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 +487,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;