[nutch] branch master updated (f861c82 -> ee9ff89)

[sn...@apache.org]

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

snagel pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git.


    from f861c82  NUTCH-1842: crawl.gen.delay value is read incorrectly from config Merge pull request #393 from YossiTamari/patch-2
     add 5f53fd4  NUTCH-2606 MIME detection is wrong for plain-text documents send as Content-Type "application/msword" - allow text/plain (from MIME magic) to overwrite type derived   from HTTP Content-Type or file extension
     new ee9ff89  Merge pull request #392 from sebastian-nagel/NUTCH-2606-mime-detection-plain-text

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/java/org/apache/nutch/util/MimeUtil.java     |  3 +--
 src/test/org/apache/nutch/util/TestMimeUtil.java | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

[nutch] 01/01: Merge pull request #392 from sebastian-nagel/NUTCH-2606-mime-detection-plain-text

[sn...@apache.org]

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

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

commit ee9ff89042acc0f9f13987ed3f303d485d82db4e
Merge: f861c82 5f53fd4
Author: Sebastian Nagel <sn...@apache.org>
AuthorDate: Mon Nov 19 21:52:24 2018 +0100

    Merge pull request #392 from sebastian-nagel/NUTCH-2606-mime-detection-plain-text
    
    NUTCH-2606 MIME detection is wrong for plain-text documents send as Content-Type "application/msword"

 src/java/org/apache/nutch/util/MimeUtil.java     |  3 +--
 src/test/org/apache/nutch/util/TestMimeUtil.java | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)