- update all patches

[packages/apache.git] / httpd-2.0.46-sslmutex.patch

diff --git a/httpd-2.0.46-sslmutex.patch b/httpd-2.0.46-sslmutex.patch
index dadc6e0050bfea5f590d9212ede3751a1a892c7d..82398d07416c4cdf5962741172105e3c6f99d03f 100644 (file)
--- a/httpd-2.0.46-sslmutex.patch
+++ b/httpd-2.0.46-sslmutex.patch
@@ -1,14 +1,12 @@
-diff -urbB httpd-2.2.0.org/modules/ssl/ssl_engine_mutex.c httpd-2.2.0/modules/ssl/ssl_engine_mutex.c
---- httpd-2.2.0.org/modules/ssl/ssl_engine_mutex.c     2005-11-10 16:20:05.000000000 +0100
-+++ httpd-2.2.0/modules/ssl/ssl_engine_mutex.c 2005-12-02 23:11:09.183916500 +0100
-@@ -45,6 +45,10 @@
-     if (mc->pMutex) {
+--- httpd-2.4.1/modules/ssl/ssl_engine_mutex.c.orig    2011-12-05 01:08:01.000000000 +0100
++++ httpd-2.4.1/modules/ssl/ssl_engine_mutex.c 2012-02-22 00:07:35.402966515 +0100
+@@ -47,6 +47,9 @@
          return TRUE;
      }
-+
+ 
 +    if (mc->szMutexFile)
 +          apr_file_remove(mc->szMutexFile, p);
 +
-     if ((rv = apr_global_mutex_create(&mc->pMutex, mc->szMutexFile,
-                                       mc->nMutexMech, s->process->pool))
+     if ((rv = ap_global_mutex_create(&mc->pMutex, NULL, SSL_CACHE_MUTEX_TYPE,
+                                      NULL, s, s->process->pool, 0))
              != APR_SUCCESS) {