Skip to content

Commit ed819f1

Browse files
committed
cast curl timeouts in options to long to avoid compiler warnings
fix and improve 872d986; bump to 2.4.19.3dev Signed-off-by: Hans Zandbelt <hans.zandbelt@openidc.com>
1 parent 51e3c8a commit ed819f1

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
03/06/2026
2+
- cast curl timeouts in options to long to avoid compiler warnings
3+
- bump to 2.4.19.3dev
4+
15
02/23/2026
26
- fix claims based authorization in OAuth 2.0 RS mode (AuthType oauth20 and AuthType auth-openidc)
37
regression introduced in 2.4.19

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([mod_auth_openidc],[2.4.19.2],[hans.zandbelt@openidc.com])
1+
AC_INIT([mod_auth_openidc],[2.4.19.3dev],[hans.zandbelt@openidc.com])
22

33
AC_SUBST(NAMEVER, AC_PACKAGE_TARNAME()-AC_PACKAGE_VERSION())
44

src/http.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -746,8 +746,8 @@ static apr_byte_t oidc_http_request(request_rec *r, const char *url, const char
746746
OIDC_HTTP_CURL_SETOPT(CURLOPT_MAXREDIRS, 5L);
747747

748748
/* set the timeouts */
749-
OIDC_HTTP_CURL_SETOPT(CURLOPT_TIMEOUT, (CURLoption)http_timeout->request_timeout);
750-
OIDC_HTTP_CURL_SETOPT(CURLOPT_CONNECTTIMEOUT, (CURLoption)http_timeout->connect_timeout);
749+
OIDC_HTTP_CURL_SETOPT(CURLOPT_TIMEOUT, (long)http_timeout->request_timeout);
750+
OIDC_HTTP_CURL_SETOPT(CURLOPT_CONNECTTIMEOUT, (long)http_timeout->connect_timeout);
751751

752752
/* setup the buffer where the response data will be written to */
753753
OIDC_HTTP_CURL_SETOPT(CURLOPT_WRITEFUNCTION, oidc_http_response_data);
@@ -852,7 +852,7 @@ static apr_byte_t oidc_http_request(request_rec *r, const char *url, const char
852852
/* set POST data */
853853
OIDC_HTTP_CURL_SETOPT(CURLOPT_POSTFIELDS, data);
854854
/* set HTTP method to POST */
855-
OIDC_HTTP_CURL_SETOPT(CURLOPT_POST, 1);
855+
OIDC_HTTP_CURL_SETOPT(CURLOPT_POST, 1L);
856856
}
857857

858858
if (content_type != NULL) {

src/mod_auth_openidc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ void oidc_request_state_json_set(request_rec *r, const char *key, json_t *value)
412412
json_t *json = json_copy(value);
413413

414414
/* register a cleanup for the json object */
415-
apr_pool_cleanup_register(r->pool, json, (apr_status_t(*)(void *))json_decref, apr_pool_cleanup_null);
415+
apr_pool_cleanup_register(r->pool, json, (apr_status_t (*)(void *))json_decref, apr_pool_cleanup_null);
416416

417417
/* put the name/value pair in that hash table */
418418
apr_hash_set(state, key, APR_HASH_KEY_STRING, json);

0 commit comments

Comments
 (0)