From 4ddf5d92f24121f4fdc3af48cca17724f6f4aea6 Mon Sep 17 00:00:00 2001 From: josh4trunks Date: Sun, 23 Mar 2014 19:29:03 -0700 Subject: Fixes login / logout when HTTP Basic Headers are avilable. --- config/config.sample.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/config.sample.php b/config/config.sample.php index adcc175e2fa..8430b8d6539 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -178,12 +178,12 @@ $CONFIG = array( /* Enable or disable the logging of IP addresses in case of webform auth failures */ "log_authfailip" => false, +<<<<<<< HEAD /* Whether ownCloud should log the last successfull cron exec */ "cron_log" => true, -/* Whether http-basic username must equal username to login */ -"basic_auth" => true, - +======= +>>>>>>> Fixes login / logout when HTTP Basic Headers are avilable. /* * Configure the size in bytes log rotation should happen, 0 or false disables the rotation. * This rotates the current owncloud logfile to a new name, this way the total log usage -- cgit v1.2.3 From 2d9b46e3b9dc2ceb8e21c23a905891aa9c33151e Mon Sep 17 00:00:00 2001 From: josh4trunks Date: Thu, 3 Apr 2014 22:17:31 -0700 Subject: Remove missed stuff from merge --- config/config.sample.php | 3 --- 1 file changed, 3 deletions(-) (limited to 'config') diff --git a/config/config.sample.php b/config/config.sample.php index 8430b8d6539..92b534d43de 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -178,12 +178,9 @@ $CONFIG = array( /* Enable or disable the logging of IP addresses in case of webform auth failures */ "log_authfailip" => false, -<<<<<<< HEAD /* Whether ownCloud should log the last successfull cron exec */ "cron_log" => true, -======= ->>>>>>> Fixes login / logout when HTTP Basic Headers are avilable. /* * Configure the size in bytes log rotation should happen, 0 or false disables the rotation. * This rotates the current owncloud logfile to a new name, this way the total log usage -- cgit v1.2.3