nginx-0.1.1-RELEASE importrelease-0.1.1

    *) Feature: the gzip_types directive.

    *) Feature: the tcp_nodelay directive.

    *) Feature: the send_lowat directive is working not only on OSes that
       support kqueue NOTE_LOWAT, but also on OSes that support SO_SNDLOWAT.

    *) Feature: the setproctitle() emulation for Linux and Solaris.

    *) Bugfix: the "Location" header rewrite bug fixed while the proxying.

    *) Bugfix: the ngx_http_chunked_module module may get caught in an
       endless loop.

    *) Bugfix: the /dev/poll module bugs fixed.

    *) Bugfix: the responses were corrupted when the temporary files were
       used while the proxying.

    *) Bugfix: the unescaped requests were passed to the backend.

    *) Bugfix: while the build configuration on Linux 2.4 the
       --with-poll_module parameter was required.

1 files changed, 5 insertions, 4 deletions

diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c
index ee4d224ba..e41e971f9 100644
--- a/src/core/ngx_palloc.c
+++ b/src/core/ngx_palloc.c
@@ -77,13 +77,14 @@ void *ngx_palloc(ngx_pool_t *pool, size_t size)
     ngx_pool_large_t  *large, *last;
 
     if (size <= (size_t) NGX_MAX_ALLOC_FROM_POOL
-        && size <= (size_t) (pool->end - (char *) pool) - sizeof(ngx_pool_t))
+        && size <= (size_t) (pool->end - (char *) pool)
+                                     - (size_t) ngx_align(sizeof(ngx_pool_t)))
     {
         for (p = pool, n = pool->next; /* void */; p = n, n = n->next) {
             m = ngx_align(p->last);
 
             if ((size_t) (p->end - m) >= size) {
-                p->last = m + size ;
+                p->last = m + size;
 
                 return m;
             }
@@ -100,8 +101,8 @@ void *ngx_palloc(ngx_pool_t *pool, size_t size)
         }
 
         p->next = n;
-        m = n->last;
-        n->last += size;
+        m = ngx_align(n->last);
+        n->last = m + size;
 
         return m;
     }