From 7bea15a7a9e24e18c035292518b05ed19d5a464a Mon Sep 17 00:00:00 2001
From: "Florian Aders (EleRas)" <eleras@froxlor.org>
Date: Mon, 29 Mar 2010 09:17:58 +0000
Subject: [PATCH] Deferred dirprotection until 0.9.5, refs #72

---
 scripts/jobs/cron_tasks.inc.http.10.apache.php   | 3 +--
 scripts/jobs/cron_tasks.inc.http.20.lighttpd.php | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php
index c1329847..e7d329ec 100644
--- a/scripts/jobs/cron_tasks.inc.http.10.apache.php
+++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php
@@ -134,7 +134,7 @@ class apache
 
 				/**
 				 * dirprotection, see #72
-				 */
+				 * @TODO deferred until 0.9.5, needs more testing
 				$this->virtualhosts_data[$vhosts_filename].= "\t<Directory \"'.$mypath.'(images|packages|templates)\">\n";
 				$this->virtualhosts_data[$vhosts_filename].= "\t\tAllow from all\n";
 				$this->virtualhosts_data[$vhosts_filename].= "\t\tOptions -Indexes\n";
@@ -144,7 +144,6 @@ class apache
 				$this->virtualhosts_data[$vhosts_filename].= "\t\tOrder Deny,Allow\n";
 				$this->virtualhosts_data[$vhosts_filename].= "\t\tDeny from All\n";
 				$this->virtualhosts_data[$vhosts_filename].= "\t</Directory>\n";
-				/**
 				 * end of dirprotection
 				 */
 
diff --git a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
index e71f5ed3..60709dbe 100644
--- a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
+++ b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
@@ -112,7 +112,7 @@ class lighttpd
 
 				/**
 				 * dirprotection, see #72
-				 * @TODO use better regex for this
+				 * @TODO use better regex for this, deferred until 0.9.5
 				 *
 				$this->lighttpd_data[$vhost_filename].= '  $HTTP["url"] =~ "^/(.+)\/(.+)\.php" {' . "\n";
 				$this->lighttpd_data[$vhost_filename].= '    url.access-deny = ("")' . "\n";