Commit Graph
93 Commits
Author SHA1 Message Date
Miguel de Icaza e0e3f3cd4f [build] Staged setup for building assemblies with cyclic dependencies
This patch introduces an infrastructure to stage the builds for the core
assemblies that have cyclic dependencies.   This deals directly with
the following cycle:

    System.dll requires:
	System.Configuration.dll
	Mono.Security.dll
	System.Xml.dll

	They all require System.dll to be built

    System.Xml requires:
	System.dll
	System.Configuration.dll

    System.Security.dll requires:
	System.dll
	Mono.Security.dll
	System.Xml.dll

Principle
=========

The patch works by directing the build infrastructure to place
intermediate build steps on their own directory.  For example the
first System.dll build that only takes a dependency in mscorlib.dll is
placed not under the final directory but on a subdirectory called
"bare".

The second time that System.dll is built (after Mono.Security and
System.Xml have been built) is placed on the "secxml" directory.

The third time is the final build, and that one ends in the profile
directory.

The same principle is applied to System.Xml.

Better Dependency Tracking
==========================

To handle the multiple stages, the new Makefiles for the various
parties involved in this loop are now able to build their
dependencies.  This means that typing "make" on System.Security or
System.Xml or System will build all of the intermediate steps as
required, without needing the toplevel Makefile to perform multiple
build shots to incrementally build the result.

Bug fixes
=========

We must have regressed at some point the build of System.Xml as we
were only doing one build of it, one without System.Configuration
support.  This patch introduces back the changes to build System.Xml
in two steps.

This patch fixes the setup where we end up rebuilding System.dll and
overwriting it two times as the build progresses as a side effect
(this is what required LIBRARY_USE_INTERMEDIATE_FILE).

Details
=======

library.make:

	Introduces a new "the_libdir_base" which is the raw directory
	where the final output will go.   This points to the same location
	that libdir_base previously pointed to.

	The existing libdir_base is modified to contain an optional
	"intermediate" directory, where intermediate builds can be
	placed.

Other cycles
============

The System.Design assembly was listed as having cycles, but while this
cycle exists in theory, in practice we have not implemented any of the
code that brings the cycle in System.Windows.Forms.Design's
ImageListImageEditor and chances are, we wont any time soon.
2014-05-09 11:27:53 -04:00
Marek Habersack 0459740493 [asp.net] Fix for bug #670874. Match request URLs against precompiled dictionary using absolute paths. 2011-03-17 01:50:35 +01:00
Marek Habersack b956f6dc78 [asp.net] Fix for bug #669048. Fix up virtual precompiled app virtual paths with the virtual root of the current app 2011-02-09 21:59:00 +01:00
Marek Habersack 4b084b4966 [asp.net] Global.asax assembly must be passed as reference when compiling. BuildManager.GetType improvements.
When user has their own global application class (global.asax is present) the assembly produced from it must
be passed as reference to the compiler.
BuildManager.GetType now supports fully-qualified type names for 'typeName' and searches for the type in the
top-level assemblies, the global.asax assembly and in the assemblies specified in as references in web.config.

All of this fixes certain MVC3+Razor applications.
2011-01-24 15:18:07 +01:00
Gonzalo Paniagua Javier a2ed4f6fc2 [System.Web] Razor works now (modulo DB) 2011-01-20 21:58:59 -05:00
Marek Habersack d18d08622c [asp.net] Implemented BuildManager.GetObjectFactory
This method is not used by Mono internally but is called by MVC v3.
2011-01-17 14:47:07 +01:00
Marek Habersack 355291ccc7 [asp.net] Use faster string comparison in caches in System.Web.Compilation 2010-11-03 20:35:51 +01:00
Marek Habersack 3639946555 [asp.net] Fix for bug #646810. Implemented FormsAuthentication.EnableFormsAUthentication + tests 2010-10-28 14:57:31 +02:00
Marek Safar aad016fd87 Clean up few more warnings 2010-10-15 15:20:25 +01:00
Marek Habersack ae23776616 [asp.net] Get rid of a possible (although unlikely) race condition when acquiring locks
The patch removes a small race condition where a boolean flag is set after acquiring a lock to
indicate to code executing in the finally {} block that it should release the lock. The boolean
variable is now removed and the lock is released unconditionally. It carries a potential to
throw an exception when the lock is not held, but it's better than to fail to release it and
lead the application to a deadlock.
2010-09-28 13:29:21 +02:00
Marek Habersack 51e6b86309 [asp.net,4.0] Added support for setting default base types for various kinds of resources.
ASP.NET 4.0 allows one to set base types for Pages, User Controls, Application and PageParserFilter
from the pre-application start method(s). This commit implements support for this mechanism.

