commit 2517fbf2b8e2306b83102ffeda0c54b5a15780a3
author Igor Sysoev <igor@sysoev.ru> Mon May 21 13:49:35 2007 +0000
committer Igor Sysoev <igor@sysoev.ru> Mon May 21 13:49:35 2007 +0000
tree 4d007d8554bf5e7e6cd5dead403d6587f17acc1d
parent 0687cb9d9932e3ff3e04082a024a7ae5859ea0a7

use memory optimization for i386 and amd64 only:
this fixes SIGBUS in PCRE on sparc64

src/core/ngx_palloc.c

diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c
index 4288bf1..2e72a0f 100644
--- a/src/core/ngx_palloc.c
+++ b/src/core/ngx_palloc.c
@@ -97,10 +97,21 @@
 
         for ( ;; ) {
 
+#if (NGX_HAVE_NONALIGNED)
+
+            /*
+             * allow non-aligned memory blocks for small allocations (1, 2,
+             * or 3 bytes) and for odd length strings (struct's have aligned
+             * size)
+             */
+
             if (size < sizeof(int) || (size & 1)) {
                 m = p->last;
 
-            } else {
+            } else
+#endif
+
+            {
                 m = ngx_align_ptr(p->last, NGX_ALIGNMENT);
             }