Mercurial > hg > nginx
changeset 1719:2ab8bb66d3d7 stable-0.5
r1577, r1582 merge:
Cygwin support
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 12 Dec 2007 20:38:44 +0000 |
parents | 5b24b2decde8 |
children | f7c4e833d85a |
files | auto/headers src/os/unix/ngx_posix_config.h src/os/unix/ngx_process_cycle.c |
diffstat | 3 files changed, 25 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/headers Wed Dec 12 20:35:32 2007 +0000 +++ b/auto/headers Wed Dec 12 20:38:44 2007 +0000 @@ -6,3 +6,5 @@ ngx_include="inttypes.h"; . auto/include ngx_include="limits.h"; . auto/include ngx_include="sys/filio.h"; . auto/include +ngx_include="crypt.h"; . auto/include +ngx_include="malloc.h"; . auto/include
--- a/src/os/unix/ngx_posix_config.h Wed Dec 12 20:35:32 2007 +0000 +++ b/src/os/unix/ngx_posix_config.h Wed Dec 12 20:38:44 2007 +0000 @@ -19,6 +19,12 @@ #endif +#ifdef __CYGWIN__ +#define timezonevar /* timezone is variable */ +#define NGX_BROKEN_SCM_RIGHTS 1 +#endif + + #include <sys/types.h> #include <sys/time.h> #if (NGX_HAVE_UNISTD_H) @@ -64,6 +70,15 @@ #include <limits.h> /* IOV_MAX */ #endif +#if (NGX_HAVE_MALLOC_H) +#include <malloc.h> /* memalign() */ +#endif + +#if (NGX_HAVE_CRYPT_H) +#include <crypt.h> +#endif + + #ifndef IOV_MAX #define IOV_MAX 16 #endif
--- a/src/os/unix/ngx_process_cycle.c Wed Dec 12 20:35:32 2007 +0000 +++ b/src/os/unix/ngx_process_cycle.c Wed Dec 12 20:38:44 2007 +0000 @@ -409,6 +409,12 @@ ngx_err_t err; ngx_channel_t ch; +#if (NGX_BROKEN_SCM_RIGHTS) + + ch.command = 0; + +#else + switch (signo) { case ngx_signal_value(NGX_SHUTDOWN_SIGNAL): @@ -427,6 +433,8 @@ ch.command = 0; } +#endif + ch.fd = -1;