httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
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 GMT
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;
     }



Mime
View raw message