You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2007/05/18 08:04:33 UTC
svn commit: r539275 - in /httpd/httpd/branches/2.2.x: CHANGES
modules/mappers/mod_so.c
Author: jerenkrantz
Date: Thu May 17 23:04:31 2007
New Revision: 539275
URL: http://svn.apache.org/viewvc?view=rev&rev=539275
Log:
mod_so: Provide more helpful LoadModule feedback when an error occurs.
(Backport of r520733)
Reviewed by: wrowe, rpluem, niq
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/modules/mappers/mod_so.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=diff&rev=539275&r1=539274&r2=539275
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Thu May 17 23:04:31 2007
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.2.5
+ *) mod_so: Provide more helpful LoadModule feedback when an error occurs.
+ [William Rowe]
+
*) mod_alias: Accept path components (URL part) in Redirects. PR 35314.
[Nick Kew]
Modified: httpd/httpd/branches/2.2.x/modules/mappers/mod_so.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/mappers/mod_so.c?view=diff&rev=539275&r1=539274&r2=539275
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/mod_so.c (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/mod_so.c Thu May 17 23:04:31 2007
@@ -268,9 +268,12 @@
*
*/
if (modp->magic != MODULE_MAGIC_COOKIE) {
- return apr_pstrcat(cmd->pool, "API module structure `", modname,
- "' in file ", szModuleFile, " is garbled -"
- " perhaps this is not an Apache module DSO?", NULL);
+ return apr_psprintf(cmd->pool, "API module structure '%s' in file %s "
+ "is garbled - expected signature %08lx but saw "
+ "%08lx - perhaps this is not an Apache module DSO, "
+ "or was compiled for a different Apache version?",
+ modname, szModuleFile,
+ MODULE_MAGIC_COOKIE, modp->magic);
}
/*