From e48f913dc7053e3206a6116eba98639305a4c8e3 Mon Sep 17 00:00:00 2001
From: "ncomputers.org" <contact@ncomputers.org>
Date: Wed, 29 Mar 2017 20:04:41 -0600
Subject: [PATCH] vlogger %O for apache >=2.5

---
 install/tpl/apache_ispconfig.conf.master | 4 ++--
 server/conf/apache_ispconfig.conf.master | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master
index 24fb9dc285..90db9c1e25 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -14,8 +14,8 @@ SSLStaplingCache shmcb:/var/run/ocsp(128000)
 # ISPConfig Logfile configuration for vlogger
 ################################################
 
-<tmpl_if name='apache_version' op='>=' value='2.4.7' format='version'>
-LogFormat "%v %h %l %u %t \"%r\" %>s %S \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
+<tmpl_if name='apache_version' op='>=' value='2.5' format='version'>
+LogFormat '%v %h %l %u %t "%r" %>s %S "%{Referer}i" "%{User-Agent}i"' combined_ispconfig
 <tmpl_else>
 LogFormat "%v %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
 </tmpl_if>
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index 24fb9dc285..90db9c1e25 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -14,8 +14,8 @@ SSLStaplingCache shmcb:/var/run/ocsp(128000)
 # ISPConfig Logfile configuration for vlogger
 ################################################
 
-<tmpl_if name='apache_version' op='>=' value='2.4.7' format='version'>
-LogFormat "%v %h %l %u %t \"%r\" %>s %S \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
+<tmpl_if name='apache_version' op='>=' value='2.5' format='version'>
+LogFormat '%v %h %l %u %t "%r" %>s %S "%{Referer}i" "%{User-Agent}i"' combined_ispconfig
 <tmpl_else>
 LogFormat "%v %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
 </tmpl_if>
-- 
GitLab