fix additional use of "session" terminology, following r907917

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

diff --git a/modules/cache/mod_socache_dbm.c b/modules/cache/mod_socache_dbm.c
index d569c99ca7d963e4ed23d299b50b10ad92ff4c45..3e15d1cec55cb5f88f46838843e6760c6e206210 100644 (file)
--- a/modules/cache/mod_socache_dbm.c
+++ b/modules/cache/mod_socache_dbm.c
@@ -452,7 +452,7 @@ static void socache_dbm_expire(ap_socache_instance_t *ctx, server_rec *s)
     }
 
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                 "Inter-Process Session Cache (DBM) Expiry: "
+                 "DBM socache expiry: "
                  "old: %d, new: %d, removed: %d",
                  elts, elts-deleted, deleted);
 }

diff --git a/modules/cache/mod_socache_dc.c b/modules/cache/mod_socache_dc.c
index 91056cc8545b833b9968c58e91d38d971f358693..331b29ef9c52d23346267f6afb613f84cabe9267 100644 (file)
--- a/modules/cache/mod_socache_dc.c
+++ b/modules/cache/mod_socache_dc.c
@@ -104,10 +104,10 @@ static apr_status_t socache_dc_store(ap_socache_instance_t *ctx, server_rec *s,
     /* Send the serialised session to the distributed cache context */
     if (!DC_CTX_add_session(ctx->dc, id, idlen, der, der_len,
                             apr_time_in_msec(expiry)) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "distributed scache 'add_session' failed");
+        ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "distributed scache 'store' failed");
         return APR_EGENERAL;
     }
-    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "distributed scache 'add_session' successful");
+    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "distributed scache 'store' successful");
     return APR_SUCCESS;
 }
 
@@ -120,15 +120,15 @@ static apr_status_t socache_dc_retrieve(ap_socache_instance_t *ctx, server_rec *
 
     /* Retrieve any corresponding session from the distributed cache context */
     if (!DC_CTX_get_session(ctx->dc, id, idlen, dest, *destlen, &data_len)) {
-        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "distributed scache 'get_session' MISS");
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "distributed scache 'retrieve' MISS");
         return APR_EGENERAL;
     }
     if (data_len > *destlen) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "distributed scache 'get_session' OVERFLOW");
+        ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "distributed scache 'retrieve' OVERFLOW");
         return APR_ENOSPC;
     }
     *destlen = data_len;
-    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "distributed scache 'get_session' HIT");
+    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "distributed scache 'retrieve' HIT");
     return APR_SUCCESS;
 }
 
@@ -138,10 +138,10 @@ static apr_status_t socache_dc_remove(ap_socache_instance_t *ctx,
 {
     /* Remove any corresponding session from the distributed cache context */
     if (!DC_CTX_remove_session(ctx->dc, id, idlen)) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "distributed scache 'remove_session' MISS");
+        ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "distributed scache 'remove' MISS");
         return APR_NOTFOUND;
     } else {
-        ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "distributed scache 'remove_session' HIT");
+        ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "distributed scache 'remove' HIT");
         return APR_SUCCESS;
     }
 }

diff --git a/modules/cache/mod_socache_shmcb.c b/modules/cache/mod_socache_shmcb.c
index 9440ae56a32df2ab4054deba7ed6f420ef48249e..487f41a2575492acf97ff6be147fc034065c9c0e 100644 (file)
--- a/modules/cache/mod_socache_shmcb.c
+++ b/modules/cache/mod_socache_shmcb.c
@@ -750,7 +750,7 @@ static int shmcb_subcache_store(server_rec *s, SHMCBHeader *header,
                      "data_used=%d", subcache->idx_used, subcache->data_used);
     }
 
-    /* HERE WE ASSUME THAT THE NEW SESSION SHOULD GO ON THE END! I'M NOT
+    /* HERE WE ASSUME THAT THE NEW ENTRY SHOULD GO ON THE END! I'M NOT
      * CHECKING WHETHER IT SHOULD BE GENUINELY "INSERTED" SOMEWHERE.
      *
      * We aught to fix that.  httpd (never mind third party modules)