trurl: the set port is the same as the scheme-default, don't show

Added two test cases

Fixes curl#79
Closes curl#83

Author: bagder

test.pl

@@ -24,6 +24,8 @@
     "--set host=example.com --set scheme=ftp|ftp://example.com/",
     "--url https://curl.se/we/are.html --redirect here.html|https://curl.se/we/here.html",
     "--url https://curl.se/we/../are.html --set port=8080|https://curl.se:8080/are.html",
+    "https://curl.se:22/ -s port=443|https://curl.se/",
+    "https://curl.se:22/ -s port=443 --get {url}|https://curl.se/",
     "--url https://curl.se/we/are.html --get \"{path}\"|/we/are.html",
     "--url https://curl.se/we/are.html --get \"{port}\"|443",
     "--url https://curl.se/we/are.html --get \"{scheme}\"|https",

trurl.c

@@ -356,7 +356,9 @@ static void get(struct option *op, CURLU *uh)
              !strncasecmp(ptr, variables[i].name, vlen)) {
             char *nurl;
             CURLUcode rc;
-            rc = curl_url_get(uh, variables[i].part, &nurl, CURLU_DEFAULT_PORT|
+            rc = curl_url_get(uh, variables[i].part, &nurl,
+                              CURLU_DEFAULT_PORT|
+                              CURLU_NO_DEFAULT_PORT|
                               (urldecode?CURLU_URLDECODE:0));
             switch(rc) {
             case CURLUE_OK:
@@ -669,7 +671,7 @@ static void singleurl(struct option *o,
     else {
       /* default output is full URL */
       char *nurl = NULL;
-      if(!curl_url_get(uh, CURLUPART_URL, &nurl, 0)) {
+      if(!curl_url_get(uh, CURLUPART_URL, &nurl, CURLU_NO_DEFAULT_PORT)) {
         printf("%s\n", nurl);
         curl_free(nurl);
       }