nginx-0.1.37-RELEASE import
*) Change: now the "\n" is added to the end of the "nginx.pid" file.
*) Bugfix: the responses may be transferred not completely, if many
parts or the big parts were included by SSI.
*) Bugfix: if all backends had returned the 404 reponse and the
"http_404" parameter of the "proxy_next_upstream" or
"fastcgi_next_upstream" directives was used, then nginx started to
request all backends again.
diff --git a/src/http/modules/ngx_http_autoindex_module.c b/src/http/modules/ngx_http_autoindex_module.c
index ab4418f..e26d294 100644
--- a/src/http/modules/ngx_http_autoindex_module.c
+++ b/src/http/modules/ngx_http_autoindex_module.c
@@ -24,6 +24,7 @@
typedef struct {
ngx_str_t name;
+ size_t utf_len;
ngx_uint_t escape;
ngx_uint_t dir;
time_t mtime;
@@ -212,7 +213,7 @@
#endif
if (ngx_array_init(&entries, pool, 50, sizeof(ngx_http_autoindex_entry_t))
- == NGX_ERROR)
+ == NGX_ERROR)
{
return ngx_http_autoindex_error(r, &dir, dname.data);
}
@@ -304,6 +305,7 @@
}
entry->name.len = len;
+
entry->escape = 2 * ngx_escape_uri(NULL, ngx_de_name(&dir), len,
NGX_ESCAPE_HTML);
@@ -314,6 +316,12 @@
ngx_cpystrn(entry->name.data, ngx_de_name(&dir), len + 1);
+ if (r->utf8) {
+ entry->utf_len = ngx_utf_length(&entry->name);
+ } else {
+ entry->utf_len = len;
+ }
+
entry->dir = ngx_de_is_dir(&dir);
entry->mtime = ngx_de_mtime(&dir);
entry->size = ngx_de_size(&dir);
@@ -336,18 +344,15 @@
entry = entries.elts;
for (i = 0; i < entries.nelts; i++) {
len += sizeof("<a href=\"") - 1
- + 1 /* 1 is for "/" */
- + entry[i].name.len + entry[i].escape
- + sizeof("\">") - 1
- + NGX_HTTP_AUTOINDEX_NAME_LEN + sizeof(">") - 2
- + sizeof("</a>") - 1
- + sizeof(" 28-Sep-1970 12:00 ") - 1
- + 19
- + 2;
-
- if (r->utf8) {
- len += entry[i].name.len - ngx_utf_length(&entry[i].name);
- }
+ + 1 /* 1 is for "/" */
+ + entry[i].name.len + entry[i].escape
+ + sizeof("\">") - 1
+ + entry[i].name.len - entry[i].utf_len
+ + NGX_HTTP_AUTOINDEX_NAME_LEN + sizeof(">") - 2
+ + sizeof("</a>") - 1
+ + sizeof(" 28-Sep-1970 12:00 ") - 1
+ + 19
+ + 2;
}
b = ngx_create_temp_buf(r->pool, len);
@@ -394,11 +399,7 @@
b->last = ngx_cpystrn(b->last, entry[i].name.data,
NGX_HTTP_AUTOINDEX_NAME_LEN + 1);
- if (r->utf8) {
- len = ngx_utf_length(&entry[i].name);
- } else {
- len = entry[i].name.len;
- }
+ len = entry[i].utf_len;
if (len > NGX_HTTP_AUTOINDEX_NAME_LEN) {
b->last = ngx_cpymem(b->last - 3, "..></a>",
diff --git a/src/http/modules/ngx_http_charset_filter_module.c b/src/http/modules/ngx_http_charset_filter_module.c
index 117281c..caf3f3f 100644
--- a/src/http/modules/ngx_http_charset_filter_module.c
+++ b/src/http/modules/ngx_http_charset_filter_module.c
@@ -34,7 +34,6 @@
typedef struct {
ngx_flag_t enable;
- ngx_flag_t autodetect;
ngx_int_t default_charset;
ngx_int_t source_charset;
@@ -96,13 +95,6 @@
offsetof(ngx_http_charset_loc_conf_t, enable),
NULL },
- { ngx_string("autodetect_charset"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
- ngx_conf_set_flag_slot,
- NGX_HTTP_LOC_CONF_OFFSET,
- offsetof(ngx_http_charset_loc_conf_t, autodetect),
- NULL },
-
ngx_null_command
};
@@ -570,7 +562,6 @@
}
lcf->enable = NGX_CONF_UNSET;
- lcf->autodetect = NGX_CONF_UNSET;
lcf->default_charset = NGX_CONF_UNSET;
lcf->source_charset = NGX_CONF_UNSET;
@@ -585,8 +576,6 @@
ngx_http_charset_loc_conf_t *conf = child;
ngx_conf_merge_value(conf->enable, prev->enable, 0);
- ngx_conf_merge_value(conf->autodetect, prev->autodetect, 0);
-
if (conf->default_charset == NGX_CONF_UNSET) {
conf->default_charset = prev->default_charset;
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index c3e1ab7..9ced028 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -31,7 +31,7 @@
static ngx_int_t ngx_http_find_virtual_server(ngx_http_request_t *r);
static void ngx_http_request_handler(ngx_event_t *ev);
-static void ngx_http_set_write_handler(ngx_http_request_t *r);
+static ngx_int_t ngx_http_set_write_handler(ngx_http_request_t *r);
static void ngx_http_writer(ngx_http_request_t *r);
static ngx_int_t ngx_http_postponed_handler(ngx_http_request_t *r);
@@ -1433,7 +1433,9 @@
}
if (r->parent || rc == NGX_AGAIN) {
- r->write_event_handler = ngx_http_writer;
+ if (ngx_http_set_write_handler(r) != NGX_OK) {
+ return;
+ }
}
r->done = 1;
@@ -1497,7 +1499,7 @@
return;
} else if (rc == NGX_AGAIN || r->out) {
- ngx_http_set_write_handler(r);
+ (void) ngx_http_set_write_handler(r);
return;
}
@@ -1541,7 +1543,7 @@
}
-static void
+static ngx_int_t
ngx_http_set_write_handler(ngx_http_request_t *r)
{
ngx_event_t *wev;
@@ -1549,10 +1551,12 @@
r->http_state = NGX_HTTP_WRITING_REQUEST_STATE;
+ r->write_event_handler = ngx_http_writer;
+
wev = r->connection->write;
if (wev->ready && wev->delayed) {
- return;
+ return NGX_OK;
}
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
@@ -1563,7 +1567,10 @@
if (ngx_handle_write_event(wev, clcf->send_lowat) == NGX_ERROR) {
ngx_http_close_request(r, 0);
ngx_http_close_connection(r->connection);
+ return NGX_ERROR;
}
+
+ return NGX_OK;
}
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 51ffbc0..d7ee08f 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1230,7 +1230,7 @@
ngx_http_upstream_next(ngx_http_request_t *r, ngx_http_upstream_t *u,
ngx_uint_t ft_type)
{
- ngx_uint_t status;
+ ngx_uint_t status, down;
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"http next upstream, %xD", ft_type);
@@ -1239,10 +1239,14 @@
ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock);
#endif
- if (ft_type != NGX_HTTP_UPSTREAM_FT_HTTP_404) {
- ngx_event_connect_peer_failed(&u->peer);
+ if (ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_404) {
+ down = 0;
+ } else {
+ down = 1;
}
-
+
+ ngx_event_connect_peer_failed(&u->peer, down);
+
if (ft_type == NGX_HTTP_UPSTREAM_FT_TIMEOUT) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, NGX_ETIMEDOUT,
"upstream timed out");
@@ -1285,14 +1289,13 @@
if (status) {
u->state->status = status;
- if (u->peer.tries == 0 || !(u->conf->next_upstream & ft_type))
- {
+ if (u->peer.tries == 0 || !(u->conf->next_upstream & ft_type)) {
#if (NGX_HTTP_CACHE)
if (u->stale && (u->conf->use_stale & ft_type)) {
ngx_http_upstream_finalize_request(r, u,
- ngx_http_send_cached_response(r));
+ ngx_http_send_cached_response(r));
return;
}
