Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix crashes with browser capabilities #758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grendello merged 3 commits into from
Sep 20, 2013
Merged

Fix crashes with browser capabilities #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03e3173
[System.Web] Do not crash on duplicate keys in browser capabilities
Sep 16, 2013
ae17cee
[Install] Add Compat.browser files for net_4_0 and net_4_5
Sep 19, 2013
ce65812
[System.Web] Re-enable AppBrowsersTest.cs tests for net_2_0
Sep 18, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion configure.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3388,7 +3388,35 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/Browsers/Compat.browser],
$ac_aux_dir/install-sh -d runtime/etc/mono/2.0/Browsers/
cd runtime/etc/mono/2.0/Browsers
rm -f Compat.browser
$LN_S $reldir/data/net_2_0/Browsers/Compat.browser Compat.browser
$LN_S $reldir/data/Browsers/Compat.browser Compat.browser
cd $depth
],[LN_S='$LN_S'])

AC_CONFIG_COMMANDS([runtime/etc/mono/4.0/Browsers/Compat.browser],
[ depth=../../../../..
case $srcdir in
[[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
.) reldir=$depth ;;
*) reldir=$depth/$srcdir ;;
esac
$ac_aux_dir/install-sh -d runtime/etc/mono/4.0/Browsers/
cd runtime/etc/mono/4.0/Browsers
rm -f Compat.browser
$LN_S $reldir/data/Browsers/Compat.browser Compat.browser
cd $depth
],[LN_S='$LN_S'])

AC_CONFIG_COMMANDS([runtime/etc/mono/4.5/Browsers/Compat.browser],
[ depth=../../../../..
case $srcdir in
[[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
.) reldir=$depth ;;
*) reldir=$depth/$srcdir ;;
esac
$ac_aux_dir/install-sh -d runtime/etc/mono/4.5/Browsers/
cd runtime/etc/mono/4.5/Browsers
rm -f Compat.browser
$LN_S $reldir/data/Browsers/Compat.browser Compat.browser
cd $depth
],[LN_S='$LN_S'])

Expand Down Expand Up @@ -3496,6 +3524,8 @@ data/net_2_0/Makefile
data/net_4_0/Makefile
data/net_4_5/Makefile
data/net_2_0/Browsers/Makefile
data/net_4_0/Browsers/Makefile
data/net_4_5/Browsers/Makefile
data/mint.pc
data/mono-2.pc
data/monosgen-2.pc
Expand Down
0 data/net_2_0/Browsers/.gitattributes → data/Browsers/.gitattributes
View file
Open in desktop
File renamed without changes.
0 data/net_2_0/Browsers/ChangeLog → data/Browsers/ChangeLog
View file
Open in desktop
File renamed without changes.
0 data/net_2_0/Browsers/Compat.browser → data/Browsers/Compat.browser
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions data/net_2_0/Browsers/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
monodir = $(sysconfdir)/mono/2.0/Browsers

EXTRA_DIST = Compat.browser
EXTRA_DIST = ../../Browsers/Compat.browser

mono_DATA = Compat.browser
mono_DATA = ../../Browsers/Compat.browser

2 changes: 2 additions & 0 deletions data/net_4_0/Browsers/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/Makefile
/Makefile.in
6 changes: 6 additions & 0 deletions data/net_4_0/Browsers/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
monodir = $(sysconfdir)/mono/4.0/Browsers

EXTRA_DIST = ../../Browsers/Compat.browser

mono_DATA = ../../Browsers/Compat.browser

2 changes: 1 addition & 1 deletion data/net_4_0/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SUBDIRS =
SUBDIRS = Browsers

monodir = $(sysconfdir)/mono/4.0

Expand Down
2 changes: 2 additions & 0 deletions data/net_4_5/Browsers/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/Makefile
/Makefile.in
6 changes: 6 additions & 0 deletions data/net_4_5/Browsers/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
monodir = $(sysconfdir)/mono/4.5/Browsers

EXTRA_DIST = ../../Browsers/Compat.browser

mono_DATA = ../../Browsers/Compat.browser

2 changes: 1 addition & 1 deletion data/net_4_5/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SUBDIRS =
SUBDIRS = Browsers

monodir = $(sysconfdir)/mono/4.5

Expand Down
12 changes: 10 additions & 2 deletions mcs/class/System.Web/System.Web.Configuration_2.0/HttpCapabilitiesBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,17 @@ public virtual bool CanSendMail {
}
}

