diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 8e5f91085c..35b6ff4fbb 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -123,7 +123,7 @@ test1408 test1409 test1410 test1412 test1413 test1414 test1415 \
test1416 test1417 \
\
test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \
-test1508 test1509 test1510 test1511 test1512 test1513 test1514 \
+test1508 test1509 test1510 test1511 test1512 test1513 test1514 test1515 \
\
test1900 test1901 test1902 test1903 \
\
diff --git a/tests/data/test1515 b/tests/data/test1515
new file mode 100644
index 0000000000..3a49d1be9c
--- /dev/null
+++ b/tests/data/test1515
@@ -0,0 +1,58 @@
+
+
+
+
+HTTP
+multi
+FAILURE
+resolve
+
+
+
+
+# Close the connection after the first request. Second request will happen after
+# the DNS cache timeout elapses and must succeed exactly like the first one.
+
+HTTP/1.1 200 OK
+Date: Thu, 03 Feb 2014 17:04:00 GMT
+Server: test-server/fake swsclose
+Connection: close
+Content-Type: text/html
+Content-Length: 6
+
+hello
+
+
+HTTP/1.1 200 OK
+Date: Thu, 03 Feb 2014 17:04:02 GMT
+Server: test-server/fake swsclose
+Connection: close
+Content-Type: text/html
+Content-Length: 6
+
+hello
+
+
+
+
+
+http
+
+
+lib1515
+
+
+caching of manual libcurl DNS entries after DNS cache timeout
+
+
+/path/1515 %HOSTIP %HTTPPORT
+
+
+
+
+
+0
+
+
+
+
diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index b4c8907b72..4aeb46cc1a 100644
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -21,7 +21,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \
lib571 lib572 lib573 lib574 lib575 lib576 lib578 lib579 lib582 \
lib583 lib585 lib586 lib587 lib590 lib591 lib597 lib598 lib599 \
lib1500 lib1501 lib1502 lib1503 lib1504 lib1505 lib1506 lib1507 lib1508 \
- lib1509 lib1510 lib1511 lib1512 lib1513 lib1514 \
+ lib1509 lib1510 lib1511 lib1512 lib1513 lib1514 lib1515 \
lib1900 \
lib2033
@@ -351,6 +351,10 @@ lib1514_SOURCES = lib1514.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib1514_LDADD = $(TESTUTIL_LIBS)
lib1514_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1514
+lib1515_SOURCES = lib1515.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
+lib1515_LDADD = $(TESTUTIL_LIBS)
+lib1515_CPPFLAGS = $(AM_CPPFLAGS)
+
lib1900_SOURCES = lib1900.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib1900_LDADD = $(TESTUTIL_LIBS)
lib1900_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/tests/libtest/lib1515.c b/tests/libtest/lib1515.c
new file mode 100644
index 0000000000..e928ebc686
--- /dev/null
+++ b/tests/libtest/lib1515.c
@@ -0,0 +1,141 @@
+/***************************************************************************
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
+ * \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, , 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 http://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.
+ *
+ ***************************************************************************/
+
+/*
+ * Check for bugs #1303 and #1327: libcurl should never remove DNS entries
+ * created via CURLOPT_RESOLVE, neither after DNS_CACHE_TIMEOUT elapses
+ * (test1515) nor a dead connection is detected (test1616).
+ */
+
+#include "test.h"
+#include "testutil.h"
+#include "warnless.h"
+#include "memdebug.h"
+
+#define TEST_HANG_TIMEOUT 60 * 1000
+
+#define DNS_TIMEOUT 1
+
+int debug_callback(CURL *curl, curl_infotype info, char *msg, size_t len, void *ptr)
+{
+ if (info == CURLINFO_TEXT)
+ fprintf(stderr, "debug: %.*s", (int) len, msg);
+
+ return 0;
+}
+
+int do_one_request(CURLM *m, char *URL, char *resolve)
+{
+ CURL *curls;
+ struct curl_slist *resolve_list = NULL;
+ int still_running;
+ int res = 0;
+ CURLMsg *msg;
+ int msgs_left;
+
+ resolve_list = curl_slist_append(resolve_list, resolve);
+
+ easy_init(curls);
+
+ easy_setopt(curls, CURLOPT_URL, URL);
+ easy_setopt(curls, CURLOPT_RESOLVE, resolve_list);
+ easy_setopt(curls, CURLOPT_DEBUGFUNCTION, debug_callback);
+ easy_setopt(curls, CURLOPT_VERBOSE, 1);
+ easy_setopt(curls, CURLOPT_DNS_CACHE_TIMEOUT, DNS_TIMEOUT);
+
+ multi_add_handle(m, curls);
+ multi_perform(m, &still_running);
+
+ abort_on_test_timeout();
+
+ while (still_running)
+ {
+ struct timeval timeout;
+ fd_set fdread, fdwrite, fdexcep;
+ int maxfd = -99;
+
+ FD_ZERO(&fdread);
+ FD_ZERO(&fdwrite);
+ FD_ZERO(&fdexcep);
+ timeout.tv_sec = 1;
+ timeout.tv_usec = 0;
+
+ multi_fdset(m, &fdread, &fdwrite, &fdexcep, &maxfd);
+ select_test(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout);
+
+ abort_on_test_timeout();
+ multi_perform(m, &still_running);
+
+ abort_on_test_timeout();
+ }
+
+ while ((msg = curl_multi_info_read(m, &msgs_left)))
+ {
+ if (msg->msg == CURLMSG_DONE && msg->easy_handle == curls)
+ {
+ res = msg->data.result;
+ break;
+ }
+ }
+
+test_cleanup:
+ curl_multi_remove_handle(m, curls);
+ curl_easy_cleanup(curls);
+ curl_slist_free_all(resolve_list);
+
+ return res;
+}
+
+int test(char *URL)
+{
+ CURLM* multi = NULL;
+ int res = 0;
+ char *address = libtest_arg2;
+ char *port = libtest_arg3;
+ char *path = URL;
+ char dns_entry[256];
+ int i;
+ int count = 2;
+
+ snprintf(dns_entry, sizeof(dns_entry), "testserver.example.com:%s:%s", port, address);
+ char target_url[256];
+
+ start_test_timing();
+
+ global_init(CURL_GLOBAL_ALL);
+ multi_init(multi);
+
+ for (i = 1; i <= count; i++)
+ {
+ snprintf(target_url, sizeof(target_url), "http://testserver.example.com:%s%s%04d", port, path, i);
+ /* second request must succeed like the first one */
+ if ((res = do_one_request(multi, target_url, dns_entry)))
+ goto test_cleanup;
+ if (i < count)
+ sleep(DNS_TIMEOUT + 1);
+ }
+
+test_cleanup:
+ curl_multi_cleanup(multi);
+
+ return (int) res;
+}