diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-05-25 14:55:59 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2011-05-25 14:55:59 +0000 |
| commit | 05db4154017269f45cc8742ca187855e1331b08d (patch) | |
| tree | b39f6526ef879ba55c0d334385cdded679fab736 /src/os/unix | |
| parent | 1b122b0876a0f0e1efcb4be6d730f353b04759ea (diff) | |
| download | nginx-1.0.3.tar.gz | |
Changes with nginx 1.0.3 25 May 2011v1.0.3
*) Feature: the "auth_basic_user_file" directive supports "$apr1",
"{PLAIN}", and "{SSHA}" password encryption methods.
Thanks to Maxim Dounin.
*) Feature: the "geoip_org" directive and $geoip_org variable.
Thanks to Alexander Uskov, Arnaud Granal, and Denis F. Latypoff.
*) Feature: ngx_http_geo_module and ngx_http_geoip_module support IPv4
addresses mapped to IPv6 addresses.
*) Bugfix: a segmentation fault occurred in a worker process during
testing IPv4 address mapped to IPv6 address, if access or deny rules
were defined only for IPv6; the bug had appeared in 0.8.22.
*) Bugfix: a cached reponse may be broken if proxy/fastcgi/scgi/
uwsgi_cache_bypass and proxy/fastcgi/scgi/uwsgi_no_cache directive
values were different; the bug had appeared in 0.8.46.
Diffstat (limited to 'src/os/unix')
| -rw-r--r-- | src/os/unix/ngx_user.c | 4 | ||||
| -rw-r--r-- | src/os/unix/ngx_user.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/os/unix/ngx_user.c b/src/os/unix/ngx_user.c index 165c6a46b..c46fb2bfd 100644 --- a/src/os/unix/ngx_user.c +++ b/src/os/unix/ngx_user.c @@ -23,7 +23,7 @@ #if (NGX_HAVE_GNU_CRYPT_R) ngx_int_t -ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) +ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) { char *value; size_t len; @@ -58,7 +58,7 @@ ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) #else ngx_int_t -ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) +ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) { char *value; size_t len; diff --git a/src/os/unix/ngx_user.h b/src/os/unix/ngx_user.h index 7cd944d01..68d1c6e5f 100644 --- a/src/os/unix/ngx_user.h +++ b/src/os/unix/ngx_user.h @@ -16,7 +16,7 @@ typedef uid_t ngx_uid_t; typedef gid_t ngx_gid_t; -ngx_int_t ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, +ngx_int_t ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted); |