From: Joe Orton Date: Wed, 16 Sep 2009 12:47:33 +0000 (+0000) Subject: * modules/ssl/ssl_util_ocsp.c, modules/ssl/ssl_engine_ocsp.c: X-Git-Tag: 2.3.3~289 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2a484bbb120036d2c4915f3bc16d474fbb22e20;p=thirdparty%2Fapache%2Fhttpd.git * modules/ssl/ssl_util_ocsp.c, modules/ssl/ssl_engine_ocsp.c: Move comment on I/O timeout to appropriate place, thanks to Steve Henson. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@815741 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/ssl/ssl_engine_ocsp.c b/modules/ssl/ssl_engine_ocsp.c index 5886475344b..e5946287a6f 100644 --- a/modules/ssl/ssl_engine_ocsp.c +++ b/modules/ssl/ssl_engine_ocsp.c @@ -141,6 +141,7 @@ static int verify_ocsp_status(X509 *cert, X509_STORE_CTX *ctx, conn_rec *c, request = create_request(ctx, cert, &certID, s, pool); if (request) { + /* Use default I/O timeout for the server. */ response = modssl_dispatch_ocsp_request(ruri, mySrvFromConn(c)->timeout, request, c, pool); diff --git a/modules/ssl/ssl_util_ocsp.c b/modules/ssl/ssl_util_ocsp.c index ce4639249d6..35583913b8a 100644 --- a/modules/ssl/ssl_util_ocsp.c +++ b/modules/ssl/ssl_util_ocsp.c @@ -82,7 +82,6 @@ static apr_socket_t *send_request(BIO *request, const apr_uri_t *uri, for (; sa; sa = sa->next) { rv = apr_socket_create(&sd, sa->family, SOCK_STREAM, APR_PROTO_TCP, p); if (rv == APR_SUCCESS) { - /* Inherit the default I/O timeout. */ apr_socket_timeout_set(sd, timeout); rv = apr_socket_connect(sd, sa);