This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 43ec1bc BZ64206: Regression that meant installer ignored HTTP port
setting
43ec1bc is described below
commit 43ec1bc00d6e68449db19466a0ed3ddae94a62f0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Mar 9 13:51:31 2020 +0000
BZ64206: Regression that meant installer ignored HTTP port setting
https://bz.apache.org/bugzilla/show_bug.cgi?id=64206
---
res/tomcat.nsi | 2 +-
webapps/docs/changelog.xml | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index c06df50..0bdeec2 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -1045,7 +1045,7 @@ Function configure
IfErrors SERVER_XML_LEAVELOOP
${StrRep} $R4 $R3 "8005" "$TomcatPortShutdown"
${StrRep} $R3 $R4 "8080" "$TomcatPortHttp"
- FileWrite $R2 $R4
+ FileWrite $R2 $R3
Goto SERVER_XML_LOOP
SERVER_XML_LEAVELOOP:
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 112c8b6..29a85fb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -52,6 +52,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>64206</fix>: Correct regression introduced in 10.0.0-M1 that meant
+ the HTTP specified when using the Windows Installer was ignored and 8080
+ was always used. (markt)
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 10.0.0-M2 (markt)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
