* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059
Fix a typo in Windows uninstaller:
Do not forget to remove Tomcat keys from 32-bit registry on deinstallation.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk@1214818 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/STATUS.txt b/STATUS.txt
index 4de80a5..9aa17f3 100644
--- a/STATUS.txt
+++ b/STATUS.txt
@@ -27,13 +27,6 @@
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059
- http://svn.apache.org/viewvc?rev=1186763&view=rev
- Fix a typo in Windows uninstaller:
- Do not forget to remove Tomcat keys from 32-bit registry on deinstallation.
- +1: kkolinko, rjung, markt
- -1:
-
* Make configuration issue for RemoteAddrValve, RemoteHostValve result
in the failure of the valve rather than just a warning message.
Ensure changes to the configuration of these valves via JMX are thread-safe.
diff --git a/build/tomcat.nsi b/build/tomcat.nsi
index 1a1b393..537a33f 100644
--- a/build/tomcat.nsi
+++ b/build/tomcat.nsi
@@ -1134,7 +1134,7 @@
; Don't know if 32-bit or 64-bit registry was used so, for now, remove both
SetRegView 32
DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName"
- DeleteRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@ $TomcatServiceName"
+ DeleteRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@\$TomcatServiceName"
DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName"
DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName"
SetRegView 64
diff --git a/container/webapps/docs/changelog.xml b/container/webapps/docs/changelog.xml
index df66d49..b8d9966 100644
--- a/container/webapps/docs/changelog.xml
+++ b/container/webapps/docs/changelog.xml
@@ -37,7 +37,7 @@
<body>
<!-- Section names:
- General, Catalina, Coyote, Jasper, Cluster, Webapps
+ General, Catalina, Coyote, Jasper, Cluster, Webapps, Other
-->
<section name="Tomcat 5.5.35 (jim)" rtext="">
<subsection name="General">
@@ -60,6 +60,14 @@
</update>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ <bug>52059</bug>: Ensure Windows registry keys are removed when using
+ the un-install option of the Windows installer. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 5.5.34 (jim)" rtext="released 2011-09-22">
<subsection name="General">
