nginx-0.0.3-2004-06-08-20:26:37 import

diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c
index 65e2eed66d43fed4af733e79ed3e350c0f88e651..77c1132670a78af6e5ea4acb47bc134154a59fef 100644 (file)
--- a/src/core/ngx_palloc.c
+++ b/src/core/ngx_palloc.c
@@ -126,9 +126,15 @@ void *ngx_palloc(ngx_pool_t *pool, size_t size)
         large->next = NULL;
     }
 
+#if 0
     if (!(p = ngx_memalign(ngx_pagesize, size, pool->log))) {
         return NULL;
     }
+#else
+    if (!(p = ngx_alloc(size, pool->log))) {
+        return NULL;
+    }
+#endif
 
     if (pool->large == NULL) {
         pool->large = large;

diff --git a/src/os/unix/ngx_alloc.c b/src/os/unix/ngx_alloc.c
index 69925d1bed9eb773b894606b3fa2d2bb68d4ae1d..bb3a299e10cbeed595560759737d677c6dbafd03 100644 (file)
--- a/src/os/unix/ngx_alloc.c
+++ b/src/os/unix/ngx_alloc.c
@@ -38,11 +38,11 @@ void *ngx_calloc(size_t size, ngx_log_t *log)
 
 #if (HAVE_POSIX_MEMALIGN)
 
-void *ngx_memalign(size_t aligment, size_t size, ngx_log_t *log)
+void *ngx_memalign(size_t alignment, size_t size, ngx_log_t *log)
 {
     void  *p;
 
-    if (posix_memalign(&p, aligment, size) == -1) {
+    if (posix_memalign(&p, alignment, size) == -1) {
         ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
                       "posix_memalign() " SIZE_T_FMT " bytes aligned to "
                       SIZE_T_FMT " failed", size, alignment);
@@ -54,13 +54,13 @@ void *ngx_memalign(size_t aligment, size_t size, ngx_log_t *log)
     return p;
 }
 
-#esif (HAVE_MEMALIGN)
+#elif (HAVE_MEMALIGN)
 
-void *ngx_memalign(size_t aligment, size_t size, ngx_log_t *log)
+void *ngx_memalign(size_t alignment, size_t size, ngx_log_t *log)
 {
     void  *p;
 
-    if (!(p = memalign(aligment, size))) {
+    if (!(p = memalign(alignment, size))) {
         ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
                       "memalign() " SIZE_T_FMT " bytes aligned to "
                       SIZE_T_FMT " failed", size, alignment);