This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new c3097526d6 Adding a favicon to the Tomcat Manager webapp
c3097526d6 is described below

commit c3097526d672c40f211c7462d48cb1de656661ba
Author: sa103736 <xs...@users.noreply.github.com>
AuthorDate: Sun Jul 27 20:46:16 2025 -0400

    Adding a favicon to the Tomcat Manager webapp
    
    1. Tomcat Manager is sometimes run on server on which there is no ROOT
    context, therefore no default favicon is not found. This commits adds
    the tomcat favicon to the manager webapp directory and references it
    from the HTML_HEADER_SECTION in Constants.java
---
 java/org/apache/catalina/manager/Constants.java |   1 +
 webapps/docs/changelog.xml                      |   6 ++++++
 webapps/manager/favicon.ico                     | Bin 0 -> 21630 bytes
 3 files changed, 7 insertions(+)

diff --git a/java/org/apache/catalina/manager/Constants.java 
b/java/org/apache/catalina/manager/Constants.java
index 3e47f70b56..6318c0eb43 100644
--- a/java/org/apache/catalina/manager/Constants.java
+++ b/java/org/apache/catalina/manager/Constants.java
@@ -44,6 +44,7 @@ public class Constants {
         HTML_HEADER_SECTION =
                 "<html>\n" +
                 "<head>\n" +
+                "<link href=\"{0}/favicon.ico\" rel=\"icon\" 
type=\"image/x-icon\" />\n" +
                 "<link rel=\"stylesheet\" href=\"{0}/css/manager.css\">\n";
 
         BODY_HEADER_SECTION =
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 33a53232dc..bf12e6ae14 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -278,6 +278,12 @@
   <subsection name="Web applications">
     <changelog>
       <!-- Entries for backport and removal before 12.0.0-M1 below this line 
-->
+      <fix>
+        Manager. Provide the Manager web application with a dedicated favicon
+        file rather than using the one from the ROOT web application which 
might
+        not be present or may represent something entirely different. Pull
+        request <pr>876</pr> by Simon Arame.
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">
diff --git a/webapps/manager/favicon.ico b/webapps/manager/favicon.ico
new file mode 100644
index 0000000000..6c5bd2c63b
Binary files /dev/null and b/webapps/manager/favicon.ico differ


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to