romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-30 14:58:28 +03:00
Code Issues Projects Releases Packages Wiki Activity

comments

Browse source
This commit is contained in:
Viktor Szakats 2025-07-25 15:06:29 +02:00
parent 6de6469303
commit 54e3b67e52
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
15 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/cf-h2-proxy.h
View file

@ -33,7 +33,6 @@ CURLcode Curl_cf_h2_proxy_insert_after(struct Curl_cfilter *cf,
extern struct Curl_cftype Curl_cft_h2_proxy;
#endif /* defined(USE_NGHTTP2) && !defined(CURL_DISABLE_PROXY) */
#endif /* USE_NGHTTP2 && !CURL_DISABLE_PROXY */
#endif /* HEADER_CURL_H2_PROXY_H */

2
lib/connect.c
View file

@ -1510,7 +1510,7 @@ CURLcode Curl_conn_setup(struct Curl_easy *data,
if(result)
goto out;
}
#endif /* !defined(CURL_DISABLE_HTTP) */
#endif /* !CURL_DISABLE_HTTP */
/* Still no cfilter set, apply default. */
if(!conn->cfilter[sockindex]) {

4
lib/curl_addrinfo.c
View file

@ -513,7 +513,7 @@ curl_dbg_freeaddrinfo(struct addrinfo *freethis,
freeaddrinfo(freethis);
#endif
}
#endif /* defined(CURLDEBUG) && defined(HAVE_FREEADDRINFO) */
#endif /* CURLDEBUG && HAVE_FREEADDRINFO */
#if defined(CURLDEBUG) && defined(HAVE_GETADDRINFO)
@ -553,7 +553,7 @@ curl_dbg_getaddrinfo(const char *hostname,
source, line);
return res;
}
#endif /* defined(CURLDEBUG) && defined(HAVE_GETADDRINFO) */
#endif /* CURLDEBUG && HAVE_GETADDRINFO */
#if defined(HAVE_GETADDRINFO) && defined(USE_RESOLVE_ON_IPS)
/*

2
lib/curl_md4.h
View file

@ -34,6 +34,6 @@
CURLcode Curl_md4it(unsigned char *output, const unsigned char *input,
const size_t len);
#endif /* defined(USE_CURL_NTLM_CORE) */
#endif /* USE_CURL_NTLM_CORE */
#endif /* HEADER_CURL_MD4_H */

2
lib/curl_ntlm_core.c
View file

@ -277,7 +277,7 @@ static bool encrypt_des(const unsigned char *in, unsigned char *out,
return TRUE;
}
#endif /* defined(USE_WIN32_CRYPTO) */
#endif /* USE_WIN32_CRYPTO */
/*
* takes a 21 byte array and treats it as 3 56-bit DES keys. The

2
lib/http_aws_sigv4.c
View file

@ -1149,4 +1149,4 @@ static bool should_urlencode(struct Curl_str *service_name)
return true;
}
#endif /* !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_AWS) */
#endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_AWS */

4
lib/ldap.c
View file

@ -273,7 +273,7 @@ static int ldap_win_bind_auth(LDAP *server, const char *user,
}
return rc;
}
#endif /* #if defined(USE_WINDOWS_SSPI) */
#endif /* USE_WINDOWS_SSPI */
static int ldap_win_bind(struct Curl_easy *data, LDAP *server,
const char *user, const char *passwd)
@ -300,7 +300,7 @@ static int ldap_win_bind(struct Curl_easy *data, LDAP *server,
return rc;
}
#endif /* #if defined(USE_WIN32_LDAP) */
#endif /* USE_WIN32_LDAP */
#ifdef USE_WIN32_LDAP
#define FREE_ON_WINLDAP(x) curlx_unicodefree(x)

8
lib/url.c
View file

