Merge lp:~lynxman/ubuntu/oneiric/apache2/fixeddefaultsite into lp:ubuntu/oneiric/apache2

[Marc Cluet]

  * Changed default website config (LP: #820936)
    - debian/config-dir/sites-available/default: Changed Virtualhost
    definition to avoid bug LP: #820936

[lp:~lynxman/ubuntu/oneiric/apache2/fixeddefaultsite]

71. By Marc Cluet on 2011-08-19

* Expanded changelog to explain more in depth the problem we solved with this fix

[James Page (james-page)]

Hi Marc

As we discussed via IRC this proposed change does not address bug 820936 due to the fact that in Apache 2.2 the rewrite engine plus inheritance have to be declared explicitly in all VirtualHost definitions , see http://httpd.apache.org/docs/2.2/mod/mod_rewrite.html#vhosts.

That said the change does make some sense as it makes the default host behave in a slight nicer way with other virtualhosts - however we should try to get this change in Debian first rather that risking an Ubuntu delta which we may have to carry.

Please could you submit a bug report back to Debian.

Cheers

James

review: Disapprove

Unmerged revisions

71. By Marc Cluet on 2011-08-19

* Expanded changelog to explain more in depth the problem we solved with this fix

70. By Marc Cluet on 2011-08-19

  * Changed default website config (LP: #820936)
    - debian/config-dir/sites-available/default: Changed Virtualhost
    definition to avoid bug LP: #820936

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-23 10:16:09 +0000
+++ debian/changelog	2011-08-19 12:51:31 +0000
@@ -1,5 +1,16 @@
 apache2 (2.2.19-1ubuntu1) oneiric; urgency=low
 
+  * Changed default website config (LP: #820936)
+    - debian/config-dir/sites-available/default: Changed Virtualhost
+    definition to avoid bug  LP: #820936
+    The definition of the default virtualhost as *:80 breaks Rewrite
+    Rules outside the virtualhost scope, we changed that to _default:80
+    as recommended by Apache itself
+
+ -- Marc Cluet <[e-mail]>  Fri, 19 Aug 2011 12:08:17 +0100
+
+apache2 (2.2.19-1ubuntu1) oneiric; urgency=low
+
   * Merge from debian unstable (LP: #787013). Remaining changes:
     - debian/{control, rules}: Enable PIE hardening.
     - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
 
=== modified file 'debian/config-dir/sites-available/default'
--- debian/config-dir/sites-available/default	2010-02-20 12:38:30 +0000
+++ debian/config-dir/sites-available/default	2011-08-19 12:51:31 +0000
@@ -1,4 +1,4 @@
-<VirtualHost *:80>
+<VirtualHost _default_:80>
 	ServerAdmin webmaster@localhost
 
 	DocumentRoot /var/www