Re: (tomcat) 03/08: Code clean - formatting. No functional change.
On Tue, Nov 28, 2023 at 4:16 PM Rémy Maucherat wrote:
>
> On Tue, Nov 28, 2023 at 3:18 PM Christopher Schultz
> wrote:
> >
> > Mark,
> >
> > On 11/25/23 08:40, Mark Thomas wrote:
> > > On 25/11/2023 07:59, Rémy Maucherat wrote:
> > >> On Fri, Nov 24, 2023 at 6:17 PM wrote:
> > >>>
> > >>> 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
> > >>>
> > >>> commit b91af3e5c32d154e26dbf8f1a19c84d301ce8e1e
> > >>> Author: Mark Thomas
> > >>> AuthorDate: Fri Nov 24 16:54:27 2023 +
> > >>>
> > >>> Code clean - formatting. No functional change.
> > >>>
> > >>> Primarily to reduce IDE warnings from generated code.
> > >>
> > >> jextract is really bad for this. OTOH, fixing them is not practical
> > >> since they will reappear every time this is regenerated for any
> > >> reason. So could it be ignored instead ?
> > >
> > > I did look at options for ignoring the warnings.
> > >
> > > You can't tell Eclipse to ignore warnings in a given file/package.
> > >
> > > We could add @SuppressWarnings("...") but that means manually editing
> > > each file.
> >
> > $ jextract ...
> > $ sed ...
> >
> > ?
>
> Also upgrade jextract and regenerate since they do improve the output
> once in a while. Clearly this is not a big priority though.
There are indeed some updates incoming:
https://github.com/openjdk/jextract/pull/145
I'll test them when they arrive.
Rémy
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix unintended escaping of XML in some WebDAV responses
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 78f2024471 Fix unintended escaping of XML in some WebDAV responses
78f2024471 is described below
commit 78f2024471d89eec9b1f2b6b2407e97c144a92dd
Author: Mark Thomas
AuthorDate: Wed Nov 29 17:04:19 2023 +
Fix unintended escaping of XML in some WebDAV responses
The XML list of support locks when provided in response to a PROPFIND
request was incorrectly XML escaped
---
java/org/apache/catalina/servlets/WebdavServlet.java | 4 ++--
java/org/apache/catalina/util/XMLWriter.java | 10 ++
webapps/docs/changelog.xml | 5 +
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index f941a23d6e..1f1aae190b 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1954,7 +1954,7 @@ public class WebdavServlet extends DefaultServlet {
"" +
"" +
"";
generatedXML.writeElement("D", "supportedlock",
XMLWriter.OPENING);
-generatedXML.writeText(supportedLocks);
+generatedXML.writeRaw(supportedLocks);
generatedXML.writeElement("D", "supportedlock",
XMLWriter.CLOSING);
generateLockDiscovery(path, generatedXML);
@@ -2062,7 +2062,7 @@ public class WebdavServlet extends DefaultServlet {
"" +
"" +
"";
generatedXML.writeElement("D", "supportedlock",
XMLWriter.OPENING);
-generatedXML.writeText(supportedLocks);
+generatedXML.writeRaw(supportedLocks);
generatedXML.writeElement("D", "supportedlock",
XMLWriter.CLOSING);
} else if (property.equals("lockdiscovery")) {
if (!generateLockDiscovery(path, generatedXML)) {
diff --git a/java/org/apache/catalina/util/XMLWriter.java
b/java/org/apache/catalina/util/XMLWriter.java
index 8290b73943..143c305f34 100644
--- a/java/org/apache/catalina/util/XMLWriter.java
+++ b/java/org/apache/catalina/util/XMLWriter.java
@@ -205,6 +205,16 @@ public class XMLWriter {
}
+/**
+ * Write raw XML data.
+ *
+ * @param raw Raw XML to append
+ */
+public void writeRaw(String raw) {
+buffer.append(raw);
+}
+
+
/**
* Write data.
*
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4099b3aa04..04b77f6b9c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -122,6 +122,11 @@
specification that requires that all HTTP error dispatches use the GET
method. (markt)
+
+Correct unintended escaping of XML in some WebDAV responses. The XML
+list of support locks when provided in response to a PROPFIND request
+was incorrectly XML escaped. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Fix unintended escaping of XML in some WebDAV responses
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new adefe070d2 Fix unintended escaping of XML in some WebDAV responses
adefe070d2 is described below
commit adefe070d221600d6e318308f2f39adc56da85e9
Author: Mark Thomas
AuthorDate: Wed Nov 29 17:04:19 2023 +
Fix unintended escaping of XML in some WebDAV responses
The XML list of support locks when provided in response to a PROPFIND
request was incorrectly XML escaped
---
java/org/apache/catalina/servlets/WebdavServlet.java | 4 ++--
java/org/apache/catalina/util/XMLWriter.java | 10 ++
webapps/docs/changelog.xml | 5 +
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index f941a23d6e..1f1aae190b 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1954,7 +1954,7 @@ public class WebdavServlet extends DefaultServlet {
"" +
"" +
"";
generatedXML.writeElement("D", "supportedlock",
XMLWriter.OPENING);
-generatedXML.writeText(supportedLocks);
+generatedXML.writeRaw(supportedLocks);
generatedXML.writeElement("D", "supportedlock",
XMLWriter.CLOSING);
generateLockDiscovery(path, generatedXML);
@@ -2062,7 +2062,7 @@ public class WebdavServlet extends DefaultServlet {
"" +
"" +
"";
generatedXML.writeElement("D", "supportedlock",
XMLWriter.OPENING);
-generatedXML.writeText(supportedLocks);
+generatedXML.writeRaw(supportedLocks);
generatedXML.writeElement("D", "supportedlock",
XMLWriter.CLOSING);
} else if (property.equals("lockdiscovery")) {
if (!generateLockDiscovery(path, generatedXML)) {
diff --git a/java/org/apache/catalina/util/XMLWriter.java
b/java/org/apache/catalina/util/XMLWriter.java
index 8290b73943..143c305f34 100644
--- a/java/org/apache/catalina/util/XMLWriter.java
+++ b/java/org/apache/catalina/util/XMLWriter.java
@@ -205,6 +205,16 @@ public class XMLWriter {
}
+/**
+ * Write raw XML data.
+ *
+ * @param raw Raw XML to append
+ */
+public void writeRaw(String raw) {
+buffer.append(raw);
+}
+
+
/**
* Write data.
*
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3f8c04bad5..6d3e3f9db4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,11 @@
Background processes should not be run concurrently with lifecycle
oprations of a container. (remm)
+
+Correct unintended escaping of XML in some WebDAV responses. The XML
+list of support locks when provided in response to a PROPFIND request
+was incorrectly XML escaped. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Fix unintended escaping of XML in some WebDAV responses
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 54d5b0f8f4 Fix unintended escaping of XML in some WebDAV responses
54d5b0f8f4 is described below
commit 54d5b0f8f4bf0803f6b8f23c29652310480dbb5c
Author: Mark Thomas
AuthorDate: Wed Nov 29 17:04:19 2023 +
Fix unintended escaping of XML in some WebDAV responses
The XML list of support locks when provided in response to a PROPFIND
request was incorrectly XML escaped
---
java/org/apache/catalina/servlets/WebdavServlet.java | 4 ++--
java/org/apache/catalina/util/XMLWriter.java | 10 ++
webapps/docs/changelog.xml | 5 +
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 24cee4c999..fb543280fb 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1953,7 +1953,7 @@ public class WebdavServlet extends DefaultServlet {
"" +
"" +
"";
generatedXML.writeElement("D", "supportedlock",
XMLWriter.OPENING);
-generatedXML.writeText(supportedLocks);
+generatedXML.writeRaw(supportedLocks);
generatedXML.writeElement("D", "supportedlock",
XMLWriter.CLOSING);
generateLockDiscovery(path, generatedXML);
@@ -2061,7 +2061,7 @@ public class WebdavServlet extends DefaultServlet {
"" +
"" +
"";
generatedXML.writeElement("D", "supportedlock",
XMLWriter.OPENING);
-generatedXML.writeText(supportedLocks);
+generatedXML.writeRaw(supportedLocks);
generatedXML.writeElement("D", "supportedlock",
XMLWriter.CLOSING);
} else if (property.equals("lockdiscovery")) {
if (!generateLockDiscovery(path, generatedXML)) {
diff --git a/java/org/apache/catalina/util/XMLWriter.java
b/java/org/apache/catalina/util/XMLWriter.java
index 8290b73943..143c305f34 100644
--- a/java/org/apache/catalina/util/XMLWriter.java
+++ b/java/org/apache/catalina/util/XMLWriter.java
@@ -205,6 +205,16 @@ public class XMLWriter {
}
+/**
+ * Write raw XML data.
+ *
+ * @param raw Raw XML to append
+ */
+public void writeRaw(String raw) {
+buffer.append(raw);
+}
+
+
/**
* Write data.
*
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 85b2bfc9da..9d7c706b75 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,11 @@
Background processes should not be run concurrently with lifecycle
oprations of a container. (remm)
+
+Correct unintended escaping of XML in some WebDAV responses. The XML
+list of support locks when provided in response to a PROPFIND request
+was incorrectly XML escaped. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 8.5.x updated: Fix unintended escaping of XML in some WebDAV responses
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new d98cd9e5de Fix unintended escaping of XML in some WebDAV responses
d98cd9e5de is described below
commit d98cd9e5dec1bd8ba9f027f5909d8b207a4e3522
Author: Mark Thomas
AuthorDate: Wed Nov 29 17:04:19 2023 +
Fix unintended escaping of XML in some WebDAV responses
The XML list of support locks when provided in response to a PROPFIND
request was incorrectly XML escaped
---
java/org/apache/catalina/servlets/WebdavServlet.java | 4 ++--
java/org/apache/catalina/util/XMLWriter.java | 10 ++
webapps/docs/changelog.xml | 5 +
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 55faf853a2..e10b85bc99 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1960,7 +1960,7 @@ public class WebdavServlet extends DefaultServlet {
"" +
"" +
"";
generatedXML.writeElement("D", "supportedlock",
XMLWriter.OPENING);
-generatedXML.writeText(supportedLocks);
+generatedXML.writeRaw(supportedLocks);
generatedXML.writeElement("D", "supportedlock",
XMLWriter.CLOSING);
generateLockDiscovery(path, generatedXML);
@@ -2068,7 +2068,7 @@ public class WebdavServlet extends DefaultServlet {
"" +
"" +
"";
generatedXML.writeElement("D", "supportedlock",
XMLWriter.OPENING);
-generatedXML.writeText(supportedLocks);
+generatedXML.writeRaw(supportedLocks);
generatedXML.writeElement("D", "supportedlock",
XMLWriter.CLOSING);
} else if (property.equals("lockdiscovery")) {
if (!generateLockDiscovery(path, generatedXML)) {
diff --git a/java/org/apache/catalina/util/XMLWriter.java
b/java/org/apache/catalina/util/XMLWriter.java
index 8290b73943..143c305f34 100644
--- a/java/org/apache/catalina/util/XMLWriter.java
+++ b/java/org/apache/catalina/util/XMLWriter.java
@@ -205,6 +205,16 @@ public class XMLWriter {
}
+/**
+ * Write raw XML data.
+ *
+ * @param raw Raw XML to append
+ */
+public void writeRaw(String raw) {
+buffer.append(raw);
+}
+
+
/**
* Write data.
*
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1fc5a0ec38..321d018ccf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,11 @@
Background processes should not be run concurrently with lifecycle
oprations of a container. (remm)
+
+Correct unintended escaping of XML in some WebDAV responses. The XML
+list of support locks when provided in response to a PROPFIND request
+was incorrectly XML escaped. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-9.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/37/builds/775 Blamelist: Mark Thomas Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 9.0.x] 54d5b0f8f4bf0803f6b8f23c29652310480dbb5c Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: (tomcat) 03/08: Code clean - formatting. No functional change.
On 29/11/2023 12:19, Rémy Maucherat wrote:
On Tue, Nov 28, 2023 at 4:16 PM Rémy Maucherat wrote:
On Tue, Nov 28, 2023 at 3:18 PM Christopher Schultz
wrote:
Mark,
On 11/25/23 08:40, Mark Thomas wrote:
On 25/11/2023 07:59, Rémy Maucherat wrote:
On Fri, Nov 24, 2023 at 6:17 PM wrote:
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
commit b91af3e5c32d154e26dbf8f1a19c84d301ce8e1e
Author: Mark Thomas
AuthorDate: Fri Nov 24 16:54:27 2023 +
Code clean - formatting. No functional change.
Primarily to reduce IDE warnings from generated code.
jextract is really bad for this. OTOH, fixing them is not practical
since they will reappear every time this is regenerated for any
reason. So could it be ignored instead ?
I did look at options for ignoring the warnings.
You can't tell Eclipse to ignore warnings in a given file/package.
We could add @SuppressWarnings("...") but that means manually editing
each file.
$ jextract ...
$ sed ...
?
Also upgrade jextract and regenerate since they do improve the output
once in a while. Clearly this is not a big priority though.
There are indeed some updates incoming:
https://github.com/openjdk/jextract/pull/145
I'll test them when they arrive.
Looks much better. Just 2 instances of ";;" rather than ";".
I can live with a couple of spurious warnings. If they do start to annoy
me, I'll fix them then.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[PR] Update README.md [tomcat]
BTrees opened a new pull request, #679: URL: https://github.com/apache/tomcat/pull/679 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68228] 9.0.83 no more allows setting a status code on a read exception
https://bz.apache.org/bugzilla/show_bug.cgi?id=68228 adwsingh changed: What|Removed |Added CC||adwsi...@gmail.com -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Update README.md [tomcat]
aooohan closed pull request #679: Update README.md URL: https://github.com/apache/tomcat/pull/679 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