public IDictionary Capabilities {
public IDictionary Capabilities
{
get { return capabilities; }
set { capabilities = new Hashtable(value, StringComparer.OrdinalIgnoreCase); }
set {
//value comes with duplicated keys, so we filter them out
capabilities = new Hashtable (value.Keys.Count, StringComparer.OrdinalIgnoreCase);
foreach (object key in value.Keys) {
if (!capabilities.Contains (key))
capabilities.Add (key, value [key]);
}
}
}

int defaultSubmitButtonLimit;
Expand Down
4 changes: 3 additions & 1 deletion mcs/class/System.Web/Test/System.Web/AppBrowsersTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
namespace MonoTests.System.Web
{
[TestFixture]
[Ignore ("Pending fix for bug 351878")]
#if NET_3_0
[Ignore ("adapters.browser depends on System.Web_test_net_2_0.dll")]
#endif
public class AppBrowsersTest
{
[TestFixtureSetUp]
Expand Down
2 changes: 2 additions & 0 deletions mono-core.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,8 +908,10 @@ Mono implementation of ASP.NET, Remoting and Web Services.
%config %_sysconfdir/mono/2.0/Browsers
%config %_sysconfdir/mono/2.0/DefaultWsdlHelpGenerator.aspx
%config %_sysconfdir/mono/2.0/web.config
%config %_sysconfdir/mono/4.0/Browsers
%config %_sysconfdir/mono/4.0/DefaultWsdlHelpGenerator.aspx
%config %_sysconfdir/mono/4.0/web.config
%config %_sysconfdir/mono/4.5/Browsers
%config %_sysconfdir/mono/4.5/DefaultWsdlHelpGenerator.aspx
%config %_sysconfdir/mono/4.5/web.config
%config %_sysconfdir/mono/browscap.ini
Expand Down
6 changes: 4 additions & 2 deletions msvc/win32.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
<Copy source="{sourcedir}\mono\data\net_2_0\DefaultWsdlHelpGenerator.aspx" destination="{destdir}\etc\mono\2.0\DefaultWsdlHelpGenerator.aspx" />
<Copy source="{sourcedir}\mono\data\net_2_0\settings.map" destination="{destdir}\etc\mono\2.0\settings.map" />
<Copy source="{sourcedir}\mono\data\net_2_0\web.config" destination="{destdir}\etc\mono\2.0\web.config" />
<Copy source="{sourcedir}\mono\data\net_2_0\Browsers\Compat.browser" destination="{destdir}\etc\mono\2.0\Browsers\Compat.browser" />
<Copy source="{sourcedir}\mono\data\Browsers\Compat.browser" destination="{destdir}\etc\mono\2.0\Browsers\Compat.browser" />
<Copy source="{sourcedir}\mono\data\Browsers\Compat.browser" destination="{destdir}\etc\mono\4.0\Browsers\Compat.browser" />
<Copy source="{sourcedir}\mono\data\Browsers\Compat.browser" destination="{destdir}\etc\mono\4.5\Browsers\Compat.browser" />
<Copy source="{sourcedir}\mono\data\browscap.ini" destination="{destdir}\etc\mono\browscap.ini" />

<!-- Bring in xulrunner -->
Expand Down Expand Up @@ -1894,4 +1896,4 @@

<!-- Build the wix includes files -->
<WixInclude installeronly="true" root="{destdir}" wixfiles="{destdir}\Files.wxi" wixcomponents="{destdir}\Components.wxi"/>
</Assemblies>
</Assemblies>
6 changes: 4 additions & 2 deletions runtime/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ etctmp = etc
symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config etc/mono/2.0/web.config etc/mono/browscap.ini etc/mono/2.0/Browsers/Compat.browser

if INSTALL_4_0
symlinks += etc/mono/4.0/machine.config etc/mono/4.0/web.config etc/mono/4.5/web.config etc/mono/4.5/machine.config
symlinks += etc/mono/4.0/machine.config etc/mono/4.0/web.config etc/mono/4.5/web.config etc/mono/4.5/machine.config etc/mono/4.0/Browsers/Compat.browser etc/mono/4.5/Browsers/Compat.browser
endif

etc/mono/2.0/machine.config: $(top_srcdir)/data/net_2_0/machine.config
etc/mono/2.0/web.config: $(top_srcdir)/data/net_2_0/web.config
etc/mono/browscap.ini: $(top_srcdir)/data/browscap.ini
etc/mono/2.0/Browsers/Compat.browser: $(top_srcdir)/data/net_2_0/Browsers/Compat.browser
etc/mono/2.0/Browsers/Compat.browser: $(top_srcdir)/data/Browsers/Compat.browser
etc/mono/4.0/Browsers/Compat.browser: $(top_srcdir)/data/Browsers/Compat.browser
etc/mono/4.5/Browsers/Compat.browser: $(top_srcdir)/data/Browsers/Compat.browser
etc/mono/4.0/machine.config: $(top_srcdir)/data/net_4_0/machine.config
etc/mono/4.0/web.config: $(top_srcdir)/data/net_4_0/web.config
etc/mono/4.5/machine.config: $(top_srcdir)/data/net_4_5/machine.config
Expand Down