This is an automated email from the ASF dual-hosted git repository.
ramanathan1504 pushed a change to branch junit5-iostreams
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from f27314b4e8 Merge branch '2.x' into junit5-iostreams
add 4ce9212cd3 resolve external entities through ConfigurationSource in
log4j 1.x XmlConfiguration (#4198)
add 46106aa0dd Merge branch '2.x' into junit5-iostreams
No new revisions were added by this update.
Summary of changes:
.../org/apache/log4j/xml/Log4jEntityResolver.java | 28 +++++-
.../config/XmlConfigurationExternalEntityTest.java | 99 ++++++++++++++++++++++
...er.xml => fix_log4j1_xml_configuration_xxe.xml} | 4 +-
3 files changed, 126 insertions(+), 5 deletions(-)
create mode 100644
log4j-1.2-api/src/test/java/org/apache/log4j/config/XmlConfigurationExternalEntityTest.java
copy src/changelog/.2.x.x/{fix-MapMessage-JSON-non-finite-number.xml =>
fix_log4j1_xml_configuration_xxe.xml} (58%)
