aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/urlapi.c8
-rw-r--r--tests/libtest/lib1560.c9
2 files changed, 15 insertions, 2 deletions
diff --git a/lib/urlapi.c b/lib/urlapi.c
index c53e52343..18a6076ff 100644
--- a/lib/urlapi.c
+++ b/lib/urlapi.c
@@ -499,8 +499,12 @@ static CURLUcode parse_port(struct Curl_URL *u, char *hostname)
(']' == endbracket)) {
/* this is a RFC2732-style specified IP-address */
portptr = &hostname[len];
- if (*portptr != ':')
- return CURLUE_MALFORMED_INPUT;
+ if(*portptr) {
+ if(*portptr != ':')
+ return CURLUE_MALFORMED_INPUT;
+ }
+ else
+ portptr = NULL;
}
else
portptr = strchr(hostname, ':');
diff --git a/tests/libtest/lib1560.c b/tests/libtest/lib1560.c
index e0faa12b2..57469a906 100644
--- a/tests/libtest/lib1560.c
+++ b/tests/libtest/lib1560.c
@@ -128,6 +128,15 @@ struct querycase {
};
static struct testcase get_parts_list[] ={
+ {"http://[fd00:a41::50]:8080",
+ "http | [11] | [12] | [13] | [fd00:a41::50] | 8080 | / | [16] | [17]",
+ CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
+ {"http://[fd00:a41::50]/",
+ "http | [11] | [12] | [13] | [fd00:a41::50] | [15] | / | [16] | [17]",
+ CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
+ {"http://[fd00:a41::50]",
+ "http | [11] | [12] | [13] | [fd00:a41::50] | [15] | / | [16] | [17]",
+ CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
{"https://[::1%252]:1234",
"https | [11] | [12] | [13] | [::1%252] | 1234 | / | [16] | [17]",
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},