Mercurial > hg > nginx-vendor-current

comparison src/os/unix/ngx_user.c @ 626:a7a5fa2e395b NGINX_1_0_3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.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.
author Igor Sysoev <http://sysoev.ru>
date Wed, 25 May 2011 00:00:00 +0400
parents 428c6e58046a
children d0f7a625f27c
comparison
equal deleted inserted replaced
625:30f948276abe 626:a7a5fa2e395b
21 #if (NGX_CRYPT) 21 #if (NGX_CRYPT)
22 22
23 #if (NGX_HAVE_GNU_CRYPT_R) 23 #if (NGX_HAVE_GNU_CRYPT_R)
24 24
25 ngx_int_t 25 ngx_int_t
26 ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) 26 ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
27 { 27 {
28 char *value; 28 char *value;
29 size_t len; 29 size_t len;
30 ngx_err_t err; 30 ngx_err_t err;
31 struct crypt_data cd; 31 struct crypt_data cd;
56 } 56 }
57 57
58 #else 58 #else
59 59
60 ngx_int_t 60 ngx_int_t
61 ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) 61 ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
62 { 62 {
63 char *value; 63 char *value;
64 size_t len; 64 size_t len;
65 ngx_err_t err; 65 ngx_err_t err;
66 66