--- 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 @@
 $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 @@
     }
 
     // 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;