comparison src/event/ngx_event_openssl.c @ 58:b55cbf18157e NGINX_0_1_29

nginx 0.1.29 *) Feature: the ngx_http_ssi_module supports "include virtual" command. *) Feature: the ngx_http_ssi_module supports the condition command like 'if expr="$NAME"' and "else" and "endif" commands. Only one nested level is supported. *) Feature: the ngx_http_ssi_module supports the DATE_LOCAL and DATE_GMT variables and "config timefmt" command. *) Feature: the "ssi_ignore_recycled_buffers" directive. *) Bugfix: the "echo" command did not show the default value for the empty QUERY_STRING variable. *) Change: the ngx_http_proxy_module was rewritten. *) Feature: the "proxy_redirect", "proxy_pass_request_headers", "proxy_pass_request_body", and "proxy_method" directives. *) Feature: the "proxy_set_header" directive. The "proxy_x_var" was canceled and must be replaced with the proxy_set_header directive. *) Change: the "proxy_preserve_host" is canceled and must be replaced with the "proxy_set_header Host $host" and the "proxy_redirect off" directives, the "proxy_set_header Host $host:$proxy_port" directive and the appropriate proxy_redirect directives. *) Change: the "proxy_set_x_real_ip" is canceled and must be replaced with the "proxy_set_header X-Real-IP $remote_addr" directive. *) Change: the "proxy_add_x_forwarded_for" is canceled and must be replaced with the "proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for" directive. *) Change: the "proxy_set_x_url" is canceled and must be replaced with the "proxy_set_header X-URL http://$host:$server_port$request_uri" directive. *) Feature: the "fastcgi_param" directive. *) Change: the "fastcgi_root", "fastcgi_set_var" and "fastcgi_params" directive are canceled and must be replaced with the fastcgi_param directives. *) Feature: the "index" directive can use the variables. *) Feature: the "index" directive can be used at http and server levels. *) Change: the last index only in the "index" directive can be absolute. *) Feature: the "rewrite" directive can use the variables. *) Feature: the "internal" directive. *) Feature: the CONTENT_LENGTH, CONTENT_TYPE, REMOTE_PORT, SERVER_ADDR, SERVER_PORT, SERVER_PROTOCOL, DOCUMENT_ROOT, SERVER_NAME, REQUEST_METHOD, REQUEST_URI, and REMOTE_USER variables. *) Change: nginx now passes the invalid lines in a client request headers or a backend response header. *) Bugfix: if the backend did not transfer response for a long time and the "send_timeout" was less than "proxy_read_timeout", then nginx returned the 408 response. *) Bugfix: the segmentation fault was occurred if the backend sent an invalid line in response header; bug appeared in 0.1.26. *) Bugfix: the segmentation fault may occurred in FastCGI fault tolerance configuration. *) Bugfix: the "expires" directive did not remove the previous "Expires" and "Cache-Control" headers. *) Bugfix: nginx did not take into account trailing dot in "Host" header line. *) Bugfix: the ngx_http_auth_module did not work under Linux. *) Bugfix: the rewrite directive worked incorrectly, if the arguments were in a request. *) Bugfix: nginx could not be built on MacOS X.
author Igor Sysoev <http://sysoev.ru>
date Thu, 12 May 2005 00:00:00 +0400
parents 72eb30262aac
children df7d3fff122b
comparison
equal deleted inserted replaced
57:5df375c55338 58:b55cbf18157e
168 168
169 if (n > 0) { 169 if (n > 0) {
170 170
171 if (c->ssl->saved_write_handler) { 171 if (c->ssl->saved_write_handler) {
172 172
173 c->write->event_handler = c->ssl->saved_write_handler; 173 c->write->handler = c->ssl->saved_write_handler;
174 c->ssl->saved_write_handler = NULL; 174 c->ssl->saved_write_handler = NULL;
175 c->write->ready = 1; 175 c->write->ready = 1;
176 176
177 if (ngx_handle_write_event(c->write, 0) == NGX_ERROR) { 177 if (ngx_handle_write_event(c->write, 0) == NGX_ERROR) {
178 return NGX_ERROR; 178 return NGX_ERROR;
221 /* 221 /*
222 * we do not set the timer because there is already the read event timer 222 * we do not set the timer because there is already the read event timer
223 */ 223 */
224 224
225 if (c->ssl->saved_write_handler == NULL) { 225 if (c->ssl->saved_write_handler == NULL) {
226 c->ssl->saved_write_handler = c->write->event_handler; 226 c->ssl->saved_write_handler = c->write->handler;
227 c->write->event_handler = ngx_ssl_write_handler; 227 c->write->handler = ngx_ssl_write_handler;
228 } 228 }
229 229
230 return NGX_AGAIN; 230 return NGX_AGAIN;
231 } 231 }
232 232
251 ngx_ssl_write_handler(ngx_event_t *wev) 251 ngx_ssl_write_handler(ngx_event_t *wev)
252 { 252 {
253 ngx_connection_t *c; 253 ngx_connection_t *c;
254 254
255 c = wev->data; 255 c = wev->data;
256 c->read->event_handler(c->read); 256 c->read->handler(c->read);
257 } 257 }
258 258
259 259
260 /* 260 /*
261 * OpenSSL has no SSL_writev() so we copy several bufs into our 16K buffer 261 * OpenSSL has no SSL_writev() so we copy several bufs into our 16K buffer
403 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_write: %d", n); 403 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_write: %d", n);
404 404
405 if (n > 0) { 405 if (n > 0) {
406 if (c->ssl->saved_read_handler) { 406 if (c->ssl->saved_read_handler) {
407 407
408 c->read->event_handler = c->ssl->saved_read_handler; 408 c->read->handler = c->ssl->saved_read_handler;
409 c->ssl->saved_read_handler = NULL; 409 c->ssl->saved_read_handler = NULL;
410 c->read->ready = 1; 410 c->read->ready = 1;
411 411
412 if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) { 412 if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) {
413 return NGX_ERROR; 413 return NGX_ERROR;
458 * we do not set the timer because there is already 458 * we do not set the timer because there is already
459 * the write event timer 459 * the write event timer
460 */ 460 */
461 461
462 if (c->ssl->saved_read_handler == NULL) { 462 if (c->ssl->saved_read_handler == NULL) {
463 c->ssl->saved_read_handler = c->read->event_handler; 463 c->ssl->saved_read_handler = c->read->handler;
464 c->read->event_handler = ngx_ssl_read_handler; 464 c->read->handler = ngx_ssl_read_handler;
465 } 465 }
466 466
467 return NGX_AGAIN; 467 return NGX_AGAIN;
468 } 468 }
469 469
480 ngx_ssl_read_handler(ngx_event_t *rev) 480 ngx_ssl_read_handler(ngx_event_t *rev)
481 { 481 {
482 ngx_connection_t *c; 482 ngx_connection_t *c;
483 483
484 c = rev->data; 484 c = rev->data;
485 c->write->event_handler(c->write); 485 c->write->handler(c->write);
486 } 486 }
487 487
488 488
489 ngx_int_t 489 ngx_int_t
490 ngx_ssl_shutdown(ngx_connection_t *c) 490 ngx_ssl_shutdown(ngx_connection_t *c)
590 590
591 ERR_error_string_n(ERR_get_error(), (char *) p, last - p); 591 ERR_error_string_n(ERR_get_error(), (char *) p, last - p);
592 592
593 ngx_log_error(level, log, err, "%s)", errstr); 593 ngx_log_error(level, log, err, "%s)", errstr);
594 } 594 }
595
596
597 void
598 ngx_ssl_cleanup_ctx(void *data)
599 {
600 SSL_CTX *ctx = data;
601
602 SSL_CTX_free(ctx);
603 }