wrowe 02/05/20 08:23:42
Modified: dso/win32 dso.c
Log:
NEVER default to ALTERNATE_SEARCH_PATH!!! It's a great last resort,
but a lousy first choice. Provided that httpd was mislocating libapr,
ssleay32, etc, from the wrong locations. Still, it's a good fail-over.
Revision Changes Path
1.32 +2 -2 apr/dso/win32/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apr/dso/win32/dso.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- dso.c 20 Mar 2002 04:25:45 -0000 1.31
+++ dso.c 20 May 2002 15:23:42 -0000 1.32
@@ -112,9 +112,9 @@
#ifndef _WIN32_WCE
em = SetErrorMode(SEM_FAILCRITICALERRORS);
#endif
- os_handle = LoadLibraryExW(wpath, NULL,
LOAD_WITH_ALTERED_SEARCH_PATH);
+ os_handle = LoadLibraryExW(wpath, NULL, 0);
if (!os_handle)
- os_handle = LoadLibraryExW(wpath, NULL, 0);
+ os_handle = LoadLibraryExW(wpath, NULL,
LOAD_WITH_ALTERED_SEARCH_PATH);
if (!os_handle)
rv = apr_get_os_error();
#ifndef _WIN32_WCE