summaryrefslogtreecommitdiff
path: root/src/mail
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2008-12-15 11:30:58 +0000
committerJonathan Kolb <jon@b0g.us>2008-12-15 11:30:58 +0000
commitaccf374de9a9b1fdc8df617172bb7e7eed62c83c (patch)
treee570222469fa41eac7977de79c9deb141cc444be /src/mail
parent37eb9af78547c075879b3c3bc5e85b9b584fe324 (diff)
downloadnginx-accf374de9a9b1fdc8df617172bb7e7eed62c83c.tar.gz
Changes with nginx 0.7.27 15 Dec 2008v0.7.27
*) Feature: the "try_files" directive. *) Feature: variables support in the "fastcgi_pass" directive. *) Feature: now the $geo variable may get an address from a variable. Thanks to Andrei Nigmatulin. *) Feature: now a location's modifier may be used without space before name. *) Feature: the $upstream_response_length variable. *) Bugfix: now a "add_header" directive does not add an empty value. *) Bugfix: if zero length static file was requested, then nginx just closed connection; the bug had appeared in 0.7.25. *) Bugfix: a MOVE method could not move file in non-existent directory. *) Bugfix: a segmentation fault occurred in worker process, if no one named location was defined in server, but some one was used in an error_page directive. Thanks to Sergey Bochenkov.
Diffstat (limited to 'src/mail')
-rw-r--r--src/mail/ngx_mail_auth_http_module.c8
-rw-r--r--src/mail/ngx_mail_handler.c6
-rw-r--r--src/mail/ngx_mail_imap_handler.c2
-rw-r--r--src/mail/ngx_mail_pop3_handler.c2
-rw-r--r--src/mail/ngx_mail_proxy_module.c12
-rw-r--r--src/mail/ngx_mail_smtp_handler.c6
6 files changed, 18 insertions, 18 deletions
diff --git a/src/mail/ngx_mail_auth_http_module.c b/src/mail/ngx_mail_auth_http_module.c
index 5b9f04238..ec1dcdc00 100644
--- a/src/mail/ngx_mail_auth_http_module.c
+++ b/src/mail/ngx_mail_auth_http_module.c
@@ -268,7 +268,7 @@ ngx_mail_auth_http_write_handler(ngx_event_t *wev)
ngx_del_timer(wev);
}
- if (ngx_handle_write_event(wev, 0) == NGX_ERROR) {
+ if (ngx_handle_write_event(wev, 0) != NGX_OK) {
ngx_close_connection(c);
ngx_destroy_pool(ctx->pool);
ngx_mail_session_internal_server_error(s);
@@ -894,7 +894,7 @@ ngx_mail_auth_sleep_handler(ngx_event_t *rev)
return;
}
- if (ngx_handle_read_event(rev, 0) == NGX_ERROR) {
+ if (ngx_handle_read_event(rev, 0) != NGX_OK) {
ngx_mail_close_connection(c);
}
@@ -902,7 +902,7 @@ ngx_mail_auth_sleep_handler(ngx_event_t *rev)
}
if (rev->active) {
- if (ngx_handle_read_event(rev, 0) == NGX_ERROR) {
+ if (ngx_handle_read_event(rev, 0) != NGX_OK) {
ngx_mail_close_connection(c);
}
}
@@ -1102,7 +1102,7 @@ ngx_mail_auth_http_block_read(ngx_event_t *rev)
ngx_log_debug0(NGX_LOG_DEBUG_MAIL, rev->log, 0,
"mail auth http block read");
- if (ngx_handle_read_event(rev, 0) == NGX_ERROR) {
+ if (ngx_handle_read_event(rev, 0) != NGX_OK) {
c = rev->data;
s = c->data;
diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c
index 6915dc94f..e86877f1a 100644
--- a/src/mail/ngx_mail_handler.c
+++ b/src/mail/ngx_mail_handler.c
@@ -513,7 +513,7 @@ ngx_mail_send(ngx_event_t *wev)
}
if (s->out.len == 0) {
- if (ngx_handle_write_event(c->write, 0) == NGX_ERROR) {
+ if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
ngx_mail_close_connection(c);
}
@@ -552,7 +552,7 @@ ngx_mail_send(ngx_event_t *wev)
ngx_add_timer(c->write, cscf->timeout);
- if (ngx_handle_write_event(c->write, 0) == NGX_ERROR) {
+ if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
ngx_mail_close_connection(c);
return;
}
@@ -579,7 +579,7 @@ ngx_mail_read_command(ngx_mail_session_t *s, ngx_connection_t *c)
}
if (n == NGX_AGAIN) {
- if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) {
+ if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
ngx_mail_session_internal_server_error(s);
return NGX_ERROR;
}
diff --git a/src/mail/ngx_mail_imap_handler.c b/src/mail/ngx_mail_imap_handler.c
index f8ca4f689..780c38fbb 100644
--- a/src/mail/ngx_mail_imap_handler.c
+++ b/src/mail/ngx_mail_imap_handler.c
@@ -46,7 +46,7 @@ ngx_mail_imap_init_session(ngx_mail_session_t *s, ngx_connection_t *c)
ngx_add_timer(c->read, cscf->timeout);
- if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) {
+ if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
ngx_mail_close_connection(c);
}
diff --git a/src/mail/ngx_mail_pop3_handler.c b/src/mail/ngx_mail_pop3_handler.c
index 51763613d..c763f04ff 100644
--- a/src/mail/ngx_mail_pop3_handler.c
+++ b/src/mail/ngx_mail_pop3_handler.c
@@ -67,7 +67,7 @@ ngx_mail_pop3_init_session(ngx_mail_session_t *s, ngx_connection_t *c)
ngx_add_timer(c->read, cscf->timeout);
- if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) {
+ if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
ngx_mail_close_connection(c);
}
diff --git a/src/mail/ngx_mail_proxy_module.c b/src/mail/ngx_mail_proxy_module.c
index 8890002d1..bd2bcf9ea 100644
--- a/src/mail/ngx_mail_proxy_module.c
+++ b/src/mail/ngx_mail_proxy_module.c
@@ -201,7 +201,7 @@ ngx_mail_proxy_block_read(ngx_event_t *rev)
ngx_log_debug0(NGX_LOG_DEBUG_MAIL, rev->log, 0, "mail proxy block read");
- if (ngx_handle_read_event(rev, 0) == NGX_ERROR) {
+ if (ngx_handle_read_event(rev, 0) != NGX_OK) {
c = rev->data;
s = c->data;
@@ -664,7 +664,7 @@ ngx_mail_proxy_dummy_handler(ngx_event_t *wev)
ngx_log_debug0(NGX_LOG_DEBUG_MAIL, wev->log, 0, "mail proxy dummy handler");
- if (ngx_handle_write_event(wev, 0) == NGX_ERROR) {
+ if (ngx_handle_write_event(wev, 0) != NGX_OK) {
c = wev->data;
s = c->data;
@@ -947,22 +947,22 @@ ngx_mail_proxy_handler(ngx_event_t *ev)
return;
}
- if (ngx_handle_write_event(dst->write, 0) == NGX_ERROR) {
+ if (ngx_handle_write_event(dst->write, 0) != NGX_OK) {
ngx_mail_proxy_close_session(s);
return;
}
- if (ngx_handle_read_event(dst->read, 0) == NGX_ERROR) {
+ if (ngx_handle_read_event(dst->read, 0) != NGX_OK) {
ngx_mail_proxy_close_session(s);
return;
}
- if (ngx_handle_write_event(src->write, 0) == NGX_ERROR) {
+ if (ngx_handle_write_event(src->write, 0) != NGX_OK) {
ngx_mail_proxy_close_session(s);
return;
}
- if (ngx_handle_read_event(src->read, 0) == NGX_ERROR) {
+ if (ngx_handle_read_event(src->read, 0) != NGX_OK) {
ngx_mail_proxy_close_session(s);
return;
}
diff --git a/src/mail/ngx_mail_smtp_handler.c b/src/mail/ngx_mail_smtp_handler.c
index 1a89f1749..46247239c 100644
--- a/src/mail/ngx_mail_smtp_handler.c
+++ b/src/mail/ngx_mail_smtp_handler.c
@@ -228,7 +228,7 @@ ngx_mail_smtp_greeting(ngx_mail_session_t *s, ngx_connection_t *c)
timeout = sscf->greeting_delay ? sscf->greeting_delay : cscf->timeout;
ngx_add_timer(c->read, timeout);
- if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) {
+ if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
ngx_mail_close_connection(c);
}
@@ -270,7 +270,7 @@ ngx_mail_smtp_invalid_pipelining(ngx_event_t *rev)
ngx_add_timer(c->read, cscf->timeout);
- if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) {
+ if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
ngx_mail_close_connection(c);
return;
}
@@ -819,7 +819,7 @@ ngx_mail_smtp_discard_command(ngx_mail_session_t *s, ngx_connection_t *c,
}
if (n == NGX_AGAIN) {
- if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) {
+ if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
ngx_mail_session_internal_server_error(s);
return NGX_ERROR;
}