* ApplicationFileParser.cs: added override of DefaultBaseType property which checks whether
  PageParser.DefaultApplicationBaseType is set and, if yes, uses it to set application base type
  if there's no custom Global.asax
* PageParser.cs: implemented the EnableLongStringsAsResources, DefaultPageBaseType, DefaultApplicationBaseType,
  DefaultPageParserFilterType and DefaultUserControlBaseType properties.
* TemplateParser.cs: if PageParser.DefaultPageParserFilterType is set, use it as the default type to create instance
  of the page parser filter
* Added tests for the new properties.
* Added support in standalone runner for setting custom application domain data on domain creation, just before
  the test is ran.
2010-08-06 22:27:08 +02:00
Marek Habersack d410d4fe4a 2010-05-17 Marek Habersack <[email protected]>
* HttpApplicationFactory.cs: pre-application start methods must be
	called even before App_Code is compiled.

2010-05-17  Marek Habersack  <[email protected]>

	* BuildProvider.cs: made the Extension property case-insensitive

2010-05-17  Marek Habersack  <[email protected]>

	* BuildProvider.cs: implemented a 4.0 method RegisterBuildProvider

	* BuildManager.cs: separated dynamically registered assemblies
	store from the referenced assemblies cache.

svn path=/trunk/mcs/; revision=157435
2010-05-17 10:58:08 +00:00
Marek Habersack aac871a351 2010-05-16 Marek Habersack <[email protected]>
* BuildManager.cs: do not cache referenced assemblies until it's
	safe.

2010-05-16  Marek Habersack  <[email protected]>

	* HttpApplicationFactory.cs: let BuildManager know when it's safe
	to cache referenced assemblies.

svn path=/trunk/mcs/; revision=157391
2010-05-16 01:55:10 +00:00
Marek Habersack f70f49d3c3 Fixlet
svn path=/trunk/mcs/; revision=157284
2010-05-13 01:18:36 +00:00
Marek Habersack 20d0038bd1 commit e25cece56ee428a8ace8979e31ab2c0c077be4f5
Author: Marek Habersack <[email protected]>
Date:   Wed May 12 23:27:21 2010 +0200

    2010-05-12  Marek Habersack  <[email protected]>

    	* HttpApplicationFactory.cs: when initializing new application
    	type, make sure to call pre-application start methods.

    2010-05-12  Marek Habersack  <[email protected]>

    	* BuildManager.cs: implemented a 4.0 feature - pre-application
    	start methods.

svn path=/trunk/mcs/; revision=157266
2010-05-12 21:28:40 +00:00
Marek Habersack 71f8b16af6 2010-05-07 Marek Habersack <[email protected]>
* BuildManager.cs:
	Implemented 4.0 methods GetObjectFactory, GetCachedBuildDependencySet and properties
	BatchCompilationEnabled, TargetFramework

svn path=/trunk/mcs/; revision=156945
2010-05-07 23:04:51 +00:00
Marek Habersack fc9dca9970 2010-05-07 Marek Habersack <[email protected]>
* BuildManager.cs:
	Implemented 4.0 method AddReferencedAssembly.

svn path=/trunk/mcs/; revision=156944
2010-05-07 23:04:40 +00:00
Marek Habersack d6a7ab5426 2010-05-07 Marek Habersack <[email protected]>
* BuildManager.cs:
	Implemented 4.0 method GetGlobalAsaxType.

svn path=/trunk/mcs/; revision=156942
2010-05-07 23:04:20 +00:00
Marek Habersack 2d0ca9037e 2010-05-07 Marek Habersack <[email protected]>
* BuildManager.cs: implemented 4.0 methods {Create,Read}CacheFile.
	Fixed signature of the GetVirtualPathDependencies method.

2010-05-07  Marek Habersack  <[email protected]>

	* BuildManagerCacheFiles.cs: added - tests for
	BuildManager.{Create,Read}CacheFile

svn path=/trunk/mcs/; revision=156941
2010-05-07 23:04:10 +00:00
Marek Habersack e105f08673 2010-03-04 Marek Habersack <[email protected]>
* BuildManager.cs: do less work in the static constructor

2010-03-04  Marek Habersack  <[email protected]>

	* RuntimeHelpers.cs: added. Contains methods moved here from
	HttpRuntime, so that initialization sequence of various objects is
	independent of HttpRuntime.

2010-03-04  Marek Habersack  <[email protected]>

	* HttpRuntime.cs: do less work in the static constructor. Most of
	the code was moved to System.Web.Util.RuntimeHelpers. Properties
	which have been moved: MonoVersion, RunningOnWindows,
	CaseInsensitive, IsDebuggingEnabled

Also:
	- hushed some compiler warnings
	- various classes now use RuntimeHelpers instead of HttpRuntime

svn path=/trunk/mcs/; revision=153038
2010-03-04 19:04:13 +00:00
Marek Habersack 07adce6380 2010-02-27 Marek Habersack <[email protected]>
* HttpRuntime.cs: added internal property DomainUnloading.

	* HttpApplication.cs: when app domain is unloading, catch
	ThreadAbortExceptions and reset the abort.

2010-02-27  Marek Habersack  <[email protected]>

	* BuildManager.cs: count only builds of updated files before
	unloading the app domain. Fixes bug #581459

svn path=/trunk/mcs/; revision=152600
2010-02-27 02:57:44 +00:00
Marek Habersack f8064df3a7 2010-02-04 Marek Habersack <[email protected]>
* PreservationFile.cs: updated the BuildResulTypeCode enum

	* BuildManager.cs: LoadCompiled now adds all the assemblies built
	from the App_Code directory to the BuildManager.CodeAssemblies
	collection. Fixes bug #576810

svn path=/trunk/mcs/; revision=150802
2010-02-04 01:01:18 +00:00
Marek Habersack f8db965300 2010-01-05 Marek Habersack <[email protected]>
* PageCompiler.cs: improved CreatePropertyAssign, it doesn't
	always use CodePrimitiveExpression now.

svn path=/trunk/mcs/; revision=149089
2010-01-05 23:13:06 +00:00
Marek Habersack 4bbf4a541c 2010-01-05 Marek Habersack <[email protected]>
* BuildManager.cs: in GenerateAssembly, if compilation fails for
	the requested path and exception thrown is of type
	CompilationException, do not wrap it in HttpException, just
	rethrow.

	* AppResourcesCompiler.cs: the culture files dictionary is
	case-insensitive now. Otherwise culture files with culture name
	cased differently will cause overlapped i/o on response files
	while building satellite assemblies and, in effect, compilation
	will fail.

svn path=/trunk/mcs/; revision=149077
2010-01-05 12:13:22 +00:00
Marek Habersack 957ef23330 2009-12-14 Marek Habersack <[email protected]>
* BuildManager.cs: RemoveFailedAssemblies ignores warnings to
	avoid throwing exceptions when the requested virtual path
	compilation produces warnings and no errors. Fixes bug #561723

svn path=/trunk/mcs/; revision=148388
2009-12-14 14:14:53 +00:00
Marek Habersack b40844116b More 1.1 code and NET_2_0 ifdefs removed
svn path=/trunk/mcs/; revision=145319
2009-11-03 20:19:37 +00:00
Marek Habersack 1e532930f2 2009-10-12 Marek Habersack <[email protected]>
* BuildManager.cs: make sure to construct correct physical path
	for every precompiled key in FixVirtualPaths. Fixes bug #546053

svn path=/trunk/mcs/; revision=143950
2009-10-12 10:49:39 +00:00
Gonzalo Paniagua Javier a6f0666908 2009-09-30 Gonzalo Paniagua Javier <[email protected]>
* BuildManager.cs: load/set the global resources assembly for
	precompiled and merged sites correctly.


svn path=/trunk/mcs/; revision=143093
2009-10-01 01:22:01 +00:00
Marek Habersack 64f7759495 2009-09-30 Marek Habersack <[email protected]>
* BuildManager.cs: if precompilation file contains virtual path
	with trailing slash (e.g. for themes), remove the slash. Fixes bug
	#541271

