Fixes for 1.1.6

svn path=/branches/mono-1-1-6/mcs/; revision=42391
mono · Mar 30, 2005 · 0512513 · 0512513
1 parent 972fb95
commit 0512513
Show file tree

Hide file tree

Showing 16 changed files with 69 additions and 26 deletions.
diff --git a/mcs/ChangeLog b/mcs/ChangeLog
@@ -15,7 +15,7 @@
 
 	* btests: Removed. This directory is now superseded by
 	mbas/Test.
-	
+
 2004-12-13  Raja R Harinath  <rharinath@novell.com>
 
 	* INSTALL.txt: Minor updates to reflect build changes.

diff --git a/mcs/build/config-default.make b/mcs/build/config-default.make
@@ -15,7 +15,7 @@ CFLAGS = -g -O2
 INSTALL = /usr/bin/install
 prefix = /usr/local
 exec_prefix = $(prefix)
-libdir = $(exec_prefix)/lib
+mono_libdir = $(exec_prefix)/lib
 RUNTIME = mono $(RUNTIME_FLAGS)
 TEST_RUNTIME = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) --debug
 

diff --git a/mcs/build/executable.make b/mcs/build/executable.make
@@ -35,7 +35,7 @@ install-local uninstall-local:
 else
 
 ifndef PROGRAM_INSTALL_DIR
-PROGRAM_INSTALL_DIR = $(libdir)/mono/$(FRAMEWORK_VERSION)
+PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
 endif
 
 install-local: $(PROGRAM) $(PROGRAM_config)

diff --git a/mcs/build/library.make b/mcs/build/library.make
@@ -92,12 +92,12 @@ SNFLAGS = -q -R
 endif
 
 ifeq ($(PLATFORM), win32)
-GACDIR = `cygpath -w $(libdir)`
-GACROOT = `cygpath -w $(DESTDIR)$(libdir)`
+GACDIR = `cygpath -w $(mono_libdir)`
+GACROOT = `cygpath -w $(DESTDIR)$(mono_libdir)`
 test_flags += -d:WINDOWS
 else
-GACDIR = $(libdir)
-GACROOT = $(DESTDIR)$(libdir)
+GACDIR = $(mono_libdir)
+GACROOT = $(DESTDIR)$(mono_libdir)
 endif
 
 all-local: $(the_lib)

diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ChangeLog b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/ChangeLog
@@ -1,3 +1,13 @@
+2005-03-18 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Tds70.cs: turns out that sp_reset_connection procedure might not be
+	found ("Invalid object name 'sp_reset_connection'"). In this case, and
+	if we get a proper state ('Class' property in the SqlException), just
+	ignore the error.
+
+	* TdsConnectionPool.cs: if the connection cannot be reset, attemp to
+	disconnect it before losing the last reference to it.
+
 2005-03-11 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* Tds.cs: set the charset for MS SQL 2000. Patch from Aleksandar

diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds70.cs b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/Tds70.cs
@@ -353,16 +353,19 @@ private static string EncryptPassword (string pass)
 
 		public override bool Reset ()
 		{
-			try
-			{
+			try {
 				ExecProc ("exec sp_reset_connection");
-				return true;
-			}
-			catch
-			{
-				Console.WriteLine ("Error reseting");
-				return false;
+			} catch (Exception e) {
+				System.Reflection.PropertyInfo pinfo = e.GetType ().GetProperty ("Class");
+				if (pinfo != null && pinfo.PropertyType == typeof (byte)) {
+					byte klass = (byte) pinfo.GetValue (e, null);
+					// 11 to 16 indicates error that can be fixed by the user such as 'Invalid object name'
+					if (klass < 11 || klass > 16)
+						return false;
+				}
 			}
+
+			return true;
 		}
 
 		public override void ExecPrepared (string commandText, TdsMetaParameterCollection parameters, int timeout, bool wantResults)

diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsConnectionPool.cs b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.Protocol/TdsConnectionPool.cs
@@ -131,6 +131,9 @@ public ITds GetConnection ()
 						connection = (ITds) list [list.Count - 1];
 						list.RemoveAt (list.Count - 1);
 						if (!connection.Reset ()) {
+							try {
+								connection.Disconnect ();
+							} catch {}
 							connection = null;
 							continue;
 						}

diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-23 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HttpCookieCollection.cs: when adding more than one cookie with the
+	same name, the last one is the winner.
+
 2005-03-09 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* HttpRequest.cs: correctly store the value cookies in Params. Fixes

diff --git a/mcs/class/System.Web/System.Web/HttpCookieCollection.cs b/mcs/class/System.Web/System.Web/HttpCookieCollection.cs
@@ -77,7 +77,10 @@ public void Add (HttpCookie cookie)
 			_AllCookies = null;
 			_AllKeys = null;
 
-			BaseAdd (cookie.Name, cookie);
+			if (BaseGet (cookie.Name) == null)
+				BaseAdd (cookie.Name, cookie);
+			else
+				BaseSet (cookie.Name, cookie);
 
 			if (null != _Response)
 				_Response.OnCookieAdd (cookie);

diff --git a/mcs/class/System/System.Net/ChangeLog b/mcs/class/System/System.Net/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-29  Miguel de Icaza  <miguel@novell.com>
+
+	* HttpWebResponse.cs: Handle quotations in the cookies values, per
+	the spec http://www.faqs.org/rfcs/rfc2109.html, it is allowed to
+	have quotations.
+
 2005-03-18 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* BasicClient.cs:

diff --git a/mcs/class/System/System.Net/HttpWebResponse.cs b/mcs/class/System/System.Net/HttpWebResponse.cs
@@ -477,11 +477,24 @@ string GetCookieValue ()
 			while (k < length && Char.IsWhiteSpace (header [k]))
 				k++;
 
-			int begin = k;
-			while (k < length && header [k] != ';')
-				k++;
-
-			pos = k;
+			int begin;
+			if (header [k] == '"'){
+				int j;
+				begin = ++k;
+
+				while (k < length && header [k] != '"')
+					k++;
+
+				for (j = k; j < length && header [j] != ';'; j++)
+					;
+				pos = j;
+			} else {
+				begin = k;
+				while (k < length && header [k] != ';')
+					k++;
+				pos = k;
+			}
+
 			return header.Substring (begin, k - begin).Trim ();
 		}
 	}

diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile
@@ -19,7 +19,7 @@ LIBRARY_USE_INTERMEDIATE_FILE = yes
 # disable, until people fix their code...
 #corlib_flags = /unsafe /nostdlib /d:INSIDE_CORLIB
 
-LIBRARY_INSTALL_DIR = $(libdir)/mono/$(FRAMEWORK_VERSION)
+LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
 
 CLEAN_FILES = $(cmplib) $(reslib) $(plattestlib) $(plattestlib).sources \
 	       $(cmp_response) $(cmp_makefrag) \

diff --git a/mcs/ilasm/AssemblyInfo.cs b/mcs/ilasm/AssemblyInfo.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyVersion("1.1.5")]
+[assembly: AssemblyVersion("1.1.6")]
 [assembly: AssemblyTitle ("Mono ILasm Compiler")]
 [assembly: AssemblyDescription ("Mono ILasm Compiler")]
 [assembly: AssemblyCopyright ("Sergey Chaban and Jackson Harper")]

diff --git a/mcs/mcs/AssemblyInfo.cs b/mcs/mcs/AssemblyInfo.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyVersion("1.1.5")]
+[assembly: AssemblyVersion("1.1.6")]
 [assembly: AssemblyTitle ("Mono C# Compiler")]
 [assembly: AssemblyDescription ("Mono C# Compiler")]
 [assembly: AssemblyCopyright ("2001, 2002, 2003 Ximian, Inc.")]

diff --git a/mcs/tools/corcompare/Makefile b/mcs/tools/corcompare/Makefile
@@ -21,7 +21,7 @@ CORCOMPARE_SOURCES = \
 	MissingType.cs \
 	ToDoAssembly.cs
 
-PROGRAM_INSTALL_DIR = $(libdir)/mono/$(FRAMEWORK_VERSION)
+PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
 
 APIINFO_SOURCES = mono-api-info.cs
 APIDIFF_SOURCES = mono-api-diff.cs

diff --git a/mcs/tools/security/Makefile b/mcs/tools/security/Makefile
@@ -8,7 +8,7 @@ LOCAL_MCS_FLAGS = /lib:$(topdir)/class/lib/$(PROFILE) /r:Mono.Security.dll
 SECURITY_PROGRAMS = secutil.exe cert2spc.exe sn.exe MakeCert.exe chktrust.exe signcode.exe setreg.exe certmgr.exe caspol.exe permview.exe
 SECURITY_SOURCES = AssemblyInfo.cs StrongNameManager.cs $(SECURITY_PROGRAMS:.exe=.cs)
 
-PROGRAM_INSTALL_DIR = $(libdir)/mono/$(FRAMEWORK_VERSION)
+PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
 
 DISTFILES = README $(SECURITY_SOURCES)