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/07/11 08:25:23 UTC

[struts] 01/01: Merge pull request #571 from apache/WW-5190-match-action-proxy

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 f3cb89202dbe30fae2af27d68a49b0c7d8a77b21
Merge: 836a27692 cb5997490
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Mon Jul 11 10:25:16 2022 +0200

    Merge pull request #571 from apache/WW-5190-match-action-proxy
    
    [WW-5190] Fixes StackOverflowException when dispatching request

 apps/showcase/pom.xml                              |   9 +-
 .../struts2/showcase/source/ViewSourceAction.java  | 385 ++++++++++-----------
 apps/showcase/src/main/resources/log4j2.xml        |   9 +-
 .../{log4j2.xml => struts-dispatcher.xml}          |  36 +-
 apps/showcase/src/main/resources/struts.xml        |   2 +
 .../src/main/webapp/WEB-INF/decorators/main.jsp    |   2 +
 .../webapp/WEB-INF/dispatcher/dispatch-result.jsp  |  42 +++
 .../src/main/webapp/WEB-INF/viewSource.jsp         |  75 ++--
 apps/showcase/src/main/webapp/WEB-INF/web.xml      |  27 +-
 .../struts2/showcase/DispatcherResultTest.java     |  56 +++
 .../org/apache/struts2/dispatcher/Dispatcher.java  |  49 ++-
 .../filter/StrutsPrepareAndExecuteFilter.java      |   8 +-
 .../dispatcher/mapper/DefaultActionMapper.java     | 120 ++++---
 .../apache/struts2/dispatcher/DispatcherTest.java  | 198 ++++++-----
 14 files changed, 589 insertions(+), 429 deletions(-)