Mercurial > hg > nginx-quic
view src/os/win32/ngx_process.h @ 6785:d1d0dd69a419
Upstream: added the ngx_http_upstream_resolved_t.name field.
This fixes inconsistency in what is stored in the "host" field.
Normally it would contain the "host" part of the parsed URL
(e.g., proxy_pass with variables), but for the case of an
implicit upstream specified with literal address it contained
the text representation of the socket address (that is, host
including port for IP).
Now the "host" field always contains the "host" part of the URL,
while the text representation of the socket address is stored
in the newly added "name" field.
The ngx_http_upstream_create_round_robin_peer() function was
modified accordingly in a way to be compatible with the code
that does not know about the new "name" field.
The "stream" code was similarly modified except for not adding
compatibility in ngx_stream_upstream_create_round_robin_peer().
This change is also a prerequisite for the next change.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Mon, 31 Oct 2016 18:33:33 +0300 |
parents | 7296b38f6416 |
children | 8b84d60ef13d |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev * Copyright (C) Nginx, Inc. */ #ifndef _NGX_PROCESS_H_INCLUDED_ #define _NGX_PROCESS_H_INCLUDED_ typedef DWORD ngx_pid_t; #define NGX_INVALID_PID 0 #define ngx_getpid GetCurrentProcessId #define ngx_log_pid ngx_pid #define NGX_PROCESS_SYNC_NAME \ (sizeof("ngx_cache_manager_mutex_") + NGX_INT32_LEN) typedef uint64_t ngx_cpuset_t; typedef struct { HANDLE handle; ngx_pid_t pid; char *name; HANDLE term; HANDLE quit; HANDLE reopen; u_char term_event[NGX_PROCESS_SYNC_NAME]; u_char quit_event[NGX_PROCESS_SYNC_NAME]; u_char reopen_event[NGX_PROCESS_SYNC_NAME]; unsigned just_spawn:1; unsigned exiting:1; } ngx_process_t; typedef struct { char *path; char *name; char *args; char *const *argv; char *const *envp; HANDLE child; } ngx_exec_ctx_t; ngx_pid_t ngx_spawn_process(ngx_cycle_t *cycle, char *name, ngx_int_t respawn); ngx_pid_t ngx_execute(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx); #define ngx_debug_point() #define ngx_sched_yield() SwitchToThread() #define NGX_MAX_PROCESSES (MAXIMUM_WAIT_OBJECTS - 4) #define NGX_PROCESS_RESPAWN -2 #define NGX_PROCESS_JUST_RESPAWN -3 extern int ngx_argc; extern char **ngx_argv; extern char **ngx_os_argv; extern ngx_int_t ngx_last_process; extern ngx_process_t ngx_processes[NGX_MAX_PROCESSES]; extern ngx_pid_t ngx_pid; #endif /* _NGX_PROCESS_H_INCLUDED_ */