Mercurial > hg > nginx
view src/os/win32/ngx_process_cycle.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 | b4cc553aafeb |
| children |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev * Copyright (C) Nginx, Inc. */ #ifndef _NGX_PROCESS_CYCLE_H_INCLUDED_ #define _NGX_PROCESS_CYCLE_H_INCLUDED_ #include <ngx_config.h> #include <ngx_core.h> #define NGX_PROCESS_SINGLE 0 #define NGX_PROCESS_MASTER 1 #define NGX_PROCESS_SIGNALLER 2 #define NGX_PROCESS_WORKER 3 void ngx_master_process_cycle(ngx_cycle_t *cycle); void ngx_single_process_cycle(ngx_cycle_t *cycle); void ngx_close_handle(HANDLE h); extern ngx_uint_t ngx_process; extern ngx_uint_t ngx_worker; extern ngx_pid_t ngx_pid; extern ngx_uint_t ngx_exiting; extern sig_atomic_t ngx_quit; extern sig_atomic_t ngx_terminate; extern sig_atomic_t ngx_reopen; extern ngx_uint_t ngx_inherited; extern ngx_pid_t ngx_new_binary; extern HANDLE ngx_master_process_event; extern char ngx_master_process_event_name[]; #endif /* _NGX_PROCESS_CYCLE_H_INCLUDED_ */