Mercurial > hg > nginx-vendor-current

comparison src/event/ngx_event_openssl.c @ 324:f7cd062ee035 NGINX_0_6_6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.6.6 *) Feature: the --sysconfdir=PATH option in configure. *) Feature: named locations. *) Feature: the $args variable can be set with the "set" directive. *) Feature: the $is_args variable. *) Bugfix: fair big weight upstream balancer. *) Bugfix: if a client has closed connection to mail proxy then nginx might not close connection to backend. *) Bugfix: if the same host without specified port was used as backend for HTTP and HTTPS, then nginx used only one port - 80 or 443. *) Bugfix: fix building on Solaris/amd64 by Sun Studio 11 and early versions; bug appeared in 0.6.4.
author Igor Sysoev <http://sysoev.ru>
date Mon, 30 Jul 2007 00:00:00 +0400
parents 9b7db0df50f0
children 5e3b425174f6
comparison
equal deleted inserted replaced
323:7e977a664d91 324:f7cd062ee035
196 196
197 ngx_int_t 197 ngx_int_t
198 ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert, 198 ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
199 ngx_str_t *key) 199 ngx_str_t *key)
200 { 200 {
201 if (ngx_conf_full_name(cf->cycle, cert) == NGX_ERROR) { 201 if (ngx_conf_full_name(cf->cycle, cert, 1) == NGX_ERROR) {
202 return NGX_ERROR; 202 return NGX_ERROR;
203 } 203 }
204 204
205 if (SSL_CTX_use_certificate_chain_file(ssl->ctx, (char *) cert->data) 205 if (SSL_CTX_use_certificate_chain_file(ssl->ctx, (char *) cert->data)
206 == 0) 206 == 0)
209 "SSL_CTX_use_certificate_chain_file(\"%s\") failed", 209 "SSL_CTX_use_certificate_chain_file(\"%s\") failed",
210 cert->data); 210 cert->data);
211 return NGX_ERROR; 211 return NGX_ERROR;
212 } 212 }
213 213
214 if (ngx_conf_full_name(cf->cycle, key) == NGX_ERROR) { 214 if (ngx_conf_full_name(cf->cycle, key, 1) == NGX_ERROR) {
215 return NGX_ERROR; 215 return NGX_ERROR;
216 } 216 }
217 217
218 if (SSL_CTX_use_PrivateKey_file(ssl->ctx, (char *) key->data, 218 if (SSL_CTX_use_PrivateKey_file(ssl->ctx, (char *) key->data,
219 SSL_FILETYPE_PEM) 219 SSL_FILETYPE_PEM)
240 240
241 if (cert->len == 0) { 241 if (cert->len == 0) {
242 return NGX_OK; 242 return NGX_OK;
243 } 243 }
244 244
245 if (ngx_conf_full_name(cf->cycle, cert) == NGX_ERROR) { 245 if (ngx_conf_full_name(cf->cycle, cert, 1) == NGX_ERROR) {
246 return NGX_ERROR; 246 return NGX_ERROR;
247 } 247 }
248 248
249 if (SSL_CTX_load_verify_locations(ssl->ctx, (char *) cert->data, NULL) 249 if (SSL_CTX_load_verify_locations(ssl->ctx, (char *) cert->data, NULL)
250 == 0) 250 == 0)
782 } 782 }
783 783
784 784
785 /* the maximum limit size is the maximum uint32_t value - the page size */ 785 /* the maximum limit size is the maximum uint32_t value - the page size */
786 786
787 if (limit == 0 || limit > NGX_MAX_UINT32_VALUE - ngx_pagesize) { 787 if (limit == 0 || limit > (off_t) (NGX_MAX_UINT32_VALUE - ngx_pagesize)) {
788 limit = NGX_MAX_UINT32_VALUE - ngx_pagesize; 788 limit = NGX_MAX_UINT32_VALUE - ngx_pagesize;
789 } 789 }
790 790
791 791
792 buf = c->ssl->buf; 792 buf = c->ssl->buf;