---- dokuwiki-rc2009-01-26/conf/dokuwiki.php~ 2009-01-27 12:56:43.000000000 +0200
-+++ dokuwiki-rc2009-01-26/conf/dokuwiki.php 2009-01-27 12:57:04.936215007 +0200
-@@ -75,6 +75,7 @@
+- https://github.com/dokuwiki/dokuwiki/pull/15
+
+--- dokuwiki-2020-07-29a/conf/dokuwiki.php~ 2022-09-03 19:58:24.000000000 +0300
++++ dokuwiki-2020-07-29a/conf/dokuwiki.php 2023-03-27 11:25:04.212540600 +0300
+@@ -63,6 +63,7 @@
+ $conf['rememberme'] = 1; //Enable/disable remember me on login
$conf['disableactions'] = ''; //comma separated list of actions to disable
- $conf['sneaky_index'] = 0; //check for namespace read permission in index view (0|1) (1 might cause unexpected behavior)
$conf['auth_security_timeout'] = 900; //time (seconds) auth data is considered valid, set to 0 to recheck on every page view
+$conf['http_auth'] = 1; //allows HTTP authorization (SSO) from PHP_AUTH_USER/PHP_AUTH_PW variables
$conf['securecookie'] = 1; //never send HTTPS cookies via HTTP
-
- /* Advanced Options */
---- dokuwiki-rc2010-10-07/inc/auth.php~ 2010-10-07 21:25:10.000000000 +0300
-+++ dokuwiki-rc2010-10-07/inc/auth.php 2010-10-07 21:26:19.795893378 +0300
-@@ -77,7 +77,7 @@
+ $conf['remote'] = 0; //Enable/disable remote interfaces
+ $conf['remoteuser'] = '!!not set!!'; //user/groups that have access to remote interface (comma separated). leave empty to allow all users
+--- dokuwiki-2023-04-04/inc/auth.php~ 2023-04-04 19:21:21.000000000 +0300
++++ dokuwiki-2023-04-04/inc/auth.php 2023-04-05 15:43:33.873377532 +0300
+@@ -75,7 +75,7 @@
}
// if no credentials were given try to use HTTP auth (for SSO)
-- if(empty($_REQUEST['u']) && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])){
-+ if($conf['http_auth'] && empty($_REQUEST['u']) && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])){
- $_REQUEST['u'] = $_SERVER['PHP_AUTH_USER'];
- $_REQUEST['p'] = $_SERVER['PHP_AUTH_PW'];
- $_REQUEST['http_credentials'] = true;
+- if (!$INPUT->str('u') && empty($_COOKIE[DOKU_COOKIE]) && !empty($INPUT->server->str('PHP_AUTH_USER'))) {
++ if ($conf['http_auth'] && !$INPUT->str('u') && empty($_COOKIE[DOKU_COOKIE]) && !empty($INPUT->server->str('PHP_AUTH_USER'))) {
+ $INPUT->set('u', $INPUT->server->str('PHP_AUTH_USER'));
+ $INPUT->set('p', $INPUT->server->str('PHP_AUTH_PW'));
+ $INPUT->set('http_credentials', true);