Hello community, here is the log from the commit of package apache2-mod_mono for openSUSE:Factory checked in at Fri Nov 5 17:02:26 CET 2010. -------- --- apache2-mod_mono/apache2-mod_mono.changes 2010-03-16 17:29:58.000000000 +0100 +++ apache2-mod_mono/apache2-mod_mono.changes 2010-11-03 16:40:06.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 3 15:38:01 UTC 2010 - ajorgensen@novell.com + +- Update to 2.8 + * http://www.go-mono.com/archive/2.8 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mod_mono-2.6.3.tar.bz2 New: ---- mod_mono-2.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_mono.spec ++++++ --- /var/tmp/diff_new_pack.yhsGTP/_old 2010-11-05 17:02:08.000000000 +0100 +++ /var/tmp/diff_new_pack.yhsGTP/_new 2010-11-05 17:02:08.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package apache2-mod_mono (Version 2.6.3) +# spec file for package apache2-mod_mono (Version 2.8) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,7 +29,7 @@ License: Apache Software License Group: Productivity/Networking/Web/Servers AutoReqProv: on -Version: 2.6.3 +Version: 2.8 Release: 1 Summary: Run ASP.NET Pages on Unix with Apache and Mono Source: %{modname}-%{version}.tar.bz2 @@ -37,6 +37,7 @@ Provides: mod_mono = %{version}-%{release} # This must be manually entered according to xsp's protocol version Requires: xsp >= %{version} +BuildRequires: pkg-config ############### Suse based options %if 0%{?suse_version} BuildRequires: apache2-devel mono-devel ++++++ mod_mono-2.6.3.tar.bz2 -> mod_mono-2.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.6.3/configure new/mod_mono-2.8/configure --- old/mod_mono-2.6.3/configure 2010-03-02 17:17:09.000000000 +0100 +++ new/mod_mono-2.8/configure 2010-09-30 18:56:08.000000000 +0200 @@ -2397,7 +2397,7 @@ # Define the identity of the package. PACKAGE=mod_mono - VERSION=2.6.3 + VERSION=2.8 cat >>confdefs.h <<_ACEOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.6.3/configure.in new/mod_mono-2.8/configure.in --- old/mod_mono-2.6.3/configure.in 2010-03-02 17:16:59.000000000 +0100 +++ new/mod_mono-2.8/configure.in 2010-09-30 17:19:04.000000000 +0200 @@ -1,5 +1,5 @@ AC_INIT(src/mod_mono.c) -AM_INIT_AUTOMAKE(mod_mono, 2.6.3) +AM_INIT_AUTOMAKE(mod_mono, 2.8) AM_CONFIG_HEADER(include/mod_mono_config.h:config.in) AC_PROG_CC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.6.3/man/ChangeLog new/mod_mono-2.8/man/ChangeLog --- old/mod_mono-2.6.3/man/ChangeLog 2009-09-25 18:01:20.000000000 +0200 +++ new/mod_mono-2.8/man/ChangeLog 2010-09-30 17:19:04.000000000 +0200 @@ -1,3 +1,7 @@ +2009-12-02 Marek Habersack <mhabersack@novell.com> + + * mod_mono.8.in: documented new directive MonoTargetFramework + 2009-09-21 Marek Habersack <mhabersack@novell.com> * mod_mono.8.in: documented MonoCheckHiddenFiles diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.6.3/man/mod_mono.8.in new/mod_mono-2.8/man/mod_mono.8.in --- old/mod_mono-2.6.3/man/mod_mono.8.in 2009-09-25 18:01:20.000000000 +0200 +++ new/mod_mono-2.8/man/mod_mono.8.in 2010-09-30 17:19:04.000000000 +0200 @@ -98,6 +98,12 @@ The full path to the mod-mono-server script. Default value: "/usr/bin/mod-mono-server" .TP +.I "MonoTargetFramework" +If MonoRunXSP is True, this option selects the .NET framework version to use. This +affects the backend that is started to service the requests. The MonoServerPath option +takes precedence over this setting. Available values are "2.0", "3.5" and "4.0". +Default value: "2.0" +.TP .I "MonoWapiDir" The directory where mono runtime will create the ".wapi" directory used to emulate windows I/O. It's used to set MONO_SHARED_DIR. @@ -168,13 +174,13 @@ .I "MonoMaxActiveRequests" The maximum number of concurrent requests mod_mono will pass off to the ASP.NET backend. Set to zero to turn off the limit. Default value: -20. +0. .TP .I "MonoMaxWaitingRequests" The maximum number of concurrent requests mod_mono will hold while the ASP.NET backend is busy with the maximum number of requests specified by MonoMaxActiveRequests. Requests that can't be processed -or held are dropped with Service Unavailable. Default value: 20. +or held are dropped with Service Unavailable. Default value: 150. .TP .I "MonoCheckHiddenFiles" Do not protect hidden files/directories from being accessed by clients. Hidden files/directories are those with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.6.3/src/ChangeLog new/mod_mono-2.8/src/ChangeLog --- old/mod_mono-2.6.3/src/ChangeLog 2010-01-19 22:44:35.000000000 +0100 +++ new/mod_mono-2.8/src/ChangeLog 2010-09-30 17:19:04.000000000 +0200 @@ -21,6 +21,12 @@ * mod_mono.c: fix compilation on systems that don't define SIGPWR. +2009-12-02 Marek Habersack <mhabersack@novell.com> + + * mod_mono.c: added new directive MonoTargetFramework which allows + one to select which framework backend to start (2.0, 3.5 and 4.0 + with the first two being aliases). + 2009-11-09 Marek Habersack <mhabersack@novell.com> * mod_mono.c: implemented a list of URLs in the control panel, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.6.3/src/mod_mono.c new/mod_mono-2.8/src/mod_mono.c --- old/mod_mono-2.6.3/src/mod_mono.c 2010-01-19 22:44:35.000000000 +0100 +++ new/mod_mono-2.8/src/mod_mono.c 2010-09-30 17:19:04.000000000 +0200 @@ -113,6 +113,7 @@ char *executable_path; char *path; char *server_path; + char *target_framework; char *applications; char *wapidir; char *document_root; @@ -588,7 +589,8 @@ server->run_xsp = "True"; /* (Obsolete) server->executable_path = EXECUTABLE_PATH; */ server->path = NULL; - server->server_path = MODMONO_SERVER_PATH; + server->server_path = NULL; + server->target_framework = NULL; server->applications = NULL; server->wapidir = WAPIDIR; server->document_root = DOCUMENT_ROOT; @@ -717,6 +719,7 @@ alias = "default"; if (cmd->server->is_virtual && cmd->server->server_hostname) alias = cmd->server->server_hostname; + value = first; is_default = 1; } else { @@ -726,7 +729,7 @@ value = second; is_default = (!strcmp (alias, "default")); } - + /* Disable autoapp if there's any other application. MonoDebug is excluded. */ if (!config->auto_app_set) config->auto_app = FALSE; @@ -1496,6 +1499,7 @@ char *path; char *tmp; char *serverdir; + char *server_path; char *wapidir; int max_memory = 0; int max_cpu_time = 0; @@ -1641,7 +1645,30 @@ if (tmp == NULL) tmp = ""; - serverdir = get_directory (pool, config->server_path); + if (config->server_path && config->server_path [0]) + server_path = config->server_path; + else if (config->target_framework && config->target_framework [0]) { + switch (config->target_framework [0]) { + case '2': + case '3': + server_path = MODMONO_SERVER_PATH; + break; + + case '4': + server_path = MODMONO_SERVER_BASEPATH "4"; + break; + + default: + ap_log_error (APLOG_MARK, APLOG_ERR, STATUS_AND_SERVER, + "Unsupported target framework version: %s", + config->target_framework); + exit (1); + } + + } else + server_path = MODMONO_SERVER_PATH; + + serverdir = get_directory (pool, server_path); DEBUG_PRINT (1, "serverdir: %s", serverdir); path = apr_pcalloc (pool, strlen (tmp) + strlen (serverdir) + 2); sprintf (path, "%s:%s", serverdir, tmp); @@ -1671,7 +1698,7 @@ #endif memset (argv, 0, sizeof (char *) * MAXARGS); argi = 0; - argv [argi++] = config->server_path; + argv [argi++] = server_path; if (config->listen_port != NULL) { char *la; @@ -1979,7 +2006,7 @@ else ptr = str = apr_pcalloc (r->pool, size); *ptr++ = (char)PROTOCOL_VERSION; /* version. Keep in sync with ModMonoRequest. */ - i = LE_FROM_INT (size); + i = LE_FROM_INT (size) - (1 + sizeof (size)); /* Subtract the command the data size from the buffer size */ memcpy (ptr, &i, sizeof (i)); ptr += sizeof (int32_t); ptr += write_string_to_buffer (ptr, 0, r->method, info.method_len); @@ -2930,6 +2957,12 @@ "Default: " MODMONO_SERVER_PATH ), + MAKE_CMD12 (MonoTargetFramework, target_framework, + "If MonoRunXSP is True, this option selects the .NET framework version to use. This " + "affects the backend that is started to service the requests. The MonoServerPath option " + "takes precedence over this setting. Default: " MONO_DEFAULT_FRAMEWORK + ), + MAKE_CMD12 (MonoApplications, applications, "Comma separated list with virtual directories and real directories. " "One ASP.NET application will be created for each pair. Default: \"\" " @@ -3005,7 +3038,7 @@ ), MAKE_CMD12 (MonoIOMAP, iomap, - "A string with format the same as the MONO_IOMAP variable (see mod_mono (1))." + "A string with format the same as the MONO_IOMAP variable (see mod_mono (8))." " Default value: none"), MAKE_CMD_ITERATE2 (AddMonoApplications, applications, @@ -3035,12 +3068,12 @@ MAKE_CMD12 (MonoMaxActiveRequests, max_active_requests, "The maximum number of concurrent requests mod_mono will pass off to the ASP.NET backend. " - "Set to zero to turn off the limit. Default value: 20"), + "Set to zero to turn off the limit. Default value: 150"), MAKE_CMD12 (MonoMaxWaitingRequests, max_waiting_requests, "The maximum number of concurrent requests mod_mono will hold while the ASP.NET backend is busy " "with the maximum number of requests specified by MonoMaxActiveRequests. " "Requests that can't be processed or held are dropped with Service Unavailable." - "Default value: 20"), + "Default value: 150"), MAKE_CMD12 (MonoCheckHiddenFiles, hidden, "Do not protect hidden files/directories from being accessed by clients. Hidden files/directories are those with " "Hidden attribute on Windows and whose name starts with a dot on Unix. Any file/directory below a hidden directory " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mod_mono-2.6.3/src/mod_mono.h new/mod_mono-2.8/src/mod_mono.h --- old/mod_mono-2.6.3/src/mod_mono.h 2009-09-25 18:01:20.000000000 +0200 +++ new/mod_mono-2.8/src/mod_mono.h 2010-09-30 17:19:04.000000000 +0200 @@ -89,7 +89,9 @@ #define DIRECTORY_SEPARATOR "/" #endif -#define MODMONO_SERVER_PATH MONO_PREFIX "/bin/mod-mono-server" +#define MODMONO_SERVER_BASEPATH MONO_PREFIX "/bin/mod-mono-server" +#define MONO_DEFAULT_FRAMEWORK "2.0" +#define MODMONO_SERVER_PATH MODMONO_SERVER_BASEPATH "2" #define WAPIDIR "/tmp" #define DOCUMENT_ROOT NULL #define APPCONFIG_FILE NULL @@ -98,8 +100,8 @@ #define LISTEN_ADDRESS "127.0.0.1" #define DASHBOARD_FILE "/tmp/mod_mono_dashboard" #define GLOBAL_SERVER_NAME "XXGLOBAL" -#define MAX_ACTIVE_REQUESTS 20 -#define MAX_WAITING_REQUESTS 20 +#define MAX_ACTIVE_REQUESTS 0 +#define MAX_WAITING_REQUESTS 150 #define START_ATTEMPTS 3 #define START_WAIT_TIME 2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org