From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Thu, 3 Aug 2006 00:19:53 +0000 (+0000)
Subject: added handling of 0-port values in URLs
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdc37bed308786a79d626031f675803fc2070de7;p=sope

added handling of 0-port values in URLs


git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1331 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 63b71db8..515d4c0b 100644
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-03  Wolfgang Sourdeau  <WSourdeau@Inverse.CA>
+
+	* WebDAV/SoWebDAVRenderer.m: added special handling for 0-port values
+	  in URLs (v4.5.242)
+
 2006-07-25  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* Templates/WODParser.m: fixed an infinite loop bug during comment
diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index 9dd486dd..65ee85ee 100644
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=241
+SUBMINOR_VERSION:=242
 
 # v4.5.234 requires libDOM          v4.5.21
 # v4.5.214 requires libNGExtensions v4.5.179
diff --git a/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m b/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
index 1b72f3b9..7c739aa1 100644
--- a/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
+++ b/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
@@ -444,8 +444,14 @@ static BOOL         formatOutput = NO;
   
   if ((tmp = [rq headerForKey:@"x-webobjects-server-name"])) {
     hostport = tmp;
-    if ((tmp = [rq headerForKey:@"x-webobjects-server-port"]))
-      hostport = [NSString stringWithFormat:@"%@:%@", hostport, tmp];
+    if ((tmp = [rq headerForKey:@"x-webobjects-server-port"]) != nil) {
+      if ([tmp intValue] > 0)
+	hostport = [NSString stringWithFormat:@"%@:%@", hostport, tmp];
+      else {
+	[self logWithFormat:@"got bogus port information from webserver: %@", 
+	        hostport];
+      }
+    }
   }
   else if ((tmp = [rq headerForKey:@"host"]))
     hostport = tmp;