Mercurial > hg > nginx
comparison src/http/modules/proxy/ngx_http_proxy_handler.c @ 509:9b8c906f6e63 release-0.1.29
nginx-0.1.29-RELEASE import
*) 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; the bug had 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 <igor@sysoev.ru> |
---|---|
date | Thu, 12 May 2005 14:58:06 +0000 |
parents | cd3117ad9aab |
children |
comparison
equal
deleted
inserted
replaced
508:ca1020ce99ba | 509:9b8c906f6e63 |
---|---|
309 { ngx_null_string, 0, NULL, NULL, NULL } | 309 { ngx_null_string, 0, NULL, NULL, NULL } |
310 }; | 310 }; |
311 | 311 |
312 | 312 |
313 | 313 |
314 ngx_http_header_t ngx_http_proxy_headers_in[] = { | 314 ngx_http_header0_t ngx_http_proxy_headers_in[] = { |
315 { ngx_string("Date"), offsetof(ngx_http_proxy_headers_in_t, date) }, | 315 { ngx_string("Date"), offsetof(ngx_http_proxy_headers_in_t, date) }, |
316 { ngx_string("Server"), offsetof(ngx_http_proxy_headers_in_t, server) }, | 316 { ngx_string("Server"), offsetof(ngx_http_proxy_headers_in_t, server) }, |
317 | 317 |
318 { ngx_string("Expires"), offsetof(ngx_http_proxy_headers_in_t, expires) }, | 318 { ngx_string("Expires"), offsetof(ngx_http_proxy_headers_in_t, expires) }, |
319 { ngx_string("Cache-Control"), | 319 { ngx_string("Cache-Control"), |
488 } | 488 } |
489 | 489 |
490 #endif | 490 #endif |
491 | 491 |
492 | 492 |
493 void ngx_http_proxy_check_broken_connection(ngx_event_t *ev) | 493 void ngx_http_proxy_rd_check_broken_connection(ngx_http_request_t *r) |
494 { | |
495 ngx_http_proxy_check_broken_connection(r, r->connection->read); | |
496 } | |
497 | |
498 | |
499 void ngx_http_proxy_wr_check_broken_connection(ngx_http_request_t *r) | |
500 { | |
501 ngx_http_proxy_check_broken_connection(r, r->connection->read); | |
502 } | |
503 | |
504 | |
505 void ngx_http_proxy_check_broken_connection(ngx_http_request_t *r, | |
506 ngx_event_t *ev) | |
494 { | 507 { |
495 int n; | 508 int n; |
496 char buf[1]; | 509 char buf[1]; |
497 ngx_err_t err; | 510 ngx_err_t err; |
498 ngx_connection_t *c; | 511 ngx_connection_t *c; |
499 ngx_http_request_t *r; | |
500 ngx_http_proxy_ctx_t *p; | 512 ngx_http_proxy_ctx_t *p; |
501 | 513 |
502 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, 0, | 514 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, 0, |
503 "http proxy check client, write event:%d", ev->write); | 515 "http proxy check client, write event:%d", ev->write); |
504 | 516 |
508 | 520 |
509 if (!ev->pending_eof) { | 521 if (!ev->pending_eof) { |
510 return; | 522 return; |
511 } | 523 } |
512 | 524 |
513 c = ev->data; | 525 c = r->connection; |
514 r = c->data; | |
515 p = ngx_http_get_module_ctx(r, ngx_http_proxy_module); | 526 p = ngx_http_get_module_ctx(r, ngx_http_proxy_module); |
516 | 527 |
517 ev->eof = 1; | 528 ev->eof = 1; |
518 | 529 |
519 if (ev->kq_errno) { | 530 if (ev->kq_errno) { |
540 return; | 551 return; |
541 } | 552 } |
542 | 553 |
543 #endif | 554 #endif |
544 | 555 |
545 c = ev->data; | 556 c = r->connection; |
546 r = c->data; | |
547 p = ngx_http_get_module_ctx(r, ngx_http_proxy_module); | 557 p = ngx_http_get_module_ctx(r, ngx_http_proxy_module); |
548 | 558 |
549 n = recv(c->fd, buf, 1, MSG_PEEK); | 559 n = recv(c->fd, buf, 1, MSG_PEEK); |
550 | 560 |
551 err = ngx_socket_errno; | 561 err = ngx_socket_errno; |
708 | 718 |
709 if (p->cache) { | 719 if (p->cache) { |
710 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | 720 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
711 "http proxy cache fd: %d", | 721 "http proxy cache fd: %d", |
712 p->cache->ctx.file.fd); | 722 p->cache->ctx.file.fd); |
713 } | |
714 | |
715 if (p->upstream && p->upstream->event_pipe) { | |
716 r->file.fd = p->upstream->event_pipe->temp_file->file.fd; | |
717 | |
718 } else if (p->cache) { | |
719 r->file.fd = p->cache->ctx.file.fd; | |
720 } | 723 } |
721 | 724 |
722 if (rc == 0 && r->main == NULL) { | 725 if (rc == 0 && r->main == NULL) { |
723 rc = ngx_http_send_last(r); | 726 rc = ngx_http_send_last(r); |
724 } | 727 } |