diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-02-17 17:24:19 +0100 |
|---|---|---|
| committer | Dr. David von Oheimb <dev@ddvo.net> | 2021-03-01 10:30:43 +0100 |
| commit | d546e8e267bfddc1ca310dfa8b9a72ab4f9aac7c (patch) | |
| tree | 1688ff89cb61a15fee808af244d528e68ce45c4a /include | |
| parent | 7932982b88f5095f60397fe727d27ddf7234f4d6 (diff) | |
Generalize schmeme parsing of OSSL_HTTP_parse_url() to OSSL_parse_url()
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14009)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/http.h | 3 | ||||
| -rw-r--r-- | include/openssl/httperr.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/openssl/http.h b/include/openssl/http.h index 508428a986..c39049918f 100644 --- a/include/openssl/http.h +++ b/include/openssl/http.h @@ -96,6 +96,9 @@ int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port, const char *proxyuser, const char *proxypass, int timeout, BIO *bio_err, const char *prog); +int OSSL_parse_url(const char *url, char **pscheme, char **puser, char **phost, + char **pport, int *pport_num, + char **ppath, char **pquery, char **pfrag); int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost, char **pport, int *pport_num, char **ppath, char **pquery, char **pfrag); diff --git a/include/openssl/httperr.h b/include/openssl/httperr.h index 796bc15a49..af5717d3dc 100644 --- a/include/openssl/httperr.h +++ b/include/openssl/httperr.h @@ -32,7 +32,7 @@ # define HTTP_R_INCONSISTENT_CONTENT_LENGTH 120 # define HTTP_R_INVALID_PORT_NUMBER 123 # define HTTP_R_INVALID_URL_PATH 125 -# define HTTP_R_INVALID_URL_PREFIX 124 +# define HTTP_R_INVALID_URL_SCHEME 124 # define HTTP_R_MAX_RESP_LEN_EXCEEDED 117 # define HTTP_R_MISSING_ASN1_ENCODING 110 # define HTTP_R_MISSING_CONTENT_TYPE 121 |