added code to work around CR/LF handling in IE's XmlHttpRequest.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@2081 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/java/hudson/model/LargeText.java

@@ -4,6 +4,7 @@ import hudson.util.CharSpool;
 import hudson.util.CountingOutputStream;
 import hudson.util.WriterOutputStream;
 import hudson.util.ByteBuffer;
+import hudson.util.LineEndNormalizingWriter;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 
@@ -152,7 +153,7 @@ public class LargeText {
         if(!completed)
             rsp.addHeader("X-More-Data","true");
 
-        spool.writeTo(rsp.getWriter());
+        spool.writeTo(new LineEndNormalizingWriter(rsp.getWriter()));
 
     }
 

core/src/main/java/hudson/util/LineEndNormalizingWriter.java

+package hudson.util;
+
+import java.io.FilterWriter;
+import java.io.Writer;
+import java.io.IOException;
+
+/**
+ * Finds the lone LF and converts that to CR+LF.
+ *
+ * <p>
+ * Internet Explorer's <tt>XmlHttpRequest.responseText</tt> seems to
+ * normalize the line end, and if we only send LF without CR, it will
+ * not recognize that as a new line. To work around this problem,
+ * we use this filter to always convert LF to CR+LF.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class LineEndNormalizingWriter extends FilterWriter {
+
+    private boolean seenCR;
+
+    public LineEndNormalizingWriter(Writer out) {
+        super(out);
+    }
+
+    public void write(char cbuf[]) throws IOException {
+        write(cbuf, 0, cbuf.length);
+    }
+
+    public void write(String str) throws IOException {
+        write(str,0,str.length());
+    }
+
+    public void write(int c) throws IOException {
+        if(!seenCR && c==LF)
+            super.write("\r\n");
+        else
+            super.write(c);
+        seenCR = (c==CR);
+    }
+
+    public void write(char cbuf[], int off, int len) throws IOException {
+        int end = off+len;
+        int writeBegin = off;
+
+        for( int i=off; i<end; i++ ) {
+            char ch = cbuf[i];
+            if(!seenCR && ch==LF) {
+                // write up to the char before LF
+                super.write(cbuf,writeBegin,i-writeBegin);
+                super.write("\r\n");
+                writeBegin=i+1;
+            }
+            seenCR = (ch==CR);
+        }
+
+        super.write(cbuf,writeBegin,end-writeBegin);
+    }
+
+    public void write(String str, int off, int len) throws IOException {
+        int end = off+len;
+        int writeBegin = off;
+
+        for( int i=off; i<end; i++ ) {
+            char ch = str.charAt(i);
+            if(!seenCR && ch==LF) {
+                // write up to the char before LF
+                super.write(str,writeBegin,i-writeBegin);
+                super.write("\r\n");
+                writeBegin=i+1;
+            }
+            seenCR = (ch==CR);
+        }
+
+        super.write(str,writeBegin,end-writeBegin);
+    }
+
+    private static final int CR = 0x0D;
+    private static final int LF = 0x0A;
+}

core/src/test/java/hudson/util/LineEndNormalizingWriterTest.java

+package hudson.util;
+
+import junit.framework.TestCase;
+
+import java.io.StringWriter;
+import java.io.Writer;
+import java.io.IOException;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+public class LineEndNormalizingWriterTest extends TestCase {
+    public void test1() throws IOException {
+        StringWriter sw = new StringWriter();
+        Writer w = new LineEndNormalizingWriter(sw);
+
+        w.write("abc\r\ndef\r");
+        w.write("\n");
+
+        assertEquals(sw.toString(),"abc\r\ndef\r\n");
+    }
+
+    public void test2() throws IOException {
+        StringWriter sw = new StringWriter();
+        Writer w = new LineEndNormalizingWriter(sw);
+
+        w.write("abc\ndef\n");
+        w.write("\n");
+
+        assertEquals(sw.toString(),"abc\r\ndef\r\n\r\n");
+    }
+
+    public void test3() throws IOException {
+        StringWriter sw = new StringWriter();
+        Writer w = new LineEndNormalizingWriter(sw);
+
+        w.write("\r\n\n");
+
+        assertEquals(sw.toString(),"\r\n\r\n");
+    }
+}