httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r815719 - in /httpd/httpd/trunk/modules/ssl: ssl_engine_ocsp.c ssl_private.h ssl_util_ocsp.c
Date Wed, 16 Sep 2009 10:56:31 GMT
Author: jorton
Date: Wed Sep 16 10:56:31 2009
New Revision: 815719

URL: http://svn.apache.org/viewvc?rev=815719&view=rev
Log:
* modules/ssl/ssl_util_ocsp.c (send_request, 
  modssl_dispatch_ocsp_request): Take timeout as argument, as pass through.
  
* modules/ssl/ssl_engine_ocsp.c (verify_ocsp_status): Pass server timeout
  to modssl_dispatch_ocsp_request.

Submitted by: Dr Stephen Henson <shenson oss-institute.org>

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_engine_ocsp.c
    httpd/httpd/trunk/modules/ssl/ssl_private.h
    httpd/httpd/trunk/modules/ssl/ssl_util_ocsp.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_ocsp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_ocsp.c?rev=815719&r1=815718&r2=815719&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_ocsp.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_ocsp.c Wed Sep 16 10:56:31 2009
@@ -141,7 +141,9 @@
 
     request = create_request(ctx, cert, &certID, s, pool);
     if (request) {
-        response = modssl_dispatch_ocsp_request(ruri, request, c, pool);
+        response = modssl_dispatch_ocsp_request(ruri, 
+                                                mySrvFromConn(c)->timeout,
+                                                request, c, pool);
     }
 
     if (!request || !response) {

Modified: httpd/httpd/trunk/modules/ssl/ssl_private.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_private.h?rev=815719&r1=815718&r2=815719&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_private.h (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_private.h Wed Sep 16 10:56:31 2009
@@ -708,7 +708,8 @@
  * responder at the given URI.  Returns the decoded OCSP response
  * object, or NULL on error (in which case, errors will have been
  * logged).  Pool 'p' is used for temporary allocations. */
-OCSP_RESPONSE *modssl_dispatch_ocsp_request(const apr_uri_t *uri, 
+OCSP_RESPONSE *modssl_dispatch_ocsp_request(const apr_uri_t *uri,
+                                            apr_interval_time_t timeout,
                                             OCSP_REQUEST *request,
                                             conn_rec *c, apr_pool_t *p);
 #endif

Modified: httpd/httpd/trunk/modules/ssl/ssl_util_ocsp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util_ocsp.c?rev=815719&r1=815718&r2=815719&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_util_ocsp.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_util_ocsp.c Wed Sep 16 10:56:31 2009
@@ -57,6 +57,7 @@
  * responder at given server given by URI.  Returns socket object or
  * NULL on error. */
 static apr_socket_t *send_request(BIO *request, const apr_uri_t *uri, 
+                                  apr_interval_time_t timeout,
                                   conn_rec *c, apr_pool_t *p)
 {
     apr_status_t rv;
@@ -82,7 +83,7 @@
         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, mySrvFromConn(c)->timeout);
+            apr_socket_timeout_set(sd, timeout);
 
             rv = apr_socket_connect(sd, sa);
             if (rv == APR_SUCCESS) {
@@ -270,7 +271,8 @@
     return response;
 }
 
-OCSP_RESPONSE *modssl_dispatch_ocsp_request(const apr_uri_t *uri, 
+OCSP_RESPONSE *modssl_dispatch_ocsp_request(const apr_uri_t *uri,
+                                            apr_interval_time_t timeout,
                                             OCSP_REQUEST *request,
                                             conn_rec *c, apr_pool_t *p) 
 {
@@ -286,7 +288,7 @@
         return NULL;
     }
     
-    sd = send_request(bio, uri, c, p);
+    sd = send_request(bio, uri, timeout, c, p);
     if (sd == NULL) {
         /* Errors already logged. */
         BIO_free(bio);



Mime
View raw message