diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2010-02-07 21:25:21 +0100 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2010-02-07 21:25:21 +0100 |
| commit | 54e9063b802082da3c08a090af8e6893a5fff4e1 (patch) | |
| tree | fface087e6ebd338627ad14c5769f9e16a72c36e /modules | |
| parent | Update. (diff) | |
| download | apache2-54e9063b802082da3c08a090af8e6893a5fff4e1.tar.xz apache2-54e9063b802082da3c08a090af8e6893a5fff4e1.zip | |
Style guides at httpd are pretty clear, macro values are UPCASE, please?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@907472 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/ssl/mod_ssl.c | 4 | ||||
| -rw-r--r-- | modules/ssl/ssl_engine_mutex.c | 6 | ||||
| -rw-r--r-- | modules/ssl/ssl_private.h | 4 | ||||
| -rw-r--r-- | modules/ssl/ssl_util_stapling.c | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c index 80b5cb8568..317cbfbf2a 100644 --- a/modules/ssl/mod_ssl.c +++ b/modules/ssl/mod_ssl.c @@ -314,9 +314,9 @@ static int ssl_hook_pre_config(apr_pool_t *pconf, ssl_scache_status_register(pconf); /* Register mutex type names so they can be configured with Mutex */ - ap_mutex_register(pconf, ssl_cache_mutex_type, NULL, APR_LOCK_DEFAULT, 0); + ap_mutex_register(pconf, SSL_CACHE_MUTEX_TYPE, NULL, APR_LOCK_DEFAULT, 0); #ifdef HAVE_OCSP_STAPLING - ap_mutex_register(pconf, ssl_stapling_mutex_type, NULL, APR_LOCK_DEFAULT, 0); + ap_mutex_register(pconf, SSL_STAPLING_MUTEX_TYPE, NULL, APR_LOCK_DEFAULT, 0); #endif return OK; diff --git a/modules/ssl/ssl_engine_mutex.c b/modules/ssl/ssl_engine_mutex.c index fccd97991b..9c0b996c44 100644 --- a/modules/ssl/ssl_engine_mutex.c +++ b/modules/ssl/ssl_engine_mutex.c @@ -47,7 +47,7 @@ int ssl_mutex_init(server_rec *s, apr_pool_t *p) return TRUE; } - if ((rv = ap_global_mutex_create(&mc->pMutex, ssl_cache_mutex_type, NULL, + if ((rv = ap_global_mutex_create(&mc->pMutex, SSL_CACHE_MUTEX_TYPE, NULL, s, s->process->pool, 0)) != APR_SUCCESS) { return FALSE; @@ -74,10 +74,10 @@ int ssl_mutex_reinit(server_rec *s, apr_pool_t *p) if (lockfile) ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, "Cannot reinit %s mutex with file `%s'", - ssl_cache_mutex_type, lockfile); + SSL_CACHE_MUTEX_TYPE, lockfile); else ap_log_error(APLOG_MARK, APLOG_WARNING, rv, s, - "Cannot reinit %s mutex", ssl_cache_mutex_type); + "Cannot reinit %s mutex", SSL_CACHE_MUTEX_TYPE); return FALSE; } return TRUE; diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h index fbd33bf7e8..313ceeb4fd 100644 --- a/modules/ssl/ssl_private.h +++ b/modules/ssl/ssl_private.h @@ -728,8 +728,8 @@ int ssl_stapling_mutex_init(server_rec *, apr_pool_t *); int ssl_stapling_mutex_reinit(server_rec *, apr_pool_t *); /* mutex type names for Mutex directive */ -#define ssl_cache_mutex_type "ssl-cache" -#define ssl_stapling_mutex_type "ssl-stapling" +#define SSL_CACHE_MUTEX_TYPE "ssl-cache" +#define SSL_STAPLING_MUTEX_TYPE "ssl-stapling" /** Logfile Support */ void ssl_die(void); diff --git a/modules/ssl/ssl_util_stapling.c b/modules/ssl/ssl_util_stapling.c index 12d3749c74..e069fae848 100644 --- a/modules/ssl/ssl_util_stapling.c +++ b/modules/ssl/ssl_util_stapling.c @@ -482,7 +482,7 @@ int ssl_stapling_mutex_init(server_rec *s, apr_pool_t *p) } if ((rv = ap_global_mutex_create(&mc->stapling_mutex, - ssl_stapling_mutex_type, NULL, s, + SSL_STAPLING_MUTEX_TYPE, NULL, s, s->process->pool, 0)) != APR_SUCCESS) { return FALSE; } @@ -506,11 +506,11 @@ int ssl_stapling_mutex_reinit(server_rec *s, apr_pool_t *p) if (lockfile) { ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, "Cannot reinit %s mutex with file `%s'", - ssl_stapling_mutex_type, lockfile); + SSL_STAPLING_MUTEX_TYPE, lockfile); } else { ap_log_error(APLOG_MARK, APLOG_WARNING, rv, s, - "Cannot reinit %s mutex", ssl_stapling_mutex_type); + "Cannot reinit %s mutex", SSL_STAPLING_MUTEX_TYPE); } return FALSE; } |