This is an automated email from the ASF dual-hosted git repository. alexoree pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 2e066fd5bbd7e9583d9222e13cbda124955b1b58 Merge: 391a206b4 6e3e29e9c Author: spyhunter99 <[email protected]> AuthorDate: Sun Nov 23 19:47:24 2025 -0500 Merge pull request #405 from spyhunter99/bug/JSPWIKI-1205 JSPWIKI-1205 adjusts the handling for too large file attachments. .../apache/wiki/attachment/AttachmentServlet.java | 53 ++++++++++++++--- .../java/org/apache/wiki/tags/MaxUploadTag.java | 66 ++++++++++++++++++++++ .../src/main/resources/META-INF/jspwiki.tld | 6 ++ .../main/resources/templates/default.properties | 1 + .../main/resources/templates/default_de.properties | 1 + .../main/resources/templates/default_es.properties | 3 +- .../main/resources/templates/default_fi.properties | 1 + .../main/resources/templates/default_fr.properties | 1 + .../main/resources/templates/default_it.properties | 1 + .../main/resources/templates/default_nl.properties | 1 + .../resources/templates/default_pt_BR.properties | 1 + .../main/resources/templates/default_ru.properties | 1 + .../resources/templates/default_zh_CN.properties | 1 + jspwiki-war/src/main/webapp/Error.jsp | 17 ++++-- .../webapp/templates/default/AttachmentTab.jsp | 6 +- 15 files changed, 143 insertions(+), 17 deletions(-)
