Mercurial > hg > nginx
view src/os/unix/ngx_setaffinity.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 | 7296b38f6416 |
children |
line wrap: on
line source
/* * Copyright (C) Nginx, Inc. */ #include <ngx_config.h> #include <ngx_core.h> #if (NGX_HAVE_CPUSET_SETAFFINITY) void ngx_setaffinity(ngx_cpuset_t *cpu_affinity, ngx_log_t *log) { ngx_uint_t i; for (i = 0; i < CPU_SETSIZE; i++) { if (CPU_ISSET(i, cpu_affinity)) { ngx_log_error(NGX_LOG_NOTICE, log, 0, "cpuset_setaffinity(): using cpu #%ui", i); } } if (cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(cpuset_t), cpu_affinity) == -1) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "cpuset_setaffinity() failed"); } } #elif (NGX_HAVE_SCHED_SETAFFINITY) void ngx_setaffinity(ngx_cpuset_t *cpu_affinity, ngx_log_t *log) { ngx_uint_t i; for (i = 0; i < CPU_SETSIZE; i++) { if (CPU_ISSET(i, cpu_affinity)) { ngx_log_error(NGX_LOG_NOTICE, log, 0, "sched_setaffinity(): using cpu #%ui", i); } } if (sched_setaffinity(0, sizeof(cpu_set_t), cpu_affinity) == -1) { ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "sched_setaffinity() failed"); } } #endif