Mercurial > hg > nginx
comparison src/event/ngx_event_openssl.h @ 4159:718f2154b813 stable-1.0
Merging r3933, r4154:
A new fix for the case when ssl_session_cache defined, but ssl is not
enabled in any server. The previous r1033 does not help when unused zone
becomes used after reconfiguration, so it is backed out.
The initial thought was to make SSL modules independed from SSL implementation
and to keep OpenSSL code dependance as much as in separate files.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 30 Sep 2011 13:36:33 +0000 |
parents | f87edc142316 |
children | fd40c9ef750d |
comparison
equal
deleted
inserted
replaced
4158:b78768308e30 | 4159:718f2154b813 |
---|---|
102 RSA *ngx_ssl_rsa512_key_callback(SSL *ssl, int is_export, int key_length); | 102 RSA *ngx_ssl_rsa512_key_callback(SSL *ssl, int is_export, int key_length); |
103 ngx_int_t ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file); | 103 ngx_int_t ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file); |
104 ngx_int_t ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name); | 104 ngx_int_t ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name); |
105 ngx_int_t ngx_ssl_session_cache(ngx_ssl_t *ssl, ngx_str_t *sess_ctx, | 105 ngx_int_t ngx_ssl_session_cache(ngx_ssl_t *ssl, ngx_str_t *sess_ctx, |
106 ssize_t builtin_session_cache, ngx_shm_zone_t *shm_zone, time_t timeout); | 106 ssize_t builtin_session_cache, ngx_shm_zone_t *shm_zone, time_t timeout); |
107 ngx_int_t ngx_ssl_session_cache_init(ngx_shm_zone_t *shm_zone, void *data); | |
107 ngx_int_t ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, | 108 ngx_int_t ngx_ssl_create_connection(ngx_ssl_t *ssl, ngx_connection_t *c, |
108 ngx_uint_t flags); | 109 ngx_uint_t flags); |
109 | 110 |
110 void ngx_ssl_remove_cached_session(SSL_CTX *ssl, ngx_ssl_session_t *sess); | 111 void ngx_ssl_remove_cached_session(SSL_CTX *ssl, ngx_ssl_session_t *sess); |
111 ngx_int_t ngx_ssl_set_session(ngx_connection_t *c, ngx_ssl_session_t *session); | 112 ngx_int_t ngx_ssl_set_session(ngx_connection_t *c, ngx_ssl_session_t *session); |