Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 52685 invoked from network); 7 Feb 2010 20:25:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Feb 2010 20:25:46 -0000 Received: (qmail 89714 invoked by uid 500); 7 Feb 2010 20:25:46 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 89620 invoked by uid 500); 7 Feb 2010 20:25:45 -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: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 89611 invoked by uid 99); 7 Feb 2010 20:25:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Feb 2010 20:25:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Feb 2010 20:25:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4E00623888EC; Sun, 7 Feb 2010 20:25:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r907472 - in /httpd/httpd/trunk/modules/ssl: mod_ssl.c ssl_engine_mutex.c ssl_private.h ssl_util_stapling.c Date: Sun, 07 Feb 2010 20:25:22 -0000 To: cvs@httpd.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100207202522.4E00623888EC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Sun Feb 7 20:25:21 2010 New Revision: 907472 URL: http://svn.apache.org/viewvc?rev=907472&view=rev Log: Style guides at httpd are pretty clear, macro values are UPCASE, please? Modified: httpd/httpd/trunk/modules/ssl/mod_ssl.c httpd/httpd/trunk/modules/ssl/ssl_engine_mutex.c httpd/httpd/trunk/modules/ssl/ssl_private.h httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c Modified: httpd/httpd/trunk/modules/ssl/mod_ssl.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/mod_ssl.c?rev=907472&r1=907471&r2=907472&view=diff ============================================================================== --- httpd/httpd/trunk/modules/ssl/mod_ssl.c (original) +++ httpd/httpd/trunk/modules/ssl/mod_ssl.c Sun Feb 7 20:25:21 2010 @@ -314,9 +314,9 @@ 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; Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_mutex.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_mutex.c?rev=907472&r1=907471&r2=907472&view=diff ============================================================================== --- httpd/httpd/trunk/modules/ssl/ssl_engine_mutex.c (original) +++ httpd/httpd/trunk/modules/ssl/ssl_engine_mutex.c Sun Feb 7 20:25:21 2010 @@ -47,7 +47,7 @@ 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 @@ 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; Modified: httpd/httpd/trunk/modules/ssl/ssl_private.h URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_private.h?rev=907472&r1=907471&r2=907472&view=diff ============================================================================== --- httpd/httpd/trunk/modules/ssl/ssl_private.h (original) +++ httpd/httpd/trunk/modules/ssl/ssl_private.h Sun Feb 7 20:25:21 2010 @@ -728,8 +728,8 @@ 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); Modified: httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c?rev=907472&r1=907471&r2=907472&view=diff ============================================================================== --- httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c (original) +++ httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c Sun Feb 7 20:25:21 2010 @@ -482,7 +482,7 @@ } 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 @@ 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; }