* src/ne_uri.c (ne_uri_unparse): Handle port correctly if scheme is

undefined.

* test/uri-tests.c (unparse): Add test case.


git-svn-id: http://svn.webdav.org/repos/projects/neon/trunk@815 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845

1 files changed, 7 insertions, 5 deletions

diff --git a/src/ne_uri.c b/src/ne_uri.c
index 22e59af..2bd9929 100644
--- a/src/ne_uri.c
+++ b/src/ne_uri.c
@@ -543,12 +543,14 @@ char *ne_uri_unparse(const ne_uri *uri)
             ne_buffer_concat(buf, uri->userinfo, "@", NULL);
         }
         ne_buffer_zappend(buf, uri->host);
-    }
         
-    if (uri->port > 0 && ne_uri_defaultport(uri->scheme) != uri->port) {
-	char str[20];
-	ne_snprintf(str, 20, ":%d", uri->port);
-	ne_buffer_zappend(buf, str);
+        if (uri->port > 0
+            && (!uri->scheme 
+                || ne_uri_defaultport(uri->scheme) != uri->port)) {
+            char str[20];
+            ne_snprintf(str, 20, ":%d", uri->port);
+            ne_buffer_zappend(buf, str);
+        }
     }
 
     ne_buffer_zappend(buf, uri->path);