Peter M. Groen / knowledgetree

Commit cf2d4f3f7bcba91157a45e0f3826a708c4dfe15b

Authored by Neil Blakey-Milner
1 parent c5b166c6

Overwrite HTTP_HOST with the configured server name (which, by default, 

comes from HTTP_HOST anyway)


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4780 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 5 additions and 2 deletions
config/dmsDefaults.php
  View file @cf2d4f3
@@ -244,6 +244,9 @@ class KTInit { @@ -244,6 +244,9 @@ class KTInit {
244 $_SERVER["PHP_SELF"] .= "?kt_path_info=" . $kt_path_info; 244 $_SERVER["PHP_SELF"] .= "?kt_path_info=" . $kt_path_info;
245 $_SERVER["PATH_INFO"] = $kt_path_info; 245 $_SERVER["PATH_INFO"] = $kt_path_info;
246 } 246 }
  247 +
  248 + $sServerName = $oConfig->get('KnowledgeTree/serverName');
  249 + $_SERVER['HTTP_HOST'] = $sServerName;
247 } 250 }
248 // }}} 251 // }}}
249 252
@@ -357,8 +360,6 @@ require_once(KT_LIB_DIR . '/util/ktutil.inc'); @@ -357,8 +360,6 @@ require_once(KT_LIB_DIR . '/util/ktutil.inc');
357 360
358 require_once(KT_LIB_DIR . "/config/config.inc.php"); 361 require_once(KT_LIB_DIR . "/config/config.inc.php");
359 362
360 -$KTInit->setupServerVariables();  
361 -  
362 $oKTConfig =& KTConfig::getSingleton(); 363 $oKTConfig =& KTConfig::getSingleton();
363 364
364 $oKTConfig->setdefaultns("KnowledgeTree", "fileSystemRoot", KT_DIR); 365 $oKTConfig->setdefaultns("KnowledgeTree", "fileSystemRoot", KT_DIR);
@@ -384,6 +385,8 @@ $oKTConfig->setdefaultns("import", "unzip", 'unzip'); @@ -384,6 +385,8 @@ $oKTConfig->setdefaultns("import", "unzip", 'unzip');
384 385
385 $KTInit->readConfig(); 386 $KTInit->readConfig();
386 387
  388 +$KTInit->setupServerVariables();
  389 +
387 // instantiate log 390 // instantiate log
388 $loggingSupport = $KTInit->setupLogging(); 391 $loggingSupport = $KTInit->setupLogging();
389 392