From 2402502c2f35b831ee89369a532b1ff4e4e19947 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Fri, 16 Dec 2005 15:07:08 +0000
Subject: nginx-0.3.16-RELEASE import

    *) Feature: the ngx_http_map_module.

    *) Feature: the "types_hash_max_size" and "types_hash_bucket_size"
       directives.

    *) Feature: the "ssi_value_length" directive.

    *) Feature: the "worker_rlimit_core" directive.

    *) Workaround: the connection number in logs was always 1 if nginx was
       built by the icc 8.1 or 9.0 compilers with optimization for
       Pentium 4.

    *) Bugfix: the "config timefmt" SSI command set incorrect time format.

    *) Bugfix: nginx did not close connection to IMAP/POP3 backend for the
       SSL connections; the bug had appeared in 0.3.13.
       Thanks to Rob Mueller.

    *) Bugfix: segmentation fault may occurred in at SSL shutdown; the bug
       had appeared in 0.3.13.
---
 src/os/win32/ngx_alloc.c      | 3 ++-
 src/os/win32/ngx_alloc.h      | 3 ++-
 src/os/win32/ngx_win32_init.c | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/os/win32')

diff --git a/src/os/win32/ngx_alloc.c b/src/os/win32/ngx_alloc.c
index a3bca02a9..82ede7211 100644
--- a/src/os/win32/ngx_alloc.c
+++ b/src/os/win32/ngx_alloc.c
@@ -8,7 +8,8 @@
 #include <ngx_core.h>
 
 
-int ngx_pagesize;
+int         ngx_pagesize;
+ngx_uint_t  ngx_cacheline_size;
 
 
 void *ngx_alloc(size_t size, ngx_log_t *log)
diff --git a/src/os/win32/ngx_alloc.h b/src/os/win32/ngx_alloc.h
index 6cf6691b9..9d8d83750 100644
--- a/src/os/win32/ngx_alloc.h
+++ b/src/os/win32/ngx_alloc.h
@@ -18,7 +18,8 @@ void *ngx_calloc(size_t size, ngx_log_t *log);
 #define ngx_free          free
 #define ngx_memalign(alignment, size, log)  ngx_alloc(size, log)
 
-extern int ngx_pagesize;
+extern int         ngx_pagesize;
+extern ngx_uint_t  ngx_cacheline_size;
 
 
 #endif /* _NGX_ALLOC_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_win32_init.c b/src/os/win32/ngx_win32_init.c
index 9c3df96f7..b4ac2b8b5 100644
--- a/src/os/win32/ngx_win32_init.c
+++ b/src/os/win32/ngx_win32_init.c
@@ -99,6 +99,7 @@ ngx_int_t ngx_os_init(ngx_log_t *log)
     GetSystemInfo(&si);
     ngx_pagesize = si.dwPageSize;
     ngx_ncpu = si.dwNumberOfProcessors;
+    ngx_cacheline_size = NGX_CPU_CACHE_LINE;
 
 
     /* init Winsock */
-- 
cgit