comparison src/http/ngx_http_upstream.c @ 92:45945fa8b8ba NGINX_0_2_0

nginx 0.2.0 *) The pid-file names used during online upgrade was changed and now is not required a manual rename operation. The old master process adds the ".oldbin" suffix to its pid-file and executes a new binary file. The new master process creates usual pid-file without the ".newbin" suffix. If the master process exits, then old master process renames back its pid-file with the ".oldbin" suffix to the pid-file without suffix. *) Change: the "worker_connections" directive, new name of the "connections" directive; now the directive specifies maximum number of connections, but not maximum socket descriptor number. *) Feature: SSL supports the session cache inside one worker process. *) Feature: the "satisfy_any" directive. *) Change: the ngx_http_access_module and ngx_http_auth_basic_module do not run for subrequests. *) Feature: the "worker_rlimit_nofile" and "worker_rlimit_sigpending" directives. *) Bugfix: if all backend using in load-balancing failed after one error, then nginx did not try do connect to them during 60 seconds. *) Bugfix: in IMAP/POP3 command argument parsing. Thanks to Rob Mueller. *) Bugfix: errors while using SSL in IMAP/POP3 proxy. *) Bugfix: errors while using SSI and gzipping. *) Bugfix: the "Expires" and "Cache-Control" header lines were omitted from the 304 responses. Thanks to Alexandr Kukushkin.
author Igor Sysoev <http://sysoev.ru>
date Fri, 23 Sep 2005 00:00:00 +0400
parents 71c46860eb55
children f63280c59dd5
comparison
equal deleted inserted replaced
91:c3eee83ea942 92:45945fa8b8ba
457 return; 457 return;
458 } 458 }
459 459
460 u->state->peer = &u->peer.peers->peer[u->peer.cur_peer].name; 460 u->state->peer = &u->peer.peers->peer[u->peer.cur_peer].name;
461 461
462 if (rc == NGX_CONNECT_ERROR) { 462 if (rc == NGX_BUSY) {
463 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "no live upstreams");
464 }
465
466 if (rc == NGX_BUSY || rc == NGX_DECLINED) {
463 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR); 467 ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
464 return; 468 return;
465 } 469 }
466 470
467 c = u->peer.connection; 471 c = u->peer.connection;