IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-26 00:41:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Mail: fixed SMTP pipelining to send the response immediately.

Browse Source 
Previously, if there were some pipelined SMTP data in the buffer when
a proxied connection with the backend was established, nginx called
ngx_mail_proxy_handler() to send these data, and not tried to send the
response to the last command.  In most cases, this response was later sent
along with the response to the pipelined command, but if for some reason
client decides to wait for the response before finishing the next command
this might result in a connection hang.

Fix is to always call ngx_mail_proxy_handler() to send the response, and
additionally post an event to send the pipelined data if needed.
This commit is contained in:
Maxim Dounin 2021-05-19 03:13:12 +03:00
parent 130a3ec501
commit 60a5a6f0d3
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mail/ngx_mail_proxy_module.c
View File

@ -813,13 +813,12 @@ ngx_mail_proxy_smtp_handler(ngx_event_t *rev)
c->log->action = NULL; c->log->action = NULL;
ngx_log_error(NGX_LOG_INFO, c->log, 0, "client logged in"); ngx_log_error(NGX_LOG_INFO, c->log, 0, "client logged in");
if (s->buffer->pos == s->buffer->last) { if (s->buffer->pos < s->buffer->last) {
ngx_mail_proxy_handler(s->connection->write); ngx_post_event(c->write, &ngx_posted_events);
} else {
ngx_mail_proxy_handler(c->write);
} }
ngx_mail_proxy_handler(s->connection->write);
return; return;
default: default: