From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Fri, 18 May 2007 06:04:31 +0000 (+0000)
Subject: mod_so: Provide more helpful LoadModule feedback when an error occurs.
X-Git-Tag: 2.2.5~213
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b141a3d4764f7b8b1af2f9437956f9cff5a1f79;p=thirdparty%2Fapache%2Fhttpd.git

mod_so: Provide more helpful LoadModule feedback when an error occurs.

(Backport of r520733)

Reviewed by: wrowe, rpluem, niq


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@539275 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 001e956c246..f8904270fe8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 
diff --git a/modules/mappers/mod_so.c b/modules/mappers/mod_so.c
index b95aba546e7..44bed43b69b 100644
--- a/modules/mappers/mod_so.c
+++ b/modules/mappers/mod_so.c
@@ -268,9 +268,12 @@ static const char *load_module(cmd_parms *cmd, void *dummy,
      *
      */
     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);
     }
 
     /*