www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

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

Browse Source 
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
This commit is contained in:
Ryan Bloom
1999-11-23 13:47:01 +00:00
parent 97660e669c
commit e35f6d1f09
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/aaa/mod_auth.c
View File

@@ -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); (auth_config_rec *) ap_get_module_config(r->per_dir_config, &auth_module);
const char *sent_pw; const char *sent_pw;
char *real_pw; char *real_pw;
char *invalid_pw; ap_status_t invalid_pw;
int res; int res;
if ((res = ap_get_basic_auth_pw(r, &sent_pw))) 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; return AUTH_REQUIRED;
} }
invalid_pw = ap_validate_password(sent_pw, real_pw); 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, ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
"user %s: authentication failure for \"%s\": %s", "user %s: authentication failure for \"%s\": "
r->user, r->uri, invalid_pw); "Password Mismatch",
r->user, r->uri);
ap_note_basic_auth_failure(r); ap_note_basic_auth_failure(r);
return AUTH_REQUIRED; return AUTH_REQUIRED;
} }

2
modules/generators/mod_autoindex.c
View File

@@ -72,7 +72,7 @@
#include "http_log.h" #include "http_log.h"
#include "http_main.h" #include "http_main.h"
#include "util_script.h" #include "util_script.h"
#include "fnmatch.h" #include "apr_fnmatch.h"
module MODULE_VAR_EXPORT autoindex_module; module MODULE_VAR_EXPORT autoindex_module;

2
modules/http/http_core.c
View File

@@ -67,7 +67,7 @@
#include "http_log.h" #include "http_log.h"
#include "rfc1413.h" #include "rfc1413.h"
#include "util_md5.h" #include "util_md5.h"
#include "fnmatch.h" #include "apr_fnmatch.h"
#include "http_connection.h" #include "http_connection.h"
/* Allow Apache to use ap_mmap */ /* Allow Apache to use ap_mmap */

2
modules/http/http_request.c
View File

@@ -76,7 +76,7 @@
#if 0 #if 0
#include "scoreboard.h" #include "scoreboard.h"
#endif #endif
#include "fnmatch.h" #include "apr_fnmatch.h"
HOOK_STRUCT( HOOK_STRUCT(
HOOK_LINK(translate_name) HOOK_LINK(translate_name)