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 dfc79b4 BZ64206: Regression that meant installer ignored HTTP port
setting
dfc79b4 is described below
commit dfc79b4dc6e38f246a6a003bb88c0af67d63c17f
Author: Mark Thomas <[email protected]>
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 | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 2948015..ab39f19 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -1044,7 +1044,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 d9d5e83..cc9b4f3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -143,6 +143,11 @@
<code>S</code>, <code>SS</code> or <code>SSS</code>) in the timestamp
used by JULI's <code>OneLineFormatter</code>. (markt)
</add>
+ <fix>
+ <bug>64206</bug>: 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)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
