diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2019-11-21 11:37:44 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2019-11-21 23:16:29 +0100 |
| commit | f70da9c17e315f382694d8ca5585191f4e5478d7 (patch) | |
| tree | 0d683814510dcea5c61af6729d192eda6fd9554c | |
| parent | e1f66ee3bfa06d294260a75ac6300f3783c7cc0b (diff) | |
| download | curl-f70da9c17e315f382694d8ca5585191f4e5478d7.tar.gz | |
include: make CURLE_HTTP3 use a new error code
To avoid potential issues with error code reuse.
Reported-by: Christoph M. Becker
Assisted-by: Dan Fandrich
Fixes #4601
Closes #4627
| -rw-r--r-- | docs/libcurl/libcurl-errors.3 | 3 | ||||
| -rw-r--r-- | include/curl/curl.h | 5 | ||||
| -rw-r--r-- | lib/strerror.c | 1 | ||||
| -rw-r--r-- | tests/data/test1538 | 5 |
4 files changed, 9 insertions, 5 deletions
diff --git a/docs/libcurl/libcurl-errors.3 b/docs/libcurl/libcurl-errors.3 index f3c714aab..4a0934ab9 100644 --- a/docs/libcurl/libcurl-errors.3 +++ b/docs/libcurl/libcurl-errors.3 @@ -256,6 +256,9 @@ Stream error in the HTTP/2 framing layer. An API function was called from inside a callback. .IP "CURLE_AUTH_ERROR (94)" An authentication function returned an error. +.IP "CURLE_HTTP3 (95)" +A problem was detected in the HTTP/3 layer. This is somewhat generic and can +be one out of several problems, see the error buffer for details. .IP "CURLE_OBSOLETE*" These error codes will never be returned. They were used in an old libcurl version and are currently unused. diff --git a/include/curl/curl.h b/include/curl/curl.h index 8c43fa884..70b37b799 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -501,9 +501,7 @@ typedef enum { CURLE_FTP_COULDNT_SET_TYPE, /* 17 */ CURLE_PARTIAL_FILE, /* 18 */ CURLE_FTP_COULDNT_RETR_FILE, /* 19 */ - CURLE_HTTP3, /* 20 - An HTTP/3 layer problem. - [was obsoleted in August 2007 for 7.17.0, - reused in November 2019 for 7.67.1] */ + CURLE_OBSOLETE20, /* 20 - NOT USED */ CURLE_QUOTE_ERROR, /* 21 - quote command failure */ CURLE_HTTP_RETURNED_ERROR, /* 22 */ CURLE_WRITE_ERROR, /* 23 */ @@ -604,6 +602,7 @@ typedef enum { inside a callback */ CURLE_AUTH_ERROR, /* 94 - an authentication function returned an error */ + CURLE_HTTP3, /* 95 - An HTTP/3 layer problem */ CURL_LAST /* never use! */ } CURLcode; diff --git a/lib/strerror.c b/lib/strerror.c index 90e8a3131..ba2e7a6f9 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -318,6 +318,7 @@ curl_easy_strerror(CURLcode error) return "HTTP/3 error"; /* error codes not used by current libcurl */ + case CURLE_OBSOLETE20: case CURLE_OBSOLETE24: case CURLE_OBSOLETE29: case CURLE_OBSOLETE32: diff --git a/tests/data/test1538 b/tests/data/test1538 index d59671d2a..36f53040b 100644 --- a/tests/data/test1538 +++ b/tests/data/test1538 @@ -52,7 +52,7 @@ e16: Error in the HTTP2 framing layer e17: FTP: couldn't set file type e18: Transferred a partial file e19: FTP: couldn't retrieve (RETR failed) the specified file -e20: HTTP/3 error +e20: Unknown error e21: Quote command returned error e22: HTTP response code said error e23: Failed writing received data to disk/application @@ -127,7 +127,8 @@ e91: SSL server certificate status verification FAILED e92: Stream error in the HTTP/2 framing layer e93: API function called from within callback e94: An authentication function returned an error -e95: Unknown error +e95: HTTP/3 error +e96: Unknown error m-1: Please call curl_multi_perform() soon m0: No error m1: Invalid multi handle |