[tomcat] branch 9.0.x updated: Use current ant for download from travis build and change URL to https
This is an automated email from the ASF dual-hosted git repository. fschumacher 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 0b6eb11 Use current ant for download from travis build and change URL to https 0b6eb11 is described below commit 0b6eb11147917c299b7a59ac2a9ca9b0af22af2a Author: Felix Schumacher AuthorDate: Sun Jun 14 17:55:12 2020 +0200 Use current ant for download from travis build and change URL to https --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 24f07da..1441aa8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,8 +40,8 @@ install: - wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz - mv jdk8* jdk - export JAVA_HOME=`pwd`/jdk -- wget -q http://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.7-bin.tar.gz && tar xzf apache-ant-*-bin.tar.gz -- export ANT_HOME=`pwd`/apache-ant-1.10.7 +- wget -q https://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.8-bin.tar.gz && tar xzf apache-ant-*-bin.tar.gz +- export ANT_HOME=`pwd`/apache-ant-1.10.8 - export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH" - java -version - ant -version - 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: Use current ant for download from travis build and change URL to https
This is an automated email from the ASF dual-hosted git repository. fschumacher 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 3b7e685 Use current ant for download from travis build and change URL to https 3b7e685 is described below commit 3b7e685e176029c2a009aa4dd9420361d9614047 Author: Felix Schumacher AuthorDate: Sun Jun 14 17:55:12 2020 +0200 Use current ant for download from travis build and change URL to https --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 24f07da..1441aa8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,8 +40,8 @@ install: - wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz - mv jdk8* jdk - export JAVA_HOME=`pwd`/jdk -- wget -q http://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.7-bin.tar.gz && tar xzf apache-ant-*-bin.tar.gz -- export ANT_HOME=`pwd`/apache-ant-1.10.7 +- wget -q https://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.8-bin.tar.gz && tar xzf apache-ant-*-bin.tar.gz +- export ANT_HOME=`pwd`/apache-ant-1.10.8 - export PATH="$JAVA_HOME/bin:$ANT_HOME/bin:$PATH" - java -version - ant -version - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Changing the name of the default branch in our git repos
вт, 16 июн. 2020 г. в 11:02, Mark Thomas : > > All, > > You may have seen the recent discussions both inside and outside the ASF > about the user of "master" as the name of the default git branch. If you > haven't, the short version is that the name can be traced back to > master/slave and its associations with human slavery. > > I'd like to propose that the Apache Tomcat project renames the master > branch in all of the project repositories. > > I think there are two front runners for the new name: > > - main - this looks to be the name GitHub and a number of OSS projects > will be switching to > > - trunk - reflects the Subversion heritage of both the project and the > ASF > > Other options I have seen suggested include "default", "dev", "develop". > Other suggestions welcome. 1. My preference is for "trunk". To come back where it was for many years. It is a well known name that we used for a long time. 2. I do not like following the hype. I think a better moment to do a rename will be when 10.0.x is branched off as a separate branch. That is when some CI servers will have to be reconfigured. I think that will be about the time when 7.0.x reaches EOL, end of March 2021. http://tomcat.apache.org/tomcat-70-eol.html > This may help for the gradual migration > https://github.com/chancancode/branch-rename/#gradual-migration Looking at "Gradual Migration" strategy there, I wonder if maybe we could create a "10.0.x" branch now (using it as the new name, as suggested by Martin Grigorov). BTW, one step is missing there: one has to update the 'HEAD' ref in Git repository. It is a symbolic reference. GitHub does not show the file, but it can be seen at gitbox . https://gitbox.apache.org/repos/asf/tomcat.git/HEAD Best regards, Kostantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64532] update to bnd 5.1.1
https://bz.apache.org/bugzilla/show_bug.cgi?id=64532 rotty3000 changed: What|Removed |Added Hardware|PC |All OS|Linux |All -- 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
[Bug 64532] New: update to bnd 5.1.1
https://bz.apache.org/bugzilla/show_bug.cgi?id=64532 Bug ID: 64532 Summary: update to bnd 5.1.1 Product: Tomcat 10 Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: raymond.a...@liferay.com Target Milestone: -- This will bring a few small fixes we need particularly to generating Spec manifest Name sections. -- 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
[GitHub] [tomcat] rotty3000 opened a new pull request #303: Fix BZ 64532 - update to bnd 5.1.1
rotty3000 opened a new pull request #303: URL: https://github.com/apache/tomcat/pull/303 Signed-off-by: Raymond Augé 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. 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 64532] update to bnd 5.1.1
https://bz.apache.org/bugzilla/show_bug.cgi?id=64532 --- Comment #1 from rotty3000 --- https://github.com/apache/tomcat/pull/303 -- 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
[Bug 64532] update to bnd 5.1.1
https://bz.apache.org/bugzilla/show_bug.cgi?id=64532 rotty3000 changed: What|Removed |Added Component|Catalina|Packaging -- 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
[tomcat] branch master updated: Use current versions of OpenJDK for travis builds
This is an automated email from the ASF dual-hosted git repository. fschumacher 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 d53dbca Use current versions of OpenJDK for travis builds d53dbca is described below commit d53dbca6db1c1456c0e1fa544dc360dc230141f6 Author: Felix Schumacher AuthorDate: Wed Jun 17 17:16:11 2020 +0200 Use current versions of OpenJDK for travis builds --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d0688ba..2ae1a0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,9 +38,9 @@ addons: install: - ARCH=`uname -p` - echo $ARCH -- JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u242-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz"; -- JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz"; -- JDK_s390x="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.5_10.tar.gz"; +- JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz"; +- JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u252-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz"; +- JDK_s390x="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.7_10.tar.gz"; - if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; elif test "$ARCH" = "s390x"; then JDK_URL=$JDK_s390x; else JDK_URL=$JDK_X64; fi - wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz - if test "$ARCH" = "s390x"; then mv jdk-11* jdk; else mv jdk8* jdk; fi - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #302: Store common build details in a shared build-defaults.bnd
markt-asf commented on pull request #302: URL: https://github.com/apache/tomcat/pull/302#issuecomment-645455170 Is this change a precursor for more setting to go in the shared defaults file? If so, I see benefit in creating the shared file. If not, I'm sot sure it is worth the effort. 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. 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
[GitHub] [tomcat] markt-asf commented on a change in pull request #303: Fix BZ 64532 - update to bnd 5.1.1
markt-asf commented on a change in pull request #303:
URL: https://github.com/apache/tomcat/pull/303#discussion_r441648490
##
File path: build.properties.default
##
@@ -286,14 +286,14 @@ saaj-api.home=${base.path}/saaj-api-${saaj-api.version}
saaj-api.jar=${saaj-api.home}/saaj-api-${saaj-api.version}.jar
saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-api-${saaj-api.version}.jar
-# - bnd & bndlib, version 4.0.0 or later -
+# - bnd, version 5.1.1 or later -
Review comment:
Is this really an increase in the minimum version? Or is 5.1.0 (with the
fix for the Java 15 bug) sufficient?
##
File path: build.properties.default
##
@@ -286,14 +286,14 @@ saaj-api.home=${base.path}/saaj-api-${saaj-api.version}
saaj-api.jar=${saaj-api.home}/saaj-api-${saaj-api.version}.jar
saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-api-${saaj-api.version}.jar
-# - bnd & bndlib, version 4.0.0 or later -
+# - bnd, version 5.1.1 or later -
# - provides OSGI metadata for JARs -
-bnd.version=5.1.0
+bnd.version=5.1.1
# checksums for biz.aQute.bnd-5.1.0.jar
Review comment:
You need to update the version in the comment for consistency.
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.
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
[GitHub] [tomcat] rotty3000 commented on pull request #302: Store common build details in a shared build-defaults.bnd
rotty3000 commented on pull request #302: URL: https://github.com/apache/tomcat/pull/302#issuecomment-645481546 It is a precursor to more changes. 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. 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
[GitHub] [tomcat] rotty3000 commented on a change in pull request #303: Fix BZ 64532 - update to bnd 5.1.1
rotty3000 commented on a change in pull request #303:
URL: https://github.com/apache/tomcat/pull/303#discussion_r441676683
##
File path: build.properties.default
##
@@ -286,14 +286,14 @@ saaj-api.home=${base.path}/saaj-api-${saaj-api.version}
saaj-api.jar=${saaj-api.home}/saaj-api-${saaj-api.version}.jar
saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-api-${saaj-api.version}.jar
-# - bnd & bndlib, version 4.0.0 or later -
+# - bnd, version 5.1.1 or later -
Review comment:
There is that yes, but also in 5.1.1 specifically there is a bug fix for
correctly generating the Manifest Name section which I'd like to use for the
Spec jars.
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.
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
[GitHub] [tomcat] markt-asf commented on a change in pull request #303: Fix BZ 64532 - update to bnd 5.1.1
markt-asf commented on a change in pull request #303:
URL: https://github.com/apache/tomcat/pull/303#discussion_r441680635
##
File path: build.properties.default
##
@@ -286,14 +286,14 @@ saaj-api.home=${base.path}/saaj-api-${saaj-api.version}
saaj-api.jar=${saaj-api.home}/saaj-api-${saaj-api.version}.jar
saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-api-${saaj-api.version}.jar
-# - bnd & bndlib, version 4.0.0 or later -
+# - bnd, version 5.1.1 or later -
Review comment:
Fair enough. Just checking.
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.
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
[tomcat] branch master updated: Store common build details in a shared build-defaults.bnd
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 dfdf344 Store common build details in a shared build-defaults.bnd
dfdf344 is described below
commit dfdf3448629ead89c888b5717a30870fe7f085ba
Author: Raymond Augé
AuthorDate: Sat Jun 13 20:32:40 2020 -0400
Store common build details in a shared build-defaults.bnd
Signed-off-by: Raymond Augé
---
res/bnd/annotations-api.jar.tmp.bnd| 4 +++-
res/bnd/{el-api.jar.tmp.bnd => build-defaults.bnd} | 4 +---
res/bnd/catalina-ha.jar.tmp.bnd| 4 +++-
res/bnd/catalina-ssi.jar.tmp.bnd | 4 +++-
res/bnd/catalina-storeconfig.jar.tmp.bnd | 4 +++-
res/bnd/catalina-tribes.jar.tmp.bnd| 4 +++-
res/bnd/catalina.jar.tmp.bnd | 4 +++-
res/bnd/el-api.jar.tmp.bnd | 4 +++-
res/bnd/jasper-el.jar.tmp.bnd | 4 +++-
res/bnd/jasper.jar.tmp.bnd | 4 +++-
res/bnd/jaspic-api.jar.tmp.bnd | 4 +++-
res/bnd/jsp-api.jar.tmp.bnd| 4 +++-
res/bnd/servlet-api.jar.tmp.bnd| 4 +++-
res/bnd/tomcat-api.jar.tmp.bnd | 4 +++-
res/bnd/tomcat-coyote.jar.tmp.bnd | 4 +++-
res/bnd/tomcat-dbcp.jar.tmp.bnd| 4 +++-
res/bnd/tomcat-embed-core.jar.tmp.bnd | 4 +++-
res/bnd/tomcat-embed-el.jar.tmp.bnd| 4 +++-
res/bnd/tomcat-embed-jasper.jar.tmp.bnd| 4 +++-
res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 4 +++-
res/bnd/tomcat-jni.jar.tmp.bnd | 4 +++-
res/bnd/tomcat-juli.jar.tmp.bnd| 4 +++-
res/bnd/tomcat-util-scan.jar.tmp.bnd | 4 +++-
res/bnd/tomcat-util.jar.tmp.bnd| 4 +++-
res/bnd/tomcat-websocket.jar.tmp.bnd | 4 +++-
res/bnd/websocket-api.jar.tmp.bnd | 4 +++-
webapps/docs/changelog.xml | 4
27 files changed, 80 insertions(+), 28 deletions(-)
diff --git a/res/bnd/annotations-api.jar.tmp.bnd
b/res/bnd/annotations-api.jar.tmp.bnd
index 702a5ad..7c13124 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -12,9 +12,11 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+
+-include: build-defaults.bnd
+
Bundle-Name: tomcat-annotations-api
Bundle-SymbolicName: org.apache.tomcat-annotations-api
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
jakarta.annotation,\
jakarta.annotation.security,\
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/build-defaults.bnd
similarity index 89%
copy from res/bnd/el-api.jar.tmp.bnd
copy to res/bnd/build-defaults.bnd
index 6eb434e..06e64c4 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -12,7 +12,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-Bundle-Name: tomcat-el-api
-Bundle-SymbolicName: org.apache.tomcat-el-api
+
Bundle-Version: ${version_cleanup;${version}}
-Export-Package: jakarta.el
\ No newline at end of file
diff --git a/res/bnd/catalina-ha.jar.tmp.bnd b/res/bnd/catalina-ha.jar.tmp.bnd
index 1e88476..824f99e 100644
--- a/res/bnd/catalina-ha.jar.tmp.bnd
+++ b/res/bnd/catalina-ha.jar.tmp.bnd
@@ -12,9 +12,11 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+
+-include: build-defaults.bnd
+
Bundle-Name: tomcat-catalina-ha
Bundle-SymbolicName: org.apache.tomcat-catalina-ha
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.catalina.ha,\
org.apache.catalina.ha.authenticator,\
diff --git a/res/bnd/catalina-ssi.jar.tmp.bnd b/res/bnd/catalina-ssi.jar.tmp.bnd
index ba9fd41..87c0cbd 100644
--- a/res/bnd/catalina-ssi.jar.tmp.bnd
+++ b/res/bnd/catalina-ssi.jar.tmp.bnd
@@ -12,8 +12,10 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+
+-include: build-defaults.bnd
+
Bundle-Name: tomcat-ssi
Bundle-SymbolicName: org.apache.tomcat-ssi
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.catalina.ssi
diff --git a/res/bnd/catalina-storeconfig.jar.tmp.bnd
b/res/bnd/catalina-storeconfig.jar.tmp.bnd
index 0443331..e21e689 100644
--- a/res/bnd/catalina-storeconfig.jar.tmp.bnd
+++ b/res/bnd/catalina-storeconfig.j
[GitHub] [tomcat] markt-asf merged pull request #302: Store common build details in a shared build-defaults.bnd
markt-asf merged pull request #302: URL: https://github.com/apache/tomcat/pull/302 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. 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
[CONF] Apache Tomcat > WebSocket 1.1 TCK
Title: Message Title There's 1 new edit on this page WebSocket 1.1 TCK Mark Thomas edited this page Here's what changed: Running Tomcat Set the following system properties ... add backgroundProcessorDelay="1" to the element Test Suite Download latest nightly build ... Accept the defaults and then run the tests Expected results (Jakarta EE 9) A default 10.0.x build running with the nightly TCK build (as of 2020-05-13) triggers 10 test failures ... 4 x extensions (TCK assumes invalid extensions are ignored)Consider making TCK smarter so it ignores other extensions the server may advertise. Better still, detect them first and then exclude them from this test.Need to discuss expected behaviour if an unknown extension is specified. Are these required or optional? 1 x timeout related test expects more frequent expiration checks Expected results (Java EE 8) A default 9.0.x build without any configuration triggers 20 test failures ... Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 7.5.0
[CONF] Apache Tomcat > JSP TCK ( 2.3 & .30)
Title: Message Title There's 1 new edit on this page JSP TCK ( 2.3 & .30) Mark Thomas edited this page Here's what changed: Running Common Configuration for all Tomcat versions None. Note: If you re-run the TCK you must stop Tomcat, empty the work directory and then restart Tomcat. This is because the TCK assumes it is running for the first time and a number of tests check various compilation activities. Tomcat 9.0.x None required (clean 9.0.x build). Tomcat 10.0.x Remove the request-character-encoding and response-character-encoding settings from conf/web.xml (the JSP TCK has one test that depends on the default encoding). Test Suite Download one of the following: Jakarta EE 8 (Tomcat 9.0.x): http://download.eclipse.org/ee4j/jakartaee-tck/jakartaee8/promoted/websocketpages-tck-12.13.10.zip Jakarta EE 9 (Tomcat 10.0.x): http://download.eclipse.org/ee4j/jakartaee-tck/master/nightly/websocketpages-tck-23.0.0.zip (this will change once formally released) ... Accept the defaults and then run the tests Expected results A default 9.0.x build with the above configuration passes the Jakarta EE 8 JSP TCK. ... A default 10.0.x build with the above configuration fails the currently nightly build (as of 2020-05-26) of the Jakarta EE 9 JSP TCK with Java 11 due to the following: This PR has been merged. Need to reset the current nightly TCK build) 1 x signature test https://github.com/eclipse-ee4j/jakartaee-tck/issues/294 (PR to fix - https://github.com/eclipse-ee4j/jakartaee-tck/pull/295) Fixed bugs The Apache Tomcat project has reported the following bugs to the Eclipse Jakarta EE TCK project which have since been fixed. ... Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 7.5.0
[CONF] Apache Tomcat > WebSocket 1.1 TCK
Title: Message Title There's 2 new edits on this page WebSocket 1.1 TCK Mark Thomas edited this page Here's what changed: ... Test Suite Download latest nightly promoted build httpshttp://download.eclipse.org/ee4j/jakartaee-tck/8.0.1/nightly/websockettckjakartaee8/promoted/websocket-tck-1.1_latest.1.zip Extract to WEBSOCKET_TCK_HOME ... Accept the defaults and then run the tests Expected results ( ... Java EE ... 8) A default 109.0.x build running with the nightly TCK build (as of 2020-05mm-13dd) without any configuration triggers 10 20 test failures 2 unclear specification 2 x URI https://github.com/eclipse-ee4j/websocket-api/issues/228 PR to exclude https://github.com/eclipse-ee4j/jakartaee-tck/pull/263 3 faulty tests 1 x signature tests PR to update signatures in TCK https://github.com/eclipse-ee4j/jakartaee-tck/pull/256 2 x faulty timeout tests https://github.com/eclipse-ee4j/jakartaee-tck/issues/260 PR to fix the tests https://github.com/eclipse-ee4j/jakartaee-tck/pull/261 5 Tests 'fixed' by appropriate system property configuration (see above). No need for the server.xml changes. 4 x extensions (TCK assumes invalid extensions are ignored) Consider making TCK smarter so it ignores other extensions the server may advertise. Better still, detect them first and then exclude them from this test. Need to discuss expected behaviour if an unknown extension is specified. Are these required or optional? 1 x timeout related test expects more frequent expiration checks Expected results (Java EE 8) A default 9.0.x build without any configuration triggers 20 test failuresTo be confirmed. Tomcat 9 was last tested with a nightly build of the WebSocket 1.1 TCK. It has yet to be tested with the 1.1.1 release of the TCK. 2 unclear specification 2 x URI https://github.com/eclipse-ee4j/websocket-api/issues/228 ... Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 7.5.0
[CONF] Apache Tomcat > WebSocket 2.0 TCK (DRAFT)
Title: Message Title There's 1 new edit on this page WebSocket 2.0 TCK (DRAFT) Mark Thomas edited this page Here's what changed: ... org.apache.tomcat.websocket.DISABLE_BUILTIN_EXTENSIONS=true org.apache.tomcat.websocket.ALLOW_UNSUPPORTED_EXTENSIONS=true org.apache.tomcat.websocket.DEFAULT_PROCESS_PERIOD=0 Make the following changes to server.xml add backgroundProcessorDelay="1" to the element Test Suite Download latest nightly build httpshttp://download.eclipse.org/ee4j/jakartaee-tck/8.0.1master/nightly/websockettck-1.1_latestwebsocket-tck-2.0.0.zip Extract to WEBSOCKET_TCK_HOME ... Expected results (Jakarta EE 9) A default 10.0.x build (as of 2020-05-13) running with the nightly TCK build (as of 2020-05-13) triggers 10 test failures: The PRs have been applied. This TCK needs to be re-run to confirm the fixes. 2 unclear specification 2 x URI https://github.com/eclipse-ee4j/websocket-api/issues/228 PR to exclude https://github.com/eclipse-ee4j/jakartaee-tck/pull/263 ... 5 Tests 'fixed' by appropriate system property configuration (see above). No need for the server.xml changes. 4 x extensions (TCK assumes invalid extensions are ignored)Consider making TCK smarter so it ignores other extensions the server may advertise. Better still, detect them first and then exclude them from this test.Need to discuss expected behaviour if an unknown extension is specified. Are these required or optional? 1 x timeout related test expects more frequent expiration checks Expected results (Java EE 8) A default 9.0.x build without any configuration triggers 20 test failures 2 unclear specification 2 x URI https://github.com/eclipse-ee4j/websocket-api/issues/228 11 Faulty tests 1 x https://github.com/eclipse-ee4j/jakartaee-tck/issues/33 (batching) 2 x https://github.com/eclipse-ee4j/jakartaee-tck/issues/35 (batching) 8 x https://github.com/eclipse-ee4j/jakartaee-tck/issues/37 (async concurrency) 5 Tests 'fixed' by appropriate system property configuration (see above) 4 x extensions (TCK assumes invalid extensions are ignored) 1 x timeout related test expects more frequent expiration checks 2 Tests 'fixed' by appropriate server.xml configuration 2 x timeout related tests requiring even more frequent expiration checks Still see intermittent failures on these A further 19 test failures caused by Tomcat bugs have been fixed 4 x Deployment failure didn't undeploy all WebSockets 4 x @PathParam not validated for correct type 6 x Throw DeploymentException rather than IAE 1 x Improve checking of multiple @OnMessage for the same type 4 x exception in encoder leading (incorrectly) to empty message Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 7.5.0
[CONF] Apache Tomcat > EL TCK (3.0 & 4.0)
Title: Message Title There's 1 new edit on this page EL TCK (3.0 & 4.0) Mark Thomas edited this page Here's what changed: Download ... one of the following: Jakarta EE 8 (Tomcat 9.0.x): http://download.eclipse.org/ee4j/jakartaee-tck ... /jakartaee8/promoted/_expression_-language-tck-3.0.0.zip Jakarta EE 9 (Tomcat 10.0.x): http://download.eclipse.org/ee4j/jakartaee-tck/master/nightly/_expression_-language-tck-4.0.0.zip (this will change once formally released) Extract to EL_TCK_HOME Edit $EL_TCK_HOME/bin/ts.jte ... Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 7.5.0
[CONF] Apache Tomcat > Servlet TCK 4.0
Title: Message Title There's 1 new edit on this page Servlet TCK 4.0 Mark Thomas edited this page Here's what changed: Running Tomcat setenv.[sh|bat] Set the following system properties -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true -Dorg.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR=false -Duser.language=en -Duser.country=US context.xml Make the following changes: ... ... tomcat-users.xml Make the following changes: server.xml Enable h2c on port 8080, and add some trailer headers ... Client certificate tests: see below Test Suite Download latest nightly build ... Accept the defaults and then run the tests Expected results A default 9.0.x build with the above configuration triggers 10 test failures ... Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 7.5.0
[CONF] Apache Tomcat > WebSocket 2.0 TCK
Title: Message Title There's 1 new edit on this page WebSocket 2.0 TCK Mark Thomas edited this page Here's what changed: Running Tomcat Set the following system properties org.apache.tomcat.websocket.DISABLE_BUILTIN_EXTENSIONS=true org.apache.tomcat.websocket.ALLOW_UNSUPPORTED_EXTENSIONS=true org.apache.tomcat.websocket.DEFAULT_PROCESS_PERIOD=0 Test Suite Download latest nightly build ... Accept the defaults and then run the tests Expected results (Jakarta EE 9) A default 10.0.x build (as of 2020-05-13) running with the nightly TCK build (as of 2020-05-13) triggers 10 test failures: ... Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 7.5.0
[CONF] Apache Tomcat > Servlet TCK 5.0 (DRAFT)
Title: Message Title There's 1 new edit on this page Servlet TCK 5.0 (DRAFT) Mark Thomas edited this page Here's what changed: Running Tomcat This is a work in progress while I figure out which settings required for the Servlet 4.0 TCK ar still required for the Servlet 5.0 TCK. setenv.[sh|bat] Set the following system properties -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true context.xml Make the following changes: ... server.xml ... web.xml Remove the sections setting the default character encoding for requests and responses to UTF-8. Tomcat config for Servlet 4.0 setenv.[sh|bat] Set the following system properties -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true -Dorg.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR=false -Duser.language=en -Duser.country=US context.xml Make the following changes: ... ... tomcat-users.xml Make the following changes: server.xml Enable h2c on port 8080, and add some trailer headers ... Client certificate tests: see below Test Suite Download latest nightly build ... Accept the defaults and then run the tests Expected results A default 10.0.x build (as of 2020-06-17) with the above configuration and the nightly TCK (as of -mm-dd) triggers 33+ test failures ... Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 7.5.0
[CONF] Apache Tomcat > JSP TCK (2.3 & 3.0)
Title: Message Title There's 1 new edit on this page JSP TCK (2.3 & 3.0) Mark Thomas edited this page Here's what changed: Running Common Configuration for all Tomcat versions None. Note: If you re-run the TCK you must stop Tomcat, empty the work directory and then restart Tomcat. This is because the TCK assumes it is running for the first time and a number of tests check various compilation activities. Tomcat 9.0.x None required (clean 9.0.x build). Tomcat 10.0.x Remove the request-character-encoding and response-character-encoding settings from conf/web.xml (the JSP TCK has one test that depends on the default encoding). Test Suite Download one of the following: ... Accept the defaults and then run the tests Expected results A default 9.0.x build with the above configuration passes the Jakarta EE 8 JSP TCK. ... 1 x signature test https://github.com/eclipse-ee4j/jakartaee-tck/issues/294 (PR to fix - https://github.com/eclipse-ee4j/jakartaee-tck/pull/295) Fixed bugs The Apache Tomcat project has reported the following bugs to the Eclipse Jakarta EE TCK project which have since been fixed. ... Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 7.5.0
[CONF] Apache Tomcat > Servlet TCK 5.0 (DRAFT)
Title: Message Title There's 1 new edit on this page Servlet TCK 5.0 (DRAFT) Mark Thomas edited this page Here's what changed: ... A default 10.0.x build (as of 2020-06-17) with the above configuration and the nightly TCK (as of -mm-dd) triggers 33+ 75 test failures 1 TCK bug PR 338 Incorrect major version 32+ 74 failures suspected to be related to incomplete configuration Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 7.5.0
[tomcat] branch master updated: Improve parsing of space around v1 cookie attributes
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 00b7666 Improve parsing of space around v1 cookie attributes
00b7666 is described below
commit 00b7666237e0866a50a8cbbdc23b8ade2cb96d45
Author: Mark Thomas
AuthorDate: Wed Jun 17 23:33:21 2020 +0100
Improve parsing of space around v1 cookie attributes
---
java/org/apache/tomcat/util/http/parser/Cookie.java | 5 +
test/org/apache/tomcat/util/http/parser/TestCookie.java | 4 ++--
webapps/docs/changelog.xml | 5 +
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/parser/Cookie.java
b/java/org/apache/tomcat/util/http/parser/Cookie.java
index 181e052..24c33b2 100644
--- a/java/org/apache/tomcat/util/http/parser/Cookie.java
+++ b/java/org/apache/tomcat/util/http/parser/Cookie.java
@@ -286,6 +286,7 @@ public class Cookie {
}
if (parseAttributes) {
+skipLWS(bb);
skipResult = skipBytes(bb, PATH_BYTES);
if (skipResult == SkipResult.FOUND) {
skipLWS(bb);
@@ -294,6 +295,7 @@ public class Cookie {
skipInvalidCookie(bb);
continue;
}
+skipLWS(bb);
path = readCookieValueRfc2109(bb, true);
if (path == null) {
skipInvalidCookie(bb);
@@ -318,6 +320,7 @@ public class Cookie {
}
if (parseAttributes) {
+skipLWS(bb);
skipResult = skipBytes(bb, DOMAIN_BYTES);
if (skipResult == SkipResult.FOUND) {
skipLWS(bb);
@@ -326,11 +329,13 @@ public class Cookie {
skipInvalidCookie(bb);
continue;
}
+skipLWS(bb);
domain = readCookieValueRfc2109(bb, false);
if (domain == null) {
skipInvalidCookie(bb);
continue;
}
+skipLWS(bb);
skipResult = skipByte(bb, COMMA_BYTE);
if (skipResult == SkipResult.FOUND) {
diff --git a/test/org/apache/tomcat/util/http/parser/TestCookie.java
b/test/org/apache/tomcat/util/http/parser/TestCookie.java
index c97e587..0f8a1dd 100644
--- a/test/org/apache/tomcat/util/http/parser/TestCookie.java
+++ b/test/org/apache/tomcat/util/http/parser/TestCookie.java
@@ -38,8 +38,8 @@ public class TestCookie {
List parameterSets = new ArrayList<>();
String[] SEPS = new String[] { ",", ";" };
-String[] PATHS = new String[] { ";$Path=/foo", ""};
-String[] DOMAINS = new String[] { ";$Domain=bar.com", ""};
+String[] PATHS = new String[] { ";$Path=/foo", " ; $Path = /foo ", ""};
+String[] DOMAINS = new String[] { ";$Domain=bar.com", " ; $Domain =
bar.com ", ""};
for (String sep1 : SEPS) {
for (String path1 : PATHS) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4c68770..84dbb14 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -94,6 +94,11 @@
to correctly handle input addresses that ended with a pair of colons.
Based on a patch by syarramsetty-skyhook. (markt)
+
+Correctly parse RFC 2109 version 1 cookies that have additional linear
+white space around cookie attrubute names and values when using the RFC
+6265 cookie processor. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Update schema (fix quotes)
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 commit 4617f72b1fcd0638a43c53f1a6af3366786f67fd Author: Mark Thomas AuthorDate: Wed Jun 17 17:26:03 2020 +0100 Update schema (fix quotes) --- java/jakarta/servlet/resources/web-app_5_0.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/jakarta/servlet/resources/web-app_5_0.xsd b/java/jakarta/servlet/resources/web-app_5_0.xsd index 017e512..de09e13 100644 --- a/java/jakarta/servlet/resources/web-app_5_0.xsd +++ b/java/jakarta/servlet/resources/web-app_5_0.xsd @@ -265,7 +265,7 @@ of the web application. An empty value for this element must cause the web application to be deployed at the root for the container. Otherwise, the default context path must start with -a “/“ character but not end with a “/“ character. +a "/" character but not end with a "/" character. Servlet containers may provide vendor specific configuration options that allows specifying a value that overrides the value specified here. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (00b7666 -> b549201)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 00b7666 Improve parsing of space around v1 cookie attributes
new 4617f72 Update schema (fix quotes)
new b549201 Add TLD schema for Jakarta EE 9
The 2 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:
LICENSE|1 +
java/jakarta/servlet/resources/web-app_5_0.xsd |2 +-
...aglibrary_2_0.xsd => web-jsptaglibrary_3_0.xsd} | 1068 +++-
.../tomcat/util/descriptor/DigesterFactory.java|1 +
.../tomcat/util/descriptor/XmlIdentifiers.java |1 +
res/INSTALLLICENSE |1 +
res/META-INF/servlet-api.jar.license |1 +
res/maven/tomcat-servlet-api.pom |1 +
res/rat/rat-excludes.txt |3 +
test/org/apache/jasper/compiler/TestValidator.java |1 +
.../tags21.tld => webapp-5.0/WEB-INF/tags30.tld} |8 +-
test/webapp-5.0/tld-versions.jsp |2 +
12 files changed, 614 insertions(+), 476 deletions(-)
copy java/jakarta/servlet/resources/{web-jsptaglibrary_2_0.xsd =>
web-jsptaglibrary_3_0.xsd} (63%)
copy test/{webapp-2.3/WEB-INF/tags21.tld => webapp-5.0/WEB-INF/tags30.tld}
(88%)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Add TLD schema for Jakarta EE 9
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 commit b5492012c982de454cd10a2f45b5b18fdee448d1 Author: Mark Thomas AuthorDate: Wed Jun 17 17:26:28 2020 +0100 Add TLD schema for Jakarta EE 9 Signed-off-by: Mark Thomas --- LICENSE|1 + .../servlet/resources/web-jsptaglibrary_3_0.xsd| 1109 .../tomcat/util/descriptor/DigesterFactory.java|1 + .../tomcat/util/descriptor/XmlIdentifiers.java |1 + res/INSTALLLICENSE |1 + res/META-INF/servlet-api.jar.license |1 + res/maven/tomcat-servlet-api.pom |1 + res/rat/rat-excludes.txt |3 + test/org/apache/jasper/compiler/TestValidator.java |1 + test/webapp-5.0/WEB-INF/tags30.tld | 37 + test/webapp-5.0/tld-versions.jsp |2 + 11 files changed, 1158 insertions(+) diff --git a/LICENSE b/LICENSE index 4950641..a3cd18e 100644 --- a/LICENSE +++ b/LICENSE @@ -219,6 +219,7 @@ following Jakarta EE Schemas: - web-app_5_0.xsd - web-commonn_5_0.xsd - web-fragment_5_0.xsd +- web-jsptaglibrary_3_0.xsd Eclipse Public License - v 2.0 diff --git a/java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd b/java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd new file mode 100644 index 000..30c3444 --- /dev/null +++ b/java/jakarta/servlet/resources/web-jsptaglibrary_3_0.xsd @@ -0,0 +1,1109 @@ + +https://jakarta.ee/xml/ns/jakartaee"; +xmlns:jakartaee="https://jakarta.ee/xml/ns/jakartaee"; +xmlns:xsd="http://www.w3.org/2001/XMLSchema"; +elementFormDefault="qualified" +attributeFormDefault="unqualified" +version="3.0"> + + + + Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved. + + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v. 2.0, which is available at + http://www.eclipse.org/legal/epl-2.0. + + This Source Code may also be made available under the following Secondary + Licenses when the conditions for such availability set forth in the + Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + version 2 with the GNU Classpath Exception, which is available at + https://www.gnu.org/software/classpath/license.html. + + SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + + + + + + + + + + + + + + + + + + + +The taglib tag is the document root. +The definition of taglib is provided +by the tldTaglibType. + + + + + + + + The taglib element contains, among other things, tag and + tag-file elements. + The name subelements of these elements must each be unique. + + + + + + + + + + + The taglib element contains function elements. + The name subelements of these elements must each be unique. + + + + + + + + + + + + + + + +Specifies the type of body that is valid for a tag. +This value is used by the JSP container to validate +that a tag invocation has the correct body syntax and +by page composition tools to assist the page author +in providing a valid tag body. + +There are currently four values specified: + +tagdependentThe body of the tag is interpreted by the tag +implementation itself, and is most likely +in a different "language", e.g embedded SQL +statements. + +JSP The body of the tag contains nested JSP +syntax. + +empty The body must be empty + +scriptless The body accepts only template text, EL +Expressions, and JSP action elements. No +scripting elements are allowed. + + + + + + + + + + + + + + + + + + + + +Defines the canonical name of a tag or attribute being +defined. + +The name must conform to the lexical rules for an NMTOKEN. + + + + + + + + + + + + + + + +A validator that can be used to validate +the conformance of a JSP page to using this tag library is +defined by a validatorType. + + + + + + + + + +Defines the TagLibraryValidator class that can be used +to validate the conformance of a JSP page to using this +tag library. + +
[tomcat] branch 9.0.x updated (0b6eb11 -> d9b0921)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from 0b6eb11 Use current ant for download from travis build and change URL to https new 07f3b57 Store common build details in a shared build-defaults.bnd new d9b0921 Improve parsing of space around v1 cookie attributes The 2 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/tomcat/util/http/parser/Cookie.java | 5 + res/bnd/annotations-api.jar.tmp.bnd | 4 +++- .../RestrictedFilters.properties => res/bnd/build-defaults.bnd | 2 +- res/bnd/catalina-ha.jar.tmp.bnd | 4 +++- res/bnd/catalina-ssi.jar.tmp.bnd | 4 +++- res/bnd/catalina-storeconfig.jar.tmp.bnd | 4 +++- res/bnd/catalina-tribes.jar.tmp.bnd | 4 +++- res/bnd/catalina.jar.tmp.bnd | 4 +++- res/bnd/el-api.jar.tmp.bnd | 4 +++- res/bnd/jasper-el.jar.tmp.bnd| 4 +++- res/bnd/jasper.jar.tmp.bnd | 4 +++- res/bnd/jaspic-api.jar.tmp.bnd | 4 +++- res/bnd/jsp-api.jar.tmp.bnd | 4 +++- res/bnd/servlet-api.jar.tmp.bnd | 4 +++- res/bnd/tomcat-api.jar.tmp.bnd | 4 +++- res/bnd/tomcat-coyote.jar.tmp.bnd| 4 +++- res/bnd/tomcat-dbcp.jar.tmp.bnd | 4 +++- res/bnd/tomcat-embed-core.jar.tmp.bnd| 4 +++- res/bnd/tomcat-embed-el.jar.tmp.bnd | 4 +++- res/bnd/tomcat-embed-jasper.jar.tmp.bnd | 4 +++- res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 4 +++- res/bnd/tomcat-jni.jar.tmp.bnd | 4 +++- res/bnd/tomcat-juli.jar.tmp.bnd | 4 +++- res/bnd/tomcat-util-scan.jar.tmp.bnd | 4 +++- res/bnd/tomcat-util.jar.tmp.bnd | 4 +++- res/bnd/tomcat-websocket.jar.tmp.bnd | 4 +++- res/bnd/websocket-api.jar.tmp.bnd| 4 +++- test/org/apache/tomcat/util/http/parser/TestCookie.java | 4 ++-- webapps/docs/changelog.xml | 9 + 29 files changed, 92 insertions(+), 28 deletions(-) copy java/org/apache/catalina/core/RestrictedFilters.properties => res/bnd/build-defaults.bnd (94%) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Improve parsing of space around v1 cookie attributes
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
commit d9b092120b1a6d8822ba514fb69718f5c0f0bc9f
Author: Mark Thomas
AuthorDate: Wed Jun 17 23:33:21 2020 +0100
Improve parsing of space around v1 cookie attributes
---
java/org/apache/tomcat/util/http/parser/Cookie.java | 5 +
test/org/apache/tomcat/util/http/parser/TestCookie.java | 4 ++--
webapps/docs/changelog.xml | 5 +
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/parser/Cookie.java
b/java/org/apache/tomcat/util/http/parser/Cookie.java
index 181e052..24c33b2 100644
--- a/java/org/apache/tomcat/util/http/parser/Cookie.java
+++ b/java/org/apache/tomcat/util/http/parser/Cookie.java
@@ -286,6 +286,7 @@ public class Cookie {
}
if (parseAttributes) {
+skipLWS(bb);
skipResult = skipBytes(bb, PATH_BYTES);
if (skipResult == SkipResult.FOUND) {
skipLWS(bb);
@@ -294,6 +295,7 @@ public class Cookie {
skipInvalidCookie(bb);
continue;
}
+skipLWS(bb);
path = readCookieValueRfc2109(bb, true);
if (path == null) {
skipInvalidCookie(bb);
@@ -318,6 +320,7 @@ public class Cookie {
}
if (parseAttributes) {
+skipLWS(bb);
skipResult = skipBytes(bb, DOMAIN_BYTES);
if (skipResult == SkipResult.FOUND) {
skipLWS(bb);
@@ -326,11 +329,13 @@ public class Cookie {
skipInvalidCookie(bb);
continue;
}
+skipLWS(bb);
domain = readCookieValueRfc2109(bb, false);
if (domain == null) {
skipInvalidCookie(bb);
continue;
}
+skipLWS(bb);
skipResult = skipByte(bb, COMMA_BYTE);
if (skipResult == SkipResult.FOUND) {
diff --git a/test/org/apache/tomcat/util/http/parser/TestCookie.java
b/test/org/apache/tomcat/util/http/parser/TestCookie.java
index c97e587..0f8a1dd 100644
--- a/test/org/apache/tomcat/util/http/parser/TestCookie.java
+++ b/test/org/apache/tomcat/util/http/parser/TestCookie.java
@@ -38,8 +38,8 @@ public class TestCookie {
List parameterSets = new ArrayList<>();
String[] SEPS = new String[] { ",", ";" };
-String[] PATHS = new String[] { ";$Path=/foo", ""};
-String[] DOMAINS = new String[] { ";$Domain=bar.com", ""};
+String[] PATHS = new String[] { ";$Path=/foo", " ; $Path = /foo ", ""};
+String[] DOMAINS = new String[] { ";$Domain=bar.com", " ; $Domain =
bar.com ", ""};
for (String sep1 : SEPS) {
for (String path1 : PATHS) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b5016dc..f2ce237 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -91,6 +91,11 @@
to correctly handle input addresses that ended with a pair of colons.
Based on a patch by syarramsetty-skyhook. (markt)
+
+Correctly parse RFC 2109 version 1 cookies that have additional linear
+white space around cookie attrubute names and values when using the RFC
+6265 cookie processor. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Store common build details in a shared build-defaults.bnd
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
commit 07f3b57fe14efa54b0aba14a9f85c2b38796cc9c
Author: Raymond Augé
AuthorDate: Sat Jun 13 20:32:40 2020 -0400
Store common build details in a shared build-defaults.bnd
Signed-off-by: Raymond Augé
---
res/bnd/annotations-api.jar.tmp.bnd| 4 +++-
res/bnd/{el-api.jar.tmp.bnd => build-defaults.bnd} | 4 +---
res/bnd/catalina-ha.jar.tmp.bnd| 4 +++-
res/bnd/catalina-ssi.jar.tmp.bnd | 4 +++-
res/bnd/catalina-storeconfig.jar.tmp.bnd | 4 +++-
res/bnd/catalina-tribes.jar.tmp.bnd| 4 +++-
res/bnd/catalina.jar.tmp.bnd | 4 +++-
res/bnd/el-api.jar.tmp.bnd | 4 +++-
res/bnd/jasper-el.jar.tmp.bnd | 4 +++-
res/bnd/jasper.jar.tmp.bnd | 4 +++-
res/bnd/jaspic-api.jar.tmp.bnd | 4 +++-
res/bnd/jsp-api.jar.tmp.bnd| 4 +++-
res/bnd/servlet-api.jar.tmp.bnd| 4 +++-
res/bnd/tomcat-api.jar.tmp.bnd | 4 +++-
res/bnd/tomcat-coyote.jar.tmp.bnd | 4 +++-
res/bnd/tomcat-dbcp.jar.tmp.bnd| 4 +++-
res/bnd/tomcat-embed-core.jar.tmp.bnd | 4 +++-
res/bnd/tomcat-embed-el.jar.tmp.bnd| 4 +++-
res/bnd/tomcat-embed-jasper.jar.tmp.bnd| 4 +++-
res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 4 +++-
res/bnd/tomcat-jni.jar.tmp.bnd | 4 +++-
res/bnd/tomcat-juli.jar.tmp.bnd| 4 +++-
res/bnd/tomcat-util-scan.jar.tmp.bnd | 4 +++-
res/bnd/tomcat-util.jar.tmp.bnd| 4 +++-
res/bnd/tomcat-websocket.jar.tmp.bnd | 4 +++-
res/bnd/websocket-api.jar.tmp.bnd | 4 +++-
webapps/docs/changelog.xml | 4
27 files changed, 80 insertions(+), 28 deletions(-)
diff --git a/res/bnd/annotations-api.jar.tmp.bnd
b/res/bnd/annotations-api.jar.tmp.bnd
index c153fef..9399b6c 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -12,9 +12,11 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+
+-include: build-defaults.bnd
+
Bundle-Name: tomcat-annotations-api
Bundle-SymbolicName: org.apache.tomcat-annotations-api
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
javax.annotation,\
javax.annotation.security,\
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/build-defaults.bnd
similarity index 89%
copy from res/bnd/el-api.jar.tmp.bnd
copy to res/bnd/build-defaults.bnd
index d401e74..06e64c4 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -12,7 +12,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-Bundle-Name: tomcat-el-api
-Bundle-SymbolicName: org.apache.tomcat-el-api
+
Bundle-Version: ${version_cleanup;${version}}
-Export-Package: javax.el
diff --git a/res/bnd/catalina-ha.jar.tmp.bnd b/res/bnd/catalina-ha.jar.tmp.bnd
index 1e88476..824f99e 100644
--- a/res/bnd/catalina-ha.jar.tmp.bnd
+++ b/res/bnd/catalina-ha.jar.tmp.bnd
@@ -12,9 +12,11 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+
+-include: build-defaults.bnd
+
Bundle-Name: tomcat-catalina-ha
Bundle-SymbolicName: org.apache.tomcat-catalina-ha
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.catalina.ha,\
org.apache.catalina.ha.authenticator,\
diff --git a/res/bnd/catalina-ssi.jar.tmp.bnd b/res/bnd/catalina-ssi.jar.tmp.bnd
index ba9fd41..87c0cbd 100644
--- a/res/bnd/catalina-ssi.jar.tmp.bnd
+++ b/res/bnd/catalina-ssi.jar.tmp.bnd
@@ -12,8 +12,10 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+
+-include: build-defaults.bnd
+
Bundle-Name: tomcat-ssi
Bundle-SymbolicName: org.apache.tomcat-ssi
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.catalina.ssi
diff --git a/res/bnd/catalina-storeconfig.jar.tmp.bnd
b/res/bnd/catalina-storeconfig.jar.tmp.bnd
index 0443331..e21e689 100644
--- a/res/bnd/catalina-storeconfig.jar.tmp.bnd
+++ b/res/bnd/catalina-storeconfig.jar.tmp.bnd
@@ -12,7 +12,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
[tomcat] branch 8.5.x updated: Improve parsing of space around v1 cookie attributes
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 6cbb1a6 Improve parsing of space around v1 cookie attributes
6cbb1a6 is described below
commit 6cbb1a6737a587bd18981417a94a6edb426e3528
Author: Mark Thomas
AuthorDate: Wed Jun 17 23:33:21 2020 +0100
Improve parsing of space around v1 cookie attributes
---
java/org/apache/tomcat/util/http/parser/Cookie.java | 5 +
test/org/apache/tomcat/util/http/parser/TestCookie.java | 4 ++--
webapps/docs/changelog.xml | 5 +
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/parser/Cookie.java
b/java/org/apache/tomcat/util/http/parser/Cookie.java
index 895ce64..17c3396 100644
--- a/java/org/apache/tomcat/util/http/parser/Cookie.java
+++ b/java/org/apache/tomcat/util/http/parser/Cookie.java
@@ -287,6 +287,7 @@ public class Cookie {
}
if (parseAttributes) {
+skipLWS(bb);
skipResult = skipBytes(bb, PATH_BYTES);
if (skipResult == SkipResult.FOUND) {
skipLWS(bb);
@@ -295,6 +296,7 @@ public class Cookie {
skipInvalidCookie(bb);
continue;
}
+skipLWS(bb);
path = readCookieValueRfc2109(bb, true);
if (path == null) {
skipInvalidCookie(bb);
@@ -319,6 +321,7 @@ public class Cookie {
}
if (parseAttributes) {
+skipLWS(bb);
skipResult = skipBytes(bb, DOMAIN_BYTES);
if (skipResult == SkipResult.FOUND) {
skipLWS(bb);
@@ -327,11 +330,13 @@ public class Cookie {
skipInvalidCookie(bb);
continue;
}
+skipLWS(bb);
domain = readCookieValueRfc2109(bb, false);
if (domain == null) {
skipInvalidCookie(bb);
continue;
}
+skipLWS(bb);
skipResult = skipByte(bb, COMMA_BYTE);
if (skipResult == SkipResult.FOUND) {
diff --git a/test/org/apache/tomcat/util/http/parser/TestCookie.java
b/test/org/apache/tomcat/util/http/parser/TestCookie.java
index c97e587..0f8a1dd 100644
--- a/test/org/apache/tomcat/util/http/parser/TestCookie.java
+++ b/test/org/apache/tomcat/util/http/parser/TestCookie.java
@@ -38,8 +38,8 @@ public class TestCookie {
List parameterSets = new ArrayList<>();
String[] SEPS = new String[] { ",", ";" };
-String[] PATHS = new String[] { ";$Path=/foo", ""};
-String[] DOMAINS = new String[] { ";$Domain=bar.com", ""};
+String[] PATHS = new String[] { ";$Path=/foo", " ; $Path = /foo ", ""};
+String[] DOMAINS = new String[] { ";$Domain=bar.com", " ; $Domain =
bar.com ", ""};
for (String sep1 : SEPS) {
for (String path1 : PATHS) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3a95d5f..b7d2fea 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -91,6 +91,11 @@
to correctly handle input addresses that ended with a pair of colons.
Based on a patch by syarramsetty-skyhook. (markt)
+
+Correctly parse RFC 2109 version 1 cookies that have additional linear
+white space around cookie attrubute names and values when using the RFC
+6265 cookie processor. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[CONF] Apache Tomcat > Servlet TCK 5.0 (DRAFT)
Title: Message Title There's 1 new edit on this page Servlet TCK 5.0 (DRAFT) Mark Thomas edited this page Here's what changed: ... resourceOnlyServlets="jsp"> ... server.xml allowedTrailerHeaders="myTrailer, myTrailer2" > ... -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true -Dorg.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR=false -Duser.language=en -Duser.country=US context.xml ... ... tomcat-users.xml Make the following changes: ... A default 10.0.x build (as of 2020-06-1718) with the above configuration and the nightly TCK built from source (as of 2020-mm06-dd18) triggers 75 58 test failures 1 TCK bugbugs PR 338 Incorrect major version ... (1 failure), Using LF rather an CRLF (15 failures) 42 failures suspected to be related to incomplete configuration Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 7.5.0
[CONF] Apache Tomcat > Servlet TCK 5.0 (DRAFT)
Title: Message Title There's 1 new edit on this page Servlet TCK 5.0 (DRAFT) Mark Thomas edited this page Here's what changed: ... web.xml Remove the sections setting the default character encoding for requests and responses to UTF-8. Tomcat config for Servlet 4.0 setenv.[sh|bat] Set the following system properties -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true -Dorg.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR=false -Duser.language=en -Duser.country=US tomcat-users.xml Make the following changes: web.xml Remove the sections setting the default character encoding for requests and responses to UTF-8. Tomcat config for Servlet 4.0 setenv.[sh|bat] Set the following system properties -Dorg.apache.catalina.STRICT_SERVLET_COMPLIANCE=true -Dorg.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR=false -Duser.language=en -Duser.country=US server.xml Enable h2c on port 8080, and add some trailer headers ... A default 10.0.x build (as of 2020-06-18) with the above configuration and the TCK built from source (as of 2020-06-18) triggers 58 32 test failures 1 Expected failures 1 x default context path test as Tomcat configuration always overrides this TCK bugs PR 338 Incorrect major version (1 failure), Using LF rather an CRLF (15 failures) 42 15 failures suspected to be related to incomplete configuration or additional TCK bugs Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 7.5.0
[GitHub] [tomcat] rotty3000 commented on a change in pull request #303: Fix BZ 64532 - update to bnd 5.1.1
rotty3000 commented on a change in pull request #303:
URL: https://github.com/apache/tomcat/pull/303#discussion_r441943416
##
File path: build.properties.default
##
@@ -286,14 +286,14 @@ saaj-api.home=${base.path}/saaj-api-${saaj-api.version}
saaj-api.jar=${saaj-api.home}/saaj-api-${saaj-api.version}.jar
saaj-api.loc=${base-maven.loc}/javax/xml/soap/saaj-api/${saaj-api.version}/saaj-api-${saaj-api.version}.jar
-# - bnd & bndlib, version 4.0.0 or later -
+# - bnd, version 5.1.1 or later -
# - provides OSGI metadata for JARs -
-bnd.version=5.1.0
+bnd.version=5.1.1
# checksums for biz.aQute.bnd-5.1.0.jar
Review comment:
Done!
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.
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
