From b895f53cf33e16f370e7c085a8d3429dad864b93 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 06:18:41 +0000 Subject: auto-import changelog data from httpd-2.0.49-2.ent.src.rpm Fri Mar 26 2004 Joe Orton 2.0.49-2 - mod_ssl: fix session cache memory leak (Madhu Mathihalli) - mod_ssl: fix SEGV when trying to shutdown during pool cleanup - merge the mod_proxy HTTP/1.1-compliance fixes - apply fix for #118020 --- ssl.conf | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) (limited to 'ssl.conf') diff --git a/ssl.conf b/ssl.conf index ffcd9ff..9e0a65a 100644 --- a/ssl.conf +++ b/ssl.conf @@ -3,10 +3,6 @@ # It contains the configuration directives to instruct the server how to # serve pages over an https connection. For detailing information about these # directives see -# -# For the moment, see for this info. -# The documents are still being prepared from material donated by the -# modssl project. # # Do NOT simply read the instructions in here without understanding # what they do. They're here only as hints or reminders. If you are unsure @@ -26,13 +22,6 @@ LoadModule ssl_module modules/mod_ssl.so # Listen 443 -# -# Dynamic Shared Object (DSO) Support -# -# To be able to use the functionality of a module which was built as a DSO you -# ErrorLog logs/dummy-host.example.com-error_log -# CustomLog logs/dummy-host.example.com-access_log common - ## ## SSL Global Context ## @@ -64,7 +53,7 @@ SSLSessionCacheTimeout 300 # Semaphore: # Configure the path to the mutual exclusion semaphore the # SSL engine uses internally for inter-process synchronization. -SSLMutex file:logs/ssl_mutex +SSLMutex default # Pseudo Random Number Generator (PRNG): # Configure one or more sources to seed the PRNG of the @@ -76,10 +65,9 @@ SSLMutex file:logs/ssl_mutex # platforms additionally provide a /dev/urandom device which doesn't # block. So, if available, use this one instead. Read the mod_ssl User # Manual for more details. -SSLRandomSeed startup builtin +SSLRandomSeed startup file:/dev/urandom 256 SSLRandomSeed connect builtin #SSLRandomSeed startup file:/dev/random 512 -#SSLRandomSeed startup file:/dev/urandom 512 #SSLRandomSeed connect file:/dev/random 512 #SSLRandomSeed connect file:/dev/urandom 512 @@ -99,14 +87,15 @@ SSLCryptoDevice builtin -# General setup for the virtual host, inherited from global configuration +# General setup for the virtual host, inherited from global configuration #DocumentRoot "/var/www/html" -#ServerName new.host.name:443 -#ServerAdmin you@your.address +#ServerName www.example.com:443 -# Use separate log files: +# Use separate log files for the SSL virtual host; note that LogLevel +# is not inherited from httpd.conf. ErrorLog logs/ssl_error_log TransferLog logs/ssl_access_log +LogLevel warn # SSL Engine Switch: # Enable/Disable SSL for this virtual host. -- cgit