summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuediger Pluem <rpluem@apache.org>2011-02-09 09:03:40 +0100
committerRuediger Pluem <rpluem@apache.org>2011-02-09 09:03:40 +0100
commitabd169214f5979440863cccf52512c1898c72fa5 (patch)
treea25610addda9f7c26bc728f02ee119cbdcabf6cb
parentRPM spec file: Make the httpd init script consistent with the htcacheclean (diff)
downloadapache2-abd169214f5979440863cccf52512c1898c72fa5.tar.xz
apache2-abd169214f5979440863cccf52512c1898c72fa5.zip
* Make module compile by fixing some typos.
PR: 50735 Submitted by: Mark Montague <mark catseye.org> Reviewed by: rpluem git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068778 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES3
-rw-r--r--modules/cache/mod_socache_dc.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index a795095108..a89d2af1fc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
Changes with Apache 2.3.11
+ *) mod_socache_dc: Make module compile by fixing some typos.
+ PR 50735 [Mark Montague <mark catseye.org>]
+
*) prefork: Update MPM state in children during a graceful stop or
restart. PR 41743. [Andrew Punch <andrew.punch 247realmedia.com>]
diff --git a/modules/cache/mod_socache_dc.c b/modules/cache/mod_socache_dc.c
index 74b879cb22..1c11d089fd 100644
--- a/modules/cache/mod_socache_dc.c
+++ b/modules/cache/mod_socache_dc.c
@@ -100,10 +100,10 @@ static apr_status_t socache_dc_store(ap_socache_instance_t *ctx, server_rec *s,
* Uhm - because most things expire things at a specific time?
* Were the API were thought out expiry - r->request_time is a good approximation
*/
- expiry -= apr_time_t(NULL);
+ expiry -= apr_time_now();
/* 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)) {
+ apr_time_msec(expiry))) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, "distributed scache 'store' failed");
return APR_EGENERAL;
}