1 --- dokuwiki-rc2009-01-26/conf/dokuwiki.php~ 2009-01-27 12:56:43.000000000 +0200
2 +++ dokuwiki-rc2009-01-26/conf/dokuwiki.php 2009-01-27 12:57:04.936215007 +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 authorization (SSO) from PHP_AUTH_USER/PHP_AUTH_PW variables
8 $conf['securecookie'] = 1; //never send HTTPS cookies via HTTP
10 /* Advanced Options */
11 --- dokuwiki-rc2010-10-07/inc/auth.php~ 2010-10-07 21:25:10.000000000 +0300
12 +++ dokuwiki-rc2010-10-07/inc/auth.php 2010-10-07 21:26:19.795893378 +0300
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'];
21 $_REQUEST['http_credentials'] = true;