From fedfa6f6c096e432983aa12560b012dd7ba72376 Mon Sep 17 00:00:00 2001
From: Michael Hierweck <michael.hierweck@hostsharing.net>
Date: Wed, 15 Aug 2012 10:50:19 +0000
Subject: [PATCH] =?UTF-8?q?Das=20Template=20unterst=C3=BCtzt=20die=20Deakt?=
 =?UTF-8?q?ivierung=20des=20Fallbacks=20auf=20htdocs(-ssl)=20nicht=20nicht?=
 =?UTF-8?q?=20als=20Verzeichnis=20angelegte=20Subdomains=20unter=20subs(-s?=
 =?UTF-8?q?sl).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hsadmin/mods/dom/httpd-vhost-dynamic.jtpl | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl
index 99043e2..ea86656 100644
--- a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl
+++ b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl
@@ -31,13 +31,20 @@
 
     RewriteEngine On
     RewriteOptions Inherit
+    
     RewriteCond %{REQUEST_URI} !^/cgi-bin/
     RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
     RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:80)?$ [novary]
     RewriteCond /home/doms/{DOM_HOSTNAME}/subs/${tolower:%1} -d
     RewriteRule ^(.*) /home/doms/{DOM_HOSTNAME}/subs/${tolower:%1}$1 [last]
 
-    AddType application/x-httpd-php .php .php5 .php4 .php3
+<!-- BEGIN: nosubdomainfallbackforhttp -->    RewriteCond %{REQUEST_URI} !^/cgi-bin/
+    RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
+    RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:80)?$ [novary]
+    RewriteCond /home/doms/{DOM_HOSTNAME}/subs/${tolower:%1} !-d
+    RewriteRule ^(.*) - [redirect=404,last]
+
+<!-- END: nosubdomainfallbackforhttp -->    AddType application/x-httpd-php .php .php5 .php4 .php3
     Action application/x-httpd-php /fastcgi-bin/phpstub
 
 </VirtualHost>
@@ -82,13 +89,20 @@
     
     RewriteEngine On
     RewriteOptions Inherit
+
     RewriteCond %{REQUEST_URI} !^/cgi-bin/
     RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
     RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:443)?$ [novary]
     RewriteCond /home/doms/{DOM_HOSTNAME}/subs-ssl/${tolower:%1} -d
     RewriteRule ^(.*) /home/doms/{DOM_HOSTNAME}/subs-ssl/${tolower:%1}$1 [last]
-
-    AddType application/x-httpd-php .php .php5 .php4 .php3
+    
+<!-- BEGIN: nosubdomainfallbackforhttps -->    RewriteCond %{REQUEST_URI} !^/cgi-bin/
+    RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
+    RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:443)?$ [novary]
+    RewriteCond /home/doms/{DOM_HOSTNAME}/subs-ssl/${tolower:%1} !-d
+    RewriteRule ^(.*) - [redirect=404,last]
+    
+<!-- END: nosubdomainfallbackforhttps -->    AddType application/x-httpd-php .php .php5 .php4 .php3
     Action application/x-httpd-php /fastcgi-bin/phpstub
 
 </VirtualHost>