svn commit: r1068778 - in /httpd/httpd/trunk: CHANGES modules/cache/mod_socache_dc.c

[rp...@apache.org]

Author: rpluem
Date: Wed Feb  9 08:03:40 2011
New Revision: 1068778

URL: http://svn.apache.org/viewvc?rev=1068778&view=rev
Log:
* Make module compile by fixing some typos.

PR: 50735
Submitted by: Mark Montague <mark catseye.org>
Reviewed by: rpluem

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/cache/mod_socache_dc.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1068778&r1=1068777&r2=1068778&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Feb  9 08:03:40 2011
@@ -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>]
 

Modified: httpd/httpd/trunk/modules/cache/mod_socache_dc.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_dc.c?rev=1068778&r1=1068777&r2=1068778&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_dc.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_dc.c Wed Feb  9 08:03:40 2011
@@ -100,10 +100,10 @@ static apr_status_t socache_dc_store(ap_
      * 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;
     }