inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALF-13807: Add range header support to the webDAV servlet

Browse Source 
* Extracted range header support from BaseDownloadContentServlet into HttpRangeProcessor
* Altered GetMethod in WebDAV to use HttpRangeProcessor



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@35614 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2012-04-24 12:15:04 +00:00
parent 0b56f5b306
commit ad219e4682
2 changed files with 543 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
source/java/org/alfresco/repo/webdav/GetMethod.java
View File

@@ -29,7 +29,9 @@ import java.util.StringTokenizer;
import javax.servlet.http.HttpServletResponse;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.filestore.FileContentReader;
import org.alfresco.repo.web.util.HttpRangeProcessor;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.model.FileNotFoundException;
@@ -50,12 +52,14 @@ public class GetMethod extends WebDAVMethod
{
// Request parameters
private static final String RANGE_HEADER_UNIT_SPECIFIER = "bytes=";
private ArrayList<String> ifMatchTags = null;
private ArrayList<String> ifNoneMatchTags = null;
private Date m_ifModifiedSince = null;
private Date m_ifUnModifiedSince = null;
protected boolean m_returnContent = true;
private String byteRanges;
/**
* Default constructor
@@ -77,7 +81,11 @@ public class GetMethod extends WebDAVMethod
if (strRange != null && strRange.length() > 0)
{
logger.warn("Range header (" + strRange + ") not supported");
byteRanges = strRange;
if (logger.isDebugEnabled())
{
logger.debug("Range header supplied: " + byteRanges);
}
}
// Capture all the If headers, process later
@@ -208,14 +216,35 @@ public class GetMethod extends WebDAVMethod
(ContentReader) reader,
I18NUtil.getMessage(FileContentReader.MSG_MISSING_CONTENT),
realNodeInfo.getNodeRef(), reader);
// there is content associated with the node
m_response.setHeader(WebDAV.HEADER_CONTENT_LENGTH, Long.toString(reader.getSize()));
m_response.setHeader(WebDAV.HEADER_CONTENT_TYPE, reader.getMimetype());
if (m_returnContent)
if (byteRanges != null && byteRanges.startsWith(RANGE_HEADER_UNIT_SPECIFIER))
{
// copy the content to the response output stream
reader.getContent(m_response.getOutputStream());
HttpRangeProcessor rangeProcessor = new HttpRangeProcessor(getContentService());
String userAgent = m_request.getHeader(WebDAV.HEADER_USER_AGENT);
if (m_returnContent)
{
rangeProcessor.processRange(
m_response,
reader,
byteRanges.substring(6),
realNodeInfo.getNodeRef(),
ContentModel.PROP_CONTENT,
reader.getMimetype(),
userAgent);
}
}
else
{
// there is content associated with the node
m_response.setHeader(WebDAV.HEADER_CONTENT_LENGTH, Long.toString(reader.getSize()));
m_response.setHeader(WebDAV.HEADER_CONTENT_TYPE, reader.getMimetype());
if (m_returnContent)
{
// copy the content to the response output stream
reader.getContent(m_response.getOutputStream());
}
}
}
}