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

tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git

commit b63072c540e19a68fd2c01823c48bce225e3e619
Merge: 8bf65c0 6a27f3e
Author: tballison <[email protected]>
AuthorDate: Mon Mar 22 14:17:41 2021 -0400

    Merge remote-tracking branch 'origin/branch_1x' into branch_1x

 CHANGES.txt                                        |   7 +-
 .../src/main/java/org/apache/tika/gui/TikaGUI.java |   3 -
 .../apache/tika/parser/RecursiveParserWrapper.java |  79 ++++++++++++++++----
 .../tika/sax/BasicContentHandlerFactory.java       |   3 +
 .../org/apache/tika/sax/SecureContentHandler.java  |   2 +-
 tika-eval/pom.xml                                  |  35 ++++++++-
 .../java/org/apache/tika/eval/FileProfiler.java    |   2 +
 .../resources/tika-eval-file-profiler-config.xml   |   9 ++-
 tika-example/pom.xml                               |   2 +-
 tika-parsers/pom.xml                               |   2 +-
 .../parser/odf/OpenDocumentManifestHandler.java    |  46 ++++++++++++
 .../apache/tika/parser/odf/OpenDocumentParser.java |  82 ++++++++++++++++-----
 .../org/apache/tika/parser/odf/ODFParserTest.java  |  29 ++++++++
 .../resources/test-documents/testODTEncrypted.odt  | Bin 0 -> 12714 bytes
 .../tika/server/RecursiveMetadataResourceTest.java |  24 +++---
 15 files changed, 262 insertions(+), 63 deletions(-)

diff --cc CHANGES.txt
index bcc7c5d,84884ed..37dcabe
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,10 +1,13 @@@
- Release 1.26 - 03/09/2021
+ Release 1.26 - ??/??/????
+ 
+    * The "writeLimit" header now pertains to the combined characters
+      written per container document (and embedded documents) in the /rmeta
+      endpoint in tika-server (TIKA-3325); it no longer functions only
+      per container or embedded document.
  
 +   * Extract more embedded files in PDFs by recursively processing the
 +     embedded file tree (TIKA-3332).
 +
     * Allow for case insensitive headers for configuration of the PDFParser
       and the TesseractOCRParser in tika-server via Subhajit Das (TIKA-3320).
  

Reply via email to