You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by do...@apache.org on 2001/11/29 07:34:53 UTC
cvs commit: httpd-2.0/modules/ssl mod_ssl.h ssl_engine_kernel.c ssl_engine_log.c
dougm 01/11/28 22:34:53
Modified: modules/ssl mod_ssl.h ssl_engine_kernel.c ssl_engine_log.c
Log:
get rid of ssl_log_applies() function. it does more than we need and
what should be done with a macro. it was only used once anyhow.
Revision Changes Path
1.49 +0 -1 httpd-2.0/modules/ssl/mod_ssl.h
Index: mod_ssl.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- mod_ssl.h 2001/11/29 06:15:01 1.48
+++ mod_ssl.h 2001/11/29 06:34:53 1.49
@@ -711,7 +711,6 @@
/* Logfile Support */
void ssl_log_open(server_rec *, server_rec *, apr_pool_t *);
-BOOL ssl_log_applies(server_rec *, int);
void ssl_log(server_rec *, int, const char *, ...);
void ssl_die(void);
1.34 +1 -1 httpd-2.0/modules/ssl/ssl_engine_kernel.c
Index: ssl_engine_kernel.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_kernel.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ssl_engine_kernel.c 2001/11/29 06:27:41 1.33
+++ ssl_engine_kernel.c 2001/11/29 06:34:53 1.34
@@ -1406,7 +1406,7 @@
* Log information about CRL
* (A little bit complicated because of ASN.1 and BIOs...)
*/
- if (ssl_log_applies(s, SSL_LOG_TRACE)) {
+ if (sc->nLogLevel >= SSL_LOG_TRACE) {
bio = BIO_new(BIO_s_mem());
BIO_printf(bio, "lastUpdate: ");
ASN1_UTCTIME_print(bio, X509_CRL_get_lastUpdate(crl));
1.8 +0 -14 httpd-2.0/modules/ssl/ssl_engine_log.c
Index: ssl_engine_log.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_log.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ssl_engine_log.c 2001/11/22 02:58:07 1.7
+++ ssl_engine_log.c 2001/11/29 06:34:53 1.8
@@ -162,20 +162,6 @@
return errstr;
}
-BOOL ssl_log_applies(server_rec *s, int level)
-{
- SSLSrvConfigRec *sc;
-
- sc = mySrvConfig(s);
- if ( sc->fileLogFile == NULL
- && !(level & SSL_LOG_ERROR))
- return FALSE;
- if ( level > sc->nLogLevel
- && !(level & SSL_LOG_ERROR))
- return FALSE;
- return TRUE;
-}
-
void ssl_log(server_rec *s, int level, const char *msg, ...)
{
char tstr[80];