svn path=/trunk/mcs/; revision=142943
2009-09-29 23:24:48 +00:00
Marek Habersack fe05e952a4 2009-09-08 Marek Habersack <[email protected]>
* BuildManager.cs: added IsPrecompiled internal property.

	* AppResourcesCompiler.cs: load precompiled site local and global
	resource assemblies from static constructor. Fixes bugs #536138
	and #536143

svn path=/trunk/mcs/; revision=141474
2009-09-08 00:13:00 +00:00
Marek Habersack e6ad1de337 2009-08-27 Marek Habersack <[email protected]>
* BuildManager.cs: when HttpRequest.FilePath is '/' in
	GetAbsoluteVirtualPath, don't try to use
	VirtualPathUtility.GetDirectory on it. Fixes bug #532679

svn path=/trunk/mcs/; revision=140786
2009-08-27 11:02:51 +00:00
Marek Habersack b6969f355f 2009-08-24 Marek Habersack <[email protected]>
* PageParser.cs: 2.0 profile takes advantage of the inputFile
	parameter to GetCompiledPageInstance. A check is made whether the
	file pointed to by this parameter is inside the application's
	virtual path and if not, the compilation request is assumed to
	refer to a fake location. Part of fix for bug #463813

2009-08-24  Marek Habersack  <[email protected]>

	* PageBuildProvider.cs: MapPath now takes a VirtualPath
	instance. Part of fix for bug #463813

	* BuildManager.cs: public APIs which take virtual path strings as
	their parameters got internal counterparts accepting a VirtualPath
	instance in place of string. Part of fix for bug #463813

	* GenericBuildProvider.cs:
	MapPath now takes a VirtualPath instance. Part of fix for bug
	#463813

2009-08-24  Marek Habersack  <[email protected]>

	* SoapDocumentationHandler.cs: get rid of the ugly fake virtual
	path hack when creating the helper page. Part of fix for bug
	#463813

2009-08-24  Marek Habersack  <[email protected]>

	* VirtualPath.cs: Added new constructor which takes virtual and
	physical paths as well as a boolean marking the instance as
	referring to a fake location. Part of fix for bug #463813

svn path=/trunk/mcs/; revision=140548
2009-08-24 20:34:57 +00:00
Gonzalo Paniagua Javier c676b64524 2009-07-30 Gonzalo Paniagua Javier <[email protected]>
* BuildManager.cs: path fixup should work now for /foo running on
	/foo. Fixes bug #526563.


svn path=/trunk/mcs/; revision=139093
2009-07-30 15:56:49 +00:00
Gonzalo Paniagua Javier 33832e187f 2009-07-23 Gonzalo Paniagua Javier <[email protected]>
* BuildManager.cs: precompilation setup failed if the precompiled
	virtual directory was / and it was deployed somewhere else.


svn path=/trunk/mcs/; revision=138576
2009-07-23 17:45:31 +00:00
Marek Habersack dd23181e08 2009-07-21 Marek Habersack <[email protected]>
* BuildManager.cs: GetReferencedAssemblies unconditionally
	includes all assemblies from bin/ for precompiled sites. Fixes bug
	#502016

svn path=/trunk/mcs/; revision=138246
2009-07-20 23:32:36 +00:00
Marek Habersack 8edbc122b0 2009-06-12 Marek Habersack <[email protected]>
* BuildManager.cs: avoid a NREX in FixVirtualPath

svn path=/trunk/mcs/; revision=135970
2009-06-12 07:55:27 +00:00
Gonzalo Paniagua Javier a5557351c4 2009-06-02 Gonzalo Paniagua Javier <[email protected]>
* BuildManager.cs: allow deployment of precompiled applications under
	any virtual path, not just the default one used when precompiling.
	Fixes bug #483268.


svn path=/trunk/mcs/; revision=135231
2009-06-02 20:38:02 +00:00
Marek Habersack 281b22f9fa 2009-06-01 Marek Habersack <[email protected]>
* HttpException.cs: if custom errors are enabled and the error
	code is 404 show the "standard" 404 error message instead of the
	default custom error mode one. Fixes bug #508649

2009-06-01  Marek Habersack  <[email protected]>

	* BuildManager.cs: when throwing a 404 exception, pass the virtual
	path to the exception constructor.

