You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/05/23 01:42:11 UTC

svn commit: r1596988 - in /manifoldcf/branches/release-1.6-branch: ./ CHANGES.txt framework/core/src/main/java/org/apache/manifoldcf/core/extmimemap/ExtensionMimeMap.java

Author: kwright
Date: Thu May 22 23:42:11 2014
New Revision: 1596988

URL: http://svn.apache.org/r1596988
Log:
Pull up fix for CONNECTORS-943 from trunk.

Modified:
    manifoldcf/branches/release-1.6-branch/   (props changed)
    manifoldcf/branches/release-1.6-branch/CHANGES.txt
    manifoldcf/branches/release-1.6-branch/framework/core/src/main/java/org/apache/manifoldcf/core/extmimemap/ExtensionMimeMap.java

Propchange: manifoldcf/branches/release-1.6-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1596983

Modified: manifoldcf/branches/release-1.6-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/CHANGES.txt?rev=1596988&r1=1596987&r2=1596988&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.6-branch/CHANGES.txt Thu May 22 23:42:11 2014
@@ -3,6 +3,9 @@ $Id$
 
 ======================= Release 1.6.1 =====================
 
+CONNECTORS-943: .aspx files not indexed by Sharepoint connector due to
+missing mime type in core.
+
 CONNECTORS-941: Solr connector not working properly with basic auth.
 (Erlend Garåsen, Karl Wright)
 

Modified: manifoldcf/branches/release-1.6-branch/framework/core/src/main/java/org/apache/manifoldcf/core/extmimemap/ExtensionMimeMap.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/framework/core/src/main/java/org/apache/manifoldcf/core/extmimemap/ExtensionMimeMap.java?rev=1596988&r1=1596987&r2=1596988&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/framework/core/src/main/java/org/apache/manifoldcf/core/extmimemap/ExtensionMimeMap.java (original)
+++ manifoldcf/branches/release-1.6-branch/framework/core/src/main/java/org/apache/manifoldcf/core/extmimemap/ExtensionMimeMap.java Thu May 22 23:42:11 2014
@@ -50,6 +50,7 @@ public class ExtensionMimeMap
     mimeMap.put("ots", "application/vnd.oasis.opendocument.spreadsheet");
     mimeMap.put("txt", "text/plain");
     mimeMap.put("log", "text/plain");
+    mimeMap.put("aspx", "text/html");
   }
 
   /** Map extension to mime type */