Merge branch 'master' of https://bitbucket.org/sage2/sage2

Former-commit-id: 61aab64e1f6c475a7d7d34cd00443a3294327a55

Merge branch 'master' of https://bitbucket.org/sage2/sage2
Former-commit-id: 61aab64e1f6c475a7d7d34cd00443a3294327a55
92b46a72 · Thomas Marrinan · 495042b7 · f992b6a4 · 92b46a72
Commit 92b46a72 authored May 08, 2014 by Thomas Marrinan
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

server.js server.js +4 -0

No files found.
--- a/server.js
+++ b/server.js
@@ -796,6 +796,10 @@ function loadConfiguration() {
 	userConfig.pointerWidth   = Math.round(0.200 * userConfig.totalHeight);
 	userConfig.pointerHeight  = Math.round(0.050 * userConfig.totalHeight);
 	
+	// Set default values if missing
+	if (userConfig.port === undefined) userConfig.port = 443;
+	if (userConfig.index_port === undefined) userConfig.index_port = 80;
+
 	return userConfig;
 }