Author: vmassol
Date: 2007-12-06 12:53:09 +0100 (Thu, 06 Dec 2007)
New Revision: 6308
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java
Log:
XWIKI-1928: XWiki returns invalid URLs when the server port is not defined
(i.e. when it's 80)
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java
2007-12-06 09:53:24 UTC (rev 6307)
+++ xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/XWiki.java
2007-12-06 11:53:09 UTC (rev 6308)
@@ -3785,7 +3785,7 @@
String server = serverobject.getStringValue("server");
if (server != null) {
int mode = serverobject.getIntValue("secure");
- int port = context.getURL().getPort();
+ int port = (context.getURL().getPort() == -1) ? 80 :
context.getURL().getPort();
if (mode == 1) {
if (port != 443) {
serverurl = "https://"; + server + ":" + port +
"/";
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
