httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1594538 - in /httpd/httpd/branches/2.4.x: ./ STATUS modules/aaa/mod_authn_socache.c
Date Wed, 14 May 2014 10:47:10 GMT
Author: trawick
Date: Wed May 14 10:47:09 2014
New Revision: 1594538

URL: http://svn.apache.org/r1594538
Log:
Merge r1583007 from trunk:

mod_authn_socache: fix logging of bogus rv in r1576233

Submitted by: trawick
Reviewed by: jim, ylavic

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/aaa/mod_authn_socache.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1583007

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1594538&r1=1594537&r2=1594538&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed May 14 10:47:09 2014
@@ -106,11 +106,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-aliasmatch_contextinfo.diff
      +1 covener, jim, ylavic
 
-   * mod_authn_socache: fix logging of bugus rv in r1576233 (now in 2.4.x)
-     trunk patch: http://svn.apache.org/r1583007
-     2.4.x patch: trunk patch works
-     +1: trawick, jim, ylavic
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

Modified: httpd/httpd/branches/2.4.x/modules/aaa/mod_authn_socache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/aaa/mod_authn_socache.c?rev=1594538&r1=1594537&r2=1594538&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/aaa/mod_authn_socache.c (original)
+++ httpd/httpd/branches/2.4.x/modules/aaa/mod_authn_socache.c Wed May 14 10:47:09 2014
@@ -107,7 +107,7 @@ static int authn_cache_post_config(apr_p
         errmsg = socache_provider->create(&socache_instance, NULL,
                                           ptmp, pconf);
         if (errmsg) {
-            ap_log_perror(APLOG_MARK, APLOG_CRIT, rv, plog, APLOGNO(02612)
+            ap_log_perror(APLOG_MARK, APLOG_CRIT, 0, plog, APLOGNO(02612)
                         "failed to create mod_socache_shmcb socache "
                         "instance: %s", errmsg);
             return 500;



Mime
View raw message