From: Joe Orton <jorton@apache.org>
Date: Tue, 8 Apr 2008 14:30:41 +0000 (+0000)
Subject: Missed in r645940:
X-Git-Tag: 2.3.0~756
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2a0651ed22714631873aac7efb34abfcae15c63;p=thirdparty%2Fapache%2Fhttpd.git

Missed in r645940:

* modules/ssl/ssl_scache.c: Switch to using socache constants.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645943 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/ssl_scache.c b/modules/ssl/ssl_scache.c
index 120ef0a0278..585958ea1ef 100644
--- a/modules/ssl/ssl_scache.c
+++ b/modules/ssl/ssl_scache.c
@@ -103,14 +103,14 @@ BOOL ssl_scache_store(server_rec *s, UCHAR *id, int idlen,
     ptr = encoded;
     len = i2d_SSL_SESSION(sess, &ptr);
 
-    if (mc->sesscache->flags & MODSSL_SESSCACHE_FLAG_NOTMPSAFE) {
+    if (mc->sesscache->flags & AP_SOCACHE_FLAG_NOTMPSAFE) {
         ssl_mutex_on(s);
     }
     
     rv = mc->sesscache->store(mc->sesscache_context, s, id, idlen, 
                               expiry, encoded, len);
 
-    if (mc->sesscache->flags & MODSSL_SESSCACHE_FLAG_NOTMPSAFE) {
+    if (mc->sesscache->flags & AP_SOCACHE_FLAG_NOTMPSAFE) {
         ssl_mutex_off(s);
     }
 
@@ -126,14 +126,14 @@ SSL_SESSION *ssl_scache_retrieve(server_rec *s, UCHAR *id, int idlen,
     MODSSL_D2I_SSL_SESSION_CONST unsigned char *ptr;
     apr_status_t rv;
 
-    if (mc->sesscache->flags & MODSSL_SESSCACHE_FLAG_NOTMPSAFE) {
+    if (mc->sesscache->flags & AP_SOCACHE_FLAG_NOTMPSAFE) {
         ssl_mutex_on(s);
     }
 
     rv = mc->sesscache->retrieve(mc->sesscache_context, s, id, idlen, 
                                  dest, &destlen, p);
 
-    if (mc->sesscache->flags & MODSSL_SESSCACHE_FLAG_NOTMPSAFE) {
+    if (mc->sesscache->flags & AP_SOCACHE_FLAG_NOTMPSAFE) {
         ssl_mutex_off(s);
     }
 
@@ -181,13 +181,13 @@ static int ssl_ext_status_hook(request_rec *r, int flags)
     ap_rputs("</td></tr>\n", r);
     ap_rputs("<tr><td bgcolor=\"#ffffff\">\n", r);
 
-    if (mc->sesscache->flags & MODSSL_SESSCACHE_FLAG_NOTMPSAFE) {
+    if (mc->sesscache->flags & AP_SOCACHE_FLAG_NOTMPSAFE) {
         ssl_mutex_on(r->server);
     }
 
     mc->sesscache->status(mc->sesscache_context, r, flags);
 
-    if (mc->sesscache->flags & MODSSL_SESSCACHE_FLAG_NOTMPSAFE) {
+    if (mc->sesscache->flags & AP_SOCACHE_FLAG_NOTMPSAFE) {
         ssl_mutex_off(r->server);
     }