Mercurial > hg > nginx-quic
comparison src/event/ngx_event_openssl.c @ 479:c52408583801 release-0.1.14
nginx-0.1.14-RELEASE import
*) Feature: the autoconfiguration directives:
--http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and
--http-fastcgi-temp-path=PATH
*) Change: the directory name for the temporary files with the client
request body is specified by directive client_body_temp_path, by
default it is <prefix>/client_body_temp.
*) Feature: the ngx_http_fastcgi_module and the directives:
fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params,
fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout,
fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers,
fastcgi_busy_buffers_size, fastcgi_temp_path,
fastcgi_max_temp_file_size, fastcgi_temp_file_write_size,
fastcgi_next_upstream, and fastcgi_x_powered_by.
*) Bugfix: the "[alert] zero size buf" error; the bug had appeared in
0.1.3.
*) Change: the URI must be specified after the host name in the
proxy_pass directive.
*) Change: the %3F symbol in the URI was considered as the argument
string start.
*) Feature: the unix domain sockets support in the
ngx_http_proxy_module.
*) Feature: the ssl_engine and ssl_ciphers directives.
Thanks to Sergey Skvortsov for SSL-accelerator.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 18 Jan 2005 13:03:58 +0000 |
parents | 8e8f3af115b5 |
children | 45a460f82aec |
comparison
equal
deleted
inserted
replaced
478:e6576f690993 | 479:c52408583801 |
---|---|
6 | 6 |
7 #include <ngx_config.h> | 7 #include <ngx_config.h> |
8 #include <ngx_core.h> | 8 #include <ngx_core.h> |
9 #include <ngx_event.h> | 9 #include <ngx_event.h> |
10 | 10 |
11 #include <openssl/engine.h> | |
12 | |
11 | 13 |
12 static void ngx_ssl_write_handler(ngx_event_t *wev); | 14 static void ngx_ssl_write_handler(ngx_event_t *wev); |
13 static ssize_t ngx_ssl_write(ngx_connection_t *c, u_char *data, size_t size); | 15 static ssize_t ngx_ssl_write(ngx_connection_t *c, u_char *data, size_t size); |
14 static void ngx_ssl_read_handler(ngx_event_t *rev); | 16 static void ngx_ssl_read_handler(ngx_event_t *rev); |
15 | 17 |
16 | 18 |
17 ngx_int_t ngx_ssl_init(ngx_log_t *log) | 19 ngx_int_t ngx_ssl_init(ngx_log_t *log) |
18 { | 20 { |
21 ENGINE *engine; | |
22 | |
19 SSL_library_init(); | 23 SSL_library_init(); |
20 SSL_load_error_strings(); | 24 SSL_load_error_strings(); |
25 ENGINE_load_builtin_engines(); | |
21 | 26 |
22 return NGX_OK; | 27 return NGX_OK; |
23 } | 28 } |
24 | 29 |
25 | 30 |
69 n = SSL_read(c->ssl->ssl, buf, size); | 74 n = SSL_read(c->ssl->ssl, buf, size); |
70 | 75 |
71 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_read: %d", n); | 76 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_read: %d", n); |
72 | 77 |
73 if (n > 0) { | 78 if (n > 0) { |
79 | |
80 #if (NGX_DEBUG) | |
81 | |
82 if (!c->ssl->handshaked && SSL_is_init_finished(c->ssl->ssl)) { | |
83 char buf[129], *s, *d; | |
84 SSL_CIPHER *cipher; | |
85 | |
86 c->ssl->handshaked = 1; | |
87 | |
88 cipher = SSL_get_current_cipher(c->ssl->ssl); | |
89 | |
90 if (cipher) { | |
91 SSL_CIPHER_description(cipher, &buf[1], 128); | |
92 | |
93 for (s = &buf[1], d = buf; *s; s++) { | |
94 if (*s == ' ' && *d == ' ') { | |
95 continue; | |
96 } | |
97 | |
98 if (*s == '\n' || *s == '\r') { | |
99 continue; | |
100 } | |
101 | |
102 *++d = *s; | |
103 } | |
104 | |
105 if (*d != ' ') { | |
106 d++; | |
107 } | |
108 | |
109 *d = '\0'; | |
110 | |
111 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, | |
112 "SSL cipher: \"%s\"", &buf[1]); | |
113 } else { | |
114 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, | |
115 "SSL no shared ciphers"); | |
116 } | |
117 } | |
118 | |
119 #endif | |
120 | |
74 if (c->ssl->saved_write_handler) { | 121 if (c->ssl->saved_write_handler) { |
75 | 122 |
76 c->write->event_handler = c->ssl->saved_write_handler; | 123 c->write->event_handler = c->ssl->saved_write_handler; |
77 c->ssl->saved_write_handler = NULL; | 124 c->ssl->saved_write_handler = NULL; |
78 c->write->ready = 1; | 125 c->write->ready = 1; |