remm 2005/04/28 05:30:39
Modified: http11/src/java/org/apache/coyote/http11
Http11AprProcessor.java
catalina/src/share/org/apache/catalina/connector
Request.java
catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java
Log:
- Rename attributes as suggested by Bill.
Revision Changes Path
1.10 +6 -4
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
Index: Http11AprProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Http11AprProcessor.java 23 Apr 2005 17:33:40 -0000 1.9
+++ Http11AprProcessor.java 28 Apr 2005 12:30:38 -0000 1.10
@@ -1324,7 +1324,7 @@
// Advertise sendfile support through a request attribute
if (endpoint.getUseSendfile()) {
- request.setAttribute("sendfile.support", Boolean.TRUE);
+ request.setAttribute("org.apache.tomcat.sendfile.support",
Boolean.TRUE);
}
}
@@ -1504,7 +1504,7 @@
}
// Sendfile support
- String fileName = (String) request.getAttribute("sendfile.filename");
+ String fileName = (String)
request.getAttribute("org.apache.tomcat.sendfile.filename");
if (fileName != null) {
// No entity body sent here
outputBuffer.addActiveFilter
@@ -1512,8 +1512,10 @@
contentDelimitation = true;
sendfileData = new AprEndpoint.SendfileData();
sendfileData.fileName = fileName;
- sendfileData.start = ((Long)
request.getAttribute("sendfile.start")).longValue();
- sendfileData.end = ((Long)
request.getAttribute("sendfile.end")).longValue();
+ sendfileData.start =
+ ((Long)
request.getAttribute("org.apache.tomcat.sendfile.start")).longValue();
+ sendfileData.end =
+ ((Long)
request.getAttribute("org.apache.tomcat.sendfile.end")).longValue();
}
// Check for compression
1.23 +2 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java
Index: Request.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Request.java 20 Apr 2005 16:13:23 -0000 1.22
+++ Request.java 28 Apr 2005 12:30:38 -0000 1.23
@@ -1367,7 +1367,7 @@
}
// Pass special attributes to the native layer
- if (name.startsWith("sendfile.")) {
+ if (name.startsWith("org.apache.tomcat.")) {
coyoteRequest.setAttribute(name, value);
}
1.34 +24 -10
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- DefaultServlet.java 27 Apr 2005 23:07:31 -0000 1.33
+++ DefaultServlet.java 28 Apr 2005 12:30:38 -0000 1.34
@@ -145,6 +145,13 @@
*/
protected String fileEncoding = null;
+
+ /**
+ * Minimum size for sendfile usage in bytes.
+ */
+ protected int sendfileSize = 48 * 1024;
+
+
// ----------------------------------------------------- Static
Initializer
@@ -235,6 +242,12 @@
;
}
try {
+ value = getServletConfig().getInitParameter("sendfileSize");
+ sendfileSize = Integer.parseInt(value) * 1024;
+ } catch (Throwable t) {
+ ;
+ }
+ try {
value = getServletConfig().getInitParameter("fileEncoding");
fileEncoding = value;
} catch (Throwable t) {
@@ -1488,21 +1501,22 @@
HttpServletResponse response,
CacheEntry entry,
long length, Range range) {
- if ((entry.resource != null)
- && ((length > 80 * 1024) || (entry.resource.getContent() ==
null))
+ if ((sendfileSize > 0)
+ && (entry.resource != null)
+ && ((length > sendfileSize) || (entry.resource.getContent() ==
null))
&& (entry.attributes.getCanonicalPath() != null)
- && (Boolean.TRUE == request.getAttribute("sendfile.support"))
+ && (Boolean.TRUE ==
request.getAttribute("org.apache.tomcat.sendfile.support"))
&&
(request.getClass().getName().equals("org.apache.catalina.connector.RequestFacade"))
&&
(response.getClass().getName().equals("org.apache.catalina.connector.ResponseFacade")))
{
- request.setAttribute("sendfile.filename",
entry.attributes.getCanonicalPath());
+ request.setAttribute("org.apache.tomcat.sendfile.filename",
entry.attributes.getCanonicalPath());
if (range == null) {
- request.setAttribute("sendfile.start", new Long(0L));
- request.setAttribute("sendfile.end", new Long(length));
+ request.setAttribute("org.apache.tomcat.sendfile.start", new
Long(0L));
+ request.setAttribute("org.apache.tomcat.sendfile.end", new
Long(length));
} else {
- request.setAttribute("sendfile.start", new
Long(range.start));
- request.setAttribute("sendfile.end", new Long(range.end +
1));
+ request.setAttribute("org.apache.tomcat.sendfile.start", new
Long(range.start));
+ request.setAttribute("org.apache.tomcat.sendfile.end", new
Long(range.end + 1));
}
- request.setAttribute("sendfile.token", this);
+ request.setAttribute("org.apache.tomcat.sendfile.token", this);
return true;
} else {
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
