Merge branch 'upstream'

Former-commit-id: 294322230b6dd391be0471d5e56c1e731def0410
2016-06-22 11:00:51 +00:00 · 2016-06-22 11:00:51 +00:00 · c71394b268
commit c71394b268
parent 563a36a8b4 589d484eee
28 changed files with 48 additions and 50 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-917c27a2a8b59452335a3e4e47dcd3bf88f60e5f
+2d6bcb46584f03dd01cd55dd2a04c15b4a6a5fec
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-fbb4acce7d31b7351f3c4b42e6f718441d9408c4
+b0b5573ff57c299411be9915864eaa21d4933c2d
--- a/mcs/build/common/Consts.cs
+++ b/mcs/build/common/Consts.cs
@ -34,7 +34,7 @@ static class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//

-	public const string MonoVersion = "4.4.0.0";
+	public const string MonoVersion = "4.4.1.0";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";
--- a/mcs/class/System.IO.Compression/SharpCompress/Writer/Zip/ZipCentralDirectoryEntry.cs
+++ b/mcs/class/System.IO.Compression/SharpCompress/Writer/Zip/ZipCentralDirectoryEntry.cs
@ -22,7 +22,7 @@ namespace SharpCompress.Writer.Zip
            byte[] encodedFilename = Encoding.UTF8.GetBytes(FileName);
            byte[] encodedComment = Encoding.UTF8.GetBytes(Comment);

