[PATCH] fix for jsp:include

[Kazuhiro Kazama]

I have already posted about problem of jsp:include.

This patch removes unnecessary character encoding conversion and speed
up jsp:include execution.

I have confirmed that the following two examples work well on Japanese
Solaris 2.8.

Example 1:
<%@ page contentType="text/html; charset=shift_jis" %>
<jsp:include page="shift_jis.html" flush="true"/>

Example 2:
<%@ page contentType="text/html; charset=euc-jp" %>
<jsp:include page="euc-jp.html" flush="true"/>


Kazuhiro Kazama ([EMAIL PROTECTED])     NTT Network Innovation Laboratories

--- StaticInterceptor.java.orig Sun Dec  3 16:58:31 2000
+++ StaticInterceptor.java      Sun Dec  3 16:59:47 2000
@@ -364,24 +364,13 @@
        try {
            in = new FileInputStream(file);
 
-           if( res.isUsingWriter() ) {
-               InputStreamReader r = new InputStreamReader(in);
-               PrintWriter out=res.getWriter();
-               char[] buf = new char[1024];
-               int read = 0;
-               
-               while ((read = r.read(buf)) != -1) {
-                   out.write(buf, 0, read);
-               }
-           } else {
-               OutputStream out=res.getOutputStream();
-               byte[] buf = new byte[1024];
-               int read = 0;
-               
-               while ((read = in.read(buf)) != -1) {
-                   out.write(buf, 0, read);
-               }
-           } 
+           OutputStream out=res.getOutputStream();
+           byte[] buf = new byte[1024];
+           int read = 0;
+           
+           while ((read = in.read(buf)) != -1) {
+               out.write(buf, 0, read);
+           }
        } catch (FileNotFoundException e) {
            // Figure out what we're serving
            context.getContextManager().handleStatus( req, res, 404);