httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1679192 - /httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c
Date Wed, 13 May 2015 12:33:38 GMT
Author: trawick
Date: Wed May 13 12:33:38 2015
New Revision: 1679192

URL: http://svn.apache.org/r1679192
Log:
Follow-up to r1679032:

Fix regression in check for cached response.

(Essentially) Submitted by: ylavic

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c?rev=1679192&r1=1679191&r2=1679192&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c Wed May 13 12:33:38 2015
@@ -652,13 +652,14 @@ static int stapling_refresh_mutex_off(se
 }
 
 static int get_and_check_cached_response(server_rec *s, modssl_ctx_t *mctx,
-                                         OCSP_RESPONSE **rsp, BOOL *ok,
-                                         certinfo *cinf, apr_pool_t *p)
+                                         OCSP_RESPONSE **rsp, certinfo *cinf, 
+                                         apr_pool_t *p)
 {
+    BOOL ok;
     int rv;
 
     /* Check to see if we already have a response for this certificate */
-    rv = stapling_get_cached_response(s, rsp, ok, cinf, p);
+    rv = stapling_get_cached_response(s, rsp, &ok, cinf, p);
     if (rv == FALSE) {
         return SSL_TLSEXT_ERR_ALERT_FATAL;
     }
@@ -711,7 +712,6 @@ static int stapling_cb(SSL *ssl, void *a
     certinfo *cinf = NULL;
     OCSP_RESPONSE *rsp = NULL;
     int rv;
-    BOOL ok;
 
     if (sc->server->stapling_enabled != TRUE) {
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01950)
@@ -730,7 +730,7 @@ static int stapling_cb(SSL *ssl, void *a
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01952)
                  "stapling_cb: retrieved cached certificate data");
 
-    rv = get_and_check_cached_response(s, mctx, &rsp, &ok, cinf, conn->pool);
+    rv = get_and_check_cached_response(s, mctx, &rsp, cinf, conn->pool);
     if (rv != 0) {
         return rv;
     }
@@ -742,8 +742,7 @@ static int stapling_cb(SSL *ssl, void *a
         /* Maybe another request refreshed the OCSP response while this
          * thread waited for the mutex.  Check again.
          */
-        rv = get_and_check_cached_response(s, mctx, &rsp, &ok, cinf,
-                                           conn->pool);
+        rv = get_and_check_cached_response(s, mctx, &rsp, cinf, conn->pool);
         if (rv != 0) {
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
                          "stapling_cb: error checking for cached response "



Mime
View raw message