diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-05-16 14:54:50 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-05-16 14:54:50 +0000 |
| commit | 5dc5945ccf6e64b7b36bb620f4b24e6fdb2364b1 (patch) | |
| tree | 37bc6eae1d5fa69c41621d03f93d06fb5e7d9dd9 /auto | |
| parent | ffc72712505da246d7d55300f71693e55a36957d (diff) | |
| download | nginx-5dc5945ccf6e64b7b36bb620f4b24e6fdb2364b1.tar.gz nginx-5dc5945ccf6e64b7b36bb620f4b24e6fdb2364b1.tar.bz2 | |
"$apr1", "{PLAIN}", and "{SSHA}" password methods in auth basic module
patch by Maxim Dounin
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/lib/conf | 1 | ||||
| -rw-r--r-- | auto/lib/sha1/conf | 3 | ||||
| -rw-r--r-- | auto/modules | 2 | ||||
| -rw-r--r-- | auto/sources | 6 |
4 files changed, 9 insertions, 3 deletions
diff --git a/auto/lib/conf b/auto/lib/conf index f89d922f8..357e7810d 100644 --- a/auto/lib/conf +++ b/auto/lib/conf @@ -43,6 +43,7 @@ if [ $USE_SHA1 = YES ]; then if [ $USE_OPENSSL = YES ]; then have=NGX_HAVE_OPENSSL_SHA1_H . auto/have + have=NGX_HAVE_SHA1 . auto/have SHA1=YES SHA1_LIB=OpenSSL diff --git a/auto/lib/sha1/conf b/auto/lib/sha1/conf index 888537779..af3d3fba2 100644 --- a/auto/lib/sha1/conf +++ b/auto/lib/sha1/conf @@ -4,6 +4,7 @@ if [ $SHA1 != NONE ]; then + have=NGX_HAVE_SHA1 . auto/have CORE_INCS="$CORE_INCS $SHA1" case "$NGX_CC_NAME" in @@ -41,7 +42,7 @@ else # FreeBSD ngx_feature="sha1 in system md library" - ngx_feature_name= + ngx_feature_name=NGX_HAVE_SHA1 ngx_feature_run=no ngx_feature_incs="#include <sha.h>" ngx_feature_path= diff --git a/auto/modules b/auto/modules index 9ac1ddd07..80c557c2b 100644 --- a/auto/modules +++ b/auto/modules @@ -197,6 +197,8 @@ if [ $HTTP_RANDOM_INDEX = YES ]; then fi if [ $HTTP_AUTH_BASIC = YES ]; then + USE_MD5=YES + USE_SHA1=YES have=NGX_CRYPT . auto/have HTTP_MODULES="$HTTP_MODULES $HTTP_AUTH_BASIC_MODULE" HTTP_SRCS="$HTTP_SRCS $HTTP_AUTH_BASIC_SRCS" diff --git a/auto/sources b/auto/sources index 07809baae..0ab99440c 100644 --- a/auto/sources +++ b/auto/sources @@ -34,7 +34,8 @@ CORE_DEPS="src/core/nginx.h \ src/core/ngx_cycle.h \ src/core/ngx_conf_file.h \ src/core/ngx_resolver.h \ - src/core/ngx_open_file_cache.h" + src/core/ngx_open_file_cache.h \ + src/core/ngx_crypt.h" CORE_SRCS="src/core/nginx.c \ @@ -64,7 +65,8 @@ CORE_SRCS="src/core/nginx.c \ src/core/ngx_cpuinfo.c \ src/core/ngx_conf_file.c \ src/core/ngx_resolver.c \ - src/core/ngx_open_file_cache.c" + src/core/ngx_open_file_cache.c \ + src/core/ngx_crypt.c" REGEX_DEPS=src/core/ngx_regex.h |