diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2007-07-11 15:53:30 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2007-07-11 15:53:30 +0000 |
| commit | 2f7453fcc9705a0c36351e6aee1bbf32294395ef (patch) | |
| tree | 64722ff89240868bf1f3d4ec5b6ea40510dcf04c | |
| parent | Updating rolltarball.sh to ignore vim backup files when creating the tar arch... (diff) | |
| download | apache-2f7453fcc9705a0c36351e6aee1bbf32294395ef.tar.gz apache-2f7453fcc9705a0c36351e6aee1bbf32294395ef.tar.bz2 apache-2f7453fcc9705a0c36351e6aee1bbf32294395ef.zip | |
bug #178966
| -rw-r--r-- | 2.2/conf/httpd.conf | 10 | ||||
| -rw-r--r-- | 2.2/conf/modules.d/40_mod_ssl.conf | 6 | ||||
| -rw-r--r-- | 2.2/conf/vhosts.d/00_default_ssl_vhost.conf | 7 | ||||
| -rw-r--r-- | 2.2/conf/vhosts.d/00_default_vhost.conf | 12 |
4 files changed, 19 insertions, 16 deletions
diff --git a/2.2/conf/httpd.conf b/2.2/conf/httpd.conf index fa3c1d8..7d76613 100644 --- a/2.2/conf/httpd.conf +++ b/2.2/conf/httpd.conf @@ -38,16 +38,6 @@ # httpd daemons, you will need to change at least LockFile and PidFile. ServerRoot "/usr/lib/apache2" -# Listen: Allows you to bind Apache to specific IP addresses and/or -# ports, instead of the default. See also the <VirtualHost> -# directive. -# -# Change this to Listen on specific IP addresses as shown below to -# prevent Apache from glomming onto all bound IP addresses. -# -#Listen 12.34.56.78:80 -Listen 80 - # Dynamic Shared Object (DSO) Support # # To be able to use the functionality of a module which was built as a DSO you diff --git a/2.2/conf/modules.d/40_mod_ssl.conf b/2.2/conf/modules.d/40_mod_ssl.conf index 438018d..331783a 100644 --- a/2.2/conf/modules.d/40_mod_ssl.conf +++ b/2.2/conf/modules.d/40_mod_ssl.conf @@ -32,12 +32,6 @@ SSLRandomSeed connect builtin #SSLRandomSeed connect file:/dev/random 512 #SSLRandomSeed connect file:/dev/urandom 512 -# When we also provide SSL we have to listen to the standard HTTP port (see -# above) and to the HTTPS port -# Note: Configurations that use IPv6 but not IPv4-mapped addresses need two -# Listen directives: "Listen [::]:443" and "Listen 0.0.0.0:443" -Listen 443 - ## SSL Global Context: # All SSL configuration in this context applies both to the main server and # all SSL-enabled virtual hosts. diff --git a/2.2/conf/vhosts.d/00_default_ssl_vhost.conf b/2.2/conf/vhosts.d/00_default_ssl_vhost.conf index 33eba02..a95d3a6 100644 --- a/2.2/conf/vhosts.d/00_default_ssl_vhost.conf +++ b/2.2/conf/vhosts.d/00_default_ssl_vhost.conf @@ -1,6 +1,13 @@ <IfDefine SSL> <IfDefine SSL_DEFAULT_VHOST> <IfModule ssl_module> +# see bug #178966 why this is in here + +# When we also provide SSL we have to listen to the HTTPS port +# Note: Configurations that use IPv6 but not IPv4-mapped addresses need two +# Listen directives: "Listen [::]:443" and "Listen 0.0.0.0:443" +Listen 443 + <VirtualHost _default_:443> Include /etc/apache2/vhosts.d/default_vhost.include ErrorLog /var/log/apache2/ssl_error_log diff --git a/2.2/conf/vhosts.d/00_default_vhost.conf b/2.2/conf/vhosts.d/00_default_vhost.conf index 2905d33..73e45b8 100644 --- a/2.2/conf/vhosts.d/00_default_vhost.conf +++ b/2.2/conf/vhosts.d/00_default_vhost.conf @@ -13,6 +13,18 @@ # configuration. <IfDefine DEFAULT_VHOST> +# see bug #178966 why this is in here + +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, instead of the default. See also the <VirtualHost> +# directive. +# +# Change this to Listen on specific IP addresses as shown below to +# prevent Apache from glomming onto all bound IP addresses. +# +#Listen 12.34.56.78:80 +Listen 80 + # Use name-based virtual hosting. NameVirtualHost *:80 |