nginx-0.3.24-RELEASE importrelease-0.3.24

    *) Workaround: for bug in FreeBSD kqueue.

    *) Bugfix: now a response generated by the "post_action" directive is
       not transferred to a client.

    *) Bugfix: the memory leaks were occurring if many log files were used.

    *) Bugfix: the first "proxy_redirect" directive was working inside one
       location.

    *) Bugfix: on 64-bit platforms segmentation fault may occurred on start
       if the many names were used in the "server_name" directives; the bug
       had appeared in 0.3.18.

1 files changed, 58 insertions, 0 deletions

diff --git a/src/os/win32/ngx_shmem.c b/src/os/win32/ngx_shmem.c
new file mode 100644
index 000000000..5c8fb6223
--- /dev/null
+++ b/src/os/win32/ngx_shmem.c
@@ -0,0 +1,58 @@
+
+/*
+ * Copyright (C) Igor Sysoev
+ */
+
+
+#include <ngx_config.h>
+#include <ngx_core.h>
+
+
+/*
+ * TODO:
+ *     maping name or inheritable handle
+ */
+
+ngx_int_t
+ngx_shm_alloc(ngx_shm_t *shm)
+{
+    shm->handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE,
+                                    0, shm->size, NULL);
+
+    if (shm->handle == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                      "CreateFileMapping(%uz) failed", shm->size);
+        return NGX_ERROR;
+    }
+
+    shm->addr = MapViewOfFile(shm->handle, FILE_MAP_WRITE, 0, 0, 0);
+
+    if (shm->addr == NULL) {
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                      "MapViewOfFile(%uz) failed", shm->size);
+
+        if (CloseHandle(shm->handle) == 0) {
+            ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                          "CloseHandle() failed");
+        }
+
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+void
+ngx_shm_free(ngx_shm_t *shm)
+{
+    if (UnmapViewOfFile(shm->addr) == 0) {
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                      "UnmapViewOfFile(%p) failed", shm->addr);
+    }
+
+    if (CloseHandle(shm->handle) == 0) {
+        ngx_log_error(NGX_LOG_ALERT, shm->log, ngx_errno,
+                      "CloseHandle() failed");
+    }
+}