Permalink
Browse files

[xsp] Hush some warnings, move keysign options to Makefiles

  • Loading branch information...
1 parent 5bb2ecf commit cccf43eb8d2f2ccc1286bb164b397d3098506726 @grendello grendello committed Apr 14, 2011
View
4 src/Mono.WebServer.Apache/AssemblyInfo.cs.in
@@ -31,7 +31,5 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyVersion("@XSP_VERSION@")]
[assembly: AssemblyTitle ("Mono.WebServer.Apache")]
[assembly: AssemblyDescription ("Mod_mono backend for XSP")]
-[assembly: AssemblyCopyright ("(c) 2002-2007 Novell, Inc.")]
+[assembly: AssemblyCopyright ("(c) 2002-2011 Novell, Inc.")]
[assembly: AssemblyCompany ("Novell, Inc.")]
-[assembly: AssemblyDelaySign(true)]
-[assembly: AssemblyKeyFile("@top_srcdir@/src/mono.pub")]
View
2 src/Mono.WebServer.Apache/Makefile.am
@@ -1,6 +1,6 @@
builddir=$(top_builddir)/src/Mono.WebServer.Apache
-MCSFLAGS= -unsafe -debug+ -debug:full -nologo -nowarn:618 $(WEBTRACING)
+MCSFLAGS= -unsafe -debug+ -debug:full -nologo -nowarn:618 $(WEBTRACING) -keyfile:$(top_srcdir)/src/mono.snk
MODMONOSERVER2_EXE = mod-mono-server2.exe
GACUTIL2=$(GACUTIL) -package 2.0
View
3 src/Mono.WebServer.FastCgi/AssemblyInfo.cs.in
@@ -5,5 +5,4 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyTitle("Mono.WebServer.FastCGI")]
[assembly: AssemblyDescription("FastCGI Backend for XSP")]
[assembly: AssemblyCopyright("2007 Brian Nickel")]
-[assembly: AssemblyDelaySign(true)]
-[assembly: AssemblyKeyFile("@top_srcdir@/src/mono.pub")]
+
View
2 src/Mono.WebServer.FastCgi/Makefile.am
@@ -1,6 +1,6 @@
builddir=$(top_builddir)/src/Mono.WebServer.FastCgi
-MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 $(WEBTRACING) -unsafe+
+MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 $(WEBTRACING) -unsafe+ -keyfile:$(top_srcdir)/src/mono.snk
XSP2_EXE = fastcgi-mono-server2.exe
GACUTIL2=$(GACUTIL) -package 2.0
View
4 src/Mono.WebServer.XSP/AssemblyInfo.cs.in
@@ -31,7 +31,5 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyVersion("@XSP_VERSION@")]
[assembly: AssemblyTitle ("Mono.WebServer.XSP")]
[assembly: AssemblyDescription ("Minimalistic web server for testing System.Web")]
-[assembly: AssemblyCopyright ("(C) 2002-2010 Novell, Inc.")]
+[assembly: AssemblyCopyright ("(C) 2002-2011 Novell, Inc.")]
[assembly: AssemblyCompany ("Novell, Inc.")]
-[assembly: AssemblyDelaySign(true)]
-[assembly: AssemblyKeyFile("@top_srcdir@/src/mono.pub")]
View
2 src/Mono.WebServer.XSP/Makefile.am
@@ -1,7 +1,7 @@
builddir=$(top_builddir)/src/Mono.WebServer.XSP
pkgconfigdir=$(libdir)/pkgconfig
-MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 -unsafe $(WEBTRACING)
+MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 -unsafe $(WEBTRACING) -keyfile:$(top_srcdir)/src/mono.snk
XSP2_EXE = xsp2.exe
GACUTIL2=$(GACUTIL) -package 2.0
View
3 src/Mono.WebServer.XSP/XSPWebSource.cs
@@ -57,7 +57,6 @@ public class XSPWebSource: WebSource
PrivateKeySelectionCallback keyCB;
bool allowClientCert;
bool requireClientCert;
- bool single_app;
public XSPWebSource(IPAddress address, int port, SecurityProtocolType securityProtocol,
X509Certificate cert, PrivateKeySelectionCallback keyCB,
@@ -70,12 +69,10 @@ public class XSPWebSource: WebSource
this.keyCB = keyCB;
this.allowClientCert = allowClientCert;
this.requireClientCert = requireClientCert;
- this.single_app = single_app;
}
public XSPWebSource (IPAddress address, int port, bool single_app)
{
- this.single_app = single_app;
SetListenAddress (address, port);
}
View
3 src/Mono.WebServer.XSP/XSPWorkerRequest.cs
@@ -815,9 +815,6 @@ unsafe int Send (byte [] buffer, int offset, int len)
return total;
}
- static bool tried_sendfile;
- static bool use_sendfile;
-
[DllImport ("libc", SetLastError=true)]
extern static int setsockopt (int handle, int level, int opt, ref bool val, IntPtr len);
View
5 src/Mono.WebServer/ApplicationServer.cs
@@ -88,7 +88,6 @@ public class ApplicationServer : MarshalByRefObject
bool started;
bool stop;
bool verbose;
- bool shuttingDown;
Socket listen_socket;
bool single_app;
Exception initialException;
@@ -388,8 +387,6 @@ void SetSocketOptions (Socket sock)
}
}
-
- AsyncCallback accept_cb;
void RunServer ()
{
started = true;
@@ -480,7 +477,7 @@ void StartRequest (Socket accepted, int reuses)
ThreadPool.QueueUserWorkItem (new WaitCallback (worker.Run));
else
worker.Run (null);
- } catch (Exception e) {
+ } catch (Exception) {
try {
if (accepted != null) {
try {
View
4 src/Mono.WebServer/AssemblyInfo.cs.in
@@ -31,8 +31,6 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyVersion("0.1.0.0")]
[assembly: AssemblyTitle ("Mono.WebServer")]
[assembly: AssemblyDescription ("Classes for embedding an ASP.NET server in your application .NET 1.1")]
-[assembly: AssemblyCopyright ("(c) 2002-2005 Novell, Inc.")]
+[assembly: AssemblyCopyright ("(c) 2002-2011 Novell, Inc.")]
[assembly: AssemblyCompany ("Novell, Inc.")]
-[assembly: AssemblyDelaySign(true)]
-[assembly: AssemblyKeyFile("@top_srcdir@/src/mono.pub")]
View
4 src/Mono.WebServer/AssemblyInfo2.cs.in
@@ -31,8 +31,6 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyVersion("0.2.0.0")]
[assembly: AssemblyTitle ("Mono.WebServer2")]
[assembly: AssemblyDescription ("Classes for embedding an ASP.NET server in your application .NET 2.0.")]
-[assembly: AssemblyCopyright ("(c) 2002-2005 Novell, Inc.")]
+[assembly: AssemblyCopyright ("(c) 2002-2011 Novell, Inc.")]
[assembly: AssemblyCompany ("Novell, Inc.")]
-[assembly: AssemblyDelaySign(true)]
-[assembly: AssemblyKeyFile("@top_srcdir@/src/mono.pub")]
View
5 src/Mono.WebServer/AssemblyInfo4.cs.in
@@ -31,8 +31,5 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyVersion("0.4.0.0")]
[assembly: AssemblyTitle ("Mono.WebServer2")]
[assembly: AssemblyDescription ("Classes for embedding an ASP.NET server in your application .NET 4.0.")]
-[assembly: AssemblyCopyright ("(c) 2002-2009 Novell, Inc.")]
+[assembly: AssemblyCopyright ("(c) 2002-2011 Novell, Inc.")]
[assembly: AssemblyCompany ("Novell, Inc.")]
-[assembly: AssemblyDelaySign(true)]
-[assembly: AssemblyKeyFile("@top_srcdir@/src/mono.pub")]
-
View
3 src/Mono.WebServer/BaseApplicationHost.cs
@@ -231,16 +231,13 @@ bool PathMatches (HttpHandlerAction handler, string uri)
string matchExact = null;
string endsWith = null;
- Regex regEx = null;
if (handlerPath.Length > 0) {
if (handlerPath [0] == '*' && (handlerPath.IndexOf ('*', 1) == -1))
endsWith = handlerPath.Substring (1);
if (handlerPath.IndexOf ('*') == -1)
if (handlerPath [0] != '/') {
- HttpContext ctx = HttpContext.Current;
- HttpRequest req = ctx != null ? ctx.Request : null;
string vpath = HttpRuntime.AppDomainAppVirtualPath;
if (vpath == "/")
View
2 src/Mono.WebServer/BaseRequestBroker.cs
@@ -127,7 +127,7 @@ int GetNextRequestId ()
if (newid != -1) {
// TODO: newid had better not exceed 0xFFFF.
- newid = (int)((newid & 0xFFFF) | ((requests_served & 0x7FFF) << 16));
+ newid = (int)(((ushort)newid & 0xFFFF) | (((ushort)requests_served & 0x7FFF) << 16));
request_ids [IdToIndex(newid)] = newid;
return newid;
}
View
2 src/Mono.WebServer/Makefile.am
@@ -1,6 +1,6 @@
pkgconfigdir=$(libdir)/pkgconfig
builddir=$(top_builddir)/src/Mono.WebServer
-MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 $(WEBTRACING) -unsafe
+MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 $(WEBTRACING) -unsafe -keyfile:$(top_srcdir)/src/mono.snk
SYSTEMCORE_DEP=@SYSTEMCORE_DEP@
monowebserver2dir = $(prefix)/lib/xsp/2.0
View
1 src/Mono.WebServer/Paths.cs
@@ -50,7 +50,6 @@ public static void GetPathsFromUri (IApplicationHost appHost, string verb, strin
{
// There's a hidden missing feature here... :)
realUri = uri; pathInfo = String.Empty;
- string basepath = HttpRuntime.AppDomainAppPath;
string vpath = HttpRuntime.AppDomainAppVirtualPath;
int vpathLen = vpath.Length;
View
2 test/1.1/customcontrol/tabcontrol2.cs
@@ -166,7 +166,7 @@ private void RenderTabs (HtmlTextWriter writer)
writer.WriteBeginTag ("a");
string postbackEvent = String.Empty;
if (Page != null)
- postbackEvent = Page.GetPostBackClientHyperlink (
+ postbackEvent = Page.ClientScript.GetPostBackClientHyperlink (
this, key);
writer.WriteAttribute ("href", postbackEvent);
View
2 test/1.1/webcontrols/Makefile.am
@@ -37,6 +37,7 @@ samples_DATA = \
peopletable.xsl \
index.aspx
+if USE_SQLITE
sqlitedir = $(pkglibdir)/test/1.1/webcontrols
sqlite_DATA = dbpage1.sqlite \
dbpage2.sqlite
@@ -55,3 +56,4 @@ dbpage1.sqlite: dbpage_test_setup.exe
dbpage2.sqlite: dbpage_test_setup.exe
-@$(RUNTIME) dbpage_test_setup.exe 2> /dev/null || echo "Warning: could not create test SQLite database"
+endif
View
2 tools/asp_state/asp_state.cs
@@ -64,7 +64,7 @@ private static void ShowVerboseConfigurationInfo(string filename)
public static void Main (string [] args)
{
if (args.Length == 0) {
- RemotingConfiguration.Configure (ConfigurationFileName);
+ RemotingConfiguration.Configure (ConfigurationFileName, false);
ShowVerboseConfigurationInfo(ConfigurationFileName);
Console.Write("Press <Enter> to stop...");
Console.ReadLine ();
View
4 tools/dbsessmgr/Makefile.am
@@ -23,9 +23,9 @@ dbsessmgr_input = AssemblyInfo.cs.in \
dbsessmgr_sources = $(dbsessmgr_input:.in=)
dbsessmgr2.exe: $(dbsessmgr_sources)
- $(GMCS) $(MCSFLAGS) -r:System.Data.dll -out:$@ $^
+ $(GMCS) $(MCSFLAGS) -r:System.Data.dll -r:System.Configuration.dll -out:$@ $^
if NET_4_0
dbsessmgr4.exe: $(dbsessmgr_sources)
- $(DMCS) $(MCSFLAGS) -r:System.Data.dll -out:$@ $^
+ $(DMCS) $(MCSFLAGS) -r:System.Data.dll -r:System.Configuration.dll -out:$@ $^
endif
View
2 tools/dbsessmgr/dbsessmgr.cs
@@ -128,7 +128,7 @@ private static IDbConnection GetConnection ()
conn_str = null;
param_prefix = null;
- NameValueCollection config = ConfigurationSettings.AppSettings;
+ NameValueCollection config = ConfigurationManager.AppSettings;
if (config != null) {
asm = config ["DBProviderAssembly"];
type = config ["DBConnectionType"];

0 comments on commit cccf43e

Please sign in to comment.