svn path=/trunk/mcs/; revision=135147
2009-06-01 20:43:24 +00:00
Marek Habersack 74712b87c1 2009-05-18 Marek Habersack <[email protected]>
* BuildManager.cs: GetPrecompiledApplicationType () uses
	VirtualPathUtility.Combine to build global.asax virtual
	path. Patch from Robert Jordan <[email protected]>, thanks! Fixes
	bug #504615

svn path=/trunk/mcs/; revision=134342
2009-05-18 19:03:22 +00:00
Marek Habersack 98a0866bd5 2009-05-05 Marek Habersack <[email protected]>
* BuildManager.cs: RemoveFailedAssemblies wraps the compilation
	exception to be rethrown in a HttpException instance.

	* AspGenerator.cs: create a Location and pass it to the parser
	before calling AddDirective from GetInheritedType, so that we get
	meaningful exception messages with source, line information etc.

svn path=/trunk/mcs/; revision=133568
2009-05-05 09:03:30 +00:00
Marek Habersack dfdb975263 2009-04-30 Marek Habersack <[email protected]>
* BuildManager.cs: when BuildInner catches a compilation
	exception, wrap it in HttpException before re-throwing.

2009-04-30  Marek Habersack  <[email protected]>

	* TemplateParser.cs: removed the PageParserFilterTypeName
	property, the filter type name is looked up on demand now.

	* ApplicationFileParser.cs, MasterPageParser.cs,
	UserControlParser.cs: load config defaults explicitly after
	initializing the instance.

svn path=/trunk/mcs/; revision=133169
2009-04-30 10:53:41 +00:00
Marek Habersack c2a841d9f8 2009-04-15 Marek Habersack <[email protected]>
* TemplateParser.cs: use generic lists for import, namespace and
	interface caches. If a namespace is added (e.g. by parsing the
	Import directive), find the assembly in which namespace is
	defined.

2009-04-15  Marek Habersack  <[email protected]>

	* BuildManager.cs: do not add all assemblies in bin/ when serving
	a precompiled site. Fixes bug #493873
	When serving a precompiled site, check if the bin/ directory
	contains certain well-known assemblies and load them if present.

svn path=/trunk/mcs/; revision=131768
2009-04-15 13:32:47 +00:00
Marek Habersack b31a989a87 2009-04-06 Marek Habersack <[email protected]>
* BuildManager.cs: make sure that precompiled is not null before
	using it in GetPrecompiledType.

svn path=/trunk/mcs/; revision=131138
2009-04-06 18:03:04 +00:00
Marek Habersack 1dca373f1f 2009-04-02 Marek Habersack <[email protected]>
* CompilationException.cs: skip warnings in ErrorMessage and
	ErrorLines

	* BuildManager.cs: when an error occurs while compiling the
	requested virtual path, throw the exception, do not attempt to
	build again.

	* TemplateControlCompiler.cs: implemented missing converter for
	the ExpandDepth property. Fixes bug #490860

2009-04-02  Marek Habersack  <[email protected]>

	* HttpException.cs: if there are more lines with errors, display
	them all.

svn path=/trunk/mcs/; revision=130876
2009-04-02 15:25:03 +00:00
Marek Habersack e9a0173141 2009-03-31 Marek Habersack <[email protected]>
* All of the below are part of the fix for bug #489687

	* ThemeDirectoryCompiler.cs: pass VirtualPath instances to parser
	constructors.

	* BuildProvider.cs: associated virtual path is stored internally
	as an instance of VirtualPath, accessible via new
	VirtualPathInternal property.

	* BuildManagerDirectoryBuilder.cs: VirtualPath.IsFake is used to
	detect fake virtual paths.
	GetBuildProvider now takes a VirtualPath instead of string for the
	virtualPath parameter. The passed VirtualPath instance is passed
	unchanged to BuildProvider.

	* BuildManager.cs: AssertVirtualPathExists now uses
	VirtualPath.IsFake to check for fake virtual paths.

	* ApplicationFileBuildProvider.cs, GenericBuildProvider.cs,
	MasterPageBuildProvider.cs, PageBuildProvider.cs,
	ThemeBuildProvider.cs, UserControlBuildProvider.cs,
	WebHandlerBuildProvider.cs, WebServiceBuildProvider.cs:
	CreateParser overloads now take a VirtualPath instead of a string
	for the virtualPath parameter.

	* ThemeBuildProvider.cs: use new parser constructors which take
	VirtualPath instances instead of strings.

