You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/06/17 22:40:04 UTC
[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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Store common build details in a shared
build-defaults.bnd
Posted by ma...@apache.org.
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é <ro...@apache.org>
AuthorDate: Sat Jun 13 20:32:40 2020 -0400
Store common build details in a shared build-defaults.bnd
Signed-off-by: Raymond Augé <ro...@apache.org>
---
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.
+
+-include: build-defaults.bnd
+
Bundle-Name: tomcat-storeconfig
Bundle-SymbolicName: org.apache.tomcat-storeconfig
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: org.apache.catalina.storeconfig
\ No newline at end of file
diff --git a/res/bnd/catalina-tribes.jar.tmp.bnd b/res/bnd/catalina-tribes.jar.tmp.bnd
index a4b8754..630169d 100644
--- a/res/bnd/catalina-tribes.jar.tmp.bnd
+++ b/res/bnd/catalina-tribes.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-tribes
Bundle-SymbolicName: org.apache.tomcat-tribes
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.catalina.tribes,\
org.apache.catalina.tribes.group,\
diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd
index ce296f2..556169f 100644
--- a/res/bnd/catalina.jar.tmp.bnd
+++ b/res/bnd/catalina.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
Bundle-SymbolicName: org.apache.tomcat-catalina
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.catalina.authenticator,\
org.apache.catalina.authenticator.jaspic,\
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
index d401e74..70fdb91 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/el-api.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.
+
+-include: build-defaults.bnd
+
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/jasper-el.jar.tmp.bnd b/res/bnd/jasper-el.jar.tmp.bnd
index 896ef52..1550548 100644
--- a/res/bnd/jasper-el.jar.tmp.bnd
+++ b/res/bnd/jasper-el.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-jasper-el
Bundle-SymbolicName: org.apache.tomcat-jasper-el
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.el,\
org.apache.el.lang,\
diff --git a/res/bnd/jasper.jar.tmp.bnd b/res/bnd/jasper.jar.tmp.bnd
index 5a5b5e6..4cd16d2 100644
--- a/res/bnd/jasper.jar.tmp.bnd
+++ b/res/bnd/jasper.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-jasper
Bundle-SymbolicName: org.apache.tomcat-jasper
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.jasper,\
org.apache.jasper.compiler,\
diff --git a/res/bnd/jaspic-api.jar.tmp.bnd b/res/bnd/jaspic-api.jar.tmp.bnd
index c063e8d..7ac9368 100644
--- a/res/bnd/jaspic-api.jar.tmp.bnd
+++ b/res/bnd/jaspic-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-jaspic-api
Bundle-SymbolicName: org.apache.tomcat-jaspic-api
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
javax.security.auth.message,\
javax.security.auth.message.callback,\
diff --git a/res/bnd/jsp-api.jar.tmp.bnd b/res/bnd/jsp-api.jar.tmp.bnd
index ffcacb0..ca2b47d 100644
--- a/res/bnd/jsp-api.jar.tmp.bnd
+++ b/res/bnd/jsp-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-jsp-api
Bundle-SymbolicName: org.apache.tomcat-jsp-api
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
javax.servlet.jsp,\
javax.servlet.jsp.el,\
diff --git a/res/bnd/servlet-api.jar.tmp.bnd b/res/bnd/servlet-api.jar.tmp.bnd
index 9923189..307d1bd 100644
--- a/res/bnd/servlet-api.jar.tmp.bnd
+++ b/res/bnd/servlet-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-servlet-api
Bundle-SymbolicName: org.apache.tomcat-servlet-api
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
javax.servlet,\
javax.servlet.annotation,\
diff --git a/res/bnd/tomcat-api.jar.tmp.bnd b/res/bnd/tomcat-api.jar.tmp.bnd
index 69a2369..54a3260 100644
--- a/res/bnd/tomcat-api.jar.tmp.bnd
+++ b/res/bnd/tomcat-api.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.
+
+-include: build-defaults.bnd
+
Bundle-Name: tomcat-api
Bundle-SymbolicName: org.apache.tomcat-api
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: org.apache.tomcat
diff --git a/res/bnd/tomcat-coyote.jar.tmp.bnd b/res/bnd/tomcat-coyote.jar.tmp.bnd
index 24eab7c..0c21cb4 100644
--- a/res/bnd/tomcat-coyote.jar.tmp.bnd
+++ b/res/bnd/tomcat-coyote.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-coyote
Bundle-SymbolicName: org.apache.tomcat-coyote
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.coyote,\
org.apache.coyote.ajp,\
diff --git a/res/bnd/tomcat-dbcp.jar.tmp.bnd b/res/bnd/tomcat-dbcp.jar.tmp.bnd
index 13f73eb..35b4008 100644
--- a/res/bnd/tomcat-dbcp.jar.tmp.bnd
+++ b/res/bnd/tomcat-dbcp.jar.tmp.bnd
@@ -12,10 +12,12 @@
# 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
+
Automatic-Module-Name: org.apache.tomcat.dbcp
Bundle-Name: tomcat-dbcp
Bundle-SymbolicName: org.apache.tomcat-dbcp
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.tomcat.dbcp.dbcp2.cpdsadapter,\
org.apache.tomcat.dbcp.dbcp2.datasources,\
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 6ea4974..553de57 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -12,10 +12,12 @@
# 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
+
Automatic-Module-Name: org.apache.tomcat.embed.core
Bundle-Name: tomcat-embed-core
Bundle-SymbolicName: org.apache.tomcat-embed-core
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
javax.security.auth.message,\
javax.security.auth.message.callback,\
diff --git a/res/bnd/tomcat-embed-el.jar.tmp.bnd b/res/bnd/tomcat-embed-el.jar.tmp.bnd
index bb7648a..19589ea 100644
--- a/res/bnd/tomcat-embed-el.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-el.jar.tmp.bnd
@@ -12,10 +12,12 @@
# 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.q
+
+-include: build-defaults.bnd
+
Automatic-Module-Name: org.apache.tomcat.embed.jasper.el
Bundle-Name: tomcat-embed-jasper-el
Bundle-SymbolicName: org.apache.tomcat-embed-jasper-el
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
javax.el,\
org.apache.el,\
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index 8b99ebf..e7eafe8 100644
--- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
@@ -12,10 +12,12 @@
# 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
+
Automatic-Module-Name: org.apache.tomcat.embed.jasper
Bundle-Name: tomcat-embed-jasper
Bundle-SymbolicName: org.apache.tomcat-embed-jasper
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
javax.servlet.jsp,\
javax.servlet.jsp.el,\
diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
index 231cd3d..1a8f762 100644
--- a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
@@ -12,10 +12,12 @@
# 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
+
Automatic-Module-Name: org.apache.tomcat.embed.websocket
Bundle-Name: tomcat-embed-websocket
Bundle-SymbolicName: org.apache.tomcat-embed-websocket
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
javax.websocket,\
javax.websocket.server,\
diff --git a/res/bnd/tomcat-jni.jar.tmp.bnd b/res/bnd/tomcat-jni.jar.tmp.bnd
index 44386e2..12801f0 100644
--- a/res/bnd/tomcat-jni.jar.tmp.bnd
+++ b/res/bnd/tomcat-jni.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.
+
+-include: build-defaults.bnd
+
Bundle-Name: tomcat-jni
Bundle-SymbolicName: org.apache.tomcat-jni
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: org.apache.tomcat.jni
\ No newline at end of file
diff --git a/res/bnd/tomcat-juli.jar.tmp.bnd b/res/bnd/tomcat-juli.jar.tmp.bnd
index 06646c4..c8b52ed 100644
--- a/res/bnd/tomcat-juli.jar.tmp.bnd
+++ b/res/bnd/tomcat-juli.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-juli
Bundle-SymbolicName: org.apache.tomcat-juli
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.juli,\
org.apache.juli.logging
\ No newline at end of file
diff --git a/res/bnd/tomcat-util-scan.jar.tmp.bnd b/res/bnd/tomcat-util-scan.jar.tmp.bnd
index 74bb629..b8c293b 100644
--- a/res/bnd/tomcat-util-scan.jar.tmp.bnd
+++ b/res/bnd/tomcat-util-scan.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-util-scan
Bundle-SymbolicName: org.apache.tomcat-util-scan
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.tomcat.util.descriptor,\
org.apache.tomcat.util.descriptor.tagplugin,\
diff --git a/res/bnd/tomcat-util.jar.tmp.bnd b/res/bnd/tomcat-util.jar.tmp.bnd
index 050330e..3c456d8 100644
--- a/res/bnd/tomcat-util.jar.tmp.bnd
+++ b/res/bnd/tomcat-util.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-util
Bundle-SymbolicName: org.apache.tomcat-util
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.tomcat.util,\
org.apache.tomcat.util.buf,\
diff --git a/res/bnd/tomcat-websocket.jar.tmp.bnd b/res/bnd/tomcat-websocket.jar.tmp.bnd
index 8882ea1..623c32c 100644
--- a/res/bnd/tomcat-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-websocket.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-websocket
Bundle-SymbolicName: org.apache.tomcat-websocket
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
org.apache.tomcat.websocket,\
org.apache.tomcat.websocket.server
\ No newline at end of file
diff --git a/res/bnd/websocket-api.jar.tmp.bnd b/res/bnd/websocket-api.jar.tmp.bnd
index d36260e..cad59c2 100644
--- a/res/bnd/websocket-api.jar.tmp.bnd
+++ b/res/bnd/websocket-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-websocket-api
Bundle-SymbolicName: org.apache.tomcat-websocket-api
-Bundle-Version: ${version_cleanup;${version}}
Export-Package: \
javax.websocket,\
javax.websocket.server
\ No newline at end of file
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0c0bc54..b5016dc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -129,6 +129,10 @@
<bug>64522</bug>: Package jars in effective dependency order. Pull
request provided by Raymond Augé. (markt)
</fix>
+ <fix>
+ Store common build details in a shared build-defaults.bnd. Pull
+ request provided by Raymond Augé. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Improve parsing of space around v1 cookie attributes
Posted by ma...@apache.org.
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 <ma...@apache.org>
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<Object[]> 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)
</fix>
+ <fix>
+ 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)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org