summaryrefslogtreecommitdiff
path: root/dso
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2002-05-20 15:23:42 +0000
committerWilliam A. Rowe Jr <wrowe@apache.org>2002-05-20 15:23:42 +0000
commitb928e0b778ba80659f502a9efbb3e191b5ec0bc0 (patch)
treec6905dbb78c9041b19886088614ca144a05e7061 /dso
parentec816674a91e52a9b5bbb53097d1ce025468fe35 (diff)
downloadapr-b928e0b778ba80659f502a9efbb3e191b5ec0bc0.tar.gz
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. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@63417 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dso')
-rw-r--r--dso/win32/dso.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dso/win32/dso.c b/dso/win32/dso.c
index 98c18878a..8deec356a 100644
--- a/dso/win32/dso.c
+++ b/dso/win32/dso.c
@@ -112,9 +112,9 @@ APR_DECLARE(apr_status_t) apr_dso_load(struct apr_dso_handle_t **res_handle,
#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