4 files changed, 129 insertions, 2 deletions
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 329695c24..a8c211191 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -189,7 +189,7 @@ test1700 test1701 test1702 \
 \
 test1800 test1801 \
 \
-test1900 test1901 test1902 test1903 test1904 test1905 \
+test1900 test1901 test1902 test1903 test1904 test1905 test1906 \
 \
 test2000 test2001 test2002 test2003 test2004 test2005 test2006 test2007 \
 test2008 test2009 test2010 test2011 test2012 test2013 test2014 test2015 \
diff --git a/tests/data/test1906 b/tests/data/test1906
new file mode 100644
index 000000000..0ff2b2be0
--- /dev/null
+++ b/tests/data/test1906
@@ -0,0 +1,52 @@
+<testcase>
+<info>
+<keywords>
+CURLOPT_CURLU
+CURLOPT_PORT
+</keywords>
+</info>
+
+# Server-side
+<reply>
+<data nocheck="yes">
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Type: text/html
+Funny-head: yesyes swsclose
+
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+ <name>
+CURLOPT_CURLU and CURLOPT_PORT
+ </name>
+<tool>
+lib1906
+</tool>
+
+# The tool does two requesets, the first sets CURLOPT_PORT to 1
+# the second resets the port again and expects that request to work.
+<command>
+http://%HOSTIP:%HTTPPORT/1906
+</command>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /1906 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol>
+</verify>
+</testcase>
diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index 4ba279452..304ee821f 100644
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -34,7 +34,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect                \
  lib1558 \
  lib1560 \
  lib1591 lib1592 \
- lib1900 lib1905 \
+ lib1900 lib1905 lib1906 \
  lib2033
 
 chkdecimalpoint_SOURCES = chkdecimalpoint.c ../../lib/mprintf.c \
@@ -544,6 +544,10 @@ lib1905_SOURCES = lib1905.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
 lib1905_LDADD = $(TESTUTIL_LIBS)
 lib1905_CPPFLAGS = $(AM_CPPFLAGS)
 
+lib1906_SOURCES = lib1906.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
+lib1906_LDADD = $(TESTUTIL_LIBS)
+lib1906_CPPFLAGS = $(AM_CPPFLAGS)
+
 lib2033_SOURCES = libntlmconnect.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
 lib2033_LDADD = $(TESTUTIL_LIBS)
 lib2033_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_PIPELINING
diff --git a/tests/libtest/lib1906.c b/tests/libtest/lib1906.c
new file mode 100644
index 000000000..af3d1acb6
--- /dev/null
+++ b/tests/libtest/lib1906.c
@@ -0,0 +1,71 @@
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at https://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+#include "test.h"
+
+#include "testutil.h"
+#include "warnless.h"
+#include "memdebug.h"
+
+int test(char *URL)
+{
+  char *url_after;
+  CURLU *curlu = curl_url();
+  CURL *curl = curl_easy_init();
+  CURLcode curl_code;
+  char error_buffer[CURL_ERROR_SIZE] = "";
+
+  curl_url_set(curlu, CURLUPART_URL, URL, CURLU_DEFAULT_SCHEME);
+  curl_easy_setopt(curl, CURLOPT_CURLU, curlu);
+  curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, error_buffer);
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
+  /* set a port number that makes this reqeuest fail */
+  curl_easy_setopt(curl, CURLOPT_PORT, 1L);
+  curl_code = curl_easy_perform(curl);
+  if(!curl_code)
+    fprintf(stderr, "failure expected, "
+            "curl_easy_perform returned %ld: <%s>, <%s>\n",
+            (long) curl_code, curl_easy_strerror(curl_code), error_buffer);
+
+  /* print the used url */
+  curl_url_get(curlu, CURLUPART_URL, &url_after, 0);
+  fprintf(stderr, "curlu now: <%s>\n", url_after);
+  curl_free(url_after);
+
+  /* now reset CURLOP_PORT to go back to originally set port number */
+  curl_easy_setopt(curl, CURLOPT_PORT, 0L);
+
+  curl_code = curl_easy_perform(curl);
+  if(curl_code)
+    fprintf(stderr, "success expected, "
+            "curl_easy_perform returned %ld: <%s>, <%s>\n",
+            (long) curl_code, curl_easy_strerror(curl_code), error_buffer);
+
+  /* print url */
+  curl_url_get(curlu, CURLUPART_URL, &url_after, 0);
+  fprintf(stderr, "curlu now: <%s>\n", url_after);
+  curl_free(url_after);
+
+  curl_easy_cleanup(curl);
+  curl_url_cleanup(curlu);
+
+  return 0;
+}