Imported Upstream version 3.12.1

Former-commit-id: ce565ca85f5d5abe367a12026a5712944dbf6319

mcs/class/System/System.Net/WebClient.cs

@@ -12,6 +12,7 @@
 // Copyright 2003 Ximian, Inc. (http://www.ximian.com)
 // Copyright 2006, 2010 Novell, Inc. (http://www.novell.com)
 // Copyright 2012 Xamarin Inc. (http://www.xamarin.com)
+// Copyright 2014 Microsoft Inc 
 //
 //
 // Permission is hereby granted, free of charge, to any person obtaining
@@ -553,6 +554,21 @@ namespace System.Net
 			}
 		}
 
+		// From the Microsoft reference source
+	        string MapToDefaultMethod(Uri address) {
+			Uri uri;
+			if (!address.IsAbsoluteUri && baseAddress != null) {
+				uri = new Uri(baseAddress, address);
+			} else {
+				uri = address;
+			}
+			if (uri.Scheme.ToLower(System.Globalization.CultureInfo.InvariantCulture) == "ftp") {
+				return WebRequestMethods.Ftp.UploadFile;
+			} else {
+				return "POST";
+			}
+	        }
+			
 		byte [] UploadFileCore (Uri address, string method, string fileName, object userToken)
 		{
 			string fileCType = Headers ["Content-Type"];
@@ -565,7 +581,10 @@ namespace System.Net
 				fileCType = "application/octet-stream";
 			}
 
-			bool needs_boundary = (method != "PUT"); // only verified case so far
+			if (method == null)
+				method = MapToDefaultMethod (address);
+			
+			bool needs_boundary = (method != "PUT" && method != WebRequestMethods.Ftp.UploadFile); // only verified case so far
 			string boundary = null;
 			if (needs_boundary) {
 				boundary = "------------" + DateTime.Now.Ticks.ToString ("x");

mcs/class/System/Test/System.Net/FtpWebRequestTest.cs

@@ -10,6 +10,7 @@
 #if NET_2_0
 using NUnit.Framework;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Net.Sockets;
@@ -23,6 +24,31 @@ namespace MonoTests.System.Net
 	{
 		FtpWebRequest defaultRequest;
 		
+		private string _tempDirectory;
+		private string _tempFile;
+
+		[SetUp]
+		public void SetUp ()
+		{
+			_tempDirectory = Path.Combine (Path.GetTempPath (), "MonoTests.System.Net.FileWebRequestTest");
+			_tempFile = Path.Combine (_tempDirectory, "FtpWebRequestTest.tmp");
+			if (!Directory.Exists (_tempDirectory)) {
+				Directory.CreateDirectory (_tempDirectory);
+			} else {
+				// ensure no files are left over from previous runs
+				string [] files = Directory.GetFiles (_tempDirectory, "*");
+				foreach (string file in files)
+					File.Delete (file);
+			}
+		}
+
+		[TearDown]
+		public void TearDown ()
+		{
+			if (Directory.Exists (_tempDirectory))
+				Directory.Delete (_tempDirectory, true);
+		}
+
 		[TestFixtureSetUp]
 		public void Init ()
 		{
@@ -183,13 +209,15 @@ namespace MonoTests.System.Net
 				ftp.KeepAlive = false;
 				ftp.Timeout = 5000;
 				ftp.Method = WebRequestMethods.Ftp.UploadFile;
-				ftp.ContentLength = 1;
+				ftp.ContentLength = 10;
 				ftp.UseBinary = true;
 				Stream stream = ftp.GetRequestStream ();
-				stream.WriteByte (0);
+				for (int i = 0; i < 10; i++)
+					stream.WriteByte ((byte)i);
 				stream.Close ();
 				FtpWebResponse response = (FtpWebResponse) ftp.GetResponse ();
 				Assert.IsTrue ((int) response.StatusCode >= 200 && (int) response.StatusCode < 300, "UP#01");
+				Assert.AreEqual (10, sp.result.Count, "UP#02");
 				response.Close ();
 			} catch (Exception) {
 				if (!String.IsNullOrEmpty (sp.Where))
@@ -200,6 +228,24 @@ namespace MonoTests.System.Net
 			}
 		}
 
+		[Test]
+		public void UploadFile_WebClient ()
+		{
+			ServerPut sp = new ServerPut ();
+			File.WriteAllText (_tempFile, "0123456789");
+			sp.Start ();
+
+			using (WebClient m_WebClient = new WebClient())
+			{
+				string uri = String.Format ("ftp://{0}:{1}/uploads/file.txt", sp.IPAddress, sp.Port);
+				
+				m_WebClient.UploadFile(uri, _tempFile);
+			}
+			Assert.AreEqual (10, sp.result.Count, "WebClient/Ftp#01");
+	    
+			sp.Stop ();
+		}
+
 		[Test]
 		public void DownloadFile1 ()
 		{
@@ -464,6 +510,8 @@ namespace MonoTests.System.Net
 		}
 
 		class ServerPut : FtpServer {
+			public List<byte> result = new List<byte> ();
+			
 			protected override void Run ()
 			{
 				Socket client = control.Accept ();
@@ -511,8 +559,12 @@ namespace MonoTests.System.Net
 				writer.Flush ();
 
 				Socket data_cnc = data.Accept ();
-				byte [] dontcare = new byte [1];
-				data_cnc.Receive (dontcare, 1, SocketFlags.None);
+				var datastr = new NetworkStream (data_cnc, false);
+				int ch;
+				while ((ch = datastr.ReadByte ()) != -1){
+					result.Add ((byte)ch);
+
+				}
 				data_cnc.Close ();
 				writer.WriteLine ("226 File received Ok");
 				writer.Flush ();