Changeset e798149 in mod_gnutls
- Timestamp:
- Jan 11, 2020, 10:40:09 AM (15 months ago)
- Branches:
- asyncio, master, proxy-ticket
- Children:
- 75f2d96
- Parents:
- bdd10be
- git-author:
- Fiona Klute <fiona.klute@…> (01/11/20 10:33:11)
- git-committer:
- Fiona Klute <fiona.klute@…> (01/11/20 10:40:09)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/gnutls_ocsp.c
rbdd10be re798149 473 473 474 474 static apr_status_t do_ocsp_request(apr_pool_t *p, server_rec *s, 475 apr_uri_t *uri, 475 476 gnutls_datum_t *request, 476 477 gnutls_datum_t *response) 477 478 __attribute__((nonnull)); 478 479 static apr_status_t do_ocsp_request(apr_pool_t *p, server_rec *s, 480 apr_uri_t *uri, 479 481 gnutls_datum_t *request, 480 482 gnutls_datum_t *response) … … 483 485 ap_get_module_config(s->module_config, &gnutls_module); 484 486 485 if (apr_strnatcmp( sc->ocsp->uri->scheme, "http"))487 if (apr_strnatcmp(uri->scheme, "http")) 486 488 { 487 489 ap_log_error(APLOG_MARK, APLOG_ERR, APR_EGENERAL, s, 488 490 "Scheme \"%s\" is not supported for OCSP requests!", 489 sc->ocsp->uri->scheme);491 uri->scheme); 490 492 return APR_EINVAL; 491 493 } 492 494 493 const char* header = http_post_header(p, sc->ocsp->uri,495 const char* header = http_post_header(p, uri, 494 496 OCSP_REQ_TYPE, OCSP_RESP_TYPE, 495 497 request->size); … … 498 500 499 501 /* Find correct port */ 500 apr_port_t port = sc->ocsp->uri->port ?501 sc->ocsp->uri->port : apr_uri_port_of_scheme(sc->ocsp->uri->scheme);502 apr_port_t port = uri->port ? 503 uri->port : apr_uri_port_of_scheme(uri->scheme); 502 504 503 505 apr_sockaddr_t *sa; 504 apr_status_t rv = apr_sockaddr_info_get(&sa, sc->ocsp->uri->hostname,506 apr_status_t rv = apr_sockaddr_info_get(&sa, uri->hostname, 505 507 APR_UNSPEC, port, 0, p); 506 508 if (rv != APR_SUCCESS) … … 508 510 ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, 509 511 "Address resolution for OCSP responder %s failed.", 510 sc->ocsp->uri->hostinfo);512 uri->hostinfo); 511 513 } 512 514 … … 535 537 ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, 536 538 "Connecting to OCSP responder %s failed.", 537 sc->ocsp->uri->hostinfo);539 uri->hostinfo); 538 540 return rv; 539 541 } … … 570 572 ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, 571 573 "Invalid HTTP response status from %s: %s", 572 sc->ocsp->uri->hostinfo, h);574 uri->hostinfo, h); 573 575 rv = APR_ECONNRESET; 574 576 goto exit; … … 587 589 ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, 588 590 "Error while reading HTTP response header from %s", 589 sc->ocsp->uri->hostinfo);591 uri->hostinfo); 590 592 rv = APR_ECONNRESET; 591 593 goto exit; … … 704 706 } 705 707 706 rv = do_ocsp_request(tmp, s, &req, &resp);708 rv = do_ocsp_request(tmp, s, sc->ocsp->uri, &req, &resp); 707 709 gnutls_free(req.data); 708 710 if (rv != APR_SUCCESS)
Note: See TracChangeset
for help on using the changeset viewer.