Merge pull request andyburke#51 from jjay/master

andyburke · andyburke · commit bb0acb56942c · 2015-07-08T12:44:04.000-07:00
Support for both version of WWWForm.headers
diff --git a/src/FormDataStream.cs b/src/FormDataStream.cs
@@ -5,8 +5,6 @@
 namespace HTTP {
 
     public class FormPart {
-        string fieldName;
-        string mimeType;
         byte[] header;
         Stream contents;
         int position = 0;
@@ -51,6 +49,11 @@ public int Read(byte[] buffer, int offset, int size){
             position += bytesToWrite;
             return writed;
         }
+
+        public void Dispose(){
+            header = null;
+            contents.Close();
+        }
     }
     
     public class FormDataStream: Stream {
@@ -151,6 +154,13 @@ public void AddPart(FormPart part){
             }
             parts.Add(part);
         }
+        
+        public override void Close(){
+            foreach (var part in parts){
+                part.Dispose();
+            }
+            base.Close();
+        }
     }
 
 }
diff --git a/src/Request.cs b/src/Request.cs
@@ -89,10 +89,17 @@ public Request( string method, string uri, WWWForm form )
             this.method = method;
             this.uri = new Uri (uri);
             this.byteStream = new MemoryStream(form.data);
-	    foreach ( KeyValuePair<string,string> pair in form.headers )
-           {
-		this.AddHeader(pair.Key,pair.Value);
-           }
+#if UNITY_5
+            foreach ( var entry in form.headers )
+            {
+                this.AddHeader( entry.Key, entry.Value );
+            }
+#else
+            foreach ( DictionaryEntry entry in form.headers )
+            {
+                this.AddHeader( (string)entry.Key, (string)entry.Value );
+            }
+#endif
         }
 
         public Request( string method, string uri, Hashtable data )

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@`
`5`	`5`	`namespace HTTP {`
`6`	`6`
`7`	`7`	`public class FormPart {`
`8`		`- string fieldName;`
`9`		`- string mimeType;`
`10`	`8`	`byte[] header;`
`11`	`9`	`Stream contents;`
`12`	`10`	`int position = 0;`
`@@ -51,6 +49,11 @@ public int Read(byte[] buffer, int offset, int size){`
`51`	`49`	`position += bytesToWrite;`
`52`	`50`	`return writed;`
`53`	`51`	`}`
	`52`	`+`
	`53`	`+ public void Dispose(){`
	`54`	`+ header = null;`
	`55`	`+ contents.Close();`
	`56`	`+ }`
`54`	`57`	`}`
`55`	`58`
`56`	`59`	`public class FormDataStream: Stream {`
`@@ -151,6 +154,13 @@ public void AddPart(FormPart part){`
`151`	`154`	`}`
`152`	`155`	`parts.Add(part);`
`153`	`156`	`}`
	`157`	`+`
	`158`	`+ public override void Close(){`
	`159`	`+ foreach (var part in parts){`
	`160`	`+ part.Dispose();`
	`161`	`+ }`
	`162`	`+ base.Close();`
	`163`	`+ }`
`154`	`164`	`}`
`155`	`165`
`156`	`166`	`}`