Mercurial > hg > nginx
annotate src/os/unix/ngx_setproctitle.h @ 7836:6a81d96d3733
Mail: fixed handling of invalid SMTP commands split between reads.
Previously, if an invalid SMTP command was split between reads, nginx failed
to wait for LF before returning an error, and interpreted the rest of the
command received later as a separate command.
The sw_invalid state in ngx_mail_smtp_parse_command(), introduced in
04e43d03e153, did not work, since ngx_mail_smtp_auth_state() clears
s->state when returning an error due to NGX_MAIL_PARSE_INVALID_COMMAND.
And not clearing s->state will introduce another problem: the rest
of the command would trigger duplicate error when rest of the command is
received.
Fix is to return NGX_AGAIN from ngx_mail_smtp_parse_command() until full
command is received.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Wed, 19 May 2021 03:13:15 +0300 |
parents | 16013b71feed |
children |
rev | line source |
---|---|
509 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4412 | 4 * Copyright (C) Nginx, Inc. |
509 | 5 */ |
6 | |
7 | |
8 #ifndef _NGX_SETPROCTITLE_H_INCLUDED_ | |
9 #define _NGX_SETPROCTITLE_H_INCLUDED_ | |
10 | |
11 | |
12 #if (NGX_HAVE_SETPROCTITLE) | |
13 | |
14 /* FreeBSD, NetBSD, OpenBSD */ | |
15 | |
5826
16013b71feed
Added ngx_init_setproctitle() return code check.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
16 #define ngx_init_setproctitle(log) NGX_OK |
3285 | 17 #define ngx_setproctitle(title) setproctitle("%s", title) |
509 | 18 |
19 | |
515 | 20 #else /* !NGX_HAVE_SETPROCTITLE */ |
509 | 21 |
515 | 22 #if !defined NGX_SETPROCTITLE_USES_ENV |
509 | 23 |
24 #if (NGX_SOLARIS) | |
25 | |
515 | 26 #define NGX_SETPROCTITLE_USES_ENV 1 |
509 | 27 #define NGX_SETPROCTITLE_PAD ' ' |
28 | |
29 ngx_int_t ngx_init_setproctitle(ngx_log_t *log); | |
30 void ngx_setproctitle(char *title); | |
31 | |
515 | 32 #elif (NGX_LINUX) || (NGX_DARWIN) |
509 | 33 |
515 | 34 #define NGX_SETPROCTITLE_USES_ENV 1 |
35 #define NGX_SETPROCTITLE_PAD '\0' | |
36 | |
37 ngx_int_t ngx_init_setproctitle(ngx_log_t *log); | |
38 void ngx_setproctitle(char *title); | |
39 | |
40 #else | |
509 | 41 |
5826
16013b71feed
Added ngx_init_setproctitle() return code check.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
42 #define ngx_init_setproctitle(log) NGX_OK |
509 | 43 #define ngx_setproctitle(title) |
44 | |
515 | 45 #endif /* OSes */ |
46 | |
47 #endif /* NGX_SETPROCTITLE_USES_ENV */ | |
48 | |
49 #endif /* NGX_HAVE_SETPROCTITLE */ | |
509 | 50 |
51 | |
52 #endif /* _NGX_SETPROCTITLE_H_INCLUDED_ */ |