core/ap_ssl_*: changes after review by rpluem

 - removed no longer needed (char*) casts when looking
   up ssl variables.
 - move 'goto cleanup;' on separate source line
 - fixed check for wrong optional function in ap_run_ssl_var_lookup
 - remove ap_bytes_t again from httpd.h and passes now ocsp
   identifier as separate const char* and apr_size_t. This
   follows more how such data is passed in the rest of the
   server.



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

1 files changed, 10 insertions, 9 deletions

diff --git a/server/ssl.c b/server/ssl.c
index 65112ca9da..1f4be8d6aa 100644
--- a/server/ssl.c
+++ b/server/ssl.c
@@ -100,7 +100,7 @@ AP_DECLARE(const char *) ap_ssl_var_lookup(apr_pool_t *p, server_rec *s,
                                            const char *name)
 {
     const char *val = ap_run_ssl_var_lookup(p, s, c, r, name);
-    if (val == NULL && module_ssl_is_https) {
+    if (val == NULL && module_ssl_var_lookup) {
         val = module_ssl_var_lookup(p, s, c, r, name);
     }
     return val;
@@ -148,18 +148,18 @@ AP_DECLARE(int) ap_ssl_answer_challenge(conn_rec *c, const char *server_name,
 }
 
 AP_DECLARE(apr_status_t) ap_ssl_ocsp_prime(server_rec *s, apr_pool_t *p,
-                                           const ap_bytes_t *id,
+                                           const char *id, apr_size_t id_len,
                                            const char *pem)
 {
-    int rv = ap_run_ssl_ocsp_prime_hook(s, p, id, pem);
+    int rv = ap_run_ssl_ocsp_prime_hook(s, p, id, id_len, pem);
     return rv == OK? APR_SUCCESS : (rv == DECLINED? APR_ENOENT : APR_EGENERAL);
 }
 
 AP_DECLARE(apr_status_t) ap_ssl_ocsp_get_resp(server_rec *s, conn_rec *c,
-                                              const ap_bytes_t *id,
+                                              const char *id, apr_size_t id_len,
                                               ap_ssl_ocsp_copy_resp *cb, void *userdata)
 {
-    int rv = ap_run_ssl_ocsp_get_resp_hook(s, c, id, cb, userdata);
+    int rv = ap_run_ssl_ocsp_get_resp_hook(s, c, id, id_len, cb, userdata);
     return rv == OK? APR_SUCCESS : (rv == DECLINED? APR_ENOENT : APR_EGENERAL);
 }
 
@@ -180,8 +180,9 @@ AP_IMPLEMENT_HOOK_RUN_FIRST(int, ssl_answer_challenge,
         (conn_rec *c, const char *server_name, const char **pcert_pem, const char **pkey_pem),
         (c, server_name, pcert_pem, pkey_pem), DECLINED)
 AP_IMPLEMENT_HOOK_RUN_FIRST(int, ssl_ocsp_prime_hook,
-        (server_rec *s, apr_pool_t *p, const ap_bytes_t *id, const char *pem),
-        (s, p, id, pem), DECLINED)
+        (server_rec *s, apr_pool_t *p, const char *id, apr_size_t id_len, const char *pem),
+        (s, p, id, id_len, pem), DECLINED)
 AP_IMPLEMENT_HOOK_RUN_FIRST(int, ssl_ocsp_get_resp_hook,
-         (server_rec *s, conn_rec *c, const ap_bytes_t *id, ap_ssl_ocsp_copy_resp *cb, void *userdata),
-         (s, c, id, cb, userdata), DECLINED)
+         (server_rec *s, conn_rec *c, const char *id, apr_size_t id_len,
+          ap_ssl_ocsp_copy_resp *cb, void *userdata),
+         (s, c, id, id_len, cb, userdata), DECLINED)