Update some dependancies. Move the final two files out of apr/inc and into

apr/include.  Basically just finish some cleanup from some changes I've
been making over the last two days.

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

diff --git a/modules/aaa/mod_auth.c b/modules/aaa/mod_auth.c
index 107d7d9e82b681b69e612916f09c83d60bf5c663..6b348f5e24fc339825b0e7e6b07732b9dbed49f8 100644 (file)
--- a/modules/aaa/mod_auth.c
+++ b/modules/aaa/mod_auth.c
@@ -203,7 +203,7 @@ static int authenticate_basic_user(request_rec *r)
     (auth_config_rec *) ap_get_module_config(r->per_dir_config, &auth_module);
     const char *sent_pw;
     char *real_pw;
-    char *invalid_pw;
+    ap_status_t invalid_pw;
     int res;
 
     if ((res = ap_get_basic_auth_pw(r, &sent_pw)))
@@ -221,10 +221,11 @@ static int authenticate_basic_user(request_rec *r)
        return AUTH_REQUIRED;
     }
     invalid_pw = ap_validate_password(sent_pw, real_pw);
-    if (invalid_pw != NULL) {
+    if (invalid_pw != APR_SUCCESS) {
        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
-                     "user %s: authentication failure for \"%s\": %s",
-                     r->user, r->uri, invalid_pw);
+                     "user %s: authentication failure for \"%s\": "
+                      "Password Mismatch",
+                     r->user, r->uri);
        ap_note_basic_auth_failure(r);
        return AUTH_REQUIRED;
     }

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index aeefbad8290d59d9848da2a4331cb52f2231e9c2..157a75fdd8b994b4625e4d83c4d311fd91aa54ac 100644 (file)
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -72,7 +72,7 @@
 #include "http_log.h"
 #include "http_main.h"
 #include "util_script.h"
-#include "fnmatch.h"
+#include "apr_fnmatch.h"
 
 module MODULE_VAR_EXPORT autoindex_module;
 

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 3dc26270af5ffbf317e38ede489f9b845173ebf4..598f19dbd2f13e64d692f1037a4fd34c2067f529 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -67,7 +67,7 @@
 #include "http_log.h"
 #include "rfc1413.h"
 #include "util_md5.h"
-#include "fnmatch.h"
+#include "apr_fnmatch.h"
 #include "http_connection.h"
 
 /* Allow Apache to use ap_mmap */

diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index 7fe520e584b1474bf2945accb100ce85e87acea2..5c7cacfc17345a1021f42e85c3b048db746ee6f7 100644 (file)
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -76,7 +76,7 @@
 #if 0
 #include "scoreboard.h"
 #endif
-#include "fnmatch.h"
+#include "apr_fnmatch.h"
 
 HOOK_STRUCT(
            HOOK_LINK(translate_name)