diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-07-15 16:35:51 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-07-15 16:35:51 +0000 |
| commit | 1c3567ecc81a9f07f3c3d53912114bc5bd5daffa (patch) | |
| tree | ba0b57b32bb1232af3fad0ff38375df9e498ec66 /src/core | |
| parent | 4aa888820d3f13a225ee6bdd596305ea3b4db6f4 (diff) | |
| download | nginx-1c3567ecc81a9f07f3c3d53912114bc5bd5daffa.tar.gz nginx-1c3567ecc81a9f07f3c3d53912114bc5bd5daffa.tar.bz2 | |
nginx-0.0.7-2004-07-15-20:35:51 import
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.c | 4 | ||||
| -rw-r--r-- | src/core/ngx_connection.h | 2 | ||||
| -rw-r--r-- | src/core/ngx_core.h | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index 38418a8ac..6d6103c0e 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -114,6 +114,10 @@ int main(int argc, char *const *argv) log = ngx_log_init_errlog(); ngx_pid = ngx_getpid(); +#if (NGX_OPENSSL) + ngx_ssl_init(log); +#endif + /* init_cycle->log is required for signal handlers and ngx_getopt() */ ngx_memzero(&init_cycle, sizeof(ngx_cycle_t)); diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h index ea69790a0..08714ad45 100644 --- a/src/core/ngx_connection.h +++ b/src/core/ngx_connection.h @@ -91,7 +91,7 @@ struct ngx_connection_s { ngx_str_t addr_text; #if (NGX_OPENSSL) - SSL *ssl; + ngx_ssl_t *ssl; #endif #if (HAVE_IOCP) diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h index 8f30f2f01..575717f10 100644 --- a/src/core/ngx_core.h +++ b/src/core/ngx_core.h @@ -56,8 +56,7 @@ typedef struct ngx_connection_s ngx_connection_t; #include <ngx_conf_file.h> #include <ngx_os.h> #if (NGX_OPENSSL) -#include <openssl/ssl.h> -#include <openssl/err.h> +#include <ngx_event_openssl.h> #endif #include <ngx_connection.h> |