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:11 UTC

[struts] 01/01: Merge pull request #257 from JCgH4164838Gh792C124B5/localS2_2_5_x_Branch

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(-)