1 --- dokuwiki-2007-06-26b/conf/dokuwiki.php~ 2007-12-19 00:27:28.671399503 +0200
2 +++ dokuwiki-2007-06-26b/conf/dokuwiki.php 2007-12-19 00:39:47.679195099 +0200
4 $conf['disableactions'] = ''; //comma separated list of actions to disable
5 $conf['sneaky_index'] = 0; //check for namespace read permission in index view (0|1) (1 might cause unexpected behavior)
6 $conf['auth_security_timeout'] = 900; //time (seconds) auth data is considered valid, set to 0 to recheck on every page view
7 +$conf['http_auth'] = 1; //allows HTTP auhtorization (SSO) from PHP_AUTH_USER/PHP_AUTH_PW variables
11 --- dokuwiki-2007-06-26b/inc/auth.php~ 2007-06-26 21:27:15.000000000 +0300
12 +++ dokuwiki-2007-06-26b/inc/auth.php 2007-12-19 00:40:14.598022033 +0200
14 if (!isset($_REQUEST['r'])) $_REQUEST['r'] = '';
16 // if no credentials were given try to use HTTP auth (for SSO)
17 - if(empty($_REQUEST['u']) && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])){
18 + if($conf['http_auth'] && empty($_REQUEST['u']) && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])){
19 $_REQUEST['u'] = $_SERVER['PHP_AUTH_USER'];
20 $_REQUEST['p'] = $_SERVER['PHP_AUTH_PW'];