Mercurial > hg > nginx
annotate src/os/unix/ngx_setproctitle.h @ 6787:640e1e778de6
Upstream: consistently initialize explicit upstreams.
When an upstream{} block follows a proxy_pass reference to it,
such an upstream inherited port and default_port settings from
proxy_pass. This was different from when they came in another
order (see ticket #1059). Explicit upstreams should not have
port and default_port in any case.
This fixes the following case:
server { location / { proxy_pass http://u; } ... }
upstream u { server 127.0.0.1; }
server { location / { proxy_pass https://u; } ... }
but not the following:
server { location / { proxy_pass http://u; } ... }
server { location / { proxy_pass https://u; } ... }
upstream u { server 127.0.0.1; }
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Mon, 17 Oct 2016 14:14:02 +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_ */ |