romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 03:43:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib: rename struct 'http_req' to 'httpreq'

Browse source 
Because FreeBSD 14 kidnapped the name.
Ref: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271526

Fixes #11163
Closes #11164
This commit is contained in:
Daniel Stenberg 2023-05-20 11:55:20 +02:00
parent 36e998b18b
commit 54ce13d3ff
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
4 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/cf-h2-proxy.c
View file

@ -777,7 +777,7 @@ static CURLcode h2_submit(int32_t *pstream_id,
struct Curl_cfilter *cf, struct Curl_cfilter *cf,
struct Curl_easy *data, struct Curl_easy *data,
nghttp2_session *h2, nghttp2_session *h2,
struct http_req *req, struct httpreq *req,
const nghttp2_priority_spec *pri_spec, const nghttp2_priority_spec *pri_spec,
void *stream_user_data, void *stream_user_data,
nghttp2_data_source_read_callback read_callback, nghttp2_data_source_read_callback read_callback,
@ -846,7 +846,7 @@ static CURLcode submit_CONNECT(struct Curl_cfilter *cf,
{ {
struct cf_h2_proxy_ctx *ctx = cf->ctx; struct cf_h2_proxy_ctx *ctx = cf->ctx;
CURLcode result; CURLcode result;
struct http_req *req = NULL; struct httpreq *req = NULL;
infof(data, "Establish HTTP/2 proxy tunnel to %s", ts->authority); infof(data, "Establish HTTP/2 proxy tunnel to %s", ts->authority);

16
lib/http.c
View file

@ -4537,13 +4537,13 @@ static char *my_strndup(const char *ptr, size_t len)
return copy; return copy;
} }
CURLcode Curl_http_req_make(struct http_req **preq, CURLcode Curl_http_req_make(struct httpreq **preq,
const char *method, size_t m_len, const char *method, size_t m_len,
const char *scheme, size_t s_len, const char *scheme, size_t s_len,
const char *authority, size_t a_len, const char *authority, size_t a_len,
const char *path, size_t p_len) const char *path, size_t p_len)
{ {
struct http_req *req; struct httpreq *req;
CURLcode result = CURLE_OUT_OF_MEMORY; CURLcode result = CURLE_OUT_OF_MEMORY;
DEBUGASSERT(method); DEBUGASSERT(method);
@ -4580,7 +4580,7 @@ out:
return result; return result;
} }
static CURLcode req_assign_url_authority(struct http_req *req, CURLU *url) static CURLcode req_assign_url_authority(struct httpreq *req, CURLU *url)
{ {
char *user, *pass, *host, *port; char *user, *pass, *host, *port;
struct dynbuf buf; struct dynbuf buf;
@ -4646,7 +4646,7 @@ out:
return result; return result;
} }
static CURLcode req_assign_url_path(struct http_req *req, CURLU *url) static CURLcode req_assign_url_path(struct httpreq *req, CURLU *url)
{ {
char *path, *query; char *path, *query;
struct dynbuf buf; struct dynbuf buf;
@ -4694,11 +4694,11 @@ out:
return result; return result;
} }
CURLcode Curl_http_req_make2(struct http_req **preq, CURLcode Curl_http_req_make2(struct httpreq **preq,
const char *method, size_t m_len, const char *method, size_t m_len,
CURLU *url, const char *scheme_default) CURLU *url, const char *scheme_default)
{ {
struct http_req *req; struct httpreq *req;
CURLcode result = CURLE_OUT_OF_MEMORY; CURLcode result = CURLE_OUT_OF_MEMORY;
CURLUcode uc; CURLUcode uc;
@ -4738,7 +4738,7 @@ out:
return result; return result;
} }
void Curl_http_req_free(struct http_req *req) void Curl_http_req_free(struct httpreq *req)
{ {
if(req) { if(req) {
free(req->scheme); free(req->scheme);
@ -4778,7 +4778,7 @@ static bool h2_non_field(const char *name, size_t namelen)
} }
CURLcode Curl_http_req_to_h2(struct dynhds *h2_headers, CURLcode Curl_http_req_to_h2(struct dynhds *h2_headers,
struct http_req *req, struct Curl_easy *data) struct httpreq *req, struct Curl_easy *data)
{ {
const char *scheme = NULL, *authority = NULL; const char *scheme = NULL, *authority = NULL;
struct dynhds_entry *e; struct dynhds_entry *e;

10
lib/http.h
View file

@ -260,7 +260,7 @@ CURLcode Curl_http_decode_status(int *pstatus, const char *s, size_t len);
/** /**
* All about a core HTTP request, excluding body and trailers * All about a core HTTP request, excluding body and trailers
*/ */
struct http_req { struct httpreq {
char method[12]; char method[12];
char *scheme; char *scheme;
char *authority; char *authority;
@ -272,17 +272,17 @@ struct http_req {
/** /**
* Create a HTTP request struct. * Create a HTTP request struct.
*/ */
CURLcode Curl_http_req_make(struct http_req **preq, CURLcode Curl_http_req_make(struct httpreq **preq,
const char *method, size_t m_len, const char *method, size_t m_len,
const char *scheme, size_t s_len, const char *scheme, size_t s_len,
const char *authority, size_t a_len, const char *authority, size_t a_len,
const char *path, size_t p_len); const char *path, size_t p_len);
CURLcode Curl_http_req_make2(struct http_req **preq, CURLcode Curl_http_req_make2(struct httpreq **preq,
const char *method, size_t m_len, const char *method, size_t m_len,
CURLU *url, const char *scheme_default); CURLU *url, const char *scheme_default);
void Curl_http_req_free(struct http_req *req); void Curl_http_req_free(struct httpreq *req);
#define HTTP_PSEUDO_METHOD ":method" #define HTTP_PSEUDO_METHOD ":method"
#define HTTP_PSEUDO_SCHEME ":scheme" #define HTTP_PSEUDO_SCHEME ":scheme"
@ -306,7 +306,7 @@ void Curl_http_req_free(struct http_req *req);
* @param data the handle to lookup defaults like ' :scheme' from * @param data the handle to lookup defaults like ' :scheme' from
*/ */
CURLcode Curl_http_req_to_h2(struct dynhds *h2_headers, CURLcode Curl_http_req_to_h2(struct dynhds *h2_headers,
struct http_req *req, struct Curl_easy *data); struct httpreq *req, struct Curl_easy *data);
/** /**
* All about a core HTTP response, excluding body and trailers * All about a core HTTP response, excluding body and trailers

4
lib/http1.h
View file

@ -36,7 +36,7 @@
#define H1_PARSE_DEFAULT_MAX_LINE_LEN (8 * 1024) #define H1_PARSE_DEFAULT_MAX_LINE_LEN (8 * 1024)
struct h1_req_parser { struct h1_req_parser {
struct http_req *req; struct httpreq *req;
struct bufq scratch; struct bufq scratch;
size_t scratch_skip; size_t scratch_skip;
const char *line; const char *line;
@ -53,7 +53,7 @@ ssize_t Curl_h1_req_parse_read(struct h1_req_parser *parser,
const char *scheme_default, int options, const char *scheme_default, int options,
CURLcode *err); CURLcode *err);
CURLcode Curl_h1_req_dprint(const struct http_req *req, CURLcode Curl_h1_req_dprint(const struct httpreq *req,
struct dynbuf *dbuf); struct dynbuf *dbuf);