2009-03-31  Marek Habersack  <[email protected]>

	* VirtualPath.cs: added code to detect whether the VirtualPath
	instance represents a fake virtual path (IsFake property).
	Added new property DirectoryNoNormalize which returns
	non-normalized directory for the VirtualPath instance.
	Made ToString () a bit more friendly and well-behaved.

2009-03-31  Marek Habersack  <[email protected]>

	* ApplicationFileParser.cs, MasterPageParser.cs, PageParser.cs,
	PageThemeFileParser.cs, PageThemeParser.cs, UserControlParser.cs,
	WebHandlerParser.cs, WebServiceParser.cs: 2.0 constructors take a
	VirtualPath instance for the virtualPath parameter, instead of a
	string.

svn path=/trunk/mcs/; revision=130665
2009-03-31 15:01:21 +00:00
Marek Habersack 39c6840184 2009-03-12 Marek Habersack <[email protected]>
* BuildManager.cs, BuildManagerDirectoryBuilder.cs,
	BuildProvider.cs, TemplateBuildProvider.cs: dependencies are
	returned as an IDictionary <string, bool>. Dependencies must be
	compared case-insensitively.

svn path=/trunk/mcs/; revision=129142
2009-03-12 14:27:12 +00:00
Gonzalo Paniagua Javier e63f092be1 2009-02-28 Gonzalo Paniagua Javier <[email protected]>
* AppResourcesAssemblyBuilder.cs:
	* BuildManagerDirectoryBuilder.cs:
	* AspComponentFoundry.cs:
	* AssemblyBuilder.cs:
	* CachingCompiler.cs:
	* AspGenerator.cs:
	* WsdlBuildProvider.cs:
	* BaseCompiler.cs:
	* BuildProvider.cs:
	* AppWebReferencesCompiler.cs:
	* TemplateControlCompiler.cs:
	* BuildManager.cs:
	* AppCodeCompiler.cs: settings that have to be in
	machine.config or the root level web.config now call
	GetWebApplicationSection.


svn path=/trunk/mcs/; revision=128275
2009-02-28 20:30:31 +00:00
Marek Habersack 75a2356018 2009-02-24 Marek Habersack <[email protected]>
* BuildManager.cs: Path.Combine must not be passed null first
	parameter.

svn path=/trunk/mcs/; revision=127878
2009-02-24 18:12:35 +00:00
Gonzalo Paniagua Javier 38d6841577 2009-02-20 Gonzalo Paniagua Javier <[email protected]>
* System.Web/HttpWriter.cs: new Response property and WriteUTF8Ptr
	method.
	* System.Web/HttpResponseStream.cs: added support for writing from an
	IntPtr. copied the memcpy method from String.cs.

	* System.Web.Compilation/BuildManager.cs: updated comment.

	* System.Web.UI/ResourceBasedLiteralControl.cs: new Control. It's just
	like a LiteralControl but will render itself from the bytes pointed to
	by an IntPtr and not create any string from the underlying data unless
	needed.

	* System.Web.UI/TemplateControl.cs: implemented a bunch of methods
	that are used from the precompiled assemblies for a web project. The
	most notable change needed is to be able to read a win32 resource from
	the dll of the control. The resource is a concatenation of literals
	with plain text for the control and a specialized LiteralControl is
	generated from different chunks of the resource.

	* System.Web.UI/HtmlTextWriter.cs: new method that returns the
	HttpWriter in use.

	* System.Web.dll.sources: added new file.

	* System.Web.Util/ICalls.cs: new internal call to get a pointer to the
	win32 resource associated with the control's assembly.


svn path=/trunk/mcs/; revision=127579
2009-02-20 21:30:58 +00:00
Gonzalo Paniagua Javier bbfde12266 2009-02-18 Gonzalo Paniagua Javier <[email protected]>
* System.Web/HttpApplicationFactory.cs: check of global.asax was precompiled.
	* System.Web.UI/MasterPage.cs: the items in ContentPlaceHolders are lowercase.
	* System.Web.Compilation/TemplateControlCompiler.cs: lowercase place holder names
	* System.Web.Compilation/BuildManager.cs: initial support for
	precompilation. No 'updatable', please.



svn path=/trunk/mcs/; revision=127352
2009-02-18 23:49:33 +00:00