Mercurial > hg > nginx-vendor-current

comparison src/os/unix/ngx_user.c @ 694:88a1b4797f2e NGINX_1_3_10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.3.10 *) Change: domain names specified in configuration file are now resolved to IPv6 addresses as well as IPv4 ones. *) Change: now if the "include" directive with mask is used on Unix systems, included files are sorted in alphabetical order. *) Change: the "add_header" directive adds headers to 201 responses. *) Feature: the "geo" directive now supports IPv6 addresses in CIDR notation. *) Feature: the "flush" and "gzip" parameters of the "access_log" directive. *) Feature: variables support in the "auth_basic" directive. *) Bugfix: nginx could not be built with the ngx_http_perl_module in some cases. *) Bugfix: a segmentation fault might occur in a worker process if the ngx_http_xslt_module was used. *) Bugfix: nginx could not be built on MacOSX in some cases. Thanks to Piotr Sikora. *) Bugfix: the "limit_rate" directive with high rates might result in truncated responses on 32-bit platforms. Thanks to Alexey Antropov. *) Bugfix: a segmentation fault might occur in a worker process if the "if" directive was used. Thanks to Piotr Sikora. *) Bugfix: a "100 Continue" response was issued with "413 Request Entity Too Large" responses. *) Bugfix: the "image_filter", "image_filter_jpeg_quality" and "image_filter_sharpen" directives might be inherited incorrectly. Thanks to Ian Babrou. *) Bugfix: "crypt_r() failed" errors might appear if the "auth_basic" directive was used on Linux. *) Bugfix: in backup servers handling. Thanks to Thomas Chen. *) Bugfix: proxied HEAD requests might return incorrect response if the "gzip" directive was used.
author Igor Sysoev <http://sysoev.ru>
date Tue, 25 Dec 2012 00:00:00 +0400
parents f5b859b2f097
children
comparison
equal deleted inserted replaced
693:cfd4279acc6e 694:88a1b4797f2e
26 ngx_int_t 26 ngx_int_t
27 ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) 27 ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
28 { 28 {
29 char *value; 29 char *value;
30 size_t len; 30 size_t len;
31 ngx_err_t err;
32 struct crypt_data cd; 31 struct crypt_data cd;
33
34 ngx_set_errno(0);
35 32
36 cd.initialized = 0; 33 cd.initialized = 0;
37 /* work around the glibc bug */ 34 /* work around the glibc bug */
38 cd.current_salt[0] = ~salt[0]; 35 cd.current_salt[0] = ~salt[0];
39 36
40 value = crypt_r((char *) key, (char *) salt, &cd); 37 value = crypt_r((char *) key, (char *) salt, &cd);
41 38
42 err = ngx_errno; 39 if (value) {
43
44 if (err == 0) {
45 len = ngx_strlen(value) + 1; 40 len = ngx_strlen(value) + 1;
46 41
47 *encrypted = ngx_pnalloc(pool, len); 42 *encrypted = ngx_pnalloc(pool, len);
48 if (*encrypted) { 43 if (*encrypted == NULL) {
49 ngx_memcpy(*encrypted, value, len); 44 return NGX_ERROR;
50 return NGX_OK;
51 } 45 }
46
47 ngx_memcpy(*encrypted, value, len);
48 return NGX_OK;
52 } 49 }
53 50
54 ngx_log_error(NGX_LOG_CRIT, pool->log, err, "crypt_r() failed"); 51 ngx_log_error(NGX_LOG_CRIT, pool->log, ngx_errno, "crypt_r() failed");
55 52
56 return NGX_ERROR; 53 return NGX_ERROR;
57 } 54 }
58 55
59 #else 56 #else
73 return NGX_AGAIN; 70 return NGX_AGAIN;
74 } 71 }
75 72
76 #endif 73 #endif
77 74
78 ngx_set_errno(0);
79
80 value = crypt((char *) key, (char *) salt); 75 value = crypt((char *) key, (char *) salt);
81 76
82 if (value) { 77 if (value) {
83 len = ngx_strlen(value) + 1; 78 len = ngx_strlen(value) + 1;
84 79
85 *encrypted = ngx_pnalloc(pool, len); 80 *encrypted = ngx_pnalloc(pool, len);
86 if (*encrypted) { 81 if (*encrypted == NULL) {
87 ngx_memcpy(*encrypted, value, len); 82 #if (NGX_THREADS && NGX_NONREENTRANT_CRYPT)
83 ngx_mutex_unlock(ngx_crypt_mutex);
84 #endif
85 return NGX_ERROR;
88 } 86 }
89 87
88 ngx_memcpy(*encrypted, value, len);
90 #if (NGX_THREADS && NGX_NONREENTRANT_CRYPT) 89 #if (NGX_THREADS && NGX_NONREENTRANT_CRYPT)
91 ngx_mutex_unlock(ngx_crypt_mutex); 90 ngx_mutex_unlock(ngx_crypt_mutex);
92 #endif 91 #endif
93 return NGX_OK; 92 return NGX_OK;
94 } 93 }