svn commit: r556234 - in /httpd/httpd/branches/2.0.x: CHANGES STATUS modules/mappers/mod_so.c

[sc...@apache.org]

Author: sctemme
Date: Fri Jul 13 23:54:04 2007
New Revision: 556234

URL: http://svn.apache.org/viewvc?view=rev&rev=556234
Log:
Backport of mod_so cookie mis-match error message

Modified:
    httpd/httpd/branches/2.0.x/CHANGES
    httpd/httpd/branches/2.0.x/STATUS
    httpd/httpd/branches/2.0.x/modules/mappers/mod_so.c

Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/CHANGES?view=diff&rev=556234&r1=556233&r2=556234
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Fri Jul 13 23:54:04 2007
@@ -6,6 +6,11 @@
      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>]

Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/STATUS?view=diff&rev=556234&r1=556233&r2=556234
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Fri Jul 13 23:54:04 2007
@@ -133,15 +133,6 @@
         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

Modified: httpd/httpd/branches/2.0.x/modules/mappers/mod_so.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/modules/mappers/mod_so.c?view=diff&rev=556234&r1=556233&r2=556234
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/mappers/mod_so.c (original)
+++ httpd/httpd/branches/2.0.x/modules/mappers/mod_so.c Fri Jul 13 23:54:04 2007
@@ -270,9 +270,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);
     }
 
     /*