Merge remote branch 'upstream/master'

[mono.git] / mcs / class / System / System.Net / ChunkStream.cs

diff --git a/mcs/class/System/System.Net/ChunkStream.cs b/mcs/class/System/System.Net/ChunkStream.cs
index 7df2e3f68acd88ab80ce6bc90a3d314a8a01bbf6..0edb422370b1d6c7e5d81bde4d48970bd4191cae 100644 (file)
--- a/mcs/class/System/System.Net/ChunkStream.cs
+++ b/mcs/class/System/System.Net/ChunkStream.cs
@@ -62,7 +62,7 @@ namespace System.Net
                        }
                }
 
-               WebHeaderCollection headers;
+               internal WebHeaderCollection headers;
                int chunkSize;
                int chunkRead;
                State state;
@@ -70,15 +70,21 @@ namespace System.Net
                StringBuilder saved;
                bool sawCR;
                bool gotit;
+               int trailerState;
                ArrayList chunks;
                
                public ChunkStream (byte [] buffer, int offset, int size, WebHeaderCollection headers)
+                                       : this (headers)
+               {
+                       Write (buffer, offset, size);
+               }
+
+               public ChunkStream (WebHeaderCollection headers)
                {
                        this.headers = headers;
                        saved = new StringBuilder ();
                        chunks = new ArrayList ();
                        chunkSize = -1;
-                       Write (buffer, offset, size);
                }
 
                public void ResetBuffer ()
@@ -224,8 +230,9 @@ namespace System.Net
                                        ThrowProtocolViolation ("Missing \\n");
 
                                try {
-                                       if (saved.Length > 0)
-                                               chunkSize = Int32.Parse (saved.ToString (), NumberStyles.HexNumber);
+                                       if (saved.Length > 0) {
+                                               chunkSize = Int32.Parse (RemoveChunkExtension (saved.ToString ()), NumberStyles.HexNumber);
+                                       }
                                } catch (Exception) {
                                        ThrowProtocolViolation ("Cannot parse chunk size.");
                                }
@@ -235,17 +242,27 @@ namespace System.Net
 
                        chunkRead = 0;
                        try {
-                               chunkSize = Int32.Parse (saved.ToString (), NumberStyles.HexNumber);
+                               chunkSize = Int32.Parse (RemoveChunkExtension (saved.ToString ()), NumberStyles.HexNumber);
                        } catch (Exception) {
                                ThrowProtocolViolation ("Cannot parse chunk size.");
                        }
                        
-                       if (chunkSize == 0)
+                       if (chunkSize == 0) {
+                               trailerState = 2;
                                return State.Trailer;
+                       }
 
                        return State.Body;
                }
 
+               static string RemoveChunkExtension (string input)
+               {
+                       int idx = input.IndexOf (';');
+                       if (idx == -1)
+                               return input;
+                       return input.Substring (0, idx);
+               }
+
                State ReadCRLF (byte [] buffer, ref int offset, int size)
                {
                        if (!sawCR) {
@@ -268,16 +285,16 @@ namespace System.Net
                        char c = '\0';
 
                        // short path
-                       if ((char) buffer [offset] == '\r') {
+                       if (trailerState == 2 && (char) buffer [offset] == '\r' && saved.Length == 0) {
                                offset++;
-                               if ((char) buffer [offset] == '\n') {
+                               if (offset < size && (char) buffer [offset] == '\n') {
                                        offset++;
                                        return State.None;
                                }
                                offset--;
                        }
                        
-                       int st = 0;
+                       int st = trailerState;
                        string stString = "\r\n\r";
                        while (offset < size && st < 4) {
                                c = (char) buffer [offset++];
@@ -292,13 +309,16 @@ namespace System.Net
                                }
 
                                if (st > 0) {
-                                       saved.Append (stString.Substring (0, st));
+                                       saved.Append (stString.Substring (0, saved.Length == 0? st-2: st));
                                        st = 0;
+                                       if (saved.Length > 4196)
+                                               ThrowProtocolViolation ("Error reading trailer (too long).");
                                }
                        }
 
                        if (st < 4) {
-                               if (offset <  size)
+                               trailerState = st;
+                               if (offset < size)
                                        ThrowProtocolViolation ("Error reading trailer.");
 
                                return State.Trailer;