Commit 656e2d92 authored by Bill Stoddard's avatar Bill Stoddard
Browse files

Get DSOs working on Windows. Required cross platform change to mod_so.c. 

Tim tested on Windows. Not tested on other platforms.

Submitted by:	Tim Costello
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84920 13f79535-47bb-0310-9956-ffa450edef68
parent 103f870f

modules/mappers/mod_so.c

+4 −3
Changes for modules/mappers/mod_so.c: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static const char *load_module(cmd_parms *cmd, void *dummy, 
{

    ap_status_t stat;

    ap_dso_handle_t *modhandle;

    ap_dso_handle_sym_t *modsym;

    ap_dso_handle_sym_t modsym;

    module *modp;

    const char *szModuleFile=ap_server_root_relative(cmd->pool, filename);

    so_server_conf *sconf;
@@ -263,12 +263,13 @@ static const char *load_module(cmd_parms *cmd, void *dummy, 
     * First with the hidden variant (prefix `AP_') and then with the plain

     * symbol name.

     */

    if ((stat = ap_dso_sym(modsym, modhandle, modname)) != APR_SUCCESS) {

    if ((stat = ap_dso_sym(&modsym, modhandle, modname)) != APR_SUCCESS) {

	return ap_pstrcat(cmd->pool, "Can't locate API module structure `", modname,

		       "' in file ", szModuleFile, ": ", ap_os_dso_error(), NULL);

    }

    modi->modp = (module *)modsym;

    modp = (module*) modsym;

    modp->dynamic_load_handle = (ap_dso_handle_t *)modhandle;

    modi->modp = modp;



    /* 

     * Make sure the found module structure is really a module structure