Compare commits

...
3 Commits
Author SHA1 Message Date
Ben Maurer 38ba17f8fb backport config change
svn path=/tags/mono-1-1-8/mono/; revision=46068
2005-06-15 19:42:07 +00:00
Gonzalo Paniagua Javier 467094bf19 2005-06-14 Gonzalo Paniagua Javier <[email protected]>
* PageParser.cs: don't try to compile the master page if it wan't
	provided. Use MapPath from the base classes instead of the long
	version. Fixes bug #75269 that prevented xsp2 from working properly.

svn path=/tags/mono-1-1-8/mcs/; revision=46007
2005-06-15 03:22:46 +00:00
Miguel de Icaza 045f78538a Fix in the 1-1-8 tag
svn path=/tags/mono-1-1-8/mono/; revision=45930
2005-06-14 00:39:30 +00:00
4 changed files with 23 additions and 17 deletions

No files matched your search

+13 -14
View File
@@ -1535,24 +1535,23 @@ case "$host" in
LIBC="libc.so"
INTL="libintl.so"
;;
esac
if test "x$X11" = "xlibX11.so"; then
*-*-*linux*)
AC_PATH_X
AC_PATH_PROG(OBJDUMP, objdump, no)
if test "x$no_x" != "xyes"; then
if test "x$OBJDUMP" != xno; then
AC_MSG_CHECKING(for the soname of libX11.so)
X11=$($OBJDUMP -p $x_libraries/libX11.so | $AWK '/SONAME/ {print $2}')
AC_MSG_RESULT($X11)
else
AC_MSG_WARN([Could not find objdump. WinForms will not work if you install this mono on a box without the X -devel package.]);
fi
AC_MSG_CHECKING(for the soname of libX11.so)
for i in $x_libraries /usr/lib /usr/lib64; do
for r in 4 5 6; do
if test -f $i/libX11.so.$r; then
X11=libX11.so.$r
AC_MSG_RESULT($X11)
fi
done
done
else
if test "x$X11" = "xlibX11.so"; then
AC_MSG_WARN([Could not find X development libs. Do you have the -devel package installed? WinForms may not work...]);
fi
fi
;;
esac
AC_SUBST(libsuffix)
@@ -1,3 +1,9 @@
2005-06-14 Gonzalo Paniagua Javier <[email protected]>
* PageParser.cs: don't try to compile the master page if it wan't
provided. Use MapPath from the base classes instead of the long
version. Fixes bug #75269 that prevented xsp2 from working properly.
2005-06-13 Lluis Sanchez Gual <[email protected]>
* MasterPage.cs: Clear the default content of placeholders before
@@ -246,7 +246,8 @@ namespace System.Web.UI
masterPage = GetString (atts, "MasterPageFile", null);
// Make sure the page exists
MasterPageParser.GetCompiledMasterType (masterPage, HttpContext.Current.Request.MapPath (masterPage), HttpContext.Current);
if (masterPage != null)
MasterPageParser.GetCompiledMasterType (masterPage, MapPath (masterPage), HttpContext.Current);
#endif
// Ignored by now
GetString (atts, "EnableViewStateMac", null);
@@ -267,7 +268,7 @@ namespace System.Web.UI
} else {
string path = GetString (atts, "VirtualPath", null);
if (path != null)
masterType = MasterPageParser.GetCompiledMasterType (path, HttpContext.Current.Request.MapPath (path), HttpContext.Current);
masterType = MasterPageParser.GetCompiledMasterType (path, MapPath (path), HttpContext.Current);
else
ThrowParseException ("The MasterType directive must have either a TypeName or a VirtualPath attribute.");
}
+1 -1
View File
@@ -119,7 +119,7 @@ copy_statfs (struct Mono_Posix_Statvfs *to, struct statfs *from)
to->f_files = from->f_files;
to->f_ffree = from->f_ffree;
to->f_favail = from->f_ffree; /* OSX doesn't have f_avail */
Mono_Posix_ToMountFlags (from->f_flag, &to->f_flag);
Mono_Posix_ToMountFlags (from->f_flags, &to->f_flag);
// from->f_fsid is an int32[2], to->f_fsid is a uint64,
// so this shouldn't lose anything.
memcpy (&to->f_fsid, &from->f_fsid, sizeof(to->f_fsid));