comparison src/http/modules/ngx_http_fastcgi_module.c @ 212:56688ed172c8 NGINX_0_3_53

nginx 0.3.53 *) Change: the "add_header" directive adds the string to 204, 301, and 302 responses. *) Feature: the "server" directive in the "upstream" context supports the "weight" parameter. *) Feature: the "server_name" directive supports the "*" wildcard. *) Feature: nginx supports the request body size more than 2G. *) Bugfix: if a client was successfully authorized using "satisfy_any on", then anyway the message "access forbidden by rule" was written in the log. *) Bugfix: the "PUT" method may erroneously not create a file and return the 409 code. *) Bugfix: if the IMAP/POP3 backend returned an error, then nginx continued proxying anyway.
author Igor Sysoev <http://sysoev.ru>
date Fri, 07 Jul 2006 00:00:00 +0400
parents 3866d57d9cfd
children 0ad9eeb6ac7f
comparison
equal deleted inserted replaced
211:f04a54878110 212:56688ed172c8
1563 u_char *p; 1563 u_char *p;
1564 size_t size; 1564 size_t size;
1565 uintptr_t *code; 1565 uintptr_t *code;
1566 ngx_str_t *header; 1566 ngx_str_t *header;
1567 ngx_uint_t i, j; 1567 ngx_uint_t i, j;
1568 ngx_peer_t *peer;
1568 ngx_array_t hide_headers; 1569 ngx_array_t hide_headers;
1569 ngx_keyval_t *src; 1570 ngx_keyval_t *src;
1570 ngx_hash_key_t *hk; 1571 ngx_hash_key_t *hk;
1571 ngx_hash_init_t hash; 1572 ngx_hash_init_t hash;
1572 ngx_http_script_compile_t sc; 1573 ngx_http_script_compile_t sc;
1691 prev->upstream.next_upstream, 1692 prev->upstream.next_upstream,
1692 (NGX_CONF_BITMASK_SET 1693 (NGX_CONF_BITMASK_SET
1693 |NGX_HTTP_UPSTREAM_FT_ERROR 1694 |NGX_HTTP_UPSTREAM_FT_ERROR
1694 |NGX_HTTP_UPSTREAM_FT_TIMEOUT)); 1695 |NGX_HTTP_UPSTREAM_FT_TIMEOUT));
1695 1696
1696 ngx_conf_merge_unsigned_value(conf->upstream.max_fails, 1697 ngx_conf_merge_uint_value(conf->upstream.max_fails,
1697 prev->upstream.max_fails, 1); 1698 prev->upstream.max_fails, 1);
1698 1699
1699 ngx_conf_merge_sec_value(conf->upstream.fail_timeout, 1700 ngx_conf_merge_sec_value(conf->upstream.fail_timeout,
1700 prev->upstream.fail_timeout, 10); 1701 prev->upstream.fail_timeout, 10);
1701 1702
1702 if (conf->upstream_peers && !conf->upstream_peers->balanced) { 1703 if (conf->upstream_peers) {
1704 peer = conf->upstream_peers->peers->peer;
1703 for (i = 0; i < conf->upstream_peers->peers->number; i++) { 1705 for (i = 0; i < conf->upstream_peers->peers->number; i++) {
1704 conf->upstream_peers->peers->peer[i].weight = 1; 1706 ngx_conf_init_uint_value(peer[i].weight, 1);
1705 conf->upstream_peers->peers->peer[i].max_fails = 1707 peer[i].current_weight = peer[i].weight;
1706 conf->upstream.max_fails; 1708 ngx_conf_init_uint_value(peer[i].max_fails,
1707 conf->upstream_peers->peers->peer[i].fail_timeout = 1709 conf->upstream.max_fails);
1708 conf->upstream.fail_timeout; 1710 ngx_conf_init_value(peer[i].fail_timeout,
1709 } 1711 conf->upstream.fail_timeout);
1712 }
1713
1710 } 1714 }
1711 1715
1712 ngx_conf_merge_path_value(conf->upstream.temp_path, 1716 ngx_conf_merge_path_value(conf->upstream.temp_path,
1713 prev->upstream.temp_path, 1717 prev->upstream.temp_path,
1714 NGX_HTTP_FASTCGI_TEMP_PATH, 1, 2, 0, 1718 NGX_HTTP_FASTCGI_TEMP_PATH, 1, 2, 0,