From ce379d3cf7ea694422c41d245b08c35d71424458 Mon Sep 17 00:00:00 2001 From: "Frank O. Martin" Date: Thu, 19 Nov 2015 19:41:16 +0100 Subject: [PATCH] Removed favicon.ico work around --- htdocs/caldav.php | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/htdocs/caldav.php b/htdocs/caldav.php index e52b09b8..909c968a 100644 --- a/htdocs/caldav.php +++ b/htdocs/caldav.php @@ -8,17 +8,7 @@ * @copyright Catalyst .Net Ltd, Morphoss Ltd * @license http://gnu.org/copyleft/gpl.html GNU GPL v2 or later */ -if ( isset($_SERVER['PATH_INFO']) && preg_match( '{^(/favicon.ico|davical.css|(images|js|css)/.+)$}', $_SERVER['PATH_INFO'], $matches ) ) { - $filename = $_SERVER['DOCUMENT_ROOT'] . preg_replace('{(\.\.|\\\\)}', '', $matches[1]); - $fh = @fopen($matches[1],'r'); - if ( ! $fh ) { - @header( sprintf("HTTP/1.1 %d %s", 404, 'Not found') ); - } - else { - fpassthru($fh); - } - @ob_flush(); exit(0); -} + require_once('./always.php'); if ( isset($_SERVER['PATH_INFO']) && preg_match( '{^/\.well-known/(.+)$}', $_SERVER['PATH_INFO'], $matches ) ) {