mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-20 19:27:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

r1577, r1582 merge:

Browse Source 
Cygwin support
This commit is contained in:
Igor Sysoev 2007-12-12 20:38:44 +00:00
parent 67c3962364
commit 0993e097cf
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auto/headers
View File

@ -6,3 +6,5 @@ ngx_include="unistd.h"; . auto/include
ngx_include="inttypes.h"; . auto/include ngx_include="inttypes.h"; . auto/include
ngx_include="limits.h"; . auto/include ngx_include="limits.h"; . auto/include
ngx_include="sys/filio.h"; . auto/include ngx_include="sys/filio.h"; . auto/include
ngx_include="crypt.h"; . auto/include
ngx_include="malloc.h"; . auto/include

15
src/os/unix/ngx_posix_config.h
View File

@ -19,6 +19,12 @@
#endif #endif
#ifdef __CYGWIN__
#define timezonevar /* timezone is variable */
#define NGX_BROKEN_SCM_RIGHTS 1
#endif
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h> #include <sys/time.h>
#if (NGX_HAVE_UNISTD_H) #if (NGX_HAVE_UNISTD_H)
@ -64,6 +70,15 @@
#include <limits.h> /* IOV_MAX */ #include <limits.h> /* IOV_MAX */
#endif #endif
#if (NGX_HAVE_MALLOC_H)
#include <malloc.h> /* memalign() */
#endif
#if (NGX_HAVE_CRYPT_H)
#include <crypt.h>
#endif
#ifndef IOV_MAX #ifndef IOV_MAX
#define IOV_MAX 16 #define IOV_MAX 16
#endif #endif

8
src/os/unix/ngx_process_cycle.c
View File

@ -409,6 +409,12 @@ ngx_signal_worker_processes(ngx_cycle_t *cycle, int signo)
ngx_err_t err; ngx_err_t err;
ngx_channel_t ch; ngx_channel_t ch;
#if (NGX_BROKEN_SCM_RIGHTS)
ch.command = 0;
#else
switch (signo) { switch (signo) {
case ngx_signal_value(NGX_SHUTDOWN_SIGNAL): case ngx_signal_value(NGX_SHUTDOWN_SIGNAL):
@ -427,6 +433,8 @@ ngx_signal_worker_processes(ngx_cycle_t *cycle, int signo)
ch.command = 0; ch.command = 0;
} }
#endif
ch.fd = -1; ch.fd = -1;