* modules/ssl/ssl_expr_eval.c (ssl_expr_eval_oid): Remove unused

variable.

* modules/ssl/ssl_private.h, modules/ssl/mod_ssl.h
(ssl_extlist_by_oid): Move prototype to ssl_private.h.

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

diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h
index 5cc37c1ee64fda7050b36fc797e1310c18b4b0d4..467c1f0f0dac08fd81c876cd95c73356f6858707 100644 (file)
--- a/modules/ssl/mod_ssl.h
+++ b/modules/ssl/mod_ssl.h
@@ -49,7 +49,6 @@ APR_DECLARE_OPTIONAL_FN(int, ssl_proxy_enable, (conn_rec *));
 
 APR_DECLARE_OPTIONAL_FN(int, ssl_engine_disable, (conn_rec *));
 
-extern apr_array_header_t *ssl_extlist_by_oid(request_rec *r, const char *oidstr);
 APR_DECLARE_OPTIONAL_FN(apr_array_header_t *, ssl_extlist_by_oid, (request_rec *r, const char *oidstr));
 
 #endif /* __MOD_SSL_H__ */

diff --git a/modules/ssl/ssl_expr_eval.c b/modules/ssl/ssl_expr_eval.c
index 3350437a9485081c5e2717c81c74fdfba158217d..e40df2dccbb7fd434ff69c0fd393b572bad57be3 100644 (file)
--- a/modules/ssl/ssl_expr_eval.c
+++ b/modules/ssl/ssl_expr_eval.c
@@ -257,7 +257,6 @@ apr_array_header_t *ssl_extlist_by_oid(request_rec *r, const char *oidstr)
 
 static BOOL ssl_expr_eval_oid(request_rec *r, const char *word, const char *oidstr)
 {
-    SSLConnRec *sslconn = myConnConfig(r->connection);
     int j;
     BOOL result = FALSE;
     apr_array_header_t *oid_array;

diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index fcaa8204e35a98a0f2d0bdfbb7055633ce2a2534..b6d50bb09a83f5181c2bcb6ca32f2f47f0c6ad2d 100644 (file)
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -643,6 +643,8 @@ void         ssl_var_register(void);
 char        *ssl_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);
 const char  *ssl_ext_lookup(apr_pool_t *p, conn_rec *c, int peer, const char *oid);
 
+extern apr_array_header_t *ssl_extlist_by_oid(request_rec *r, const char *oidstr);
+
 void         ssl_var_log_config_register(apr_pool_t *p);
 
 #define APR_SHM_MAXSIZE (64 * 1024 * 1024)