You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by am...@apache.org on 2018/11/01 19:53:10 UTC
[struts] branch struts-2-5-x updated (f4d7dbe -> 8293add)
This is an automated email from the ASF dual-hosted git repository.
amashchenko pushed a change to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git.
from f4d7dbe [maven-release-plugin] prepare for next development iteration
add 567fae9 WW-4971 Fix broken s:includes for non-UTF8 content. The low-risk fix retains existing behaviour by default, but provides a configuration flag users can set (to true) in order to enable usage of response (page) encoding for s:include tags. A WARN level log output is also generated for failed FastByteArrayOutputStream decoding (can be suppressed by log configuration).
add 7bca982 Fix typos and whitespace (on top of WW-4971 Fix broken s:includes for non-UTF8 content).
new 8293add Merge pull request #257 from JCgH4164838Gh792C124B5/localS2_2_5_x_Branch
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/struts2/StrutsConstants.java | 65 +++++++++++-----------
.../org/apache/struts2/components/Include.java | 36 +++++++++---
.../struts2/util/FastByteArrayOutputStream.java | 24 ++++++--
.../apache/struts2/views/jsp/IncludeTagTest.java | 60 +++++++++++++++++++-
4 files changed, 138 insertions(+), 47 deletions(-)
[struts] 01/01: Merge pull request #257 from
JCgH4164838Gh792C124B5/localS2_2_5_x_Branch
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amashchenko pushed a commit to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 8293add6aaa6f496c636f39982d99950621d44a5
Merge: f4d7dbe 7bca982
Author: Aleksandr Mashchenko <al...@users.noreply.github.com>
AuthorDate: Thu Nov 1 21:53:04 2018 +0200
Merge pull request #257 from JCgH4164838Gh792C124B5/localS2_2_5_x_Branch
Fix WW-4971 (broken includes for non-UTF8 content).
.../java/org/apache/struts2/StrutsConstants.java | 65 +++++++++++-----------
.../org/apache/struts2/components/Include.java | 36 +++++++++---
.../struts2/util/FastByteArrayOutputStream.java | 24 ++++++--
.../apache/struts2/views/jsp/IncludeTagTest.java | 60 +++++++++++++++++++-
4 files changed, 138 insertions(+), 47 deletions(-)