Update copyright year to 2005 and standardize on current copyright owner line.

[apache] / modules / ssl / ssl_engine_mutex.c

diff --git a/modules/ssl/ssl_engine_mutex.c b/modules/ssl/ssl_engine_mutex.c
index 4e81d9d252655fb2d9318a6818697ef5b225779b..65924d269ea779f31d913d2f7b2c949aa0753495 100644 (file)
--- a/modules/ssl/ssl_engine_mutex.c
+++ b/modules/ssl/ssl_engine_mutex.c
@@ -1,4 +1,5 @@
-/* Copyright 2001-2004 Apache Software Foundation
+/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+ * applicable.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,10 +28,10 @@
                                   because DEC 25 = OCT 31.''
                                              -- Unknown     */
 
-#include "mod_ssl.h"
-#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+#include "ssl_private.h"
+
+#ifdef AP_NEED_SET_MUTEX_PERMS
 #include "unixd.h"
-#define MOD_SSL_SET_MUTEX_PERMS /* XXX Apache should define something */
 #endif
 
 int ssl_mutex_init(server_rec *s, apr_pool_t *p)
@@ -57,7 +58,7 @@ int ssl_mutex_init(server_rec *s, apr_pool_t *p)
         return FALSE;
     }
 
-#ifdef MOD_SSL_SET_MUTEX_PERMS
+#ifdef AP_NEED_SET_MUTEX_PERMS
     rv = unixd_set_global_mutex_perms(mc->pMutex);
     if (rv != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
@@ -100,7 +101,7 @@ int ssl_mutex_on(server_rec *s)
         return TRUE;
     if ((rv = apr_global_mutex_lock(mc->pMutex)) != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_WARNING, rv, s,
-                     "Failed to acquire global mutex lock");
+                     "Failed to acquire SSL session cache lock");
         return FALSE;
     }
     return TRUE;
@@ -115,7 +116,7 @@ int ssl_mutex_off(server_rec *s)
         return TRUE;
     if ((rv = apr_global_mutex_unlock(mc->pMutex)) != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_WARNING, rv, s,
-                     "Failed to release global mutex lock");
+                     "Failed to release SSL session cache lock");
         return FALSE;
     }
     return TRUE;