Changeset 30565 for main

Timestamp:

2016-06-07T15:56:03+12:00 (8 years ago)

Author:

ak19

Message:

Some changes when moving from default port 80 to 8282 should not have been made

Location:

main/trunk/greenstone2

Files:

• etc/oai.cfg (modified) (1 diff)
• runtime-src/src/w32server/fnord.cpp (modified) (1 diff)
• runtime-src/src/w32server/netio.cpp (modified) (1 diff)

main/trunk/greenstone2/etc/oai.cfg

@@ -29 +29 @@
 # oaiserver program if not specified here, but may use 'xxx.xxx.xxx.xxx' 
 # IP address, but NOT a human-readable domain name like 'www.mylibrary.com'.
-# If you edit this, it must include the port number if not using port 8282.
+# If you edit this, it must include the port number if not using port 80.
 #baseServerURL "http://your-domain-name:port"
 

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

@@ -370 +370 @@
     write_settings(gsdl_url);
 
-    if (gsdl_port_num != 8282) {
+    if (gsdl_port_num != 80) {
       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 == 8282) bind_port = IPPORT_RESERVED+1;
+    if (bind_port == 80) bind_port = IPPORT_RESERVED+1;
     else if (bind_count == 0) bind_port = 8282;
     else ++bind_port;