mod_{ssl,md}: init_stapling_status hooks should return an int.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1876549 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/md/mod_md_ocsp.c b/modules/md/mod_md_ocsp.c
index fcc0a98160c5d912b30cf12ed93ad9ab647177a4..2891f331cc776b2a4a1db4db25882dc3bf524d64 100644 (file)
--- a/modules/md/mod_md_ocsp.c
+++ b/modules/md/mod_md_ocsp.c
@@ -52,7 +52,7 @@ static int staple_here(md_srv_conf_t *sc)
             && md_config_geti(sc, MD_CONFIG_STAPLE_OTHERS));
 }
 
-apr_status_t md_ocsp_init_stapling_status(server_rec *s, apr_pool_t *p, 
+int md_ocsp_init_stapling_status(server_rec *s, apr_pool_t *p, 
                                           X509 *cert, X509 *issuer)
 {
     md_srv_conf_t *sc;

diff --git a/modules/md/mod_md_ocsp.h b/modules/md/mod_md_ocsp.h
index b0894caf1158140b1af5bff555bc4ec78b40ba22..9b36687434c3024ff9d98f77ec438b7d5d222a0e 100644 (file)
--- a/modules/md/mod_md_ocsp.h
+++ b/modules/md/mod_md_ocsp.h
@@ -18,8 +18,8 @@
 #define mod_md_md_ocsp_h
 
 
-apr_status_t md_ocsp_init_stapling_status(server_rec *s, apr_pool_t *p, 
-                                          X509 *cert, X509 *issuer);
+int md_ocsp_init_stapling_status(server_rec *s, apr_pool_t *p, 
+                                 X509 *cert, X509 *issuer);
 
 apr_status_t md_ocsp_get_stapling_status(unsigned char **pder, int *pderlen, 
                                          conn_rec *c, server_rec *s, X509 *cert);

diff --git a/modules/ssl/ssl_util_stapling.c b/modules/ssl/ssl_util_stapling.c
index a8e5d5d61b13a16f17d85b001ad8ebf3828cbc49..7ee434037187fcaa1b470c6325b6d14c9bd8bc00 100644 (file)
--- a/modules/ssl/ssl_util_stapling.c
+++ b/modules/ssl/ssl_util_stapling.c
@@ -149,7 +149,7 @@ int ssl_stapling_init_cert(server_rec *s, apr_pool_t *p, apr_pool_t *ptemp,
         return 1;
     }
 
-    if (ssl_run_init_stapling_status(s, p, x, issuer) == APR_SUCCESS) {
+    if (ssl_run_init_stapling_status(s, p, x, issuer) == OK) {
         /* Someone's taken over or mod_ssl's own implementation is not enabled */
         if (mctx->stapling_enabled != TRUE) {
             SSL_CTX_set_tlsext_status_cb(mctx->ssl_ctx, stapling_cb);