Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 48213 invoked by uid 500); 28 Mar 2002 02:46:29 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 48202 invoked by uid 500); 28 Mar 2002 02:46:29 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 28 Mar 2002 02:46:28 -0000 Message-ID: <20020328024628.4584.qmail@icarus.apache.org> From: dougm@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/ssl ssl_engine_init.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N dougm 02/03/27 18:46:28 Modified: modules/ssl ssl_engine_init.c Log: fixup naming: ssl_init_ctx_* will be used for both proxy and server ssl_init_server_* is specific to the server Revision Changes Path 1.79 +24 -24 httpd-2.0/modules/ssl/ssl_engine_init.c Index: ssl_engine_init.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_init.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- ssl_engine_init.c 28 Mar 2002 02:40:01 -0000 1.78 +++ ssl_engine_init.c 28 Mar 2002 02:46:28 -0000 1.79 @@ -365,7 +365,7 @@ } #endif -static void ssl_init_check_server(server_rec *s, +static void ssl_init_server_check(server_rec *s, apr_pool_t *p, apr_pool_t *ptemp, SSLSrvConfigRec *sc) @@ -454,7 +454,7 @@ return ctx; } -static void ssl_init_session_cache_ctx(server_rec *s, +static void ssl_init_ctx_session_cache(server_rec *s, apr_pool_t *p, apr_pool_t *ptemp, SSLSrvConfigRec *sc) @@ -494,10 +494,10 @@ } } -static void ssl_init_verify(server_rec *s, - apr_pool_t *p, - apr_pool_t *ptemp, - SSLSrvConfigRec *sc) +static void ssl_init_ctx_verify(server_rec *s, + apr_pool_t *p, + apr_pool_t *ptemp, + SSLSrvConfigRec *sc) { SSL_CTX *ctx = sc->pSSLCtx; @@ -573,10 +573,10 @@ } } -static void ssl_init_cipher_suite(server_rec *s, - apr_pool_t *p, - apr_pool_t *ptemp, - SSLSrvConfigRec *sc) +static void ssl_init_ctx_cipher_suite(server_rec *s, + apr_pool_t *p, + apr_pool_t *ptemp, + SSLSrvConfigRec *sc) { SSL_CTX *ctx = sc->pSSLCtx; const char *suite = sc->szCipherSuite; @@ -599,10 +599,10 @@ } } -static void ssl_init_crl(server_rec *s, - apr_pool_t *p, - apr_pool_t *ptemp, - SSLSrvConfigRec *sc) +static void ssl_init_ctx_crl(server_rec *s, + apr_pool_t *p, + apr_pool_t *ptemp, + SSLSrvConfigRec *sc) { /* * Configure Certificate Revocation List (CRL) Details @@ -627,10 +627,10 @@ } } -static void ssl_init_cert_chain(server_rec *s, - apr_pool_t *p, - apr_pool_t *ptemp, - SSLSrvConfigRec *sc) +static void ssl_init_ctx_cert_chain(server_rec *s, + apr_pool_t *p, + apr_pool_t *ptemp, + SSLSrvConfigRec *sc) { BOOL skip_first = TRUE; int i, n; @@ -871,21 +871,21 @@ apr_pool_t *ptemp, SSLSrvConfigRec *sc) { - ssl_init_check_server(s, p, ptemp, sc); + ssl_init_server_check(s, p, ptemp, sc); ssl_init_ctx(s, p, ptemp, sc); - ssl_init_session_cache_ctx(s, p, ptemp, sc); + ssl_init_ctx_session_cache(s, p, ptemp, sc); ssl_init_ctx_callbacks(s, p, ptemp, sc); - ssl_init_verify(s, p, ptemp, sc); + ssl_init_ctx_verify(s, p, ptemp, sc); - ssl_init_cipher_suite(s, p, ptemp, sc); + ssl_init_ctx_cipher_suite(s, p, ptemp, sc); - ssl_init_crl(s, p, ptemp, sc); + ssl_init_ctx_crl(s, p, ptemp, sc); - ssl_init_cert_chain(s, p, ptemp, sc); + ssl_init_ctx_cert_chain(s, p, ptemp, sc); ssl_init_server_certs(s, p, ptemp, sc); }