summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2023-02-23 18:15:59 +0300
committerMaxim Dounin <mdounin@mdounin.ru>2023-02-23 18:15:59 +0300
commit62b790c3318a56971e461a1e1f5b79197b604e89 (patch)
treef5bfd152bf290db4f60c1f20416790795154fc6f
parent180be97d3157c6ed81efc0272dea6472241304c3 (diff)
downloadnginx-62b790c3318a56971e461a1e1f5b79197b604e89.tar.gz
Win32: i386 now assumed when crossbuilding (ticket #2416).
Previously, NGX_MACHINE was not set when crossbuilding, resulting in NGX_ALIGNMENT=16 being used in 32-bit builds (if not explicitly set to a correct value). This in turn might result in memory corruption in ngx_palloc() (as there are no usable aligned allocator on Windows, and normal malloc() is used instead, which provides 8 byte alignment on 32-bit platforms). To fix this, now i386 machine is set when crossbuilding, so nginx won't assume strict alignment requirements.
-rwxr-xr-xauto/configure1
1 files changed, 1 insertions, 0 deletions
diff --git a/auto/configure b/auto/configure
index 474d69e84..5b88ebb4c 100755
--- a/auto/configure
+++ b/auto/configure
@@ -44,6 +44,7 @@ if test -z "$NGX_PLATFORM"; then
else
echo "building for $NGX_PLATFORM"
NGX_SYSTEM=$NGX_PLATFORM
+ NGX_MACHINE=i386
fi
. auto/cc/conf