equal
deleted
inserted
replaced
1 Patch origin: in-house |
1 Patch origin: in-house |
2 Patch status: Solaris-specific; not suitable for upstream |
2 Patch status: Solaris-specific; not suitable for upstream |
|
3 Patch status: SSLProtocol part will be submitted to upstream |
3 |
4 |
4 --- docs/conf/extra/httpd-ssl.conf.in Wed Jan 4 12:10:40 2012 |
5 --- docs/conf/extra/httpd-ssl.conf.in |
5 +++ docs/conf/extra/httpd-ssl.conf.in Mon Feb 27 07:09:48 2012 |
6 +++ docs/conf/extra/httpd-ssl.conf.in |
6 @@ -22,11 +22,16 @@ |
7 @@ -22,11 +22,16 @@ |
7 # Manual for more details. |
8 # Manual for more details. |
8 # |
9 # |
9 #SSLRandomSeed startup file:/dev/random 512 |
10 #SSLRandomSeed startup file:/dev/random 512 |
10 -#SSLRandomSeed startup file:/dev/urandom 512 |
11 -#SSLRandomSeed startup file:/dev/urandom 512 |
29 -ServerName www.example.com:@@SSLPort@@ |
30 -ServerName www.example.com:@@SSLPort@@ |
30 +ServerName 127.0.0.1:@@SSLPort@@ |
31 +ServerName 127.0.0.1:@@SSLPort@@ |
31 ServerAdmin [email protected] |
32 ServerAdmin [email protected] |
32 ErrorLog "@exp_logfiledir@/error_log" |
33 ErrorLog "@exp_logfiledir@/error_log" |
33 TransferLog "@exp_logfiledir@/access_log" |
34 TransferLog "@exp_logfiledir@/access_log" |
|
35 @@ -86,8 +91,9 @@ |
|
36 |
|
37 # SSL Protocol support: |
|
38 # List the protocol versions which clients are allowed to |
|
39 -# connect with. Disable SSLv2 by default (cf. RFC 6176). |
|
40 -SSLProtocol all -SSLv2 |
|
41 +# connect with. SSLv2 and SSLv3 are disabled by default and |
|
42 +# and must be enabled below if really needed. |
|
43 +SSLProtocol all |
|
44 |
|
45 # SSL Cipher Suite: |
|
46 # List the ciphers that the client is permitted to negotiate. |