Index: trunk/core/kernel/application.php
===================================================================
diff -u -r2659 -r2664
--- trunk/core/kernel/application.php	(.../application.php)	(revision 2659)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 2664)
@@ -795,10 +795,14 @@
 		}
 		else {
 			if ($ssl) {
+				if (PROTOCOL == 'http://') {
+					$this->StoreVar('HTTP_SERVER_NAME', SERVER_NAME);
+				}
 				return $this->ConfigValue('SSL_URL').$prefix.'/';
 			}
 			else {
-				return 'http://'.SERVER_NAME.(defined('PORT')?':'.PORT : '').BASE_PATH.$prefix.'/';
+
+				return 'http://'.$this->RecallVar('HTTP_SERVER_NAME').(defined('PORT')?':'.PORT : '').BASE_PATH.$prefix.'/';
 			}
 		}
 	}