httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1210133 - in /httpd/httpd/branches/2.4.x: ./ modules/aaa/mod_authn_socache.c modules/ssl/ssl_engine_config.c
Date Sun, 04 Dec 2011 16:10:06 GMT
Author: sf
Date: Sun Dec  4 16:10:06 2011
New Revision: 1210133

URL: http://svn.apache.org/viewvc?rev=1210133&view=rev
Log:
Merge r1210130:
More pointers to mod_socache*

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

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec  4 16:10:06 2011
@@ -1,3 +1,3 @@
 /httpd/httpd/branches/revert-ap-ldap:1150158-1150173
 /httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124
+/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130

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=1210133&r1=1210132&r2=1210133&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 Sun Dec  4 16:10:06 2011
@@ -95,7 +95,8 @@ static int authn_cache_post_config(apr_p
     if (socache_provider == NULL) {
         ap_log_perror(APLOG_MARK, APLOG_CRIT, 0, plog,
                       "Please select a socache provider with AuthnCacheSOCache "
-                      "(no default found on this platform)");
+                      "(no default found on this platform). Maybe you need to "
+                      "load mod_socache_shmcb or another socache module first");
         return 500; /* An HTTP status would be a misnomer! */
     }
 
@@ -143,10 +144,15 @@ static const char *authn_cache_socache(c
                                        const char *arg)
 {
     const char *errmsg = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+    if (errmsg)
+        return errmsg;
     socache_provider = ap_lookup_provider(AP_SOCACHE_PROVIDER_GROUP, arg,
                                           AP_SOCACHE_PROVIDER_VERSION);
     if (socache_provider == NULL) {
-        errmsg = "Unknown socache provider";
+        errmsg = apr_psprintf(cmd->pool,
+                              "Unknown socache provider '%s'. Maybe you need "
+                              "to load the appropriate socache module "
+                              "(mod_socache_%s?)", arg, arg);
     }
     return errmsg;
 }

Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_config.c?rev=1210133&r1=1210132&r2=1210133&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_config.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_config.c Sun Dec  4 16:10:06 2011
@@ -1689,7 +1689,9 @@ const char *ssl_cmd_SSLStaplingCache(cmd
         all_names = apr_array_pstrcat(cmd->pool, name_list, ',');
 
         err = apr_psprintf(cmd->pool, "'%s' stapling cache not supported "
-                           "(known names: %s)", name, all_names);
+                           "(known names: %s) Maybe you need to load the "
+                           "appropriate socache module (mod_socache_%s?)",
+                           name, all_names, name);
     }
 
     if (err) {



Mime
View raw message