You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@struts.apache.org by lu...@apache.org on 2022/11/02 09:32:41 UTC

[struts] 01/01: Merge pull request #628 from apache/WW-5252-external

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 79a84a8f0255e66344a88fef3aa2d1fa5001507d
Merge: 2660aaec5 8d2d99605
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Wed Nov 2 10:32:36 2022 +0100

    Merge pull request #628 from apache/WW-5252-external
    
    [WW-5252] Disables parsing external entities

 .../com/opensymphony/xwork2/util/DomHelper.java    | 130 ++++++++++++---------
 .../org/apache/struts2/views/xslt/XSLTResult.java  |  62 +++++++---
 core/src/main/resources/author.dtd                 |  22 ++++
 .../opensymphony/xwork2/util/DomHelperTest.java    |  56 ++++-----
 4 files changed, 174 insertions(+), 96 deletions(-)