Mercurial > hg > nginx
annotate src/os/win32/ngx_thread.c @ 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 | 537259db5af4 |
children |
rev | line source |
---|---|
461 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4412 | 4 * Copyright (C) Nginx, Inc. |
461 | 5 */ |
6 | |
7 | |
8 #include <ngx_config.h> | |
9 #include <ngx_core.h> | |
10 | |
11 | |
563 | 12 ngx_err_t |
13 ngx_create_thread(ngx_tid_t *tid, | |
14 ngx_thread_value_t (__stdcall *func)(void *arg), void *arg, ngx_log_t *log) | |
461 | 15 { |
2725 | 16 u_long id; |
461 | 17 ngx_err_t err; |
18 | |
6111
537259db5af4
Removed "worker_threads" and "thread_stack_size" directives.
Ruslan Ermilov <ru@nginx.com>
parents:
6110
diff
changeset
|
19 *tid = CreateThread(NULL, 0, func, arg, 0, &id); |
461 | 20 |
21 if (*tid != NULL) { | |
2725 | 22 ngx_log_error(NGX_LOG_NOTICE, log, 0, |
23 "create thread " NGX_TID_T_FMT, id); | |
461 | 24 return 0; |
25 } | |
26 | |
27 err = ngx_errno; | |
28 ngx_log_error(NGX_LOG_ALERT, log, err, "CreateThread() failed"); | |
29 return err; | |
30 } |