Compare commits

...
5 Commits
Author SHA1 Message Date
Miguel de Icaza 4a93eca61a Some from Sebastien
svn path=/branches/mono-1-1-6/mcs/; revision=42401
2005-03-30 22:48:26 +00:00
Miguel de Icaza af152d7dc9 Another one, this is from Gonzalo
svn path=/branches/mono-1-1-6/mcs/; revision=42397
2005-03-30 22:17:10 +00:00
Miguel de Icaza a0ee96d72e Another one
svn path=/branches/mono-1-1-6/mcs/; revision=42393
2005-03-30 21:58:16 +00:00
Miguel de Icaza 0512513cff Fixes for 1.1.6
svn path=/branches/mono-1-1-6/mcs/; revision=42391
2005-03-30 21:49:23 +00:00
Miguel de Icaza 972fb95152 For 1.1.6
svn path=/branches/mono-1-1-6/mono/; revision=42390
2005-03-30 21:47:50 +00:00
33 changed files with 111 additions and 39 deletions

No files matched your search

+1 -1
View File
@@ -86,7 +86,7 @@ Mon Feb 21 17:14:34 CET 2005 Paolo Molaro <[email protected]>
($(tmpinst)/bin/mono): Simplify.
(mcs-do-compiler-tests,mcs-compileall): Update.
* runtime/mono-wrapper.in: Use wrapper-config.
* Makefile.am (DIST_SUBDIRS): Sync with $(SUBDIRS).
* runtime/Makefile.am (verify_profiles): Remove.
+2 -2
View File
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(mono,1.1.5)
AM_INIT_AUTOMAKE(mono,1.1.6)
AM_MAINTAINER_MODE
AC_PROG_LN_S
@@ -1665,7 +1665,7 @@ runtime/Makefile
echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
echo "libdir=$libdir" >> $srcdir/$mcsdir/build/config.make
echo "mono_libdir=$exec_prefix/lib" >> $srcdir/$mcsdir/build/config.make
echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
)
+1 -1
View File
@@ -15,7 +15,7 @@
* btests: Removed. This directory is now superseded by
mbas/Test.
2004-12-13 Raja R Harinath <[email protected]>
* INSTALL.txt: Minor updates to reflect build changes.
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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)
+4 -4
View File
@@ -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)
@@ -1,3 +1,13 @@
2005-03-18 Gonzalo Paniagua Javier <[email protected]>
* 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 <[email protected]>
* Tds.cs: set the charset for MS SQL 2000. Patch from Aleksandar
@@ -353,16 +353,19 @@ namespace Mono.Data.Tds.Protocol {
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)
@@ -131,6 +131,9 @@ namespace Mono.Data.Tds.Protocol
connection = (ITds) list [list.Count - 1];
list.RemoveAt (list.Count - 1);
if (!connection.Reset ()) {
try {
connection.Disconnect ();
} catch {}
connection = null;
continue;
}
@@ -1,3 +1,8 @@
2005-03-30 Sebastien Pouliot <[email protected]>
* SymmetricTransform.cs: Fixed a padding bug affecting that can occurs
when no padding is used.
2005-03-07 Sebastien Pouliot <[email protected]>
* MD2Managed.cs: Removed memory allocation from the transform method.
@@ -414,7 +414,8 @@ namespace Mono.Security.Cryptography {
lastBlock = false;
}
byte padding = res [total - 1];
// total may be 0 (e.g. PaddingMode.None)
byte padding = ((total > 0) ? res [total - 1] : (byte) 0);
switch (algo.Padding) {
#if NET_2_0
case PaddingMode.ANSIX923:
@@ -1,3 +1,8 @@
2005-03-23 Gonzalo Paniagua Javier <[email protected]>
* HttpCookieCollection.cs: when adding more than one cookie with the
same name, the last one is the winner.
2005-03-09 Gonzalo Paniagua Javier <[email protected]>
* HttpRequest.cs: correctly store the value cookies in Params. Fixes
@@ -77,7 +77,10 @@ namespace System.Web
_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);
+4
View File
@@ -1,3 +1,7 @@
2005-03-30 Geoff Norton <[email protected]>
* KeventWatcher.cs: Fix a file handle leak on raised events.
2005-02-10 Lluis Sanchez Gual <[email protected]>
* DefaultWatcher.cs: Fix nullref exception when the object is disposed
+2 -1
View File
@@ -227,7 +227,8 @@ namespace System.IO {
if (haveEvents > 0) {
// Restart monitoring
KeventData data = (KeventData) requests [ev.ident];
StartMonitoringDirectory(data);
StopMonitoringDirectory (data);
StartMonitoringDirectory (data);
ProcessEvent (ev);
} else {
System.Threading.Thread.Sleep (500);
+11
View File
@@ -1,3 +1,14 @@
2005-03-30 Gonzalo Paniagua Javier <[email protected]>
* WebConnection.cs: we don't need to trigger the next queued request
until the response is closed.
2005-03-29 Miguel de Icaza <[email protected]>
* 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 <[email protected]>
* BasicClient.cs:
+17 -4
View File
@@ -477,11 +477,24 @@ namespace System.Net
while (k < length && Char.IsWhiteSpace (header [k]))
k++;
int begin = k;
while (k < length && header [k] != ';')
k++;
int begin;
if (header [k] == '"'){
int j;
begin = ++k;
pos = 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 ();
}
}
@@ -375,7 +375,6 @@ namespace System.Net
if (!ExpectContent (data.StatusCode))
stream.ForceCompletion ();
stream.CheckComplete ();
data.request.SetResponseData (data);
}
+1 -1
View File
@@ -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) \
@@ -1,3 +1,8 @@
2005-03-30 Sebastien Pouliot <[email protected]>
* SymmetricTransform.cs: Fixed a padding bug affecting that can occurs
when no padding is used.
2005-01-11 Sebastien Pouliot <[email protected]>
* DSAManaged.cs: PublicOnly now reports false when a key hasn't yet
@@ -414,7 +414,8 @@ namespace Mono.Security.Cryptography {
lastBlock = false;
}
byte padding = res [total - 1];
// total may be 0 (e.g. PaddingMode.None)
byte padding = ((total > 0) ? res [total - 1] : (byte) 0);
switch (algo.Padding) {
#if NET_2_0
case PaddingMode.ANSIX923:
+1 -1
View File
@@ -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")]
+1 -1
View File
@@ -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.")]
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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)
+1 -1
View File
@@ -10,7 +10,7 @@ confdir = `cygpath -m "${sysconfdir}"`
AM_CFLAGS = -O
PLATFORM_LIB = ../os/libmonoos.la
else
assembliesdir = $(libdir)
assembliesdir = $(exec_prefix)/lib
confdir = $(sysconfdir)
endif
+2
View File
@@ -13,6 +13,8 @@
#include <string.h>
#include <errno.h>
#include <signal.h>
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
/* On solaris, curses.h must come before both termios.h and term.h */
#ifdef HAVE_CURSES_H
+3 -3
View File
@@ -6580,8 +6580,9 @@ create_custom_attr (MonoImage *image, MonoMethod *method, const char *data, guin
return NULL;
/*g_print ("got attr %s\n", method->klass->name);*/
params = g_new (void*, mono_method_signature (method)->param_count);
/* Allocate using alloca so it gets GC tracking */
params = alloca (mono_method_signature (method)->param_count * sizeof (void*));
/* skip prolog */
p += 2;
@@ -6593,7 +6594,6 @@ create_custom_attr (MonoImage *image, MonoMethod *method, const char *data, guin
attr = mono_object_new (mono_domain_get (), method->klass);
mono_runtime_invoke (method, attr, params, NULL);
free_param_data (method->signature, params);
g_free (params);
num_named = read16 (named);
named += 2;
for (j = 0; j < num_named; j++) {
+3
View File
@@ -199,6 +199,7 @@ arch_get_restore_context (void)
ppc_break (code);
g_assert ((code - start) < sizeof(start));
mono_arch_flush_icache (start, code - start);
return start;
}
@@ -268,6 +269,7 @@ arch_get_call_filter (void)
ppc_blr (code);
g_assert ((code - start) < sizeof(start));
mono_arch_flush_icache (start, code - start);
return start;
}
@@ -371,6 +373,7 @@ mono_arch_get_throw_exception_generic (guint8 *start, int size, int by_name, gbo
/* we should never reach this breakpoint */
ppc_break (code);
g_assert ((code - start) < size);
mono_arch_flush_icache (start, code - start);
return start;
}
+1 -1
View File
@@ -341,7 +341,7 @@ mono_arch_flush_icache (guint8 *code, gint size)
#define FP_ALSO_IN_REG(s) s
#else
#define ALWAYS_ON_STACK(s)
#define FP_ALSO_IN_REG(s) s
#define FP_ALSO_IN_REG(s)
#define ALIGN_DOUBLES
#endif
+2
View File
@@ -4186,12 +4186,14 @@ mono_arch_emit_prolog (MonoCompile *cfg)
x86_branch8 (code, X86_CC_NE, 0, 0);
x86_push_imm (code, cfg->domain);
code = emit_call (cfg, code, MONO_PATCH_INFO_INTERNAL_METHOD, (gpointer)"mono_jit_thread_attach");
x86_alu_reg_imm (code, X86_ADD, X86_ESP, 4);
x86_patch (buf, code);
}
else {
g_assert (!cfg->compile_aot);
x86_push_imm (code, cfg->domain);
code = emit_call (cfg, code, MONO_PATCH_INFO_INTERNAL_METHOD, (gpointer)"mono_jit_thread_attach");
x86_alu_reg_imm (code, X86_ADD, X86_ESP, 4);
}
}
+1
View File
@@ -537,6 +537,7 @@ mono_debugger_create_notification_function (gpointer *notification_address)
if (notification_address)
*notification_address = buf;
ppc_blr (buf);
mono_arch_flush_icache (ptr, buf - ptr);
return ptr;
}
+2 -2
View File
@@ -53,8 +53,8 @@ mono_one_instdir = $(shell cygpath -m $(libdir))/mono/1.0
mono_two_instdir = $(shell cygpath -m $(libdir))/mono/2.0
else
plat_bindir = $(bindir)
mono_one_instdir = $(libdir)/mono/1.0
mono_two_instdir = $(libdir)/mono/2.0
mono_one_instdir = $(prefix)/lib/mono/1.0
mono_two_instdir = $(prefix)/lib/mono/2.0
endif
REWRITE = sed \