From 84a30d0a419ad95c53cbdfc76eb2eb75d2e51835 Mon Sep 17 00:00:00 2001 From: Brad Spencer Date: Fri, 14 Dec 2018 17:18:22 -0400 Subject: curl_multi_remove_handle() don't block terminating c-ares requests Added Curl_resolver_kill() for all three resolver modes, which only blocks when necessary, along with test 1592 to confirm curl_multi_remove_handle() doesn't block unless it must. Closes #3428 Fixes #3371 --- tests/data/Makefile.inc | 6 +++--- tests/data/test1592 | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 tests/data/test1592 (limited to 'tests/data') diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index 59635be04..23ee19b36 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2018, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2019, 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 @@ -179,8 +179,8 @@ test1550 test1551 test1552 test1553 test1554 test1555 test1556 test1557 \ \ test1560 test1561 \ \ -test1590 \ -test1591 \ +test1590 test1591 test1592 \ +\ test1600 test1601 test1602 test1603 test1604 test1605 test1606 test1607 \ test1608 test1609 test1620 \ \ diff --git a/tests/data/test1592 b/tests/data/test1592 new file mode 100644 index 000000000..d1346e1e3 --- /dev/null +++ b/tests/data/test1592 @@ -0,0 +1,37 @@ + + + +HTTP +multi +resolve +speedcheck + + + +# Client-side + + +none + + +lib1592 + + +HTTP request, remove handle while resolving, don't block + + + +http://a-site-never-accessed.example.org/1592 + + + +# Verify data after the test has been "shot" + + +disable + + +0 + + + -- cgit v1.2.3