Changeset 30561 for main/trunk/greenstone2/runtime-src

Timestamp:

2016-06-02T18:07:55+12:00 (8 years ago)

Author:

ak19

Message:

All the changes (I think) to switch from port 80 as default for GS2 to port 8282 as new default.

Location:

main/trunk/greenstone2/runtime-src/src/w32server

Files:

• fnord.cpp (modified) (1 diff)
• netio.cpp (modified) (1 diff)
• settings.cpp (modified) (3 diffs)
• wincgiutils.cpp (modified) (1 diff)

main/trunk/greenstone2/runtime-src/src/w32server/fnord.cpp

@@ -370 +370 @@
     write_settings(gsdl_url);
 
-    if (gsdl_port_num != 80) {
+    if (gsdl_port_num != 8282) {
       url += ":" + text_t(gsdl_port_num);
     }

main/trunk/greenstone2/runtime-src/src/w32server/netio.cpp

@@ -239 +239 @@
     
     // Or choose another port number to try
-    if (bind_port == 80) bind_port = IPPORT_RESERVED+1;
-    else if (bind_count == 0) bind_port = 80;
+    if (bind_port == 8282) bind_port = IPPORT_RESERVED+1;
+    else if (bind_count == 0) bind_port = 8282;
     else ++bind_port;
   }

main/trunk/greenstone2/runtime-src/src/w32server/settings.cpp

@@ -60 +60 @@
 
 // general settings
-int gsdl_port_num = 80;
+int gsdl_port_num = 8282;
 int gsdl_external_access = 0;
 int gsdl_auto_enter = 0;
@@ -406 +406 @@
   
   // general settings
-  gsdl_port_num = 80;
+  gsdl_port_num = 8282;
   gsdl_external_access = 0;
   if(gsdl_mode_property_prefix == "") {
@@ -649 +649 @@
   // port number
   gsdl_port_num = GetDlgItemInt(hwndDlg, SERVER_PORT_EDIT_BOX, &bres, 0);
-  if (!bres) gsdl_port_num = 80;
+  if (!bres) gsdl_port_num = 8282;
 
   // whether to allow external access or not

main/trunk/greenstone2/runtime-src/src/w32server/wincgiutils.cpp

@@ -33 +33 @@
 #include "wincgiutils.h"
 
-#define default_http_port 80
+#define default_http_port 8282
 
 // Attempt to break a url into segments. If the parsing fails, 'name' is