Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
CURLOPT_OPENSOCKETFUNCTION: return error at once
When CURL_SOCKET_BAD is returned in the callback, it should be treated as an error (CURLE_COULDNT_CONNECT) if no other socket is subsequently created when trying to connect to a server. Bug: http://curl.haxx.se/mail/lib-2015-06/0047.html
- Loading branch information
Showing
5 changed files
with
104 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
<testcase> | ||
<info> | ||
<keywords> | ||
CURLOPT_OPENSOCKETFUNCTION | ||
</keywords> | ||
</info> | ||
|
||
<client> | ||
<server> | ||
none | ||
</server> | ||
<tool> | ||
lib1530 | ||
</tool> | ||
<name> | ||
CURLOPT_OPENSOCKETFUNCTION returns bad socket | ||
</name> | ||
</client> | ||
|
||
# it should be detected and an error should be reported | ||
<verify> | ||
# 7 == CURLE_COULDNT_CONNECT | ||
<errorcode> | ||
7 | ||
</errorcode> | ||
</verify> | ||
</testcase> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
/*************************************************************************** | ||
* _ _ ____ _ | ||
* Project ___| | | | _ \| | | ||
* / __| | | | |_) | | | ||
* | (__| |_| | _ <| |___ | ||
* \___|\___/|_| \_\_____| | ||
* | ||
* Copyright (C) 1998 - 2015, 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 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. | ||
* | ||
***************************************************************************/ | ||
|
||
#include "test.h" | ||
|
||
#include "memdebug.h" | ||
|
||
static curl_socket_t opensocket(void *clientp, | ||
curlsocktype purpose, | ||
struct curl_sockaddr *address) | ||
{ | ||
(void)purpose; | ||
(void)address; | ||
(void)clientp; | ||
fprintf(stderr, "opensocket() returns CURL_SOCKET_BAD\n"); | ||
return CURL_SOCKET_BAD; | ||
} | ||
|
||
int test(char *URL) | ||
{ | ||
CURL *curl = NULL; | ||
CURLcode res = CURLE_FAILED_INIT; | ||
(void)URL; | ||
|
||
if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { | ||
fprintf(stderr, "curl_global_init() failed\n"); | ||
return TEST_ERR_MAJOR_BAD; | ||
} | ||
|
||
if((curl = curl_easy_init()) == NULL) { | ||
fprintf(stderr, "curl_easy_init() failed\n"); | ||
curl_global_cleanup(); | ||
return TEST_ERR_MAJOR_BAD; | ||
} | ||
|
||
test_setopt(curl, CURLOPT_URL, "http://99.99.99.99:9999"); | ||
test_setopt(curl, CURLOPT_VERBOSE, 1L); | ||
test_setopt(curl, CURLOPT_OPENSOCKETFUNCTION, opensocket); | ||
|
||
res = curl_easy_perform(curl); | ||
|
||
test_cleanup: | ||
|
||
curl_easy_cleanup(curl); | ||
curl_global_cleanup(); | ||
|
||
return (int)res; | ||
} |