From accfe5ed9238e8dba04ab2524fbc69cf3295739a Mon Sep 17 00:00:00 2001 From: ftimme Date: Mon, 9 Apr 2012 22:20:08 +0000 Subject: [PATCH] - Fixed FS#2099. --- server/plugins-available/apache2_plugin.inc.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 9724317d6..1f4cc2bc4 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -709,6 +709,11 @@ class apache2_plugin { $vhost_data['ssl_domain'] = $data['new']['ssl_domain']; $vhost_data['has_custom_php_ini'] = $has_custom_php_ini; $vhost_data['custom_php_ini_dir'] = escapeshellcmd($custom_php_ini_dir); + + // Custom Apache directives + // Make sure we only have Unix linebreaks + $vhost_data['apache_directives'] = str_replace("\r\n", "\n", $vhost_data['apache_directives']); + $vhost_data['apache_directives'] = str_replace("\r", "\n", $vhost_data['apache_directives']); // Check if a SSL cert exists $ssl_dir = $data['new']['document_root'].'/ssl'; -- GitLab