@ -3202,8 +3202,8 @@ static CURLcode parse_connect_to_slist(struct Curl_easy *data,
&as /* to */,
allowed_alpns);
}
#endif
#ifdef USE_HTTP2
#endif
#ifdef USE_HTTP2
if(!hit && (neg->wanted & CURL_HTTP_V2x) &&
!neg->h2_prior_knowledge) {
srcalpnid = ALPN_h2;
@ -3212,7 +3212,7 @@ static CURLcode parse_connect_to_slist(struct Curl_easy *data,
&as /* to */,
allowed_alpns);
}
#endif
#endif
if(!hit && (neg->wanted & CURL_HTTP_V1x) &&
!neg->only_10) {
srcalpnid = ALPN_h1;
@ -4089,7 +4089,7 @@ void Curl_data_priority_clear_state(struct Curl_easy *data)
memset(&data->state.priority, 0, sizeof(data->state.priority));
}
#endif /* defined(USE_HTTP2) || defined(USE_HTTP3) */
#endif /* USE_HTTP2 || USE_HTTP3 */
CURLcode Curl_conn_meta_set(struct connectdata *conn, const char *key,

2
lib/url.h
View file

@ -118,7 +118,7 @@ CURLcode Curl_1st_fatal(CURLcode r1, CURLcode r2);
void Curl_data_priority_clear_state(struct Curl_easy *data);
#else
#define Curl_data_priority_clear_state(x)
#endif /* !(defined(USE_HTTP2) || defined(USE_HTTP3)) */
#endif /* USE_HTTP2 || USE_HTTP3 */
#ifdef USE_NGHTTP2
CURLcode Curl_data_priority_add_child(struct Curl_easy *parent,

2
lib/vtls/wolfssl.c
View file

@ -178,7 +178,7 @@ wssl_tls13_secret_callback(SSL *ssl, int id, const unsigned char *secret,
Curl_tls_keylog_write(label, client_random, secret, secretSz);
return 0;
}
#endif /* defined(HAVE_SECRET_CALLBACK) && defined(WOLFSSL_TLS13) */
#endif /* HAVE_SECRET_CALLBACK && WOLFSSL_TLS13 */
static void wssl_log_tls12_secret(WOLFSSL *ssl)
{

4
tests/libtest/lib518.c
View file

@ -471,7 +471,7 @@ test_cleanup:
return res;
}
#else /* defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) */
#else /* HAVE_GETRLIMIT && HAVE_SETRLIMIT */
static CURLcode test_lib518(char *URL)
{
@ -480,4 +480,4 @@ static CURLcode test_lib518(char *URL)
return TEST_ERR_MAJOR_BAD; /* skip test */
}
#endif /* defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) */
#endif /* HAVE_GETRLIMIT && HAVE_SETRLIMIT */

4
tests/libtest/lib537.c
View file

@ -485,7 +485,7 @@ test_cleanup:
return res;
}
#else /* defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) */
#else /* HAVE_GETRLIMIT && HAVE_SETRLIMIT */
static CURLcode test_lib537(char *URL)
{
@ -494,4 +494,4 @@ static CURLcode test_lib537(char *URL)
return TEST_ERR_MAJOR_BAD; /* skip test */
}
#endif /* defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) */
#endif /* HAVE_GETRLIMIT && HAVE_SETRLIMIT */

2
tests/unit/unit1979.c
View file

@ -131,7 +131,7 @@ static CURLcode test_unit1979(char *arg)
buffer);
curlx_dyn_free(&canonical_path);
}
#endif /* !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_AWS) */
#endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_AWS */
UNITTEST_END_SIMPLE
}

2
tests/unit/unit1980.c
View file

@ -102,7 +102,7 @@ static CURLcode test_unit1980(char *arg)
buffer);
curlx_dyn_free(&canonical_query);
}
#endif /* !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_AWS) */
#endif /* !CURL_DISABLE_HTTP && !CURL_DISABLE_AWS */
UNITTEST_END_SIMPLE
}

2
tests/unit/unit3205.c
View file

@ -605,7 +605,7 @@ static CURLcode test_unit3205(char *arg)
j++;
}
}
#endif /* defined(USE_MBEDTLS) || defined(USE_RUSTLS) */
#endif /* USE_MBEDTLS || USE_RUSTLS */
UNITTEST_END_SIMPLE
}