[tomcat] branch BZ-63905/9.0.x updated (de12b4d -> 0346831)

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[tomcat] branch BZ-63905/9.0.x updated (de12b4d -> 0346831)

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

michaelo pushed a change to branch BZ-63905/9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


 discard de12b4d  BZ 63905: Clean up Tomcat CSS
     add 67909e0  Add comment to explain the cleanup
     add ffb553c  Fix logic that meant AJP was not always non-blocking between requests
     new 0346831  BZ 63905: Clean up Tomcat CSS

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (de12b4d)
            \
             N -- N -- N   refs/heads/BZ-63905/9.0.x (0346831)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/coyote/ajp/AjpProcessor.java     | 8 +++++---
 java/org/apache/tomcat/util/net/AprEndpoint.java | 2 ++
 webapps/docs/changelog.xml                       | 9 +++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat] 01/01: BZ 63905: Clean up Tomcat CSS

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

michaelo pushed a commit to branch BZ-63905/9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 0346831b2abacc706a75f6e9807a449c89964ae4
Author: Michael Osipov <[hidden email]>
AuthorDate: Thu Nov 7 22:21:27 2019 +0100

    BZ 63905: Clean up Tomcat CSS
   
    Remove duplication in Tomcat CSS which applies to ErrorReportValve,
    DefaultServlet and ManagerServlet as well as update incorrect documentation.
---
 java/org/apache/catalina/util/TomcatCSS.java | 16 +++++++---------
 webapps/docs/changelog.xml                   |  3 +++
 webapps/docs/config/valve.xml                |  5 ++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/java/org/apache/catalina/util/TomcatCSS.java b/java/org/apache/catalina/util/TomcatCSS.java
index c4f6da3..93f15a9 100644
--- a/java/org/apache/catalina/util/TomcatCSS.java
+++ b/java/org/apache/catalina/util/TomcatCSS.java
@@ -22,15 +22,13 @@ package org.apache.catalina.util;
 public class TomcatCSS {
 
     public static final String TOMCAT_CSS =
-        "h1 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;} " +
-        "h2 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:16px;} " +
-        "h3 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:14px;} " +
-        "body {font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;} " +
-        "b {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;} " +
-        "p {font-family:Tahoma,Arial,sans-serif;background:white;color:black;font-size:12px;} " +
+        "body {font-family:Tahoma,Arial,sans-serif;} " +
+        "h1, h2, h3, b {color:white;background-color:#525D76;} " +
+        "h1 {font-size:22px;} " +
+        "h2 {font-size:16px;} " +
+        "h3 {font-size:14px;} " +
+        "p {font-size:12px;} " +
         "a {color:black;} " +
-        "a.name {color:black;} " +
         ".line {height:1px;background-color:#525D76;border:none;}";
 
-
-}
\ No newline at end of file
+}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c910d17..0e701f3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -70,6 +70,9 @@
         to this change it was possible to see an updated last modified time but
         the content would be that prior to the modification. (markt)
       </fix>
+      <update>
+        <bug>63905</bug> Clean up Tomcat CSS. (michaelo)
+      </update>
     </changelog>
   </subsection>
   <subsection name="Coyote">
diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index 5e05287..72f0584 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -1900,8 +1900,7 @@
     status codes and/or exception types.</p>
 
     <p><strong>NOTE:</strong> Disabling both showServerInfo and showReport will
-    only return the HTTP status code and remove all CSS from the default
-    response.</p>
+    only return the HTTP status code.</p>
 
   </subsection>
 
@@ -1922,7 +1921,7 @@
         <p>The location of the UTF-8 encoded HTML file to return for the HTTP
         error code represented by <code>nnn</code>. For example,
         <code>errorCode.404</code> specifies the file to return for an HTTP 404
-        error. The location may be relative or absolule. If relative, it must be
+        error. The location may be relative or absolute. If relative, it must be
         relative to <code>$CATALINA_BASE</code>. The special value of
         <code>errorCode.0</code> may be used to define a default error page to
         be used if no error page is defined for a status code. If no matching


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]