nginx-0.0.3-2004-06-06-23:49:18 import

3 files changed, 19 insertions, 4 deletions

diff --git a/auto/cc b/auto/cc
index 59cbfbfe6..29e94d055 100644
--- a/auto/cc
+++ b/auto/cc
@@ -5,7 +5,7 @@ case $CC in
 
     *gcc*)
          # gcc 2.7.2.3, 2.8.1, 2.95.4,
-         #     3.2.3, 3.3.2, 3.3.3, 3.3.4, 3.4
+         #     3.0.4, 3.1.1, 3.2.3, 3.3.2, 3.3.3, 3.3.4, 3.4
 
          # optimization
          #CFLAGS="$CFLAGS -O2 -fomit-frame-pointer"
diff --git a/auto/sources b/auto/sources
index 86a1cddd8..c48443392 100644
--- a/auto/sources
+++ b/auto/sources
@@ -8,7 +8,7 @@ CORE_DEPS="src/core/nginx.h \
             src/core/ngx_core.h \
             src/core/ngx_atomic.h \
             src/core/ngx_log.h \
-            src/core/ngx_alloc.h \
+            src/core/ngx_palloc.h \
             src/core/ngx_array.h \
             src/core/ngx_table.h \
             src/core/ngx_buf.h \
@@ -27,7 +27,7 @@ CORE_DEPS="src/core/nginx.h \
 
 CORE_SRCS="src/core/nginx.c \
             src/core/ngx_log.c \
-            src/core/ngx_alloc.c \
+            src/core/ngx_palloc.c \
             src/core/ngx_array.c \
             src/core/ngx_buf.c \
             src/core/ngx_output_chain.c \
@@ -103,6 +103,7 @@ UNIX_DEPS="$CORE_DEPS $EVENT_DEPS \
             src/os/unix/ngx_time.h \
             src/os/unix/ngx_types.h \
             src/os/unix/ngx_errno.h \
+            src/os/unix/ngx_alloc.h \
             src/os/unix/ngx_files.h \
             src/os/unix/ngx_process.h \
             src/os/unix/ngx_thread.h \
@@ -113,6 +114,7 @@ UNIX_DEPS="$CORE_DEPS $EVENT_DEPS \
 UNIX_SRCS="$CORE_SRCS $EVENT_SRCS \
             src/os/unix/ngx_time.c \
             src/os/unix/ngx_errno.c \
+            src/os/unix/ngx_alloc.c \
             src/os/unix/ngx_files.c \
             src/os/unix/ngx_socket.c \
             src/os/unix/ngx_recv.c \
@@ -146,6 +148,7 @@ WIN32_DEPS="$CORE_DEPS $EVENT_DEPS \
             src/os/win32/ngx_time.h \
             src/os/win32/ngx_types.h \
             src/os/win32/ngx_errno.h \
+            src/os/win32/ngx_alloc.h \
             src/os/win32/ngx_files.h \
             src/os/win32/ngx_process.h \
             src/os/win32/ngx_socket.h \
@@ -156,6 +159,7 @@ WIN32_CONFIG=src/os/win32/ngx_win32_config.h
 
 WIN32_SRCS="$CORE_SRCS $EVENT_SRCS \
             src/os/win32/ngx_errno.c \
+            src/os/win32/ngx_alloc.c \
             src/os/win32/ngx_files.c \
             src/os/win32/ngx_time.c \
             src/os/win32/ngx_process.c \
@@ -194,7 +198,6 @@ HTTP_INCS="src/http src/http/modules"
 
 HTTP_DEPS="src/http/ngx_http.h \
             src/http/ngx_http_request.h \
-            src/http/ngx_http_filter.h \
             src/http/ngx_http_config.h \
             src/http/ngx_http_core_module.h \
             src/http/ngx_http_cache.h \
diff --git a/auto/unix b/auto/unix
index 55b66bf93..c150f2e9c 100755
--- a/auto/unix
+++ b/auto/unix
@@ -110,3 +110,15 @@ ngx_func="localtime_r()"
 ngx_func_inc="#include <time.h>"
 ngx_func_test="struct tm t; time_t c=0; localtime_r(&c, &t)"
 . auto/func
+
+
+ngx_func="posix_memalign()"
+ngx_func_inc="#include <stdlib.h>"
+ngx_func_test="void *p, int n; n = posix_memalign(&p, 4096, 4096)"
+. auto/func
+
+
+ngx_func="memalign()"
+ngx_func_inc="#include <stdlib.h>"
+ngx_func_test="void *p; p = memalign(4096, 4096)"
+. auto/func