-            outputStream.Write(new byte[] {80, 75, 1, 2, 0x14, 0, 0x0A, 0}, 0, 8);
+            outputStream.Write(new byte[] {80, 75, 1, 2, 0x14, 0, 0x14, 0}, 0, 8);
            HeaderFlags flags = HeaderFlags.UTF8;
            if (!outputStream.CanSeek)
            {
--- a/mcs/class/System/System.Net/ServicePoint.cs
+++ b/mcs/class/System/System.Net/ServicePoint.cs
@ -42,7 +42,7 @@ namespace System.Net
 {
 	public class ServicePoint
 	{
-		Uri uri;
+		readonly Uri uri;
 		int connectionLimit;
 		int maxIdleTime;
 		int currentConnections;
@ -345,15 +345,31 @@ namespace System.Net
 				lock (hostE) {
 					string uriHost = uri.Host;

-					if (host == null || HasTimedOut) {
-						lastDnsResolve = DateTime.UtcNow;
+					if (host == null) {
+						// Cannot do DNS resolution on literal IP addresses
+						if (uri.HostNameType == UriHostNameType.IPv6 || uri.HostNameType == UriHostNameType.IPv4) {

-						try {
-							host = Dns.GetHostEntry (uriHost);
-						}
-						catch (Exception) {
-							return null;
+							if (uri.HostNameType == UriHostNameType.IPv6) {
+								// Remove square brackets
+								uriHost = uriHost.Substring (1, uriHost.Length - 2);
+							}
+
+							// Creates IPHostEntry
+							host = new IPHostEntry();
+							host.AddressList = new IPAddress[] { IPAddress.Parse (uriHost) };
+							return host;
 						}
+					} else {
+						if (!HasTimedOut)
+							return host;
+					}
+
+					lastDnsResolve = DateTime.UtcNow;
+
+					try {
+						host = Dns.GetHostEntry (uriHost);
+					} catch {
+						return null;
 					}
 				}

--- a/mcs/class/corlib/Test/System/TypeTest.cs.REMOVED.git-id
+++ b/mcs/class/corlib/Test/System/TypeTest.cs.REMOVED.git-id
@ -1 +1 @@
-541acb6afb71ee34f37b1aa52431ed984f0cbca2
+3f2d6283fb73256107a13090b14da77a1c945496
--- a/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-5203fe1002a11476d61e6876fd7bfce0d3bdd618
+e934aa847a9bb85a18be8d07b96e7d6993720912
--- a/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-28d0cee3d630bf94dfea9611a14d38b8287e32ac
+c073df92aad3e4cb1eec74cd3793f98a19642fd3
--- a/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-1123b73866732a094cf1c7bdcf6e3a92e8f34df7
+0dcdcff2aca4d02e18366f5f81d99176e12bb43b
--- a/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-c64b6fef099910e33f49c5132d6568abfbdf62b3
+536360351387a28619f72f9f06f8b78b4f4cbf57
--- a/mcs/class/lib/monolite/System.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite/System.dll.REMOVED.git-id
@ -1 +1 @@
-0c4f173c3278c4f1e67d28260a84b3168b0cb207
+9a33903c9edf089e542bf0de761534d6eea793b0
--- a/mcs/class/lib/monolite/basic.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite/basic.exe.REMOVED.git-id
@ -1 +1 @@
-d59fb29c1b13df4116b62d402850b1a5280b854b
+46bf5ab511c5ce47b0cbfea612f125cfd43ae8a2
--- a/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-94fa7ed0e1fb060ea39ff108b58e4bf1c7169357
+ebd373f12ebde7e4ab93a17a9e7ed762d636b19f
--- a/mono/metadata/icall.c.REMOVED.git-id
+++ b/mono/metadata/icall.c.REMOVED.git-id
@ -1 +1 @@
-6f8827dfb84f99f9c320aaf3b0ab5c9ac82e720e
+3a7706caa6d103a9a9472a381d23c61967aca79d
--- a/mono/mini/Makefile.am
+++ b/mono/mini/Makefile.am
@ -801,16 +801,7 @@ EXTRA_DIST = TestDriver.cs \
 	Makefile.am.in

 version.h: Makefile
-	if test -d $(top_srcdir)/.git; then \
-		(cd $(top_srcdir); \
-			LANG=C; export LANG; \
-			branch=`git branch | grep '^\*' | sed 's/(detached from .*/explicit/' | cut -d ' ' -f 2`; \
-			version=`git log --no-color --first-parent -n1 --pretty=format:%h`; \
-			echo "#define FULL_VERSION \"$$branch/$$version\""; \
-		); \
-	else \
-		echo "#define FULL_VERSION \"tarball\""; \
-	fi > version.h
+	echo "#define FULL_VERSION \"Nightly 4.4.1.0/4747417\"" > version.h

 # Utility target for patching libtool to speed up linking
 patch-libtool:
--- a/mono/mini/Makefile.am.in
+++ b/mono/mini/Makefile.am.in
@ -801,16 +801,7 @@ EXTRA_DIST = TestDriver.cs \
 	Makefile.am.in

 version.h: Makefile
-	if test -d $(top_srcdir)/.git; then \
-		(cd $(top_srcdir); \
-			LANG=C; export LANG; \
-			branch=`git branch | grep '^\*' | sed 's/(detached from .*/explicit/' | cut -d ' ' -f 2`; \
-			version=`git log --no-color --first-parent -n1 --pretty=format:%h`; \
-			echo "#define FULL_VERSION \"$$branch/$$version\""; \
-		); \
-	else \
-		echo "#define FULL_VERSION \"tarball\""; \
-	fi > version.h
+	echo "#define FULL_VERSION \"Nightly 4.4.1.0/4747417\"" > version.h

 # Utility target for patching libtool to speed up linking
 patch-libtool:
--- a/mono/mini/Makefile.in.REMOVED.git-id
+++ b/mono/mini/Makefile.in.REMOVED.git-id
@ -1 +1 @@
-6c03785fef833c714738425b7c5b79097181b4c1
+238ef5049dc84e06db3a057176abddb461e871a7
--- a/mono/mini/main.c
+++ b/mono/mini/main.c
@ -52,7 +52,7 @@ probe_embedded (const char *program, int *ref_argc, char **ref_argv [])
 	int fd = open (program, O_RDONLY);
 	if (fd == -1)
 		return FALSE;
-	if ((sigstart = lseek (fd, -(16+sizeof(uint64_t)), SEEK_END)) == -1)
+	if ((sigstart = lseek (fd, -24, SEEK_END)) == -1)
 		goto doclose;
 	if (read (fd, sigbuffer, sizeof (sigbuffer)) == -1)
 		goto doclose;
--- a/mono/mini/version.h
+++ b/mono/mini/version.h
@ -1 +1 @@
-#define FULL_VERSION "explicit/5995f74"
+#define FULL_VERSION "Nightly 4.4.1.0/4747417"
--- a/po/mcs/de.gmo
+++ b/po/mcs/de.gmo
--- a/po/mcs/de.po.REMOVED.git-id
+++ b/po/mcs/de.po.REMOVED.git-id
@ -1 +1 @@
-7635a2bab41c88020674a640bb17d943ea5108cb
+b8bd8202d35848d77c31bf5c5e4222054593d8ba
--- a/po/mcs/es.gmo
+++ b/po/mcs/es.gmo
--- a/po/mcs/es.po.REMOVED.git-id
+++ b/po/mcs/es.po.REMOVED.git-id
@ -1 +1 @@
-eb6b987175fb2d16d99c7afc45f44c8f07d860ca
+6a6ecd15d2b5db4e399dbb297deb93cde2531b1b
--- a/po/mcs/ja.gmo
+++ b/po/mcs/ja.gmo
--- a/po/mcs/ja.po.REMOVED.git-id
+++ b/po/mcs/ja.po.REMOVED.git-id
@ -1 +1 @@
-0d7d08be85f2f6ecafb3f3f1b1984ab72c2f8a1b
+2e5547acb0496d00f3670b9c8b988016c30f6094
--- a/po/mcs/mcs.pot
+++ b/po/mcs/mcs.pot
@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: mono 4.4.0\n"
+"Project-Id-Version: mono 4.4.1\n"
 "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
-"POT-Creation-Date: 2016-06-09 15:23+0000\n"
+"POT-Creation-Date: 2016-06-22 09:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
--- a/po/mcs/pt_BR.gmo
+++ b/po/mcs/pt_BR.gmo
--- a/po/mcs/pt_BR.po.REMOVED.git-id
+++ b/po/mcs/pt_BR.po.REMOVED.git-id
@ -1 +1 @@
-fdeb8aa1522b7a279267f945befa204962e1f356
+4df9d1ee8dd7ed7c65062f6acd84e04d240e79ee