commit a893eab667078a8ad9f473296663b36e6ade111a
author Igor Sysoev <igor@sysoev.ru> Thu Mar 11 21:34:52 2004 +0000
committer Igor Sysoev <igor@sysoev.ru> Thu Mar 11 21:34:52 2004 +0000
tree 5eb4a198f0e0976948fc154c832663db661a4a91
parent 6bb889f442bd7c5c6f640021014014ebc59bac27

nginx-0.0.2-2004-03-12-00:34:52 import

src/core/ngx_cycle.c

diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index 7fcc679..4e61a54 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -226,20 +226,14 @@
         }
     }
 
-#if (WIN32)
-#if 0
-    /* TODO: TEST */
-fprintf(stderr, "BEFORE\n");
-    CloseHandle(GetStdHandle(STD_ERROR_HANDLE));
-    SetStdHandle(STD_ERROR_HANDLE, cycle->log->file->fd);
-fprintf(stderr, "AFTER\n");
-#endif
-#else
+#if !(WIN32)
+
     if (dup2(cycle->log->file->fd, STDERR_FILENO) == NGX_ERROR) {
         ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
                       "dup2(STDERR) failed");
         failed = 1;
     }
+
 #endif
 
     if (failed) {
@@ -454,15 +448,13 @@
         file[i].fd = fd;
     }
 
-#if (WIN32)
-    /* TODO: TEST */
-    CloseHandle(GetStdHandle(STD_ERROR_HANDLE));
-    SetStdHandle(STD_ERROR_HANDLE, cycle->log->file->fd);
-#else
+#if !(WIN32)
+
     if (dup2(cycle->log->file->fd, STDERR_FILENO) == -1) {
         ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
                       "dup2(STDERR) failed");
     }
+
 #endif
 }
 

src/http/ngx_http_headers.c

diff --git a/src/http/ngx_http_headers.c b/src/http/ngx_http_headers.c
index 1287449..1820ea7 100644
--- a/src/http/ngx_http_headers.c
+++ b/src/http/ngx_http_headers.c
@@ -19,8 +19,10 @@
     { ngx_string("If-Range"), offsetof(ngx_http_headers_in_t, if_range) },
 #endif
 
+#if (NGX_HTTP_GZIP)
     { ngx_string("Accept-Encoding"),
                            offsetof(ngx_http_headers_in_t, accept_encoding) },
+#endif
 
     { ngx_string("Authorization"),
                              offsetof(ngx_http_headers_in_t, authorization) },