Mercurial > hg > nginx
changeset 525:09b42134ac0c release-0.1.37
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.
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Thu, 23 Jun 2005 13:41:06 +0000 |
| parents | a55bc21dee27 |
| children | e31ce4d8b8e6 |
| files | docs/xml/nginx/changes.xml src/core/nginx.h src/core/ngx_cycle.c src/core/ngx_string.c src/core/ngx_times.c src/event/ngx_event_connect.c src/event/ngx_event_connect.h src/http/modules/ngx_http_autoindex_module.c src/http/modules/ngx_http_charset_filter_module.c src/http/ngx_http_request.c src/http/ngx_http_upstream.c src/imap/ngx_imap.h src/imap/ngx_imap_auth_http_module.c src/imap/ngx_imap_handler.c src/os/unix/ngx_atomic.h |
| diffstat | 15 files changed, 165 insertions(+), 69 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/xml/nginx/changes.xml +++ b/docs/xml/nginx/changes.xml @@ -9,6 +9,44 @@ <title lang="en">nginx changelog</title> +<changes ver="0.1.37" date="23.06.2005"> + +<change type="change"> +<para lang="ru"> +в конце файла nginx.pid теперь добавляется "\n". +</para> +<para lang="en"> +now the "\n" is added to the end of the "nginx.pid" file. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +при включении большого количества вставок или нескольких больших вставок +с помощью SSI ответ мог передаваться не полностью. +</para> +<para lang="en"> +the responses may be transferred not completely, +if many parts or the big parts were included by SSI. +</para> +</change> + +<change type="bugfix"> +<para lang="ru"> +если все бэкенды возвращали ответ 404, то при использовании параметра http_404 +в директивах proxy_next_upstream или fastcgi_next_upstream, nginx +начинал запрашивать все бэкенды снова. +</para> +<para lang="en"> +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. +</para> +</change> + +</changes> + + <changes ver="0.1.36" date="15.06.2005"> <change type="change">
--- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VER "nginx/0.1.36" +#define NGINX_VER "nginx/0.1.37" #define NGINX_VAR "NGINX" #define NGX_NEWPID_EXT ".newbin"
--- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -744,7 +744,7 @@ ngx_int_t ngx_create_pidfile(ngx_cycle_t } if (!ngx_test_config) { - len = ngx_sprintf(pid, "%P", ngx_pid) - pid; + len = ngx_sprintf(pid, "%P%N", ngx_pid) - pid; if (ngx_write_file(&file, pid, len, 0) == NGX_ERROR) { return NGX_ERROR;
--- a/src/core/ngx_string.c +++ b/src/core/ngx_string.c @@ -62,6 +62,7 @@ ngx_pstrdup(ngx_pool_t *pool, ngx_str_t * %V pointer to ngx_str_t * %s null-terminated string * %Z '\0' + * %N '\n' * %c char * %% % * @@ -315,6 +316,15 @@ ngx_vsnprintf(u_char *buf, size_t max, c continue; + case 'N': +#if (NGX_WIN32) + *buf++ = CR; +#endif + *buf++ = LF; + fmt++; + + continue; + case '%': *buf++ = '%'; fmt++;
--- a/src/core/ngx_times.c +++ b/src/core/ngx_times.c @@ -60,11 +60,11 @@ ngx_thread_volatile ngx_str_t ngx_cache static u_char cached_err_log_time[NGX_TIME_SLOTS] - [sizeof("1970/09/28 12:00:00")]; + [sizeof("1970/09/28 12:00:00")]; static u_char cached_http_time[NGX_TIME_SLOTS] - [sizeof("Mon, 28 Sep 1970 06:00:00 GMT")]; + [sizeof("Mon, 28 Sep 1970 06:00:00 GMT")]; static u_char cached_http_log_time[NGX_TIME_SLOTS] - [sizeof("28/Sep/1970:12:00:00 +0600")]; + [sizeof("28/Sep/1970:12:00:00 +0600")]; static char *week[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
--- a/src/event/ngx_event_connect.c +++ b/src/event/ngx_event_connect.c @@ -376,18 +376,20 @@ ngx_event_connect_peer(ngx_peer_connecti void -ngx_event_connect_peer_failed(ngx_peer_connection_t *pc) +ngx_event_connect_peer_failed(ngx_peer_connection_t *pc, ngx_uint_t down) { time_t now; - now = ngx_time(); + if (down) { + now = ngx_time(); - /* ngx_lock_mutex(pc->peers->mutex); */ + /* ngx_lock_mutex(pc->peers->mutex); */ - pc->peers->peer[pc->cur_peer].fails++; - pc->peers->peer[pc->cur_peer].accessed = now; + pc->peers->peer[pc->cur_peer].fails++; + pc->peers->peer[pc->cur_peer].accessed = now; - /* ngx_unlock_mutex(pc->peers->mutex); */ + /* ngx_unlock_mutex(pc->peers->mutex); */ + } pc->cur_peer++;
--- a/src/event/ngx_event_connect.h +++ b/src/event/ngx_event_connect.h @@ -67,7 +67,7 @@ typedef struct { ngx_int_t ngx_event_connect_peer(ngx_peer_connection_t *pc); -void ngx_event_connect_peer_failed(ngx_peer_connection_t *pc); +void ngx_event_connect_peer_failed(ngx_peer_connection_t *pc, ngx_uint_t down); #endif /* _NGX_EVENT_CONNECT_H_INCLUDED_ */
--- a/src/http/modules/ngx_http_autoindex_module.c +++ b/src/http/modules/ngx_http_autoindex_module.c @@ -24,6 +24,7 @@ typedef struct { 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 @@ ngx_http_autoindex_handler(ngx_http_requ #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 @@ ngx_http_autoindex_handler(ngx_http_requ } entry->name.len = len; + entry->escape = 2 * ngx_escape_uri(NULL, ngx_de_name(&dir), len, NGX_ESCAPE_HTML); @@ -314,6 +316,12 @@ ngx_http_autoindex_handler(ngx_http_requ 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 @@ ngx_http_autoindex_handler(ngx_http_requ 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 @@ ngx_http_autoindex_handler(ngx_http_requ 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>",
--- 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 { typedef struct { ngx_flag_t enable; - ngx_flag_t autodetect; ngx_int_t default_charset; ngx_int_t source_charset; @@ -96,13 +95,6 @@ static ngx_command_t ngx_http_charset_f 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 @@ ngx_http_charset_create_loc_conf(ngx_con } 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_merge_loc_conf(ngx_conf 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;
--- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -31,7 +31,7 @@ static ngx_int_t ngx_http_process_reques 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 @@ ngx_http_finalize_request(ngx_http_reque } 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 @@ ngx_http_finalize_request(ngx_http_reque 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 @@ ngx_http_finalize_request(ngx_http_reque } -static void +static ngx_int_t ngx_http_set_write_handler(ngx_http_request_t *r) { ngx_event_t *wev; @@ -1549,10 +1551,12 @@ ngx_http_set_write_handler(ngx_http_requ 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 @@ ngx_http_set_write_handler(ngx_http_requ 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; }
--- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -1230,7 +1230,7 @@ static void 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_upstream_next(ngx_http_request_ 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 @@ ngx_http_upstream_next(ngx_http_request_ 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; }
--- a/src/imap/ngx_imap.h +++ b/src/imap/ngx_imap.h @@ -136,6 +136,7 @@ typedef struct { void ngx_imap_init_connection(ngx_connection_t *c); void ngx_imap_close_connection(ngx_connection_t *c); +void ngx_imap_session_internal_server_error(ngx_imap_session_t *s); ngx_int_t ngx_pop3_parse_command(ngx_imap_session_t *s);
--- a/src/imap/ngx_imap_auth_http_module.c +++ b/src/imap/ngx_imap_auth_http_module.c @@ -23,6 +23,7 @@ typedef struct { typedef struct { ngx_buf_t *request; + ngx_buf_t *response; ngx_peer_connection_t peer; } ngx_imap_auth_http_ctx_t; @@ -91,7 +92,7 @@ ngx_imap_auth_http_init(ngx_imap_session ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_imap_auth_http_ctx_t)); if (ctx == NULL) { - ngx_imap_close_connection(s->connection); + ngx_imap_session_internal_server_error(s); return; } @@ -99,7 +100,7 @@ ngx_imap_auth_http_init(ngx_imap_session ctx->request = ngx_imap_auth_http_create_request(s, ahcf); if (ctx->request == NULL) { - ngx_imap_close_connection(s->connection); + ngx_imap_session_internal_server_error(s); return; } @@ -112,7 +113,7 @@ ngx_imap_auth_http_init(ngx_imap_session rc = ngx_event_connect_peer(&ctx->peer); if (rc == NGX_ERROR) { - ngx_imap_close_connection(s->connection); + ngx_imap_session_internal_server_error(s); return; } @@ -153,8 +154,8 @@ ngx_imap_auth_http_write_handler(ngx_eve if (wev->timedout) { ngx_log_error(NGX_LOG_ERR, wev->log, NGX_ETIMEDOUT, "auth http server timed out"); - ngx_imap_close_connection(ctx->peer.connection); - ngx_imap_close_connection(s->connection); + ngx_close_connection(ctx->peer.connection); + ngx_imap_session_internal_server_error(s); return; } @@ -163,8 +164,8 @@ ngx_imap_auth_http_write_handler(ngx_eve n = ngx_send(c, ctx->request->pos, size); if (n == NGX_ERROR) { - ngx_imap_close_connection(ctx->peer.connection); - ngx_imap_close_connection(s->connection); + ngx_close_connection(ctx->peer.connection); + ngx_imap_session_internal_server_error(s); return; } @@ -192,23 +193,52 @@ ngx_imap_auth_http_write_handler(ngx_eve static void ngx_imap_auth_http_read_handler(ngx_event_t *rev) { + ssize_t n, size; ngx_peers_t *peers; ngx_connection_t *c; ngx_imap_session_t *s; -#if 0 ngx_imap_auth_http_ctx_t *ctx; -#endif c = rev->data; s = c->data; -#if 0 - ctx = ngx_imap_get_module_ctx(s, ngx_imap_auth_http_module); -#endif - ngx_log_debug0(NGX_LOG_DEBUG_IMAP, rev->log, 0, "imap auth http read handler"); + ctx = ngx_imap_get_module_ctx(s, ngx_imap_auth_http_module); + + if (rev->timedout) { + ngx_log_error(NGX_LOG_ERR, rev->log, NGX_ETIMEDOUT, + "auth http server timed out"); + ngx_close_connection(ctx->peer.connection); + ngx_imap_session_internal_server_error(s); + return; + } + + if (ctx->response == NULL) { + ctx->response = ngx_create_temp_buf(s->connection->pool, 1024); + if (ctx->response == NULL) { + ngx_close_connection(ctx->peer.connection); + ngx_imap_session_internal_server_error(s); + return; + } + } + + size = ctx->response->last - ctx->response->pos; + + n = ngx_recv(c, ctx->response->pos, size); + + if (n == NGX_ERROR || n == 0) { + ngx_close_connection(ctx->peer.connection); + ngx_imap_session_internal_server_error(s); + return; + } + + + + + + peers = NULL; ngx_imap_proxy_init(s, peers); @@ -231,8 +261,8 @@ ngx_imap_auth_http_block_read(ngx_event_ ctx = ngx_imap_get_module_ctx(s, ngx_imap_auth_http_module); - ngx_imap_close_connection(ctx->peer.connection); - ngx_imap_close_connection(s->connection); + ngx_close_connection(ctx->peer.connection); + ngx_imap_session_internal_server_error(s); } }
--- a/src/imap/ngx_imap_handler.c +++ b/src/imap/ngx_imap_handler.c @@ -24,6 +24,11 @@ static ngx_str_t greetings[] = { ngx_string("* OK " NGINX_VER " ready" CRLF) }; +static ngx_str_t internal_server_errors[] = { + ngx_string("-ERR internal server error" CRLF), + ngx_string("* BAD internal server error" CRLF), +}; + static u_char pop3_ok[] = "+OK" CRLF; static u_char pop3_invalid_command[] = "-ERR invalid command" CRLF; @@ -342,6 +347,16 @@ ngx_imap_close_session(ngx_imap_session_ void +ngx_imap_session_internal_server_error(ngx_imap_session_t *s) +{ + (void) ngx_send(s->connection, internal_server_errors[s->protocol].data, + internal_server_errors[s->protocol].len); + + ngx_imap_close_connection(s->connection); +} + + +void ngx_imap_close_connection(ngx_connection_t *c) { ngx_pool_t *pool;