From: Sander Temme <sctemme@apache.org>
Date: Sat, 14 Jul 2007 06:54:04 +0000 (+0000)
Subject: Backport of mod_so cookie mis-match error message
X-Git-Tag: 2.0.60~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=690fcf0b249f60d6c6a46b10c71bd431b3fcf2f2;p=thirdparty%2Fapache%2Fhttpd.git

Backport of mod_so cookie mis-match error message

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

diff --git a/CHANGES b/CHANGES
index 54a1eb607e6..faaf72d4ff0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@ Changes with Apache 2.0.60
      server-status page and ExtendedStatus enabled, for browsers which
      perform charset "detection".  Reported by Stefan Esser.  [Joe Orton]
 
+  *) mod_so: Solve dev's confusion by reporting expected/seen module
+     magic signatures when failing with a 'garbled' message, and solve
+     user's confusion by pointing out 'perhaps compiled for a different
+     version of apache?'.  [William Rowe]
+
   *) mod_ssl: initialize thread locks before initializing the hardware
      acceleration library, so the latter can make use of the former. 
      PR 20951. [<adunn ncipher.com>]
diff --git a/STATUS b/STATUS
index a8cc69eb2f8..9f4a6d49b6e 100644
--- a/STATUS
+++ b/STATUS
@@ -133,15 +133,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         http://people.apache.org/~jorton/httpd-2.0.x-CVE-2007-3304.patch
       +1: jorton, jim, rpluem
 
-    * Backport 520733; more helpful LoadModule feedback, so it reads;
-          Syntax error in -C/-c directive:
-          API module structure 'ftp_module' in file /.../modules/mod_ftp.so 
-          is garbled - expected signature 41503230 but saw 41503232 -
-          perhaps this is not an Apache module DSO, or was compiled 
-          for a different Apache version?
-       http://svn.apache.org/viewvc?view=rev&rev=520733
-       +1: wrowe, sctemme, rpluem
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
     identify exactly what the proposed changes are!  Add all new
diff --git a/modules/mappers/mod_so.c b/modules/mappers/mod_so.c
index 22940768871..984cb54946d 100644
--- a/modules/mappers/mod_so.c
+++ b/modules/mappers/mod_so.c
@@ -270,9 +270,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);
     }
 
     /*