Commit e8bf95d2 authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

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
parent d57ac498

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                        -*- 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]















































modules/mappers/mod_so.c



+6
−3






























Original line number
Diff line number
Diff line








@@ -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);















    }































    /*