Complete the rename of the ssl_scache_status_register and

  ssl_ext_proxy_register (which has yet to be renamed for it's
  future location, since I'm not going further at the moment
  with implementing it's functionallity, all my focus is on
  the ssl_var_register arm.)

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

diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index 086cb9bd96b005af47de4540c75f8bdccd004664..3ad296eccf068c32bdad839a3a69216f8c8d5367 100644 (file)
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -211,9 +211,9 @@ static void ssl_hook_pre_config(
     ssl_var_log_config_register(pconf);
 #if 0 /* XXX */
     /* XXX: Register us to handle mod_proxy extensions that don't exist yet */
-    ssl_ext_mp_register(pconf);
+    ssl_ext_proxy_register(pconf);
     /* XXX: Register us to handle mod_status extensions that don't exist yet */
-    ssl_ext_ms_register(pconf);
+    ssl_scache_status_register(pconf);
 #endif /* -0- */
 }
 

diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h
index a929af1a139bb2e9abe07b6159aed0179ea56c44..dab123b0a9310b78caf7c17b5294feafcd25aa65 100644 (file)
--- a/modules/ssl/mod_ssl.h
+++ b/modules/ssl/mod_ssl.h
@@ -612,6 +612,9 @@ void         ssl_callback_LogTracingState(SSL *, int, int);
 
 /*  Session Cache Support  */
 void         ssl_scache_init(server_rec *, apr_pool_t *);
+#if 0 /* XXX */
+void         ssl_scache_status_register(apr_pool_t *p);
+#endif
 void         ssl_scache_kill(server_rec *);
 BOOL         ssl_scache_store(server_rec *, UCHAR *, int, time_t, SSL_SESSION *);
 SSL_SESSION *ssl_scache_retrieve(server_rec *, UCHAR *, int);
@@ -683,10 +686,9 @@ void         ssl_var_register(void);
 char        *ssl_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *);
 void         ssl_var_log_config_register(apr_pool_t *p);
 
-/*  Extensions  */
+/*  Proxy Extensions  */
 #if 0 /* XXX */
 void         ssl_ext_proxy_register(apr_pool_t *p);
-void         ssl_ext_ms_register(apr_pool_t *p);
 #endif /* -0- */
 
 /*  I/O  */

diff --git a/modules/ssl/ssl_engine_ext.c b/modules/ssl/ssl_engine_ext.c
index fac590521d1cb1beee618ed8af12dae8f0fb6624..76aa63ff58172d1260e7cb2fad52e7e8d6a0dd73 100644 (file)
--- a/modules/ssl/ssl_engine_ext.c
+++ b/modules/ssl/ssl_engine_ext.c
@@ -598,4 +598,4 @@ static int ssl_ext_mp_verify_cb(int ok, X509_STORE_CTX *ctx)
 
 #endif /* SSL_EXPERIMENTAL_PROXY */
 
-#endif /* XXX */
\ No newline at end of file
+#endif /* XXX */

diff --git a/modules/ssl/ssl_scache.c b/modules/ssl/ssl_scache.c
index a485e8cb5696990060bcb11a217048936f20cbe4..d3992380f99f05908c228eb4e360651439fe7b47 100644 (file)
--- a/modules/ssl/ssl_scache.c
+++ b/modules/ssl/ssl_scache.c
@@ -184,7 +184,7 @@ void ssl_scache_expire(server_rec *s)
 
 static void ssl_ext_ms_display(request_rec *, int, int);
 
-static void ssl_scache_status_register(void)
+void ssl_scache_status_register(apr_pool_t *p)
 {
     /* XXX point mod_status to this update, when it grows the opt fn */
 #if 0