This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new dc2580f Correct registry entry locations for silent installs with
64-bit JVMs
dc2580f is described below
commit dc2580fe23df33118b6e4ef8c69d8b83805f3148
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 10 09:04:39 2019 +0100
Correct registry entry locations for silent installs with 64-bit JVMs
---
res/tomcat.nsi | 10 +++++++---
webapps/docs/changelog.xml | 5 +++++
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 58d6d57..438506e 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -822,22 +822,26 @@ Function checkJava
IntOp $R3 $R3 << 8
IntOp $R2 $R2 + $R3
- IntCmp $R2 0x014c +1 +3 +3
+ IntCmp $R2 0x014c +1 +4 +4
StrCpy "$Arch" "x86"
+ SetRegView 32
Goto DonePEHeader
- IntCmp $R2 0x8664 +1 +3 +3
+ IntCmp $R2 0x8664 +1 +4 +4
StrCpy "$Arch" "x64"
+ SetRegView 64
Goto DonePEHeader
- IntCmp $R2 0x0200 +1 +3 +3
+ IntCmp $R2 0x0200 +1 +4 +4
StrCpy "$Arch" "i64"
+ SetRegView 64
Goto DonePEHeader
WrongPEHeader:
IfSilent +2
MessageBox MB_OK|MB_ICONEXCLAMATION 'Cannot read PE header from
"$JvmDll"$\r$\nWill assume that the architecture is x86.'
DetailPrint 'Cannot read PE header from "$JvmDll". Assuming the architecture
is x86.'
+ SetRegView 32
StrCpy "$Arch" "x86"
DonePEHeader:
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6d4f8fc..61c2049 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -225,6 +225,11 @@
reject them with a 400 response rather than triggering an internal
error
that results in a 500 response. (markt)
</fix>
+ <fix>
+ When performing a silent install with the Windows Installer, ensure
that
+ the registry entires are added to the 64-bit registry when using a
+ 64-bit JVM. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
