Index: branches/5.1.x/core/kernel/utility/debugger.php
===================================================================
diff -u -N -r14241 -r14323
--- branches/5.1.x/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 14241)
+++ branches/5.1.x/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 14323)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: debugger.php 14241 2011-03-16 20:24:35Z alex $
+* @version	$Id: debugger.php 14323 2011-05-20 08:04:26Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -328,7 +328,7 @@
 				// include debugger files from this url
 				$reg_exp = '/^'.preg_quote(FULL_PATH, '/').'/';
 				$kernel_path = preg_replace($reg_exp, '', KERNEL_PATH, 1);
-				$this->baseURL = PROTOCOL.SERVER_NAME.rtrim(BASE_PATH, '/').$kernel_path.'/utility/debugger';
+				$this->baseURL = PROTOCOL.SERVER_NAME.(defined('PORT') ? ':'.PORT : '').rtrim(BASE_PATH, '/').$kernel_path.'/utility/debugger';
 
 				// save debug output in this folder
 				$this->tempFolder = WRITEABLE . '/cache';
Index: branches/5.1.x/core/kernel/startup.php
===================================================================
diff -u -N -r14241 -r14323
--- branches/5.1.x/core/kernel/startup.php	(.../startup.php)	(revision 14241)
+++ branches/5.1.x/core/kernel/startup.php	(.../startup.php)	(revision 14323)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: startup.php 14241 2011-03-16 20:24:35Z alex $
+* @version	$Id: startup.php 14323 2011-05-20 08:04:26Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -52,26 +52,32 @@
 	safeDefine('BASE_PATH', $ps); // in case in-portal has defined it before
 	# New path detection method: end
 
-	if ( array_key_exists('HTTP_HOST', $_SERVER) ) {
+	$https_mark = getArrayValue($_SERVER, 'HTTPS');
+	safeDefine('PROTOCOL', ($https_mark == 'on') || ($https_mark == '1') ? 'https://' : 'http://');
+
+	if ( isset($_SERVER['HTTP_HOST']) ) {
 		// accessed from browser
-		define('SERVER_NAME', $_SERVER['HTTP_HOST']);
+		$http_host = $_SERVER['HTTP_HOST'];
 	}
 	else {
 		// accessed from command line
-		define('SERVER_NAME', $vars['Domain']);
+		$http_host = $vars['Domain'];
 		$_SERVER['HTTP_HOST'] = $vars['Domain'];
 	}
 
-	$https_mark = getArrayValue($_SERVER, 'HTTPS');
-	safeDefine('PROTOCOL', ($https_mark == 'on') || ($https_mark == '1') ? 'https://' : 'http://');
+	$port = isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : false;
 
-	$port = array_key_exists('HTTP_PORT', $_SERVER) ? $_SERVER['HTTP_PORT'] : false;
-
-	if ($port && ((PROTOCOL == 'http://' && $port != '80') || (PROTOCOL == 'https://' && $port != '443'))) {
+	if ($port) {
+		if ( (PROTOCOL == 'http://' && $port != '80') || (PROTOCOL == 'https://' && $port != '443') ) {
 		// if non-standard port is used, then define it
-        define('PORT', $_SERVER['HTTP_PORT']);
+        	define('PORT', $port);
+		}
+
+		$http_host = preg_replace('/:' . $port . '$/', '', $http_host);
     }
 
+	define('SERVER_NAME', $http_host);
+
 	safeDefine('APPLICATION_CLASS', isset($vars['ApplicationClass']) ? $vars['ApplicationClass'] : 'kApplication');
 	safeDefine('APPLICATION_PATH', isset($vars['ApplicationPath']) ? $vars['ApplicationPath'] : '/core/kernel/application.php');