mod-aspdotnet-svn Mailing List for mod_aspdotnet
Brought to you by:
wrowe
You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
(10) |
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
|
Feb
|
Mar
(10) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(26) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
2008 |
Jan
|
Feb
|
Mar
(5) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <wr...@us...> - 2009-04-15 03:19:20
|
Revision: 222 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=222&view=rev Author: wrowe Date: 2009-04-15 03:19:04 +0000 (Wed, 15 Apr 2009) Log Message: ----------- Ensure HttpResponse.TransmitFile(filename, ...) succeeds, oberstation suggests this is the right combination of flags. Needs testing for sendfile [en|dis]abled on various levels of .NET Submitted by: Tobias Polley (rrayst) Modified Paths: -------------- mod_aspdotnet/trunk/Apache.Web/WorkerRequest.h Modified: mod_aspdotnet/trunk/Apache.Web/WorkerRequest.h =================================================================== --- mod_aspdotnet/trunk/Apache.Web/WorkerRequest.h 2009-04-15 03:18:46 UTC (rev 221) +++ mod_aspdotnet/trunk/Apache.Web/WorkerRequest.h 2009-04-15 03:19:04 UTC (rev 222) @@ -632,7 +632,7 @@ #endif FileStream *stream = new FileStream(filename, FileMode::Open, FileAccess::Read, - FileShare::Read, 0, true); + FileShare::Read, 8192, true); SendResponseFromFile(stream->Handle, offset, length); stream->Close(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2009-04-15 03:18:55
|
Revision: 221 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=221&view=rev Author: wrowe Date: 2009-04-15 03:18:46 +0000 (Wed, 15 Apr 2009) Log Message: ----------- Ensure HttpResponse.TransmitFile(filename, ...) succeeds, oberstation suggests this is the right combination of flags. Needs testing for sendfile [en|dis]abled on various levels of .NET Submitted by: Tobias Polley (rrayst) Modified Paths: -------------- mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.h Modified: mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.h =================================================================== --- mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.h 2008-03-03 22:39:57 UTC (rev 220) +++ mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.h 2009-04-15 03:18:46 UTC (rev 221) @@ -661,7 +661,7 @@ #endif FileStream ^stream = gcnew FileStream(filename, FileMode::Open, FileAccess::Read, - FileShare::Read, 0, true); + FileShare::Read, 8192, true); SendResponseFromFile(stream->Handle, offset, length); stream->Close(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2008-03-03 22:39:59
|
Revision: 220 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=220&view=rev Author: wrowe Date: 2008-03-03 14:39:57 -0800 (Mon, 03 Mar 2008) Log Message: ----------- Drop the copy from the post-build steps, this will fail every time Apache is already running with the module loaded, and UAC is going to interfere. Modified Paths: -------------- mod_aspdotnet2/trunk/mod/mod_aspdotnet.vcproj Modified: mod_aspdotnet2/trunk/mod/mod_aspdotnet.vcproj =================================================================== --- mod_aspdotnet2/trunk/mod/mod_aspdotnet.vcproj 2008-03-03 22:32:52 UTC (rev 219) +++ mod_aspdotnet2/trunk/mod/mod_aspdotnet.vcproj 2008-03-03 22:39:57 UTC (rev 220) @@ -95,8 +95,6 @@ /> <Tool Name="VCPostBuildEventTool" - Description="Installing debug module to $(APACHE_PATH)\modules" - CommandLine="copy /y "$(OutDir)\mod_aspdotnet.so" "$(APACHE_PATH)\modules" && copy /y "$(OutDir)\mod_aspdotnet.pdb" "$(APACHE_PATH)\modules"" /> </Configuration> <Configuration @@ -350,8 +348,6 @@ /> <Tool Name="VCPostBuildEventTool" - Description="Installing debug module to $(APACHE22_PATH)\modules" - CommandLine="copy /y "$(OutDir)\mod_aspdotnet.so" "$(APACHE22_PATH)\modules" && copy /y "$(OutDir)\mod_aspdotnet.pdb" "$(APACHE22_PATH)\modules"" /> </Configuration> </Configurations> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2008-03-03 22:33:04
|
Revision: 219 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=219&view=rev Author: wrowe Date: 2008-03-03 14:32:52 -0800 (Mon, 03 Mar 2008) Log Message: ----------- Readme updates for moot issues (since .NET 2, at least) Modified Paths: -------------- mod_aspdotnet2/trunk/README.txt Modified: mod_aspdotnet2/trunk/README.txt =================================================================== --- mod_aspdotnet2/trunk/README.txt 2008-03-03 22:26:37 UTC (rev 218) +++ mod_aspdotnet2/trunk/README.txt 2008-03-03 22:32:52 UTC (rev 219) @@ -2,7 +2,8 @@ ----------------------------------- mod_aspdotnet.so and Apache.Web.dll require Windows 2000 or later, they -are not maintained to be compatible with Windows 98, ME or NT 4. +are not maintained to be compatible with Windows 98, ME or NT 4. Your +results attempting to use earlier flavors will vary. Build Notes @@ -14,7 +15,7 @@ set APACHE_PATH=d:\path\to\apache2 devenv mod_aspdotnet.sln /useenv /build Release /project mod_aspdotnet -or to build for Apache 2.1-dev or Apache 2.2, invoke with the syntax; +or to build for Apache 2.2, invoke with the syntax; set APACHE22_PATH=d:\path\to\apache2.2 devenv mod_aspdotnet.sln /useenv /build "Release 2.2" /project mod_aspdotnet @@ -35,10 +36,9 @@ may again change the CLR C++ syntax to be entirely incompatible with the sources. -Note that the Apache.Web.dll is temporarily registered, it's type library -(.tlb file) is extracted, and it is unregistered as a post-build step for -both the Debug and Release builds of the Apache.web. This assures us that -the usual build environment remains clean of excess COM registration gunk. +The Apache.Web.dll is no longer temporarily registered, it's type library +(.tlb file) is extracted using tlbexp. Earlier notes about this should be +ignored. We build Apache.Web.dll with delay-load of libhttpd, libapr and libaprutil dll's. This is important since Apache.Web.dll normally can't be loaded, @@ -58,28 +58,6 @@ for installations of Apache.exe (Release flavor) or httpd.exe (Release 2.2). -Alternate Build Notes ---------------------- - -We have attempted to build the modules with the free Microsoft Visual C++ -Toolkit, Microsoft's .NET Framework SDK and Windows Platform SDK. Sadly, -this combination is not a complete replacement for the Developer Studio, -and is insufficient to build the mod_aspdotnet and Apache.Web.dll modules. - -Notably, none of these packages includes the DelayImp.lib which is -required to link libhttpd, libaprutil and libapr .dll files to the -Apache.Web.dll module. This allows the regasm and gacutil utilities, -amoung others, to load and process the Apache.Web.dll, without loading -the actual Apache .dll files. Without this feature it's impossible to -place Apache.Web.dll in the GAC (required for loading inside Microsoft's -System.Web.Hosting framework), while the Apache .dll files remain in the -Apache bin directory. - -This should be solved in a future release by migrating to VisualStudio 2005 -which offers a much more complete "Lite" flavor that users may obtain for -free from Microsoft. - - Deployment Notes ---------------- @@ -94,27 +72,24 @@ So it is not possible to install Apache.Web.dll in the 'usual' modules subdirectory of Apache HTTP Server. -The Debug build will do so automatically, copying mod_aspdotnet.so + .pdb -into the $(APACHE_PATH)\modules directory, for testing. -Apache.Web.dll + .pdb files are copied into $(APACHE_PATH)\bin -so that it can discover libapr.dll, libaprutil.dll and libhttpd.dll when -running in the System.Web.Hosting's AppDomain. Apache.Web.dll is then -registered and installed into the Global Assembly Cache by the Debug build's -post-build custom command. - In order to install a reference into the Global Assembly Cache (for testing -the release build instead of the debug build) use; +the release build or debug build) use; regasm d:\path-to-apache\bin\Apache.Web.dll gacutil /ir Apache.Web.dll FILEPATH d:\path-to-apache\bin\Apache.Web.dll Apache.Web -This installs Apache.Web.dll by reference to the built assembly. +This installs Apache.Web.dll by reference to the built assembly. Note that +UAC will prevent you from doing this in Vista or 2008 and you may need to +launch a command shell "run as Administrator" in order to complete this +package registration in the global cache. This may *NOT* work on an end-user's machine without the .NET Platform SDK. Those tools [regasm/gacutil] were not officially going to be distributed with the retail .NET runtime redistributables. Instead, the .msi installer, has all details for registering the Apache.Web assembly into the Global Assembly Cache, is entrusted to install Apache.Web to the GAC for end-users. +Note that it appears they are installed with the runtime, but all warnings +by Microsoft were to the contrary. TODO @@ -130,12 +105,6 @@ .dll's [that assembly is a .dll itself] but it does not actually merge the other .dll's into a single package. -Consider registering aspnet_isapi.dll keys in the registry. This could -occur as part of the installer or module startup. The installer would be -a much more efficient method. (This is no longer needed with .NET 1.1 as -it more thoroughly registers itself on install, even in the absense of IIS -on the target machine.) - Note that the .msi package searches for apache/bin/apache.exe up to 3 levels deep from the local hard drives, in sequence. It aught to test further, as necessary, or allow explicitly long paths, if the user chooses. The path can This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2008-03-03 22:26:40
|
Revision: 218 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=218&view=rev Author: wrowe Date: 2008-03-03 14:26:37 -0800 (Mon, 03 Mar 2008) Log Message: ----------- Sync the version 2 flavor with it's latest reviews Modified Paths: -------------- mod_aspdotnet2/trunk/STATUS.txt Modified: mod_aspdotnet2/trunk/STATUS.txt =================================================================== --- mod_aspdotnet2/trunk/STATUS.txt 2008-03-03 22:24:45 UTC (rev 217) +++ mod_aspdotnet2/trunk/STATUS.txt 2008-03-03 22:26:37 UTC (rev 218) @@ -53,12 +53,10 @@ * Supports both Apache 2.0.x or 2.2.x (use Release 2.2/Debug 2.2 project configurations with the APACHE22_PATH environment variable - pointing at the installed Apache 2.1/2.2 root) + pointing at the installed Apache 2.2 root) - * Supports Microsoft's ASP.NET / .NET Runtime v1.1.4322 and v1.0.3705 + * Supports Microsoft's ASP.NET / .NET Runtime v2.0 - * There are no reports of success from .NET Runtime v2.0, as of yet - CURRENT VOTES: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2008-03-03 22:24:50
|
Revision: 217 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=217&view=rev Author: wrowe Date: 2008-03-03 14:24:45 -0800 (Mon, 03 Mar 2008) Log Message: ----------- Note last weeks activity Modified Paths: -------------- mod_aspdotnet2/trunk/CHANGES.txt Modified: mod_aspdotnet2/trunk/CHANGES.txt =================================================================== --- mod_aspdotnet2/trunk/CHANGES.txt 2008-03-03 22:20:38 UTC (rev 216) +++ mod_aspdotnet2/trunk/CHANGES.txt 2008-03-03 22:24:45 UTC (rev 217) @@ -1,5 +1,11 @@ Changes to mod_aspdotnet SourceForge build 2199 + Replaced the use of regasm and gacutil with tlbexp due to Windows 2008 + UAC restrictions on end users/developers. Confirmed to build for 2008 + under Visual Studio 2008 (version 9.0) and .NET 2.0, and also confirmed + compatible with x86_64 bit builds of Apache 2.2 (requires a 64 bit + installation of .NET to be installed and activated). + MAJOR: Update solution files and C++.NET source syntax to Visual Studio 2005 (version 8.0), and .NET 2.0. @@ -62,4 +68,4 @@ [Yussef Alkhamrichi <yalkhamrichi hotmail.com> Original code contributed by William A. Rowe, Jr. and Covalent - Technologies, Inc. \ No newline at end of file + Technologies, Inc. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2008-03-03 22:20:40
|
Revision: 216 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=216&view=rev Author: wrowe Date: 2008-03-03 14:20:38 -0800 (Mon, 03 Mar 2008) Log Message: ----------- Use tlbexp.exe to generate the package's binding library for COM. Modified Paths: -------------- mod_aspdotnet2/trunk/Apache.Web/Apache.Web.vcproj Modified: mod_aspdotnet2/trunk/Apache.Web/Apache.Web.vcproj =================================================================== --- mod_aspdotnet2/trunk/Apache.Web/Apache.Web.vcproj 2007-09-21 14:37:24 UTC (rev 215) +++ mod_aspdotnet2/trunk/Apache.Web/Apache.Web.vcproj 2008-03-03 22:20:38 UTC (rev 216) @@ -102,7 +102,7 @@ <Tool Name="VCPostBuildEventTool" Description="Signing .dll, Exporting .tlb and Installing debug components to the GAC" - CommandLine="sn -Ra "$(OutDir)\Apache.Web.dll" "$(ProjectDir)\Apache.Web.snk"
regasm /nologo /tlb:"$(IntDir)/Apache.Web.tlb" "$(OutDir)\Apache.Web.dll"
gacutil /ir "$(OutDir)\Apache.Web.dll" FILEPATH "$(OutDir)\Apache.Web.dll" Apache.Web" + CommandLine="sn -Ra "$(OutDir)\Apache.Web.dll" "$(ProjectDir)\Apache.Web.snk"
tlbexp /nologo /out:"$(IntDir)/Apache.Web.tlb" "$(OutDir)\Apache.Web.dll"
" /> </Configuration> <Configuration @@ -191,7 +191,7 @@ <Tool Name="VCPostBuildEventTool" Description="Signing .dll and Exporting .tlb" - CommandLine="sn -Ra "$(OutDir)\Apache.Web.dll" "$(ProjectDir)\Apache.Web.snk"
regasm /nologo /tlb:"$(IntDir)/Apache.Web.tlb" "$(OutDir)\Apache.Web.dll"
regasm /nologo /unregister "$(OutDir)\Apache.Web.dll"" + CommandLine="sn -Ra "$(OutDir)\Apache.Web.dll" "$(ProjectDir)\Apache.Web.snk"
tlbexp /nologo /out:"$(IntDir)/Apache.Web.tlb" "$(OutDir)\Apache.Web.dll"
" /> </Configuration> <Configuration @@ -280,7 +280,7 @@ <Tool Name="VCPostBuildEventTool" Description="Signing .dll and Exporting .tlb" - CommandLine="sn -Ra "$(OutDir)\Apache.Web.dll" "$(ProjectDir)\Apache.Web.snk"
regasm /nologo /tlb:"$(IntDir)/Apache.Web.tlb" "$(OutDir)\Apache.Web.dll"
regasm /nologo /unregister "$(OutDir)\Apache.Web.dll"" + CommandLine="sn -Ra "$(OutDir)\Apache.Web.dll" "$(ProjectDir)\Apache.Web.snk"
tlbexp /nologo /out:"$(IntDir)/Apache.Web.tlb" "$(OutDir)\Apache.Web.dll"
" /> </Configuration> <Configuration @@ -372,7 +372,7 @@ <Tool Name="VCPostBuildEventTool" Description="Signing .dll, Exporting .tlb and Installing debug components to the GAC" - CommandLine="sn -Ra "$(OutDir)\Apache.Web.dll" "$(ProjectDir)\Apache.Web.snk"
regasm /nologo /tlb:"$(IntDir)/Apache.Web.tlb" "$(OutDir)\Apache.Web.dll"
gacutil /ir "$(OutDir)\Apache.Web.dll" FILEPATH "$(OutDir)\Apache.Web.dll" Apache.Web" + CommandLine="sn -Ra "$(OutDir)\Apache.Web.dll" "$(ProjectDir)\Apache.Web.snk"
tlbexp /nologo /out:"$(IntDir)/Apache.Web.tlb" "$(OutDir)\Apache.Web.dll"
" /> </Configuration> </Configurations> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2007-09-21 14:37:27
|
Revision: 215 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=215&view=rev Author: wrowe Date: 2007-09-21 07:37:24 -0700 (Fri, 21 Sep 2007) Log Message: ----------- Some .NET 2 wording changes Modified Paths: -------------- mod_aspdotnet2/trunk/installer.ism Modified: mod_aspdotnet2/trunk/installer.ism =================================================================== --- mod_aspdotnet2/trunk/installer.ism 2007-09-21 14:36:29 UTC (rev 214) +++ mod_aspdotnet2/trunk/installer.ism 2007-09-21 14:37:24 UTC (rev 215) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml-stylesheet type="text/xsl" href="is.xsl" ?> <!DOCTYPE msi [ <!ELEMENT msi (summary,table*)> @@ -1365,7 +1365,6 @@ <col def="S255">ISBuildSourcePath</col> <col def="I4">ISAttributes</col> <col def="S72">ISComponentSubFolder_</col> - <row><td>Apache.Web.Helpers.netmodu</td><td>Apache.Web</td><td>APACHE~1.NET|Apache.Web.Helpers.netmodule</td><td>0</td><td/><td/><td/><td>1</td><td><ReleaseBinaryFolder>\Apache.Web.Helpers.netmodule</td><td>1</td><td/></row> <row><td>Apache.Web.dll</td><td>Apache.Web</td><td>APACHE~1.DLL|Apache.Web.dll</td><td>0</td><td/><td/><td>512</td><td>1</td><td><ReleaseBinaryFolder>\Apache.Web.dll</td><td>1</td><td/></row> <row><td>mod_aspdotnet.html</td><td>manual_mod</td><td>MOD_AS~1.HTM|mod_aspdotnet.html</td><td>0</td><td/><td/><td/><td>1</td><td><ISProjectFolder>\docs\mod_aspdotnet.html</td><td>1</td><td/></row> <row><td>mod_aspdotnet.so</td><td>mod_aspdotnet.so</td><td>MOD_AS~1.SO|mod_aspdotnet.so</td><td>0</td><td/><td/><td>0</td><td>1</td><td><ReleaseBinaryFolder>\mod_aspdotnet.so</td><td>1</td><td/></row> @@ -1705,7 +1704,7 @@ <table name="ISLanguage"> <col key="yes" def="s50">ISLanguage</col> <col def="I2">Included</col> - <row><td>1033</td><td>1</td></row> + <row><td>1033</td><td>0</td></row> </table> <table name="ISLinkerLibrary"> @@ -1880,7 +1879,6 @@ <col key="yes" def="s72">ISProductConfiguration</col> <col def="S255">ProductConfigurationFlags</col> <col def="I4">GeneratePackageCode</col> - <row><td>Default Configuration</td><td/><td>0</td></row> <row><td>mod_aspdotnet2.0</td><td/><td>0</td></row> <row><td>mod_aspdotnet2.2</td><td/><td>0</td></row> </table> @@ -1896,20 +1894,20 @@ <col key="yes" def="s72">ISProductConfiguration_</col> <col key="yes" def="s72">Property</col> <col def="L255">Value</col> - <row><td>mod_aspdotnet2.0</td><td>MSIPackageFileName</td><td>mod_aspdotnet-2.0.0.2007</td></row> + <row><td>mod_aspdotnet2.0</td><td>MSIPackageFileName</td><td>mod_aspdotnet-2.0.0.2199</td></row> <row><td>mod_aspdotnet2.0</td><td>PackageCode</td><td>{AFB3093A-B243-4865-9130-13A1C9DA6A6E}</td></row> <row><td>mod_aspdotnet2.0</td><td>PreProcessorDefines</td><td>APACHE_VERSION=2.0</td></row> <row><td>mod_aspdotnet2.0</td><td>ProductCode</td><td>{18C26F50-5E08-4274-BC7B-430AF1FDD147}</td></row> - <row><td>mod_aspdotnet2.0</td><td>ProductName</td><td>mod_aspdotnet for Apache HTTP Server 2.0</td></row> - <row><td>mod_aspdotnet2.0</td><td>ProductVersion</td><td>2.0.0.2007</td></row> + <row><td>mod_aspdotnet2.0</td><td>ProductName</td><td>mod_aspdotnet for .NET 2.0 / Apache HTTP Server 2.0</td></row> + <row><td>mod_aspdotnet2.0</td><td>ProductVersion</td><td>2.0.0.2199</td></row> <row><td>mod_aspdotnet2.0</td><td>Subject</td><td>##ID_STRING3##</td></row> <row><td>mod_aspdotnet2.0</td><td>UpgradeCode</td><td>{D7DEB71F-1CF3-4956-9AC9-2187FEE06F02}</td></row> - <row><td>mod_aspdotnet2.2</td><td>MSIPackageFileName</td><td>mod_aspdotnet-2.2.0.2007</td></row> + <row><td>mod_aspdotnet2.2</td><td>MSIPackageFileName</td><td>mod_aspdotnet-2.2.0.2199</td></row> <row><td>mod_aspdotnet2.2</td><td>PackageCode</td><td>{BAE8F78E-FE91-4E0A-9D9F-74AD2793777B}</td></row> <row><td>mod_aspdotnet2.2</td><td>PreProcessorDefines</td><td>APACHE_VERSION=2.2</td></row> <row><td>mod_aspdotnet2.2</td><td>ProductCode</td><td>{45261452-CE23-4440-BFBE-8085F2B9A183}</td></row> - <row><td>mod_aspdotnet2.2</td><td>ProductName</td><td>mod_aspdotnet for Apache HTTP Server 2.2</td></row> - <row><td>mod_aspdotnet2.2</td><td>ProductVersion</td><td>2.2.0.2007</td></row> + <row><td>mod_aspdotnet2.2</td><td>ProductName</td><td>mod_aspdotnet for .NET 2.0 / Apache HTTP Server 2.2</td></row> + <row><td>mod_aspdotnet2.2</td><td>ProductVersion</td><td>2.2.0.2199</td></row> <row><td>mod_aspdotnet2.2</td><td>SetupFileName</td><td/></row> <row><td>mod_aspdotnet2.2</td><td>Subject</td><td>##ID_STRING4##</td></row> <row><td>mod_aspdotnet2.2</td><td>UpgradeCode</td><td>{9E4E662E-946B-42E1-AFC0-74C648A1A11C}</td></row> @@ -1946,8 +1944,6 @@ <col def="S255">DotNetBuildConfiguration</col> <col def="S255">MsiCommandLine</col> <col def="I4">ISSetupPrerequisiteLocation</col> - <row><td>Debug</td><td>Default Configuration</td><td><ISProjectFolder>\Debug</td><td>PackageName</td><td>1</td><td>1033</td><td>2</td><td>2</td><td>Intel</td><td/><td>1033</td><td>3</td><td>0</td><td>0</td><td>0</td><td/><td>0</td><td/><td>MediaLocation</td><td/><td>http://</td><td/><td/><td/><td/><td>75789</td><td/><td/><td/><td/></row> - <row><td>Release</td><td>Default Configuration</td><td><ReleaseBinaryFolder></td><td>PackageName</td><td>1</td><td>1033</td><td>2</td><td>2</td><td>Intel</td><td/><td>1033</td><td>3</td><td>0</td><td>0</td><td>0</td><td/><td>0</td><td/><td>MediaLocation</td><td/><td>http://</td><td/><td/><td/><td/><td>75789</td><td/><td/><td/><td/></row> <row><td>Release</td><td>mod_aspdotnet2.0</td><td><ReleaseBinaryFolder></td><td>PackageName</td><td>1</td><td>1033</td><td>2</td><td>1</td><td>Intel</td><td/><td>1033</td><td>0</td><td>0</td><td>1</td><td>0</td><td/><td>0</td><td/><td>MediaLocation</td><td/><td>http://</td><td/><td/><td/><td/><td>139276</td><td/><td/><td/><td/></row> <row><td>Release</td><td>mod_aspdotnet2.2</td><td><ReleaseBinaryFolder></td><td>PackageName</td><td>1</td><td>1033</td><td>2</td><td>1</td><td>Intel</td><td/><td>1033</td><td>0</td><td>0</td><td>1</td><td>0</td><td/><td>0</td><td/><td>MediaLocation</td><td/><td>http://</td><td/><td/><td/><td/><td>139276</td><td/><td/><td/><td/></row> </table> @@ -1991,10 +1987,8 @@ <col def="S255">WinMsi30Url</col> <col def="S255">CertPassword</col> <row><td>.msi Installer</td><td>mod_aspdotnet2.0</td><td>0</td><td>http://</td><td>0</td><td>install</td><td>install</td><td>[WindowsFolder]Downloaded Installations</td><td>0</td><td>http://www.installengine.com/Msiengine20</td><td>http://www.installengine.com/Msiengine20</td><td>0</td><td>http://www.installengine.com/cert05/isengine</td><td/><td/><td/><td/><td>3</td><td>http://www.installengine.com/cert05/dotnetfx</td><td/><td/><td/><td/><td/><td/><td/><td>3</td><td/><td/><td/></row> - <row><td>Debug</td><td>Default Configuration</td><td>0</td><td>http://</td><td>0</td><td>install</td><td>install</td><td>[WindowsFolder]Downloaded Installations</td><td>0</td><td>http://www.installengine.com/Msiengine20</td><td>http://www.installengine.com/Msiengine20</td><td>0</td><td>http://www.installengine.com/cert05/isengine</td><td/><td/><td/><td/><td>3</td><td>http://www.installengine.com/cert05/dotnetfx</td><td/><td/><td/><td/><td/><td/><td/><td>3</td><td>4</td><td/><td/></row> - <row><td>Release</td><td>Default Configuration</td><td>0</td><td>http://</td><td>0</td><td>install</td><td>install</td><td>[WindowsFolder]Downloaded Installations</td><td>0</td><td>http://www.installengine.com/Msiengine20</td><td>http://www.installengine.com/Msiengine20</td><td>0</td><td>http://www.installengine.com/cert05/isengine</td><td/><td/><td/><td/><td>3</td><td>http://www.installengine.com/cert05/dotnetfx</td><td/><td/><td/><td/><td/><td/><td/><td>3</td><td>4</td><td/><td/></row> - <row><td>Release</td><td>mod_aspdotnet2.0</td><td>0</td><td>http://</td><td>0</td><td>install</td><td>install</td><td>[WindowsFolder]Downloaded Installations</td><td>0</td><td>http://www.installengine.com/Msiengine20</td><td>http://www.installengine.com/Msiengine20</td><td>0</td><td>http://www.installengine.com/cert05/isengine</td><td/><td/><td/><td/><td>3</td><td>http://www.installengine.com/cert05/dotnetfx</td><td>1</td><td>1033</td><td/><td/><td/><td/><td/><td>3</td><td>4</td><td/><td/></row> - <row><td>Release</td><td>mod_aspdotnet2.2</td><td>0</td><td>http://</td><td>0</td><td>install</td><td>install</td><td>[WindowsFolder]Downloaded Installations</td><td>0</td><td>http://www.installengine.com/Msiengine20</td><td>http://www.installengine.com/Msiengine20</td><td>0</td><td>http://www.installengine.com/cert05/isengine</td><td/><td/><td/><td/><td>3</td><td>http://www.installengine.com/cert05/dotnetfx</td><td>1</td><td>1033</td><td/><td/><td/><td/><td>16</td><td>3</td><td>4</td><td/><td/></row> + <row><td>Release</td><td>mod_aspdotnet2.0</td><td>0</td><td>http://</td><td>0</td><td>install</td><td>install</td><td>[WindowsFolder]Downloaded Installations</td><td>0</td><td>http://www.installengine.com/Msiengine20</td><td>http://www.installengine.com/Msiengine20</td><td>0</td><td>http://www.installengine.com/cert05/isengine</td><td/><td/><td/><td/><td>3</td><td>http://www.installengine.com/cert05/dotnetfx</td><td>2</td><td>1033</td><td/><td/><td/><td/><td/><td>3</td><td>4</td><td/><td/></row> + <row><td>Release</td><td>mod_aspdotnet2.2</td><td>0</td><td>http://</td><td>0</td><td>install</td><td>install</td><td>[WindowsFolder]Downloaded Installations</td><td>0</td><td>http://www.installengine.com/Msiengine20</td><td>http://www.installengine.com/Msiengine20</td><td>0</td><td>http://www.installengine.com/cert05/isengine</td><td/><td/><td/><td/><td>3</td><td>http://www.installengine.com/cert05/dotnetfx</td><td>2</td><td>1033</td><td/><td/><td/><td/><td>16</td><td>3</td><td>4</td><td/><td/></row> </table> <table name="ISReleasePublishInfo"> @@ -3063,8 +3057,8 @@ <row><td>IDS__TargetReq_DESC_RESOLUTION</td><td>1033</td><td>The screen resolution is not adequate for running [ProductName].</td><td>0</td><td/><td>-1021924763</td></row> <row><td>ID_STRING1</td><td>1033</td><td/><td>0</td><td/><td>865759893</td></row> <row><td>ID_STRING2</td><td>1033</td><td>The install path must be an installed Apache HTTP Server path. [1] was not a valid path to Apache.</td><td>0</td><td/><td>1687578668</td></row> - <row><td>ID_STRING3</td><td>1033</td><td>mod_aspdotnet for Apache 2.0</td><td>0</td><td/><td>865761524</td></row> - <row><td>ID_STRING4</td><td>1033</td><td>mod_aspdotnet for Apache 2.2</td><td>0</td><td/><td>865736980</td></row> + <row><td>ID_STRING3</td><td>1033</td><td>mod_aspdotnet for .NET 2.0 / Apache 2.0</td><td>0</td><td/><td>-1810154639</td></row> + <row><td>ID_STRING4</td><td>1033</td><td>mod_aspdotnet for .NET 2.0 / Apache 2.2</td><td>0</td><td/><td>-1810164879</td></row> <row><td>ID_STRING6</td><td>1033</td><td>http://sourceforge.net/projects/mod-aspdotnet</td><td>0</td><td/><td>865757492</td></row> <row><td>NEW_STRING1</td><td>1033</td><td>[ProductName] Installer Information</td><td>0</td><td/><td>1687606380</td></row> <row><td>NEW_STRING6</td><td>1033</td><td>[INSTALLDIR] is not a valid path to an installed instance of Apache.</td><td>0</td><td/><td>1687569580</td></row> @@ -3273,8 +3267,8 @@ <row><td>ActiveLanguage</td><td>1033</td></row> <row><td>ApplicationType</td><td>Apache HTTP Server Module</td></row> <row><td>Comments</td><td/></row> - <row><td>CurrentMedia</td><td dt:dt="bin.base64" md5="a562d2a626f13ad139eb2cf318fa2693"> -UgBlAGwAZQBhAHMAZQABAG0AbwBkAF8AYQBzAHAAZABvAHQAbgBlAHQAMgAuADAA + <row><td>CurrentMedia</td><td dt:dt="bin.base64" md5="01740888d717c3579162e8ff829c3fed"> +UgBlAGwAZQBhAHMAZQABAG0AbwBkAF8AYQBzAHAAZABvAHQAbgBlAHQAMgAuADIA </td></row> <row><td>DefaultProductConfiguration</td><td>mod_aspdotnet</td></row> <row><td>ISCompilerOption_Debug</td><td>1</td></row> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2007-09-21 14:36:32
|
Revision: 214 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=214&view=rev Author: wrowe Date: 2007-09-21 07:36:29 -0700 (Fri, 21 Sep 2007) Log Message: ----------- Some style simplifications for the site Modified Paths: -------------- mod_aspdotnet/trunk/docs/index.html mod_aspdotnet/trunk/docs/introduction.html mod_aspdotnet/trunk/docs/manual.css Modified: mod_aspdotnet/trunk/docs/index.html =================================================================== --- mod_aspdotnet/trunk/docs/index.html 2007-08-18 01:41:18 UTC (rev 213) +++ mod_aspdotnet/trunk/docs/index.html 2007-09-21 14:36:29 UTC (rev 214) @@ -11,6 +11,9 @@ <title>Summary of mod-aspdotnet on SourceForge</title> </head> <body bgcolor="#ffffff" text="#000000" link="#525D76"> +<div id="page-header"> +<p class="apache">mod_aspdotnet module for Apache HTTP Server 2.x</p> +</div> <!-- <p><a href="/"><img src="../images/logo_wide.gif" border="0" alt="The mod-aspdotnet Project on SourceForge" /></a></p> --> <table border="0" width="100%" cellspacing="4"> @@ -22,7 +25,7 @@ <li><a href="http://mod-aspdotnet.sourceforge.net/">Summary</a></li> <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li> <li><a href="http://mod-aspdotnet.sourceforge.net/mod_aspdotnet.html">Reference</a></li> - <li><a href="http://sourceforge.net/project/showfiles.php?group_id=175077">Download</a></li> + <li><a href="http://sourceforge.net/project/platformdownload.php?group_id=175077&sel_platform=1390">Download</a></li> <li><a href="http://mod-aspdotnet.sourceforge.net/verify/">Verify</a></li> </menu> <p><b>Project</b></p> @@ -34,29 +37,35 @@ </menu> </td> <!-- RIGHT SIDE INFORMATION --> - <td align="left" valign="top"> -<h2>Read This First</h2> -<p>mod_aspdotnet is a module for Apache HTTP Server 2.0.44 or later, running -on Windows, Windows NT Service Pack 6 or later (including 2000, 2003, and XP) -with the .NET Framework 1.1 (or 1.0), including Microsoft's ASP.NET hosting -framework. It was originally developed by Covalent Technologies, lived for -a time at the Apache Software Foundation and is now maintained by the +<td><table border="0" cellspacing="0" cellpadding="2" width="100%"> + <tr><td bgcolor="#525D76"> + <font color="#ffffff" face="arial,helvetica,sanserif"> + <a name="Server"><strong>Read This First</strong></a> + </font> + </td></tr> + <tr><td align="left" valign="top"> + +<p class="indent">mod_aspdotnet is a module for Apache HTTP Server 2.0.44 or +later, running on Windows, Windows NT Service Pack 6 or later (including 2000, +2003, XP and Vista) with the .NET Framework 1.1 (or 1.0), including Microsoft's +ASP.NET hosting framework. It was originally developed by Covalent Technologies, +lived for a time at the Apache Software Foundation and is now maintained by the <a href="http://sourceforge.net/projects/mod-aspdotnet">mod-aspdotnet project</a> hosted on SourceForge and sponsored by Covalent Technologies. It is not known to work on non-Windows platforms, with earlier versions of Apache, or 2.0 and later versions of the .NET framework. Consult the project's pages for more details.</p> -<p>mod_aspdotnet is available as an .msi for you to get running out of -the box. Simply ensure you have installed Apache HTTP Server 2.0 or 2.2 +<p class="indent">mod_aspdotnet is available as an .msi for you to get running +out of the box. Simply ensure you have installed Apache HTTP Server 2.0 or 2.2 first, and also the Microsoft .NET Framework 1.1, before you attempt to install it. Two flavors are provided, one for Apache 2.0 (2.0.44 or later) and the other for Apache 2.2. A new flavor will be required for later version of Apache web server.</p> -<p>The -src.zip files contain the sources of this module. It is not -trivial to build and run without a bit of understanding, it is much +<p class="indent">The -src.zip files contain the sources of this module. +It is not trivial to build and run without a bit of understanding, it is much easier for most users to simply install the .msi. Note that at present, it can only be built under Microsoft Visual Studio .NET (2002), and not the later 2003 or 2005 Studio products, due to major changes in the way @@ -66,10 +75,11 @@ to helping contribute to the mod-aspdotnet project! Or stay tuned for the availability of the .NET 2.0 flavor.</p> -<p>We have an <a href="introduction.html">introduction</a> to help you get -started, and a <a href="mod_aspdotnet.html">module reference</a> to detail -the particulars of configuring the module.</p> +<p class="indent">We have an <a href="introduction.html">introduction</a> to +help you get started, and a <a href="mod_aspdotnet.html">module reference</a> +to detail the particulars of configuring the module.</p> +</td></tr></table> </td> </tr> <!-- FOOTER --> Modified: mod_aspdotnet/trunk/docs/introduction.html =================================================================== --- mod_aspdotnet/trunk/docs/introduction.html 2007-08-18 01:41:18 UTC (rev 213) +++ mod_aspdotnet/trunk/docs/introduction.html 2007-09-21 14:36:29 UTC (rev 214) @@ -11,6 +11,9 @@ <title>Introduction to mod_aspdotnet - from mod-aspdotnet on SourceForge</title> </head> <body bgcolor="#ffffff" text="#000000" link="#525D76"> +<div id="page-header"> +<p class="apache">mod_aspdotnet module for Apache HTTP Server 2.x</p> +</div> <!-- <p><a href="/"><img src="../images/logo_wide.gif" border="0" alt="The mod-aspdotnet Project on SourceForge" /></a></p> --> <table border="0" width="100%" cellspacing="4"> @@ -22,7 +25,7 @@ <li><a href="http://mod-aspdotnet.sourceforge.net/">Summary</a></li> <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li> <li><a href="http://mod-aspdotnet.sourceforge.net/mod_aspdotnet.html">Reference</a></li> - <li><a href="http://sourceforge.net/project/showfiles.php?group_id=175077">Download</a></li> + <li><a href="http://sourceforge.net/project/platformdownload.php?group_id=175077&sel_platform=1390">Download</a></li> <li><a href="http://mod-aspdotnet.sourceforge.net/verify/">Verify</a></li> </menu> <p><b>Project</b></p> @@ -42,28 +45,26 @@ </font> </td></tr> <tr><td> - <blockquote> -<p>The Apache HTTP Server is a robust implementation of an HTTP/1.1 server -which runs on Windows, various flavors of unix and other modern operating -systems. It is a modular framework, which allows modules supporting various -features to be loaded, or not, as required by the administrator.</p> +<p class="indent">The Apache HTTP Server is a robust implementation of an +HTTP/1.1 server which runs on Windows, various flavors of unix and other modern +operating systems. It is a modular framework, which allows modules supporting +various features to be loaded, or not, as required by the administrator.</p> -<p>The mod_aspdotnet module is provided only for the Windows operating system, -and this module won't work for the other operating systems. See the -<a href="http://sourceforge.net/projects/mod-aspdotnet/">mod-aspdotnet project +<p class="indent">The mod_aspdotnet module is provided only for the Windows +operating system, and this module won't work for the other operating systems. +See the <a href="http://mod-aspdotnet.sourceforge.net/">mod-aspdotnet project page</a> for alternatives available to users of other operating systems.</p> -<p>This document will introduce you to all of the key concepts you might be -unfamiliar with, introduce you to mod_aspdotnet and the purpose it serves, -and what you can accomplish with it. This document is a work in progress, -feedback is welcome at the users mailing list.</p> +<p class="indent">This document will introduce you to all of the key concepts +you might be unfamiliar with, introduce you to mod_aspdotnet and the purpose +it serves, and what you can accomplish with it. This document is a work in +progress, feedback is welcome at the users mailing list.</p> -<p>See <a href="http://sourceforge.net/projects/mod-aspdotnet">mod-aspdotnet -Project Pages</a> for information about mailing lists, other resources and -how to participate in these ongoing efforts!</p> +<p class="indent">See <a href="http://sourceforge.net/projects/mod-aspdotnet" +>mod-aspdotnet Project Pages</a> for information about mailing lists, other +resources and how to participate in these ongoing efforts!</p> - </blockquote> </td></tr> </table> <table border="0" cellspacing="0" cellpadding="2" width="100%"> @@ -73,28 +74,27 @@ </font> </td></tr> <tr><td> - <blockquote> -<p>Microsoft's marketing of .NET is a vision encompasing a wide spectrum of -technologies, not one specific new technology. This leads to much confusion -about .NET development, and what web development under .NET really entails.</p> +<p class="indent">Microsoft's marketing of .NET is a vision encompasing a wide +spectrum of technologies, not one specific new technology. This leads to much +confusion about .NET development, and what web development under .NET really +entails.</p> -<p>The deepest underpinning of .NET is a new program execution model, the CLR -(Common Language Runtime), which hosts IL (Intermediate Language) code. -This model is very similar to Java's JVM running .class'es compiled into -Java bytecode. Far different than the classic interpreted script (such as -Perl) or compiled machine code (such as C or C++), the CLR enforces rules -to ensure code trust, machine security and data integrity. Many languages -are already available for writing code to run within the CLR, including -C#, and Microsoft's C++.NET, VisualBasic.NET and J#. Many third party -companies are bringing additional languages to the .NET managed code world, -there are more than 20 different languages shipping today.</p> +<p class="indent">The deepest underpinning of .NET is a new program execution +model, the CLR (Common Language Runtime), which hosts IL (Intermediate +Language) code. This model is very similar to Java's JVM running .class'es +compiled into Java bytecode. Far different than the classic interpreted +script (such as Perl) or compiled machine code (such as C or C++), the CLR +enforces rules to ensure code trust, machine security and data integrity. +Many languages are already available for writing code to run within the CLR, +including C#, and Microsoft's C++.NET, VisualBasic.NET and J#. Many third +party companies are bringing additional languages to the .NET managed code +world, there are more than 20 different languages shipping today.</p> -<p>Microsoft's .NET Framework includes many core facilities, packaged as -language-agnostic classes that can be generally used by any .NET language. -It includes the C# compiler, and the ASP.NET related classes.</p> +<p class="indent">Microsoft's .NET Framework includes many core facilities, +packaged as language-agnostic classes that can be generally used by any .NET +language. It includes the C# compiler, and the ASP.NET related classes.</p> - </blockquote> </td></tr> </table> <table border="0" cellspacing="0" cellpadding="2" width="100%"> @@ -104,27 +104,25 @@ </font> </td></tr> <tr><td> - <blockquote> -<p>ASP.NET (known inside the .NET framework as System.Web) is a hosting -environment for web applications that provides facilities to query and -collect information about the current request, prepare the response, and -maintain session state information. ASP.NET simplifies the chore of -building web applications down to the essential task of generating and -serving content.</p> +<p class="indent">ASP.NET (known inside the .NET framework as System.Web) is +a hosting environment for web applications that provides facilities to query +and collect information about the current request, prepare the response, and +maintain session state information. ASP.NET simplifies the chore of building +web applications down to the essential task of generating and serving +content.</p> -<p>The converse question, "are ASP.NET and ASP the same thing?", deserves -a resounding answer of <strong>NO</strong>. Although in some respects +<p class="indent">The converse question, "are ASP.NET and ASP the same thing?", +deserves a resounding answer of <strong>NO</strong>. Although in some respects they offer similar facilities, they have no relation to each other. mod_aspdotnet only provides the ASP.NET environment, and does nothing for ASP content. Simply put, ASP.NET has replaced ASP, and ASP runs in its own environment(s), (one per scripting language) and not inside the .NET framework.</p> -<p>If you have ASP pages to serve, consider porting them to ASP.NET. -There are many fine books and online guides to assist you.</p> +<p class="indent">If you have ASP pages to serve, consider porting them to +ASP.NET. There are many fine books and online guides to assist you.</p> - </blockquote> </td></tr> </table> <table border="0" cellspacing="0" cellpadding="2" width="100%"> @@ -134,43 +132,41 @@ </font> </td></tr> <tr><td> - <blockquote> -<p>This is actually two modules; the first, mod_aspdotnet.so, is an in-process -Apache 2.0 or 2.2 module, which starts the ASP.NET engine and hands off requests -to the ASP.NET engine. There is a second module compiled for .NET, which -is named Apache.Web.dll. The Apache.Web.dll is loaded into Microsoft's ASP.NET -host environment, and dispatches request and response operations back to -the mod_aspdotnet.so. This combination of managed (.NET-side) and -unmanaged (Apache-side) code, running in the same process as the Apache 2.0 -server, attains very optimal performance for serving ASP.NET content. The -solution maintains tight compatibility with existing, IIS-hosted ASP.NET, -because the same Microsoft ASP.NET hosting environment is running under -either of these scenarios.</p> +<p class="indent">This is actually two modules; the first, mod_aspdotnet.so, is +an in-process Apache 2.0 or 2.2 module, which starts the ASP.NET engine and +hands off requests to the ASP.NET engine. There is a second module compiled +for .NET, which is named Apache.Web.dll. The Apache.Web.dll is loaded into +Microsoft's ASP.NET host environment, and dispatches request and response +operations back to the mod_aspdotnet.so. This combination of managed +(.NET-side) and unmanaged (Apache-side) code, running in the same process as +the Apache 2.0 server, attains very optimal performance for serving ASP.NET +content. The solution maintains tight compatibility with existing, IIS-hosted +ASP.NET, because the same Microsoft ASP.NET hosting environment is running +under either of these scenarios.</p> -<p>Multiple ASP.NET virtual webs are supported by the mod_aspdotnet module. -A request is directed to the asp.net handler using conventional Apache -configuration options, and is mapped to a specific ASP.NET virtual web by -matching the requested URI to the AspNetMount directives given for the -specific Apache virtual host, uri, and file location. The same AspNetMount -can be given in multiple Apache virtual hosts. Any given AspNetMount is -created only once for all Apache virtual hosts that share the same AspNetMount, -conserving memory and resources.</p> +<p class="indent">Multiple ASP.NET virtual webs are supported by the +mod_aspdotnet module. A request is directed to the asp.net handler using +conventional Apache configuration options, and is mapped to a specific ASP.NET +virtual web by matching the requested URI to the AspNetMount directives given +for the specific Apache virtual host, uri, and file location. The same +AspNetMount can be given in multiple Apache virtual hosts. Any given +AspNetMount is created only once for all Apache virtual hosts that share the +same AspNetMount, conserving memory and resources.</p> -<p>AspNetMount and other directive changes are processed when the server is -restarted. With Apache 2.0, the original Windows child process continues to -serve requests until a new child process is ready to process requests itself. -This provides minimal interruption of service when modifying the web server -configuration. The restart option begins a graceful restart sequence, loading -and initializing the new server while the old server finishes fulfilling open -requests, and there is no interruption in web services during the transition -from the old to the new configuration.</p> +<p class="indent">AspNetMount and other directive changes are processed when +the server is restarted. With Apache 2.0, the original Windows child process +continues to serve requests until a new child process is ready to process +requests itself. This provides minimal interruption of service when modifying +the web server configuration. The restart option begins a graceful restart +sequence, loading and initializing the new server while the old server finishes +fulfilling open requests, and there is no interruption in web services during +the transition from the old to the new configuration.</p> -<p>This is not a module for Unix platforms. The Mono project's mod_mono -provides very similar features for non-Win32 machines, with their own +<p class="indent">This is not a module for Unix platforms. The Mono project's +mod_mono provides very similar features for non-Win32 machines, with their own implementation of ASP.NET for Apache httpd server.</p> - </blockquote> </td></tr> </table> <table border="0" cellspacing="0" cellpadding="2" width="100%"> @@ -180,25 +176,23 @@ </font> </td></tr> <tr><td> - <blockquote> -<p>Microsoft's .NET Framework is available as a free download for Windows 2000 -or 2003 Professional and Server versions, XP Professional, and .NET Server -platforms from +<p class="indent">Microsoft's .NET Framework is available as a free download +for Windows 2000 or 2003 Professional and Server versions, XP Professional, +and .NET Server platforms from <a href="http://asp.net/download.aspx">http://asp.net/download.aspx</a>. You must minimally install the .NET Framework Resdistributable version, while developers will prefer to install the .NET Framework Software Development Kit, or another .NET development tool such as VisualStudio .NET.</p> -<p>Once you download and install the mod_aspdotnet .msi package, it will -install both mod_aspdotnet.so into your Apache2/modules/ directory, and the -Apache.Web.dll into the Global Assembly Cache. You then need to modify your -Apache2/conf/httpd.conf file to load the mod_aspdotnet.so module, and declare -what content you will serve. See the <a href="mod_aspdotnet">mod_aspdotnet</a> -module documentation for the directives to add for a typical scenario, or -follow the Example below.</p> +<p class="indent">Once you download and install the mod_aspdotnet .msi package, +it will install both mod_aspdotnet.so into your Apache2/modules/ directory, and +the Apache.Web.dll into the Global Assembly Cache. You then need to modify +your Apache2/conf/httpd.conf file to load the mod_aspdotnet.so module, and +declare what content you will serve. See the <a href="mod_aspdotnet.html" +>mod_aspdotnet</a>module documentation for the directives to add for a typical +scenario, or follow the Example below.</p> - </blockquote> </td></tr> </table> <table border="0" cellspacing="0" cellpadding="2" width="100%"> @@ -208,16 +202,16 @@ </font> </td></tr> <tr><td> - <blockquote> -<p>The following configuration will support the Microsoft IBuySpy sample, an -illustration of a web storefront. IBuySpy is available as a free download -from <a href="http://asp.net/ibuyspy/">http://asp.net/ibuyspy/</a>. Note that +<p class="indent">The following configuration will support the Microsoft +IBuySpy sample, an illustration of a web storefront. IBuySpy is available +as a free download from <a href="http://asp.net/ibuyspy/">http://asp.net/ibuyspy/</a>. Note that Microsoft SQL Server version 7.0 must be installed before installing the Microsoft IBuySpy sample. The configuration below illustrates configuration for the C# flavor of the IBuySpy Store sample, installed into the default installation directory:</p> + <div class="example"> <pre> LoadModule aspdotnet_module modules/mod_aspdotnet.so @@ -256,10 +250,10 @@ </IfModule> </pre> -<p>Configuring the VisualBasic.NET version is very similar, simply change the + </div> +<p class="indent">Configuring the VisualBasic.NET version is very similar, simply change the <code>StoreCSVS</code> directory names above, to <code>StoreVBVS</code>.</p> - </blockquote> </td></tr> </table> </td> Modified: mod_aspdotnet/trunk/docs/manual.css =================================================================== --- mod_aspdotnet/trunk/docs/manual.css 2007-08-18 01:41:18 UTC (rev 213) +++ mod_aspdotnet/trunk/docs/manual.css 2007-09-21 14:36:29 UTC (rev 214) @@ -692,7 +692,7 @@ div#page-header p.apache { background-color: #405871; color: #fff; - padding: 0 0 0 248px; + padding: 0 0 0 0; margin: 0; text-align: center; vertical-align: middle; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2007-08-18 01:41:20
|
Revision: 213 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=213&view=rev Author: wrowe Date: 2007-08-17 18:41:18 -0700 (Fri, 17 Aug 2007) Log Message: ----------- Follow intro style Modified Paths: -------------- mod_aspdotnet2/trunk/docs/index.html Modified: mod_aspdotnet2/trunk/docs/index.html =================================================================== --- mod_aspdotnet2/trunk/docs/index.html 2007-08-18 00:41:46 UTC (rev 212) +++ mod_aspdotnet2/trunk/docs/index.html 2007-08-18 01:41:18 UTC (rev 213) @@ -37,29 +37,35 @@ </menu> </td> <!-- RIGHT SIDE INFORMATION --> - <td align="left" valign="top"> -<h2>Read This First</h2> -<p>mod_aspdotnet is a module for Apache HTTP Server 2.0.44 or later, running -on Windows, Windows NT Service Pack 6 or later (including 2000, 2003, and XP) -with the .NET Framework 1.1 (or 1.0), including Microsoft's ASP.NET hosting -framework. It was originally developed by Covalent Technologies, lived for -a time at the Apache Software Foundation and is now maintained by the +<td><table border="0" cellspacing="0" cellpadding="2" width="100%"> + <tr><td bgcolor="#525D76"> + <font color="#ffffff" face="arial,helvetica,sanserif"> + <a name="Server"><strong>Read This First</strong></a> + </font> + </td></tr> + <tr><td align="left" valign="top"> + +<p class="indent">mod_aspdotnet is a module for Apache HTTP Server 2.0.44 or +later, running on Windows, Windows NT Service Pack 6 or later (including 2000, +2003, XP and Vista) with the .NET Framework 1.1 (or 1.0), including Microsoft's +ASP.NET hosting framework. It was originally developed by Covalent Technologies, +lived for a time at the Apache Software Foundation and is now maintained by the <a href="http://sourceforge.net/projects/mod-aspdotnet">mod-aspdotnet project</a> hosted on SourceForge and sponsored by Covalent Technologies. It is not known to work on non-Windows platforms, with earlier versions of Apache, or 2.0 and later versions of the .NET framework. Consult the project's pages for more details.</p> -<p>mod_aspdotnet is available as an .msi for you to get running out of -the box. Simply ensure you have installed Apache HTTP Server 2.0 or 2.2 +<p class="indent">mod_aspdotnet is available as an .msi for you to get running +out of the box. Simply ensure you have installed Apache HTTP Server 2.0 or 2.2 first, and also the Microsoft .NET Framework 1.1, before you attempt to install it. Two flavors are provided, one for Apache 2.0 (2.0.44 or later) and the other for Apache 2.2. A new flavor will be required for later version of Apache web server.</p> -<p>The -src.zip files contain the sources of this module. It is not -trivial to build and run without a bit of understanding, it is much +<p class="indent">The -src.zip files contain the sources of this module. +It is not trivial to build and run without a bit of understanding, it is much easier for most users to simply install the .msi. Note that at present, it can only be built under Microsoft Visual Studio .NET (2002), and not the later 2003 or 2005 Studio products, due to major changes in the way @@ -69,10 +75,11 @@ to helping contribute to the mod-aspdotnet project! Or stay tuned for the availability of the .NET 2.0 flavor.</p> -<p>We have an <a href="introduction.html">introduction</a> to help you get -started, and a <a href="mod_aspdotnet.html">module reference</a> to detail -the particulars of configuring the module.</p> +<p class="indent">We have an <a href="introduction.html">introduction</a> to +help you get started, and a <a href="mod_aspdotnet.html">module reference</a> +to detail the particulars of configuring the module.</p> +</td></tr></table> </td> </tr> <!-- FOOTER --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2007-08-18 00:41:48
|
Revision: 212 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=212&view=rev Author: wrowe Date: 2007-08-17 17:41:46 -0700 (Fri, 17 Aug 2007) Log Message: ----------- Prettify, somewhat. Modified Paths: -------------- mod_aspdotnet2/trunk/docs/index.html mod_aspdotnet2/trunk/docs/introduction.html mod_aspdotnet2/trunk/docs/manual.css Modified: mod_aspdotnet2/trunk/docs/index.html =================================================================== --- mod_aspdotnet2/trunk/docs/index.html 2007-08-17 23:56:15 UTC (rev 211) +++ mod_aspdotnet2/trunk/docs/index.html 2007-08-18 00:41:46 UTC (rev 212) @@ -11,6 +11,9 @@ <title>Summary of mod-aspdotnet on SourceForge</title> </head> <body bgcolor="#ffffff" text="#000000" link="#525D76"> +<div id="page-header"> +<p class="apache">mod_aspdotnet module for Apache HTTP Server 2.x</p> +</div> <!-- <p><a href="/"><img src="../images/logo_wide.gif" border="0" alt="The mod-aspdotnet Project on SourceForge" /></a></p> --> <table border="0" width="100%" cellspacing="4"> Modified: mod_aspdotnet2/trunk/docs/introduction.html =================================================================== --- mod_aspdotnet2/trunk/docs/introduction.html 2007-08-17 23:56:15 UTC (rev 211) +++ mod_aspdotnet2/trunk/docs/introduction.html 2007-08-18 00:41:46 UTC (rev 212) @@ -11,6 +11,9 @@ <title>Introduction to mod_aspdotnet - from mod-aspdotnet on SourceForge</title> </head> <body bgcolor="#ffffff" text="#000000" link="#525D76"> +<div id="page-header"> +<p class="apache">mod_aspdotnet module for Apache HTTP Server 2.x</p> +</div> <!-- <p><a href="/"><img src="../images/logo_wide.gif" border="0" alt="The mod-aspdotnet Project on SourceForge" /></a></p> --> <table border="0" width="100%" cellspacing="4"> @@ -42,28 +45,26 @@ </font> </td></tr> <tr><td> - <blockquote> -<p>The Apache HTTP Server is a robust implementation of an HTTP/1.1 server -which runs on Windows, various flavors of unix and other modern operating -systems. It is a modular framework, which allows modules supporting various -features to be loaded, or not, as required by the administrator.</p> +<p class="indent">The Apache HTTP Server is a robust implementation of an +HTTP/1.1 server which runs on Windows, various flavors of unix and other modern +operating systems. It is a modular framework, which allows modules supporting +various features to be loaded, or not, as required by the administrator.</p> -<p>The mod_aspdotnet module is provided only for the Windows operating system, -and this module won't work for the other operating systems. See the -<a href="http://sourceforge.net/projects/mod-aspdotnet/">mod-aspdotnet project +<p class="indent">The mod_aspdotnet module is provided only for the Windows +operating system, and this module won't work for the other operating systems. +See the <a href="http://mod-aspdotnet.sourceforge.net/">mod-aspdotnet project page</a> for alternatives available to users of other operating systems.</p> -<p>This document will introduce you to all of the key concepts you might be -unfamiliar with, introduce you to mod_aspdotnet and the purpose it serves, -and what you can accomplish with it. This document is a work in progress, -feedback is welcome at the users mailing list.</p> +<p class="indent">This document will introduce you to all of the key concepts +you might be unfamiliar with, introduce you to mod_aspdotnet and the purpose +it serves, and what you can accomplish with it. This document is a work in +progress, feedback is welcome at the users mailing list.</p> -<p>See <a href="http://sourceforge.net/projects/mod-aspdotnet">mod-aspdotnet -Project Pages</a> for information about mailing lists, other resources and -how to participate in these ongoing efforts!</p> +<p class="indent">See <a href="http://sourceforge.net/projects/mod-aspdotnet" +>mod-aspdotnet Project Pages</a> for information about mailing lists, other +resources and how to participate in these ongoing efforts!</p> - </blockquote> </td></tr> </table> <table border="0" cellspacing="0" cellpadding="2" width="100%"> @@ -73,28 +74,27 @@ </font> </td></tr> <tr><td> - <blockquote> -<p>Microsoft's marketing of .NET is a vision encompasing a wide spectrum of -technologies, not one specific new technology. This leads to much confusion -about .NET development, and what web development under .NET really entails.</p> +<p class="indent">Microsoft's marketing of .NET is a vision encompasing a wide +spectrum of technologies, not one specific new technology. This leads to much +confusion about .NET development, and what web development under .NET really +entails.</p> -<p>The deepest underpinning of .NET is a new program execution model, the CLR -(Common Language Runtime), which hosts IL (Intermediate Language) code. -This model is very similar to Java's JVM running .class'es compiled into -Java bytecode. Far different than the classic interpreted script (such as -Perl) or compiled machine code (such as C or C++), the CLR enforces rules -to ensure code trust, machine security and data integrity. Many languages -are already available for writing code to run within the CLR, including -C#, and Microsoft's C++.NET, VisualBasic.NET and J#. Many third party -companies are bringing additional languages to the .NET managed code world, -there are more than 20 different languages shipping today.</p> +<p class="indent">The deepest underpinning of .NET is a new program execution +model, the CLR (Common Language Runtime), which hosts IL (Intermediate +Language) code. This model is very similar to Java's JVM running .class'es +compiled into Java bytecode. Far different than the classic interpreted +script (such as Perl) or compiled machine code (such as C or C++), the CLR +enforces rules to ensure code trust, machine security and data integrity. +Many languages are already available for writing code to run within the CLR, +including C#, and Microsoft's C++.NET, VisualBasic.NET and J#. Many third +party companies are bringing additional languages to the .NET managed code +world, there are more than 20 different languages shipping today.</p> -<p>Microsoft's .NET Framework includes many core facilities, packaged as -language-agnostic classes that can be generally used by any .NET language. -It includes the C# compiler, and the ASP.NET related classes.</p> +<p class="indent">Microsoft's .NET Framework includes many core facilities, +packaged as language-agnostic classes that can be generally used by any .NET +language. It includes the C# compiler, and the ASP.NET related classes.</p> - </blockquote> </td></tr> </table> <table border="0" cellspacing="0" cellpadding="2" width="100%"> @@ -104,27 +104,25 @@ </font> </td></tr> <tr><td> - <blockquote> -<p>ASP.NET (known inside the .NET framework as System.Web) is a hosting -environment for web applications that provides facilities to query and -collect information about the current request, prepare the response, and -maintain session state information. ASP.NET simplifies the chore of -building web applications down to the essential task of generating and -serving content.</p> +<p class="indent">ASP.NET (known inside the .NET framework as System.Web) is +a hosting environment for web applications that provides facilities to query +and collect information about the current request, prepare the response, and +maintain session state information. ASP.NET simplifies the chore of building +web applications down to the essential task of generating and serving +content.</p> -<p>The converse question, "are ASP.NET and ASP the same thing?", deserves -a resounding answer of <strong>NO</strong>. Although in some respects +<p class="indent">The converse question, "are ASP.NET and ASP the same thing?", +deserves a resounding answer of <strong>NO</strong>. Although in some respects they offer similar facilities, they have no relation to each other. mod_aspdotnet only provides the ASP.NET environment, and does nothing for ASP content. Simply put, ASP.NET has replaced ASP, and ASP runs in its own environment(s), (one per scripting language) and not inside the .NET framework.</p> -<p>If you have ASP pages to serve, consider porting them to ASP.NET. -There are many fine books and online guides to assist you.</p> +<p class="indent">If you have ASP pages to serve, consider porting them to +ASP.NET. There are many fine books and online guides to assist you.</p> - </blockquote> </td></tr> </table> <table border="0" cellspacing="0" cellpadding="2" width="100%"> @@ -134,43 +132,41 @@ </font> </td></tr> <tr><td> - <blockquote> -<p>This is actually two modules; the first, mod_aspdotnet.so, is an in-process -Apache 2.0 or 2.2 module, which starts the ASP.NET engine and hands off requests -to the ASP.NET engine. There is a second module compiled for .NET, which -is named Apache.Web.dll. The Apache.Web.dll is loaded into Microsoft's ASP.NET -host environment, and dispatches request and response operations back to -the mod_aspdotnet.so. This combination of managed (.NET-side) and -unmanaged (Apache-side) code, running in the same process as the Apache 2.0 -server, attains very optimal performance for serving ASP.NET content. The -solution maintains tight compatibility with existing, IIS-hosted ASP.NET, -because the same Microsoft ASP.NET hosting environment is running under -either of these scenarios.</p> +<p class="indent">This is actually two modules; the first, mod_aspdotnet.so, is +an in-process Apache 2.0 or 2.2 module, which starts the ASP.NET engine and +hands off requests to the ASP.NET engine. There is a second module compiled +for .NET, which is named Apache.Web.dll. The Apache.Web.dll is loaded into +Microsoft's ASP.NET host environment, and dispatches request and response +operations back to the mod_aspdotnet.so. This combination of managed +(.NET-side) and unmanaged (Apache-side) code, running in the same process as +the Apache 2.0 server, attains very optimal performance for serving ASP.NET +content. The solution maintains tight compatibility with existing, IIS-hosted +ASP.NET, because the same Microsoft ASP.NET hosting environment is running +under either of these scenarios.</p> -<p>Multiple ASP.NET virtual webs are supported by the mod_aspdotnet module. -A request is directed to the asp.net handler using conventional Apache -configuration options, and is mapped to a specific ASP.NET virtual web by -matching the requested URI to the AspNetMount directives given for the -specific Apache virtual host, uri, and file location. The same AspNetMount -can be given in multiple Apache virtual hosts. Any given AspNetMount is -created only once for all Apache virtual hosts that share the same AspNetMount, -conserving memory and resources.</p> +<p class="indent">Multiple ASP.NET virtual webs are supported by the +mod_aspdotnet module. A request is directed to the asp.net handler using +conventional Apache configuration options, and is mapped to a specific ASP.NET +virtual web by matching the requested URI to the AspNetMount directives given +for the specific Apache virtual host, uri, and file location. The same +AspNetMount can be given in multiple Apache virtual hosts. Any given +AspNetMount is created only once for all Apache virtual hosts that share the +same AspNetMount, conserving memory and resources.</p> -<p>AspNetMount and other directive changes are processed when the server is -restarted. With Apache 2.0, the original Windows child process continues to -serve requests until a new child process is ready to process requests itself. -This provides minimal interruption of service when modifying the web server -configuration. The restart option begins a graceful restart sequence, loading -and initializing the new server while the old server finishes fulfilling open -requests, and there is no interruption in web services during the transition -from the old to the new configuration.</p> +<p class="indent">AspNetMount and other directive changes are processed when +the server is restarted. With Apache 2.0, the original Windows child process +continues to serve requests until a new child process is ready to process +requests itself. This provides minimal interruption of service when modifying +the web server configuration. The restart option begins a graceful restart +sequence, loading and initializing the new server while the old server finishes +fulfilling open requests, and there is no interruption in web services during +the transition from the old to the new configuration.</p> -<p>This is not a module for Unix platforms. The Mono project's mod_mono -provides very similar features for non-Win32 machines, with their own +<p class="indent">This is not a module for Unix platforms. The Mono project's +mod_mono provides very similar features for non-Win32 machines, with their own implementation of ASP.NET for Apache httpd server.</p> - </blockquote> </td></tr> </table> <table border="0" cellspacing="0" cellpadding="2" width="100%"> @@ -180,25 +176,23 @@ </font> </td></tr> <tr><td> - <blockquote> -<p>Microsoft's .NET Framework is available as a free download for Windows 2000 -or 2003 Professional and Server versions, XP Professional, and .NET Server -platforms from +<p class="indent">Microsoft's .NET Framework is available as a free download +for Windows 2000 or 2003 Professional and Server versions, XP Professional, +and .NET Server platforms from <a href="http://asp.net/download.aspx">http://asp.net/download.aspx</a>. You must minimally install the .NET Framework Resdistributable version, while developers will prefer to install the .NET Framework Software Development Kit, or another .NET development tool such as VisualStudio .NET.</p> -<p>Once you download and install the mod_aspdotnet .msi package, it will -install both mod_aspdotnet.so into your Apache2/modules/ directory, and the -Apache.Web.dll into the Global Assembly Cache. You then need to modify your -Apache2/conf/httpd.conf file to load the mod_aspdotnet.so module, and declare -what content you will serve. See the <a href="mod_aspdotnet">mod_aspdotnet</a> -module documentation for the directives to add for a typical scenario, or -follow the Example below.</p> +<p class="indent">Once you download and install the mod_aspdotnet .msi package, +it will install both mod_aspdotnet.so into your Apache2/modules/ directory, and +the Apache.Web.dll into the Global Assembly Cache. You then need to modify +your Apache2/conf/httpd.conf file to load the mod_aspdotnet.so module, and +declare what content you will serve. See the <a href="mod_aspdotnet.html" +>mod_aspdotnet</a>module documentation for the directives to add for a typical +scenario, or follow the Example below.</p> - </blockquote> </td></tr> </table> <table border="0" cellspacing="0" cellpadding="2" width="100%"> @@ -208,16 +202,16 @@ </font> </td></tr> <tr><td> - <blockquote> -<p>The following configuration will support the Microsoft IBuySpy sample, an -illustration of a web storefront. IBuySpy is available as a free download -from <a href="http://asp.net/ibuyspy/">http://asp.net/ibuyspy/</a>. Note that +<p class="indent">The following configuration will support the Microsoft +IBuySpy sample, an illustration of a web storefront. IBuySpy is available +as a free download from <a href="http://asp.net/ibuyspy/">http://asp.net/ibuyspy/</a>. Note that Microsoft SQL Server version 7.0 must be installed before installing the Microsoft IBuySpy sample. The configuration below illustrates configuration for the C# flavor of the IBuySpy Store sample, installed into the default installation directory:</p> + <div class="example"> <pre> LoadModule aspdotnet_module modules/mod_aspdotnet.so @@ -256,10 +250,10 @@ </IfModule> </pre> -<p>Configuring the VisualBasic.NET version is very similar, simply change the + </div> +<p class="indent">Configuring the VisualBasic.NET version is very similar, simply change the <code>StoreCSVS</code> directory names above, to <code>StoreVBVS</code>.</p> - </blockquote> </td></tr> </table> </td> Modified: mod_aspdotnet2/trunk/docs/manual.css =================================================================== --- mod_aspdotnet2/trunk/docs/manual.css 2007-08-17 23:56:15 UTC (rev 211) +++ mod_aspdotnet2/trunk/docs/manual.css 2007-08-18 00:41:46 UTC (rev 212) @@ -692,7 +692,7 @@ div#page-header p.apache { background-color: #405871; color: #fff; - padding: 0 0 0 248px; + padding: 0 0 0 0; margin: 0; text-align: center; vertical-align: middle; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2007-08-17 23:56:16
|
Revision: 211 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=211&view=rev Author: wrowe Date: 2007-08-17 16:56:15 -0700 (Fri, 17 Aug 2007) Log Message: ----------- unused files Removed Paths: ------------- mod_aspdotnet2/trunk/docs/manual-zip-100pc.css mod_aspdotnet2/trunk/docs/manual-zip.css Deleted: mod_aspdotnet2/trunk/docs/manual-zip-100pc.css =================================================================== --- mod_aspdotnet2/trunk/docs/manual-zip-100pc.css 2007-08-17 23:56:02 UTC (rev 210) +++ mod_aspdotnet2/trunk/docs/manual-zip-100pc.css 2007-08-17 23:56:15 UTC (rev 211) @@ -1,23 +0,0 @@ -@import url(manual-loose-100pc.css); - -/* Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -h1 { - margin: 0 0 0.5em 0; -} - -/* the end */ Deleted: mod_aspdotnet2/trunk/docs/manual-zip.css =================================================================== --- mod_aspdotnet2/trunk/docs/manual-zip.css 2007-08-17 23:56:02 UTC (rev 210) +++ mod_aspdotnet2/trunk/docs/manual-zip.css 2007-08-17 23:56:15 UTC (rev 211) @@ -1,24 +0,0 @@ -@import url(manual.css); - -/* Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -h1 { - margin: 0 0 0.5em 0; -} - -/* the end */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2007-08-17 23:56:05
|
Revision: 210 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=210&view=rev Author: wrowe Date: 2007-08-17 16:56:02 -0700 (Fri, 17 Aug 2007) Log Message: ----------- Default Download page Modified Paths: -------------- mod_aspdotnet2/trunk/docs/index.html mod_aspdotnet2/trunk/docs/introduction.html Modified: mod_aspdotnet2/trunk/docs/index.html =================================================================== --- mod_aspdotnet2/trunk/docs/index.html 2007-08-17 23:55:28 UTC (rev 209) +++ mod_aspdotnet2/trunk/docs/index.html 2007-08-17 23:56:02 UTC (rev 210) @@ -22,7 +22,7 @@ <li><a href="http://mod-aspdotnet.sourceforge.net/">Summary</a></li> <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li> <li><a href="http://mod-aspdotnet.sourceforge.net/mod_aspdotnet.html">Reference</a></li> - <li><a href="http://sourceforge.net/project/showfiles.php?group_id=175077">Download</a></li> + <li><a href="http://sourceforge.net/project/platformdownload.php?group_id=175077&sel_platform=1390">Download</a></li> <li><a href="http://mod-aspdotnet.sourceforge.net/verify/">Verify</a></li> </menu> <p><b>Project</b></p> Modified: mod_aspdotnet2/trunk/docs/introduction.html =================================================================== --- mod_aspdotnet2/trunk/docs/introduction.html 2007-08-17 23:55:28 UTC (rev 209) +++ mod_aspdotnet2/trunk/docs/introduction.html 2007-08-17 23:56:02 UTC (rev 210) @@ -22,7 +22,7 @@ <li><a href="http://mod-aspdotnet.sourceforge.net/">Summary</a></li> <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li> <li><a href="http://mod-aspdotnet.sourceforge.net/mod_aspdotnet.html">Reference</a></li> - <li><a href="http://sourceforge.net/project/showfiles.php?group_id=175077">Download</a></li> + <li><a href="http://sourceforge.net/project/platformdownload.php?group_id=175077&sel_platform=1390">Download</a></li> <li><a href="http://mod-aspdotnet.sourceforge.net/verify/">Verify</a></li> </menu> <p><b>Project</b></p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2007-08-17 23:55:30
|
Revision: 209 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=209&view=rev Author: wrowe Date: 2007-08-17 16:55:28 -0700 (Fri, 17 Aug 2007) Log Message: ----------- unused files Removed Paths: ------------- mod_aspdotnet/trunk/docs/manual-zip-100pc.css mod_aspdotnet/trunk/docs/manual-zip.css Deleted: mod_aspdotnet/trunk/docs/manual-zip-100pc.css =================================================================== --- mod_aspdotnet/trunk/docs/manual-zip-100pc.css 2007-08-17 22:27:30 UTC (rev 208) +++ mod_aspdotnet/trunk/docs/manual-zip-100pc.css 2007-08-17 23:55:28 UTC (rev 209) @@ -1,23 +0,0 @@ -@import url(manual-loose-100pc.css); - -/* Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -h1 { - margin: 0 0 0.5em 0; -} - -/* the end */ Deleted: mod_aspdotnet/trunk/docs/manual-zip.css =================================================================== --- mod_aspdotnet/trunk/docs/manual-zip.css 2007-08-17 22:27:30 UTC (rev 208) +++ mod_aspdotnet/trunk/docs/manual-zip.css 2007-08-17 23:55:28 UTC (rev 209) @@ -1,24 +0,0 @@ -@import url(manual.css); - -/* Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -h1 { - margin: 0 0 0.5em 0; -} - -/* the end */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2007-08-17 22:27:32
|
Revision: 208 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=208&view=rev Author: wrowe Date: 2007-08-17 15:27:30 -0700 (Fri, 17 Aug 2007) Log Message: ----------- Refresh correct docs Added Paths: ----------- mod_aspdotnet2/trunk/docs/ Copied: mod_aspdotnet2/trunk/docs (from rev 207, mod_aspdotnet/trunk/docs) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2007-08-17 22:27:04
|
Revision: 207 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=207&view=rev Author: wrowe Date: 2007-08-17 15:26:55 -0700 (Fri, 17 Aug 2007) Log Message: ----------- remove stale docs tree Removed Paths: ------------- mod_aspdotnet2/trunk/docs/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2007-08-17 22:25:10
|
Revision: 206 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=206&view=rev Author: wrowe Date: 2007-08-17 15:25:07 -0700 (Fri, 17 Aug 2007) Log Message: ----------- Update for our detached location. Modified Paths: -------------- mod_aspdotnet/trunk/docs/index.html mod_aspdotnet/trunk/docs/introduction.html mod_aspdotnet/trunk/docs/mod_aspdotnet.html Modified: mod_aspdotnet/trunk/docs/index.html =================================================================== --- mod_aspdotnet/trunk/docs/index.html 2007-08-17 22:24:23 UTC (rev 205) +++ mod_aspdotnet/trunk/docs/index.html 2007-08-17 22:25:07 UTC (rev 206) @@ -1,35 +1,85 @@ -<h2><a name="mirrors">Download from your - <a href="http://www.apache.org/dyn/closer.cgi/httpd/mod_aspdotnet/" - >nearest mirror site!</a></a></h2> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> + <meta name="author" content="mod-aspdotnet users" /> + <meta name="email" content="mod...@li..." /> + <link href="manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /> + <link href="manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /> + <link href="manual-print.css" rel="stylesheet" media="print" type="text/css" /> + <title>Summary of mod-aspdotnet on SourceForge</title> + </head> + <body bgcolor="#ffffff" text="#000000" link="#525D76"> +<!-- <p><a href="/"><img src="../images/logo_wide.gif" border="0" + alt="The mod-aspdotnet Project on SourceForge" /></a></p> --> + <table border="0" width="100%" cellspacing="4"> + <tr> + <!-- LEFT SIDE NAVIGATION --> + <td valign="top" nowrap="nowrap"> + <p><b>Essentials</b></p> + <menu compact="compact"> + <li><a href="http://mod-aspdotnet.sourceforge.net/">Summary</a></li> + <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li> + <li><a href="http://mod-aspdotnet.sourceforge.net/mod_aspdotnet.html">Reference</a></li> + <li><a href="http://sourceforge.net/project/showfiles.php?group_id=175077">Download</a></li> + <li><a href="http://mod-aspdotnet.sourceforge.net/verify/">Verify</a></li> + </menu> + <p><b>Project</b></p> + <menu compact="compact"> + <li><a href="http://sourceforge.net/projects/mod-aspdotnet">Project Home</a></li> + <li><a href="http://sourceforge.net/news/?group_id=175077">Project News</a></li> + <li><a href="http://sourceforge.net/mail/?group_id=175077l">Mailing Lists</a></li> + <li><a href="http://sourceforge.net/tracker/?group_id=175077&atid=871785">Bug Reports</a></li> + </menu> + </td> + <!-- RIGHT SIDE INFORMATION --> + <td align="left" valign="top"> +<h2>Read This First</h2> -<p>Do not download from www.apache.org. Please use a mirror site - to help us save apache.org bandwidth. - <a href="http://www.apache.org/dyn/closer.cgi/httpd/mod_aspdotnet/">Go - here to find your nearest mirror.</a></p> - -<h2><a name="READ">Read This First</a></h2> - -<p>mod_aspdotnet is a module from the -<a href="http://httpd.apache.org/cli/">cli subproject</a> for the Apache -HTTP Server 2.0.44 or later running on Windows NT Service Pack 6 or later -(including 2000, 2003, and XP) with the .NET Framework 1.1 (or 1.0). +<p>mod_aspdotnet is a module for Apache HTTP Server 2.0.44 or later, running +on Windows, Windows NT Service Pack 6 or later (including 2000, 2003, and XP) +with the .NET Framework 1.1 (or 1.0), including Microsoft's ASP.NET hosting +framework. It was originally developed by Covalent Technologies, lived for +a time at the Apache Software Foundation and is now maintained by the +<a href="http://sourceforge.net/projects/mod-aspdotnet">mod-aspdotnet project</a> +hosted on SourceForge and sponsored by Covalent Technologies. It is not known to work on non-Windows platforms, with earlier versions of Apache, or 2.0 and later versions of the .NET framework. Consult the project's pages for more details.</p> <p>mod_aspdotnet is available as an .msi for you to get running out of -the box. Simply ensure you have installed Apache HTTP Server 2.0 first, -and the Microsoft .NET Framework, before you attempt to install it.</p> +the box. Simply ensure you have installed Apache HTTP Server 2.0 or 2.2 +first, and also the Microsoft .NET Framework 1.1, before you attempt to +install it. Two flavors are provided, one for Apache 2.0 (2.0.44 or later) +and the other for Apache 2.2. A new flavor will be required for later +version of Apache web server.</p> <p>The -src.zip files contain the sources of this module. It is not trivial to build and run without a bit of understanding, it is much easier for most users to simply install the .msi. Note that at present, -it can only be built under Microsoft Visual Studio .NET, and not the later -2003 or (preview) 2005 Studio products, due to major changes in the way -that C++.NET files are parsed. If you want to proceed to build your own, -please be our guest, you are well on your way to helping contribute to the -httpd-cli subproject!</p> +it can only be built under Microsoft Visual Studio .NET (2002), and not +the later 2003 or 2005 Studio products, due to major changes in the way +that C++.NET files are parsed. A new flavor is under development for .NET +2.0 and Visual Studio 2005. If you want to proceed to build your own using +Visual Studio .NET 2002, please be our guest, you will be well on your way +to helping contribute to the mod-aspdotnet project! Or stay tuned for the +availability of the .NET 2.0 flavor.</p> -<p>We have an <a href="http://httpd.apache.org/cli/introduction" ->introduction</a> to help you get started using this module.</p> +<p>We have an <a href="introduction.html">introduction</a> to help you get +started, and a <a href="mod_aspdotnet.html">module reference</a> to detail +the particulars of configuring the module.</p> + </td> + </tr> + <!-- FOOTER --> + <tr><td colspan="2"><hr noshade="noshade" size="1"/></td></tr> + <tr><td colspan="2" align="center"> + <font size="-1"> + <em>Copyright © 2002-2006, Covalent Technologies</em> + </font> + </td> + </tr> + </table> + </body> +</html> Modified: mod_aspdotnet/trunk/docs/introduction.html =================================================================== --- mod_aspdotnet/trunk/docs/introduction.html 2007-08-17 22:24:23 UTC (rev 205) +++ mod_aspdotnet/trunk/docs/introduction.html 2007-08-17 22:25:07 UTC (rev 206) @@ -5,34 +5,32 @@ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> <meta name="author" content="mod-aspdotnet users" /> <meta name="email" content="mod...@li..." /> + <link href="manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /> + <link href="manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /> + <link href="manual-print.css" rel="stylesheet" media="print" type="text/css" /> <title>Introduction to mod_aspdotnet - from mod-aspdotnet on SourceForge</title> </head> <body bgcolor="#ffffff" text="#000000" link="#525D76"> -<!-- <p><a href="/"><img src="../images/logo_wide.gif" alt="The mod-aspdotnet Project on SourceForge" border="0"/></a></p> --> +<!-- <p><a href="/"><img src="../images/logo_wide.gif" border="0" + alt="The mod-aspdotnet Project on SourceForge" /></a></p> --> <table border="0" width="100%" cellspacing="4"> <tr> <!-- LEFT SIDE NAVIGATION --> <td valign="top" nowrap="nowrap"> <p><b>Essentials</b></p> <menu compact="compact"> - <li><a href="http://sourceforge.net/news/?group_id=175077">News</a></li> + <li><a href="http://mod-aspdotnet.sourceforge.net/">Summary</a></li> <li><a href="http://www.apache.org/licenses/LICENSE-2.0">License</a></li> + <li><a href="http://mod-aspdotnet.sourceforge.net/mod_aspdotnet.html">Reference</a></li> + <li><a href="http://sourceforge.net/project/showfiles.php?group_id=175077">Download</a></li> + <li><a href="http://mod-aspdotnet.sourceforge.net/verify/">Verify</a></li> </menu> - <p><b>Download!</b></p> + <p><b>Project</b></p> <menu compact="compact"> - <li><a href="http://sourceforge.net/project/showfiles.php?group_id=175077">from a mirror</a></li> - </menu> - <p><b><a -href="/docs/">Apache Docs</a></b></p> - <menu compact="compact"> - <li><a href="http://httpd.apache.org/docs/2.2/">Version 2.2</a></li> - <li><a href="http://httpd.apache.org/docs/2.0/">Version 2.0</a></li> - </menu> - <p><b>Get Involved</b></p> - <menu compact="compact"> + <li><a href="http://sourceforge.net/projects/mod-aspdotnet">Project Home</a></li> + <li><a href="http://sourceforge.net/news/?group_id=175077">Project News</a></li> <li><a href="http://sourceforge.net/mail/?group_id=175077l">Mailing Lists</a></li> <li><a href="http://sourceforge.net/tracker/?group_id=175077&atid=871785">Bug Reports</a></li> - <li><a href="/dev/">Developer Info</a></li> </menu> </td> <!-- RIGHT SIDE INFORMATION --> Modified: mod_aspdotnet/trunk/docs/mod_aspdotnet.html =================================================================== --- mod_aspdotnet/trunk/docs/mod_aspdotnet.html 2007-08-17 22:24:23 UTC (rev 205) +++ mod_aspdotnet/trunk/docs/mod_aspdotnet.html 2007-08-17 22:25:07 UTC (rev 206) @@ -3,9 +3,9 @@ <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> <title>mod_aspdotnet - Apache HTTP Server</title> -<link href="http://httpd.apache.org/docs/2.0/style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /> -<link href="http://httpd.apache.org/docs/2.0/style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /> -<link href="http://httpd.apache.org/docs/2.0/style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /> +<link href="manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /> +<link href="manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /> +<link href="manual-print.css" rel="stylesheet" media="print" type="text/css" /> </head> <body> <div id="page-header"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2007-08-17 22:24:36
|
Revision: 205 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=205&view=rev Author: wrowe Date: 2007-08-17 15:24:23 -0700 (Fri, 17 Aug 2007) Log Message: ----------- Borrow ASF-licensed style sheets Added Paths: ----------- mod_aspdotnet/trunk/docs/manual-loose-100pc.css mod_aspdotnet/trunk/docs/manual-print.css mod_aspdotnet/trunk/docs/manual-zip-100pc.css mod_aspdotnet/trunk/docs/manual-zip.css mod_aspdotnet/trunk/docs/manual.css Added: mod_aspdotnet/trunk/docs/manual-loose-100pc.css =================================================================== --- mod_aspdotnet/trunk/docs/manual-loose-100pc.css (rev 0) +++ mod_aspdotnet/trunk/docs/manual-loose-100pc.css 2007-08-17 22:24:23 UTC (rev 205) @@ -0,0 +1,155 @@ +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * manual.css - no sidebar, 100% normal font height + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +/* Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* import the main CSS, so we + * have to adjust only a few things + */ +@import url(manual.css); + +html { + font-size: 100%; +} + +/* "sidebar" background is white here */ +div#quickview a:hover, +div#quickview a:active { + background-color: #f0f0f0; + color: #0073c7; +} + +div#quickview code.module a:hover, +div#quickview code.module a:active { + background-color: #f0f0f0; + color: #8b4513; +} + +div#quickview code.directive a:hover, +div#quickview code.directive a:active { + background-color: #f0f0f0; + color: #287f00; +} + +h1 { + font-size: 1.5em; +} + +h2 { + font-size: 1.2em; +} + +.category h2 { + font-size: 1em; +} + +h3 { + font-size: 1.1em; +} + +h4 { + font-size: 1em; +} + +div.example h3, +div.note h3, +div.warning h3 { + font-size: 1em; +} + +div#quickview h3, +div#quickview h3.directives { + margin: 1em 0 0.3em 0; + font-size: 1.1em; +} + +div#quickview h3.directives { + margin-top: 0; +} + +div#quickview li { + font-size: 1em; +} + +div#quickview ul { + margin-bottom: 1em; +} + +div#quickview ul#toc { + margin-left: 0; +} + +div#quickview li img { + display: inline; + margin-right: 19px; +} + +#module-index div#quickview ul#toc, +#manual-page div#quickview ul#toc, +div#quickview #topics { + padding-left: 0; +} + +div#quickview .seealso { + padding-left: 34px; +} + +#module-index div#quickview ul#toc li, +#manual-page div#quickview ul#toc li, +div#quickview #topics li, +div#quickview .seealso li { + margin: 0; + list-style-type: none; +} + +div#page-header p.menu, +div#path, +div#footer { + font-size: smaller; +} + +div#quickview { + position: static; + margin: 0 0 1em 30px; + padding: 0; + width: auto; + background-color: #fff; +} + +div#page-content { + margin-right: 0; + padding-right: 0; +} + +div.example pre, +div.example p > code { + font-size: 0.9em; +} + +div.note pre, +div.warning pre { + font-size: 0.9em; +} + +table.qref td.descr { + font-size: 0.9em; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * -> The End <- + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ Property changes on: mod_aspdotnet/trunk/docs/manual-loose-100pc.css ___________________________________________________________________ Name: svn:eol-style + native Added: mod_aspdotnet/trunk/docs/manual-print.css =================================================================== --- mod_aspdotnet/trunk/docs/manual-print.css (rev 0) +++ mod_aspdotnet/trunk/docs/manual-print.css 2007-08-17 22:24:23 UTC (rev 205) @@ -0,0 +1,717 @@ +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * manual.css for printers + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +/* Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * mainframe ;-) + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +html { + font-size: 11pt; +} + +body { + background-color: #fff; + color: #000; + padding: 0 0 0 0; + margin: 0; + font-family: "Times New Roman", serif; + font-weight: normal; +} + +pre, code { + font-family: "Courier New", Courier, monospace; +} + +strong { + font-weight: bold; +} + +q, em, var { + font-style: italic; +} + +span.transnote, span.phonetic { + font-weight: normal; + background-color: inherit; + color: #888; +} + +/* fixup IE & Opera + * otherwise they forget to inherit + * the computed font-size value + */ +table, code { + font-size: 1em; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * Links + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +/* normal links */ +/* ====================== */ +a:link, +a:visited, +a:hover, +a:active { + color: #000; + background-color: inherit; + text-decoration: none; +} + +/* sidebar */ +div#quickview a:hover, +div#quickview a:active { + background-color: #fff; + color: #000; +} + +/* EXPERIMENTAL! I'm waiting for complaints... */ +#page-content p > a[href]:after { + content: " (\002197\0000A0" attr(href) ") "; + color: #036; +} + +/* code.module [links] */ +/* ====================== */ +code.module, +code.module a:link, +code.module a:visited, +code.module a:hover, +code.module a:active { + color: #8b4513; + background-color: inherit; + text-decoration: none; +} + +/* code.directive [links] */ +/* ====================== */ +code.directive, +code.directive a:link, +code.directive a:visited, +code.directive a:hover, +code.directive a:active { + color: #287f00; + background-color: inherit; + text-decoration: none; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * Headings + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +/* h1 */ +/* ====================== */ +h1 { + padding: 0 0 0.2em 0; + margin: 1em 0 0.5em 0; + border-style: none none solid none; + border-bottom-width: 1px; + border-bottom-color: #405871; + background-color: inherit; + color: #000; + text-decoration: none; + font-size: 17pt; + font-weight: bold; + text-align: center; +} + +/* h2 */ +/* ====================== */ +h2 { + padding: 0.2em 0 0.2em 0.2em; + margin: 0 0 0.5em 0; + width: 80%; + text-decoration: none; + font-size: 15pt; + font-weight: bold; + border-bottom: 1px solid #000; + text-align: left; +} + +.section h2, +.directive-section h2, +.category h2 { + background-color: #fff; + color: #000; +} + +/* take care of <a name>s inside */ +h2 a, +h2 a:hover, +h2 a:active { + color: inherit; + background-color: inherit; + text-decoration: none; +} + +/* h3, h4 */ +/* ====================== */ +h3 { + background-color: inherit; + color: #000; + text-decoration: none; + font-weight: bold; + font-size: 13pt; + margin: 1.3em 0 0.4em 0; + padding: 0 0 0 0.2em; +} + +h4 { + background-color: inherit; + color: #000; + text-decoration: none; + font-weight: bold; + font-size: 11pt; + margin: 1.3em 0 0.2em 0; + padding: 0 0 0 0.2em; +} + +/* margin adjustment */ +h3 + *, h4 + * { + margin-top: 0; +} + +/* IE confuses the + * :-( + * so reset some things + */ +ul, .section table, .directive-section table { + margin-bottom: 1em; +} + +/* titles for + * examples, notes and warnings + */ +div.example h3, +div.note h3, +div.warning h3 { + margin: 0 0 0.5em 0; + text-align: left; + font-size: 11pt; +} + +/* sidebar */ +div#quickview h3 { + margin: 1em 0 0.3em 0; + font-size: 13pt; +} + +div#quickview h3.directives { + margin-top: 0; +} + +/* take care of <a name>s inside */ +h3 a, +h3 a:hover, +h3 a:active, +h4 a, +h4 a:hover, +h4 a:active { + color: inherit; + background-color: inherit; + text-decoration: none; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * Up & Top helper images + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +div.up, +div.top { + display: none; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * Tables + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +/* general */ +/* ====================== */ +table { + border: 1px solid #000; + border-collapse: collapse; + padding: 2px; + margin-top: 0.5em; + margin-bottom: 0; + margin-left: 1px; /* border-width == 1px */ +} + +td, th { + empty-cells: show; /* show border around empty cells */ + padding: 0.1em 0.2em; + vertical-align: top; + text-align: left; + line-height: 1.1em; +} + +th { + font-weight: bold; +} + +td.centered { + text-align: center; +} + +tr.header, tr.header th { + border-top: 1px solid #000; + border-bottom: 1px solid #000; +} + +/* bordered table cells */ +/* ====================== */ + +/* turn off borders in tables nested in + * bordered tables per default + */ +table.bordered table td, +table.bordered table th { + border-style: none; +} + +table.bordered td, +table.bordered th, +table table.bordered td, +table table.bordered th { + border: 1px solid #000; +} + +/* mod/dir. overview table and quick reference */ +/* ============================================ */ +table.module th, +table.directive th { + white-space: nowrap; +} + +table.qref { + border-collapse: collapse; + width: auto; +} + +table.qref td { + border-style: none solid; + border-color: #000; + border-width: 1px; +} + +table.qref td.descr { + padding-left: 1em; + font-size: 11pt; +} + +table#legend { + width: 100%; + border-style: none; + border-width: 0; + vertical-align: bottom; + padding: 0; + margin: 0; +} + +table#legend td { + vertical-align: bottom; + margin: 0; + padding: 0; +} + +table#legend table { + vertical-align: bottom; + margin: 0 0 0 0.4em; + padding: 0; + height: 7.5em; +} + +table#legend td.letters span { + display: none; +} + +table#legend table td, +table#legend table th { + vertical-align: middle; + padding: 0.1ex 0.2em; + line-height: 1em; +} + +/* related modules & dir. */ +/* ====================== */ + +/* assuming, all links are enclosed by + * <code class="directive"> or + * <code class="module"> + */ + +table.related { + border-collapse: collapse; +} + +table.related th, +table.related td { + background-color: #fff; + color: #000; + padding: 0.2ex 0.4em; + border: 1px solid #000; +} + +table.related th { + vertical-align: middle; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * Lists + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +/* list default values */ +/* ====================== */ +ul { + list-style-type: disc; +} + +ul ul { + list-style-type: square; +} + +ul ul ul { + list-style-type: circle; +} + +li, dt, dd { + line-height: 1.1em; +} + +dt { + margin-top: 0.5em; + font-weight: bold; +} + +ol li { + margin-top: 0.5em; +} + +ol.up-A { + list-style-type: upper-alpha; +} + +/* table of contents */ +/* ====================== */ +#toc, +#topics { + margin: 0; + padding: 0; +} + +#toc li, +#topics li { + list-style-type: square; + margin: 0 0 1em 0; + padding: 0; +} + +#toc li img, +#topics li img { + margin-right: 19px; +} + +/* see also */ +/* ====================== */ +.seealso { + margin: 0; + padding: 0; +} + +.seealso li { + list-style-type: square; + margin: 0 0 1em 0; + padding: 0 0 0 34px; +} + +/* related modules & dir. */ +/* ====================== */ +table.related td ul, +table.related td li { + list-style-type: none; + margin: 0; + padding: 0; +} + +/* list of all directives */ +/* ====================== */ +div#directive-list ul { + margin: 0; + padding: 0; +} + +/* quickview */ +/* ====================== */ +div#quickview li { + font-size: 11pt; +} + +div#quickview ul { + margin: 0; + padding: 0; +} + +div#quickview ul#toc { + margin: 0; + padding: 0; +} + +div#quickview ul#toc li { + margin: 0 0 0 1em; + padding: 0; + list-style-type: square; + list-style-position: outside; +} + +div#quickview li img { + display: none; +} + +#module-index div#quickview ul#toc, +#manual-page div#quickview ul#toc, +div#quickview #topics, +div#quickview .seealso { + padding-left: 0; +} + +#module-index div#quickview ul#toc li, +#manual-page div#quickview ul#toc li, +div#quickview #topics li, +div#quickview .seealso li { + margin: 0 0 2px 1em; + padding: 0; + list-style-type: square; + list-style-position: outside; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * main page sections + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +/* page header */ +/* ====================== */ +div#page-header { + margin-left: 0; +} + +div#page-header img { + display: none; +} + +div#page-header p.apache { + background-color: #fff; + color: #000; + padding: 0; + margin: 0; + text-align: center; + vertical-align: middle; + font-size: 20pt; + font-weight: bold; + line-height: 20pt; +} + +div#page-header p.menu { + display: none; +} + +/* breadcrumb navigation */ +div#path { + display: none; +} + +/* content sections */ +/* ====================== */ +div#preamble { + padding-bottom: 1em; + margin-left: 0; +} + +div.section, +div.directive-section { + margin: 0; + padding: 0; +} + +.section p, +.directive-section p { + margin: 0 0 1em 0; + padding: 0; +} + +/* look for this on directive + * list pages + */ +div#directive-list { + margin-left: 0; + padding: 0 0 1em 1em; +} + +div#directive-ref { + margin: -1em 0 0 1px; + padding: 0 0 1em 0; + width: auto; +} + +/* no sidebar */ +div#quickview { + position: static; + margin: 0 0 1em 0; + padding: 0; + width: auto; + background-color: #fff; + color: inherit; +} + +/* -> keep content wide */ +div#page-content { + padding-top: 0; + margin-right: 0; + padding-right: 0; +} + +/* in general */ +p { + line-height: 1.1em; +} + +/* page footer */ +/* ====================== */ +div#footer { + margin-left: 0; + font-size: 11pt; + border-top: 1px solid #000; + padding-top: 0.2em; +} + +div#footer p.apache { + float: none; + text-align: center; + padding: 0 0 1em 0; + margin-top: 0; + font-weight: bold; +} + +div.toplang, +div.bottomlang, +div#footer p.menu { + display: none; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * subsections (examples, notes, warnings) + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +/* examples */ +/* ====================== */ +div.example, +div.note div.example { + background-color: #fff; + color: #000; + padding: 0.5em; + margin: 1em; + border: 1px dotted #000; +} + +/* the following [block] elements + * may appear inside example... + */ +div.example p, +div.example pre, +div.example table { + padding: 0; + margin: 0; +} + +div.example p { + line-height: 1em; +} + +div.example pre, +div.example p > code { + font-size: 10pt; +} + +/* notes & warnings */ +/* ====================== */ +div.note, +div.warning { + background-color: #fff; + color: #000; + border: 1px solid #000; + padding: 0.5em; + margin: 1em; +} + +div.note p, +div.warning p { + margin: 0; + padding: 0; +} + +div.note pre, +div.warning pre { + font-size: 10pt; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * quotations, indented paragraphs and figures + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +p.letters { + display: none; +} + +blockquote p { + font-style: italic; + margin: 0; +} + +blockquote p.cite { + font-style: normal; + margin-top: 0; + margin-left: 2em; +} + +blockquote p.cite cite { + font-style: normal; +} + +p.indent { + margin-left: 2em; + margin-top: 1em; +} + +#index-page form { + display: none; +} + +p.figure { + margin-left: 2em; + font-style: italic; +} + +p.figure img { + border: 1px solid #000; +} + +p.figure dfn { + font-weight: bold; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * -> The End <- + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ Property changes on: mod_aspdotnet/trunk/docs/manual-print.css ___________________________________________________________________ Name: svn:eol-style + native Added: mod_aspdotnet/trunk/docs/manual-zip-100pc.css =================================================================== --- mod_aspdotnet/trunk/docs/manual-zip-100pc.css (rev 0) +++ mod_aspdotnet/trunk/docs/manual-zip-100pc.css 2007-08-17 22:24:23 UTC (rev 205) @@ -0,0 +1,23 @@ +@import url(manual-loose-100pc.css); + +/* Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +h1 { + margin: 0 0 0.5em 0; +} + +/* the end */ Property changes on: mod_aspdotnet/trunk/docs/manual-zip-100pc.css ___________________________________________________________________ Name: svn:eol-style + native Added: mod_aspdotnet/trunk/docs/manual-zip.css =================================================================== --- mod_aspdotnet/trunk/docs/manual-zip.css (rev 0) +++ mod_aspdotnet/trunk/docs/manual-zip.css 2007-08-17 22:24:23 UTC (rev 205) @@ -0,0 +1,24 @@ +@import url(manual.css); + +/* Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +h1 { + margin: 0 0 0.5em 0; +} + +/* the end */ Property changes on: mod_aspdotnet/trunk/docs/manual-zip.css ___________________________________________________________________ Name: svn:eol-style + native Added: mod_aspdotnet/trunk/docs/manual.css =================================================================== --- mod_aspdotnet/trunk/docs/manual.css (rev 0) +++ mod_aspdotnet/trunk/docs/manual.css 2007-08-17 22:24:23 UTC (rev 205) @@ -0,0 +1,1026 @@ +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * manual.css + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +/* Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * mainframe ;-) + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +html { + font-size: 14px; +} + +body { + background-color: #fff; + color: #036; + padding: 0 1em 0 0; + margin: 0; + font-family: Arial, Helvetica, sans-serif; + font-weight: normal; +} + +pre, code { + font-family: "Courier New", Courier, monospace; +} + +strong { + font-weight: bold; +} + +q, em, var { + font-style: italic; +} + +span.transnote, span.phonetic { + font-weight: normal; + background-color: inherit; + color: #888; +} + +/* fixup IE & Opera + * otherwise they forget to inherit + * the computed font-size value + */ +table, code { + font-size: 1em; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * Links + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +/* normal links */ +/* ====================== */ +a:link { + color: #0073c7; + background-color: inherit; +} + +a:visited { + color: #5A88B5; + background-color: inherit; +} + +a:link:hover, +a:link:active, +a:visited:hover, +a:visited:active { + color: #0073c7; + background-color: #f0f0f0; +} + +/* hover on non-white backgrounds */ +tr.odd a:hover, +tr.odd a:active, +tr.header a:hover, +tr.header a:active, +div.note a:hover, +div.note a:active, +div.example a:hover, +div.example a:active, +div.warning a:hover, +div.warning a:active, +div#quickview a:hover, +div#quickview a:active { + background-color: #fff; + color: #0073c7; +} + +/* code.module [links] */ +/* ====================== */ +code.module, +code.module a:link { + color: #8b4513; + background-color: inherit; +} + +code.module a:visited { + color: #bc8f8f; + background-color: inherit; +} + +code.module a:hover, +code.module a:active { + color: #8b4513; + background-color: #f0f0f0; +} + +/* hover on non-white backgrounds */ +tr.odd code.module a:hover, +tr.odd code.module a:active, +tr.header code.module a:hover, +tr.header code.module a:active, +div.note code.module a:hover, +div.note code.module a:active, +div.example code.module a:hover, +div.example code.module a:active, +div.warning code.module a:hover, +div.warning code.module a:active, +div#quickview code.module a:hover, +div#quickview code.module a:active { + background-color: #fff; + color: #8b4513; +} + +/* code.directive [links] */ +/* ====================== */ +code.directive, +code.directive a:link { + color: #287f00; + background-color: inherit; +} + +code.directive a:visited { + color: #35a500; + background-color: inherit; +} + +code.directive a:hover, +code.directive a:active { + color: #287f00; + background-color: #f0f0f0; +} + +/* hover on non-white backgrounds */ +tr.odd code.directive a:hover, +tr.odd code.directive a:active, +tr.header code.directive a:hover, +tr.header code.directive a:active, +div.note code.directive a:hover, +div.note code.directive a:active, +div.example code.directive a:hover, +div.example code.directive a:active, +div.warning code.directive a:hover, +div.warning code.directive a:active, +div#quickview code.directive a:hover, +div#quickview code.directive a:active { + background-color: #fff; + color: #287f00; +} + +/* glossary [links] */ +/* ====================== */ +.glossarylink { + cursor: help; + border-bottom: 1px dashed #0073c7; + text-decoration: none; +} + + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * Headings + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +/* h1 */ +/* ====================== */ +h1 { + padding: 0.2em; + margin: 0; + border: 1px solid #405871; + background-color: inherit; + color: #036; + text-decoration: none; + font-size: 22px; + font-weight: bold; +} + +/* h2 */ +/* ====================== */ +h2 { + padding: 0.2em 0 0.2em 0.7em; + margin: 0 0 0.5em 0; + text-decoration: none; + font-size: 18px; + font-weight: bold; +} + +.section h2 { + background-color: #405871; + color: #fff; +} + +.directive-section h2 { + background-color: #557697; + color: #fff; +} + +.category h2 { + background-color: #e5ecf3; + color: #405871; + font-size: 14px; +} + +/* take care of <a name>s inside */ +h2 a, +h2 a:hover, +h2 a:active { + color: inherit; + background-color: inherit; + text-decoration: none; +} + +/* h3, h4 */ +/* ====================== */ +h3 { + background-color: inherit; + color: #036; + text-decoration: none; + font-weight: bold; + font-size: 16px; + margin: 1.3em 0 0.4em 0; + padding: 0; +} + +h4 { + background-color: inherit; + color: #036; + text-decoration: none; + font-weight: bold; + font-size: 14px; + margin: 1.3em 0 0.2em 0; + padding: 0; +} + +/* margin adjustment */ +h3 + *, h4 + * { + margin-top: 0; +} + +/* IE confuses the + * :-( + * so reset some things + */ +ul, .section table, .directive-section table { + margin-bottom: 1em; +} + +/* titles for + * examples, notes and warnings + */ +div.example h3, +div.note h3, +div.warning h3 { + margin: 0 0 0.5em 0; + text-align: left; + font-size: 14px; +} + +/* sidebar */ +div#quickview h3 { + margin: 1em 0 0.3em 0.5em; + font-size: 15px; +} + +div#quickview h3.directives { + margin-top: 0.3em; +} + +/* take care of <a name>s inside */ +h3 a, +h3 a:hover, +h3 a:active, +h4 a, +h4 a:hover, +h4 a:active { + color: inherit; + background-color: inherit; + text-decoration: none; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * Up & Top helper images + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +/* arrow left */ +/* ====================== */ +div.up { + width: 30px; + height: 20px; + padding: 0; + margin: -20px 0 1px 0; + text-align: center; + vertical-align: top; +} + +div.up img { + vertical-align: top; + width: 11px; + height: 11px; + border-style: none; +} + +/* arrow up (to page top) */ +/* ====================== */ +div.top { + width: 30px; + padding: 0 0 0 30px; + margin: 0; +} + +div.top img { + margin-top: 0.5em; + vertical-align: bottom; + width: 11px; + height: 11px; + border-style: none; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * Tables + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +/* general */ +/* ====================== */ +table { + border: 1px solid #aaa; + border-collapse: collapse; + padding: 2px; + margin-top: 0.5em; + margin-bottom: 0; +} + +td, th { + empty-cells: show; /* show border around empty cells */ + padding: 0.1em 0.2em; + vertical-align: top; + text-align: left; + line-height: 1.3em; +} + +th { + font-weight: bold; +} + +td.centered { + text-align: center; +} + +td.data { + font-family: monospace; + text-align: right; + padding-left: 1em; +} + +th.data { + text-align: right; +} + +tr.odd { /* for large tables alternating colors */ + background-color: #f2f2f2; +} + +tr.header, tr.header th { + background-color: #e2e2e2; + border-top: 1px solid #aaa; + border-bottom: 1px solid #aaa; +} + +/* bordered table cells */ +/* ====================== */ + +/* turn off borders in tables nested in + * bordered tables per default + */ +table.bordered table td, +table.bordered table th { + border-style: none; +} + +table.bordered td, +table.bordered th, +table table.bordered td, +table table.bordered th { + border: 1px solid #aaa; +} + +/* index page layout table */ +/* ======================= */ +body#index-page div#page-content { + width: 100%; /* IE fun */ +} + +body[id]#index-page div#page-content { + width: auto; /* reasonable browsers. */ +} + +table#indextable { + width: 100%; + border-collapse: collapse; + border: 0 none; +} + +table#indextable td { + width: 33.3%; + border-left: 1px solid #aaa; + padding-top: 0; + padding-bottom: 0; +} + +table#indextable td.col1 { + border-left: 0 none; + padding-left: 0; +} + +table#indextable td.col3 { + padding-right: 0; +} + +/* mod/dir. overview table and quick reference */ +/* ============================================ */ +table.module th, +table.directive th { + white-space: nowrap; +} + +table.qref { + border-collapse: collapse; + width: 100%; +} + +table.qref td { + border-style: none solid; + border-color: #aaa; + border-width: 1px; +} + +table.qref td.descr { + padding-left: 1em; + font-size: 13px; +} + +table#legend { + width: 100%; + border-style: none; + border-width: 0; + vertical-align: bottom; + padding: 0; + margin: 0; +} + +table#legend td { + vertical-align: bottom; + margin: 0; + padding: 0; +} + +table#legend td.letters { + width: 100%; + padding-bottom: 0.5em; +} + +table#legend table { + vertical-align: bottom; + margin: 0 0 0 0.4em; + padding: 0; + height: 7.5em; +} + +table#legend table td, +table#legend table th { + vertical-align: middle; + padding: 0.1ex 0.2em; + line-height: 1em; + white-space: nowrap; +} + +/* related modules & dir. */ +/* ====================== */ + +/* assuming, all links are enclosed by + * <code class="directive"> or + * <code class="module"> + */ + +table.related { + border-collapse: separate; +} + +table.related th { + padding: 0.2ex 0.3em; + background-color: #e5ecf3; + color: #405871; + vertical-align: middle; +} + +table.related td { + padding: 0.2ex 0.3em; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * Lists + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +/* list default values */ +/* ====================== */ +ul { + list-style-type: disc; +} + +ul ul { + list-style-type: square; +} + +ul ul ul { + list-style-type: circle; +} + +li, dt, dd { + line-height: 1.3em; +} + +dt { + margin-top: 0.5em; + font-weight: bold; +} + +ol li { + margin-top: 0.5em; +} + +ol.up-A { + list-style-type: upper-alpha; +} + +ol.lo-A { + list-style-type: lower-alpha; +} + +dd.separate { + margin-bottom: 2em; +} + +li.separate { + margin-bottom: 1em; +} + +/* table of contents */ +/* ====================== */ +#toc, +#topics { + margin: 0 0 1em 0; + padding: 0; +} + +#toc li, +#topics li { + list-style-type: none; + margin: 0; + padding: 0; +} + +/* see also */ +/* ====================== */ +.seealso { + margin: 0 0 1em 0; + padding: 0; +} + +.seealso li { + list-style-type: none; + margin: 0; + padding: 0 0 0 34px; +} + +/* related modules & dir. */ +/* ====================== */ +table.related td ul, +table.related td li { + list-style-type: none; + margin: 0; + padding: 0; +} + +/* list of all directives */ +/* ====================== */ +div#directive-list ul { + margin: 0; + padding: 0; +} + +/* indextable */ +/* ========== */ +table#indextable td ul { + list-style-type: none; + margin: 0 0 1em 0.5em; + padding: 0 0 0 0; +} + +table#indextable td ul li { + margin-top: 0.3em; +} + +/* sidebar */ +/* ====================== */ +div#quickview li { + font-size: 13px; +} + +div#quickview ul { + margin: 0 0 15px 0; + padding: 0; +} + +div#quickview ul#toc { + margin: 0 0 0 0.5em; + padding: 0; +} + +#module-index div#quickview ul#toc, +#manual-page div#quickview ul#toc { + margin-left: 0; +} + +div#quickview ul#toc li { + margin: 0; + padding: 0; + list-style-type: none; +} + +div#quickview li img { + display: none; +} + +#module-index div#quickview ul#toc, +#manual-page div#quickview ul#toc, +div#quickview #topics, +div#quickview .seealso { + padding-left: 15px; +} + +#module-index div#quickview ul#toc li, +#manual-page div#quickview ul#toc li, +div#quickview #topics li, +div#quickview .seealso li { + margin: 0.4em 0 2px 0; + padding: 0; + list-style-type: square; + list-style-position: outside; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * main page sections + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +/* page header */ +/* ====================== */ +div#page-header { + margin-left: 30px; +} + +div#page-header img { + padding: 0; + display: block; + margin: -70px 0 1px 2em; + width: 248px; + height: 70px; +} + +div#page-header p.apache { + background-color: #405871; + color: #fff; + padding: 0 0 0 248px; + margin: 0; + text-align: center; + vertical-align: middle; + font-size: 16px; + font-weight: bold; + line-height: 29px; +} + +div#page-header p.menu { + text-align: right; + font-size: 13px; + margin: 30px 0 0.5em 0; + padding: 0; +} + +/* breadcrumb navigation */ +div#path { + margin: 0.2em 0 1.2em 30px; + padding: 0; + font-size: 13px; +} + +/* content sections */ +/* ====================== */ +div#preamble { + padding-bottom: 1em; + margin-left: 30px; +} + +div.section, +div.directive-section { + margin: -1.2em 0 0 60px; + padding: 0; +} + +.section p, +.directive-section p { + margin: 0 0 1em 0; + padding: 0; +} + +/* look for this on directive + * list pages + */ +div#directive-list { + margin-left: 30px; + padding: 0 0 1em 1em; +} + +div#directive-ref { + margin: -1em 0 0 0; + padding: 0 0 1em 30px; + width: 100%; /* IE is BAD (broken as designed) */ +} + +div[id]#directive-ref { /* a big sorry to ICab, Amaya (and old Konquerors?) */ + width: auto; /* other browsers are fine ;-) */ +} + +/* sidebar position: right */ +div#quickview { + position: absolute; + top: 5.5em; + right: 1em; + margin-left: 0; + margin-top: 40px; + padding: 4px; + width: 13.5em; + background-color: #f0f0f0; + color: inherit; +} + +/* -> move content left */ +div#page-content { + padding-top: 0; + margin-right: 13em; + padding-right: 30px; +} + +/* unsqueeze on some pages... */ +body.no-sidebar div#page-content, +body#index-page div#page-content { + margin-right: 0; + padding-right: 0; +} + +body#index-page div#page-content { + margin-left: 30px; + padding-bottom: 1em; +} + +/* in general */ +p { + line-height: 1.3em; +} + +/* translations */ +/* ====================== */ +.toplang { + padding: 0; + margin: 0.2em 0.2em 1em 0; +} + +.bottomlang { + padding: 0; + margin: 0 0.2em 0.2em 0; +} + +.toplang p, +.bottomlang p { + font-size: 13px; + text-align: right; + background-color: inherit; + color: #ccc; + margin: 0; + padding: 0; +} + +.toplang p span, +.bottomlang p span { + background-color: inherit; + color: #036; +} + +.toplang p a:link, +.toplang p a:visited, +.bottomlang p a:link, +.bottomlang p a:visited { + text-decoration: none; + font-weight: bold; +} + +.toplang p a:hover, +.toplang p a:active, +.bottomlang p a:hover, +.bottomlang p a:active { + font-weight: bold; +} + +/* page footer */ +/* ====================== */ +div#footer { + margin-left: 30px; + font-size: 13px; + border-top: 1px solid #405871; + padding-top: 0.2em; +} + +div#footer p.apache { + float: left; + text-align: left; + padding: 0 0 1em 0; + margin-top: 0; +} + +div#footer p.menu { + float: right; + text-align: right; + margin-top: 0; + padding: 0 0 1em 0; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * subsections (examples, notes, warnings) + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ + +/* examples */ +/* ====================== */ +div.example { + background-color: #e5ecf3; + color: #000; + padding: 0.5em; + margin: 1em 2em 1em 1em; +} + +/* example inside a note: + * blue in gray doesn't look good + * so simply draw a border around + * and keep it gray + */ +div.note div.example, +div.warning div.example { + border: 1px solid #aaa; + background-color: transparent; + color: inherit; + margin-right: 1em; +} + +/* example inside table */ +table div.example { + margin-right: 1em; +} + +/* the following [block] elements + * may appear inside example... + */ +div.example p, +div.example pre, +div.example table { + padding: 0; + margin: 0; +} + +div.example p { + line-height: 1em; +} + +div.example pre, +div.example p > code { + font-size: 13px; +} + +/* notes & warnings */ +/* ====================== */ +div.note, +div.warning { + background-color: #eee; + color: #036; + padding: 0.5em; + margin: 1em 2em 1em 1em; +} + +div.warning { + border: 1px solid #f00; +} + +div.note p, +div.warning p { + margin: 0.5em 0 0 0; + padding: 0; +} + +div.note pre, +div.warning pre { + font-size: 13px; +} + +/* inside table */ +table div.note, +table div.warning { + margin-right: 1em; +} + +div.outofdate { + background-color: #ffffe0; + color: #036; + padding: 0.5em; + margin: 1em 2em 1em 1em; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * quotations, indented paragraphs, forms and figures + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +p.letters { + margin: 1em 0 0 0; +} + +p.centered { + text-align: center; +} + +.letters { + text-align: center; + background-color: inherit; + color: #ccc; +} + +.letters a:link, +.letters a:visited { + text-decoration: none; + font-weight: bold; +} + +.letters a:hover, +.letters a:active { + font-weight: bold; +} + +blockquote p { + font-style: italic; + margin: 0; +} + +blockquote p.cite { + font-style: normal; + margin-top: 0; + margin-left: 2em; +} + +blockquote p.cite cite { + font-style: normal; +} + +p.indent { + margin-left: 2em; + margin-top: 1em; +} + +span.indent { + padding-left: 1.5em; + display: block; +} + +#index-page form { + text-align: center; +} + +#index-page form p { + line-height: 1.1em; +} + +#index-page form input { + font-size: 1em; +} + +p.figure { + margin-left: 2em; + font-style: italic; +} + +p.figure img { + border: 1px solid #aaa; +} + +p.figure dfn { + font-weight: bold; +} + +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * -> The End <- + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ Property changes on: mod_aspdotnet/trunk/docs/manual.css ___________________________________________________________________ Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2007-08-17 22:19:18
|
Revision: 204 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=204&view=rev Author: wrowe Date: 2007-08-17 15:19:15 -0700 (Fri, 17 Aug 2007) Log Message: ----------- Note history Modified Paths: -------------- mod_aspdotnet/trunk/CHANGES.txt Modified: mod_aspdotnet/trunk/CHANGES.txt =================================================================== --- mod_aspdotnet/trunk/CHANGES.txt 2007-08-17 22:18:40 UTC (rev 203) +++ mod_aspdotnet/trunk/CHANGES.txt 2007-08-17 22:19:15 UTC (rev 204) @@ -1,3 +1,9 @@ +Changes to mod-aspdotnet SourceForge project build 2006 + + Rebrand the project to SourceForge sponsored by Covalent, from the + ASF branding (no longer an ASF effort, due to the small number of + active module developers.) + Changes to Apache mod_aspdotnet build 2004 MAJOR: Changed the preferred thread model to COINIT_MULTITHREADED, only This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2007-08-17 22:18:41
|
Revision: 203 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=203&view=rev Author: wrowe Date: 2007-08-17 15:18:40 -0700 (Fri, 17 Aug 2007) Log Message: ----------- Note rev history Modified Paths: -------------- mod_aspdotnet2/trunk/CHANGES.txt Modified: mod_aspdotnet2/trunk/CHANGES.txt =================================================================== --- mod_aspdotnet2/trunk/CHANGES.txt 2007-08-17 19:24:43 UTC (rev 202) +++ mod_aspdotnet2/trunk/CHANGES.txt 2007-08-17 22:18:40 UTC (rev 203) @@ -1,3 +1,14 @@ +Changes to mod_aspdotnet SourceForge build 2199 + + MAJOR: Update solution files and C++.NET source syntax to Visual + Studio 2005 (version 8.0), and .NET 2.0. + +Changes to mod-aspdotnet SourceForge project build 2006 + + Rebrand the project to SourceForge sponsored by Covalent, from the + ASF branding (no longer an ASF effort, due to the small number of + active module developers.) + Changes to Apache mod_aspdotnet build 2004 MAJOR: Changed the preferred thread model to COINIT_MULTITHREADED, only This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2007-08-17 19:24:44
|
Revision: 202 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=202&view=rev Author: wrowe Date: 2007-08-17 12:24:43 -0700 (Fri, 17 Aug 2007) Log Message: ----------- Remove unnessary define. Modified Paths: -------------- mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.cpp Modified: mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.cpp =================================================================== --- mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.cpp 2007-08-15 09:19:49 UTC (rev 201) +++ mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.cpp 2007-08-17 19:24:43 UTC (rev 202) @@ -21,8 +21,6 @@ #using <System.Web.dll> #include "Apache.Web.h" -#define size_t apr_size_t - Apache::Web::Host::~Host() { // thisFactory may have already evaporated, ignore the fault This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2007-08-15 09:19:51
|
Revision: 201 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=201&view=rev Author: wrowe Date: 2007-08-15 02:19:49 -0700 (Wed, 15 Aug 2007) Log Message: ----------- safe_cast is preferable to dynamic_cast in this case. Modified Paths: -------------- mod_aspdotnet2/trunk/Apache.Web/Host.h mod_aspdotnet2/trunk/Apache.Web/HostFactory.h mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.cpp Modified: mod_aspdotnet2/trunk/Apache.Web/Host.h =================================================================== --- mod_aspdotnet2/trunk/Apache.Web/Host.h 2007-08-15 07:18:36 UTC (rev 200) +++ mod_aspdotnet2/trunk/Apache.Web/Host.h 2007-08-15 09:19:49 UTC (rev 201) @@ -59,7 +59,7 @@ virtual Object ^ InitializeLifetimeService() override { - ILease ^lease = dynamic_cast<ILease ^> + ILease ^lease = safe_cast<ILease ^> (MarshalByRefObject::InitializeLifetimeService()); if (lease->CurrentState == System::Runtime::Remoting::Lifetime::LeaseState::Initial) { Modified: mod_aspdotnet2/trunk/Apache.Web/HostFactory.h =================================================================== --- mod_aspdotnet2/trunk/Apache.Web/HostFactory.h 2007-08-15 07:18:36 UTC (rev 200) +++ mod_aspdotnet2/trunk/Apache.Web/HostFactory.h 2007-08-15 09:19:49 UTC (rev 201) @@ -65,7 +65,7 @@ virtual Object ^ InitializeLifetimeService() override { - ILease ^lease = dynamic_cast<ILease^> + ILease ^lease = safe_cast<ILease^> (MarshalByRefObject::InitializeLifetimeService()); if (lease->CurrentState == System::Runtime::Remoting::Lifetime::LeaseState::Initial) { @@ -117,15 +117,15 @@ try { newHost = ApplicationHost::CreateApplicationHost(hostType, - dynamic_cast<String^>(hostURI[HostKey]), - dynamic_cast<String^>(hostDir[HostKey])); + safe_cast<String^>(hostURI[HostKey]), + safe_cast<String^>(hostDir[HostKey])); hostObj[HostKey] = newHost; if (newHost) { Host ^host = dynamic_cast<Host^>(newHost); host->Configure( - dynamic_cast<String^>(hostURI[HostKey]), - dynamic_cast<String^>(hostDir[HostKey]), + safe_cast<String^>(hostURI[HostKey]), + safe_cast<String^>(hostDir[HostKey]), this, HostKey); return true; } @@ -180,9 +180,9 @@ if (!ConnectHost(newHostKey)) { server_rec *s = (server_rec *)ServerRecPtr; String ^msg = String::Concat(L"Mount failure creating host ", - dynamic_cast<String^>(hostURI[newHostKey]), + safe_cast<String^>(hostURI[newHostKey]), L" mapped to ", - dynamic_cast<String^>(hostDir[newHostKey])); + safe_cast<String^>(hostDir[newHostKey])); LogServerError(msg, APLOG_ERR, 0, s); newHostKey = -1; } @@ -197,7 +197,7 @@ Object ^obj = hostObj[HostKey]; if (obj != nullptr) { try { - Host ^host = dynamic_cast<Host^>(obj); + Host ^host = safe_cast<Host^>(obj); int status = host->HandleRequest(ReqRecordPtr); return status; } @@ -223,9 +223,9 @@ } msg = String::Concat(L"Restarting host of ", - dynamic_cast<String^>(hostURI[HostKey]), + safe_cast<String^>(hostURI[HostKey]), L" mapped to ", - dynamic_cast<String^>(hostDir[HostKey])); + safe_cast<String^>(hostDir[HostKey])); LogServerError(msg, APLOG_INFO, 0, rr->server); int welocked = 0; @@ -253,9 +253,9 @@ Threading::Monitor::Exit(this); msg = String::Concat(L"Mount failed to connect ", L"to the restarting host ", - dynamic_cast<String^>(hostURI[HostKey]), + safe_cast<String^>(hostURI[HostKey]), L" mapped to ", - dynamic_cast<String^>(hostDir[HostKey])); + safe_cast<String^>(hostDir[HostKey])); LogServerError(msg, APLOG_ERR, 0, rr->server); return 500; } @@ -264,9 +264,9 @@ Threading::Monitor::Exit(this); msg = String::Concat(L"Mount failed to query ", L"the restarting host ", - dynamic_cast<String^>(hostURI[HostKey]), + safe_cast<String^>(hostURI[HostKey]), L" mapped to ", - dynamic_cast<String^>(hostDir[HostKey])); + safe_cast<String^>(hostDir[HostKey])); LogServerError(msg, APLOG_ERR, 0, rr->server); return 500; } @@ -278,9 +278,9 @@ Threading::Monitor::Exit(this); } msg = String::Concat(L"Mount failure restarting host ", - dynamic_cast<String^>(hostURI[HostKey]), + safe_cast<String^>(hostURI[HostKey]), L" mapped to ", - dynamic_cast<String^>(hostDir[HostKey])); + safe_cast<String^>(hostDir[HostKey])); LogServerError(msg, APLOG_ERR, 0, rr->server); msg = String::Concat(L"Mount failure exception restarting " L"host; ", e->ToString()); @@ -289,7 +289,7 @@ } try { - Host ^host = dynamic_cast<Host^>(obj); + Host ^host = safe_cast<Host^>(obj); int status = host->HandleRequest(ReqRecordPtr); return status; } Modified: mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.cpp =================================================================== --- mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.cpp 2007-08-15 07:18:36 UTC (rev 200) +++ mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.cpp 2007-08-15 09:19:49 UTC (rev 201) @@ -241,8 +241,7 @@ #endif return; } - const char *buf_data - = static_cast<const char *>(data.ToPointer()); + const char *buf_data = static_cast<const char *>(data.ToPointer()); #ifdef _DEBUG String ^res = String::Concat(L"SendResponseFromMemory: passed ", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2007-08-15 07:18:37
|
Revision: 200 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=200&view=rev Author: wrowe Date: 2007-08-15 00:18:36 -0700 (Wed, 15 Aug 2007) Log Message: ----------- Major Patch; Adopt VC 8.0 (Studio 2005) C++ syntax. Major changes include language class keywords, pinning pointers and explicit references (simplying "true" pointers). Modified Paths: -------------- mod_aspdotnet2/trunk/Apache.Web/Apache.Web.h mod_aspdotnet2/trunk/Apache.Web/Host.h mod_aspdotnet2/trunk/Apache.Web/HostFactory.h mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.cpp mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.h Modified: mod_aspdotnet2/trunk/Apache.Web/Apache.Web.h =================================================================== --- mod_aspdotnet2/trunk/Apache.Web/Apache.Web.h 2007-08-15 07:17:13 UTC (rev 199) +++ mod_aspdotnet2/trunk/Apache.Web/Apache.Web.h 2007-08-15 07:18:36 UTC (rev 200) @@ -1,4 +1,4 @@ -/* Copyright 2002-2006 Covalent Technologies +/* Copyright 2007 Covalent Technologies * * Covalent Technologies licenses this file to You under the Apache * Software Foundation's Apache License, Version 2.0 (the "License"); @@ -60,24 +60,22 @@ using namespace System::Runtime::Remoting::Lifetime; //using namespace System::Diagnostics; -#using "Apache.Web.Helpers.netmodule" - namespace Apache { namespace Web { // Forward declare a Host - public __gc class Host; + ref class Host; // Define using dispinterfaces for COM transition to ASP.Net - [InterfaceType(ComInterfaceType::InterfaceIsIDispatch)] - public __gc __interface IApacheWebHostFactory + public interface class IApacheWebHostFactory { public: - HRESULT Configure(String *path); + HRESULT Configure(String ^path); void Destroy(void); // Returns HostKey to pass on to HandleHostRequest() - int CreateHost(String *virtualPath, String *physicalPath, UINT_PTR ServerRecPtr); + int CreateHost(String ^virtualPath, String ^physicalPath, + UINT_PTR ServerRecPtr); // Returns HTTP Status from ApacheWebHost::HandleRequest int HandleHostRequest(int HostKey, UINT_PTR ReqRecordPtr); }; Modified: mod_aspdotnet2/trunk/Apache.Web/Host.h =================================================================== --- mod_aspdotnet2/trunk/Apache.Web/Host.h 2007-08-15 07:17:13 UTC (rev 199) +++ mod_aspdotnet2/trunk/Apache.Web/Host.h 2007-08-15 07:18:36 UTC (rev 200) @@ -1,4 +1,4 @@ -/* Copyright 2002-2006 Covalent Technologies +/* Copyright 2007 Covalent Technologies * * Covalent Technologies licenses this file to You under the Apache * Software Foundation's Apache License, Version 2.0 (the "License"); @@ -28,40 +28,41 @@ { namespace Web { - public __gc class HostFactory; + ref class HostFactory; - public __gc class Host : public MarshalByRefObject + public ref class Host : public MarshalByRefObject { private: // Create our utf8-encoding to handle utf8->unicode names - static Encoding *utf8_encoding = new UTF8Encoding(false); + static Encoding ^utf8_encoding = gcnew UTF8Encoding(false); // our default cultureNeutral object for proper strcmp's - static CultureInfo *nullCulture = CultureInfo::InvariantCulture; + static CultureInfo ^nullCulture = CultureInfo::InvariantCulture; // No trailing slash for this URI-path - String *virtualPath; + String ^virtualPath; // No trailing backslash for this filesystem path - String *physicalPath; + String ^physicalPath; - HostFactory *thisFactory; + HostFactory ^thisFactory; int thisHostKey; protected: - void ~Host(); + ~Host(); public: Host() { - thisFactory = NULL; + thisFactory = nullptr; thisHostKey = 0; } - virtual Object* InitializeLifetimeService() + virtual Object ^ InitializeLifetimeService() override { - ILease *lease - = __try_cast<ILease*>(MarshalByRefObject::InitializeLifetimeService()); - if (lease->CurrentState == System::Runtime::Remoting::Lifetime::LeaseState::Initial) { + ILease ^lease = dynamic_cast<ILease ^> + (MarshalByRefObject::InitializeLifetimeService()); + if (lease->CurrentState + == System::Runtime::Remoting::Lifetime::LeaseState::Initial) { lease->InitialLeaseTime = TimeSpan::FromDays(366); lease->SponsorshipTimeout = TimeSpan::FromMinutes(2); lease->RenewOnCallTime = TimeSpan::FromMinutes(1); @@ -70,8 +71,8 @@ } // Internal accessor for new Host construction - void Configure(String *VirtualPath, String *PhysicalPath, - HostFactory *Factory, int HostKey) + void Configure(String ^VirtualPath, String ^PhysicalPath, + HostFactory ^Factory, int HostKey) { // // The ApplicationHost::CreateApplicationHost() constructor @@ -85,83 +86,90 @@ virtualPath = VirtualPath->Replace(L'\\', L'/'); if (physicalPath->EndsWith(L"\\")) { physicalPath - = physicalPath->Substring(0, physicalPath->get_Length() - 1); + = physicalPath->Substring(0, physicalPath->Length - 1); } if (virtualPath->EndsWith(L"/")) { virtualPath - = virtualPath->Substring(0, virtualPath->get_Length() - 1); + = virtualPath->Substring(0, virtualPath->Length - 1); } } // Reports an error message in the error log - void LogRequestError(String *msg, int loglevel, apr_status_t rv, request_rec __nogc *rr) + void LogRequestError(String ^msg, int loglevel, apr_status_t rv, + request_rec *rr) { - unsigned char avalue __gc[] + array<unsigned char> ^avalue = utf8_encoding->GetBytes(msg); - unsigned char __pin *msg_text = &avalue[0]; - ap_log_rerror("Apache.Web", 0, loglevel | (rv ? 0 : APLOG_NOERRNO), rv, rr, - "mod_aspdotnet: %s", (char*) msg_text, NULL); + pin_ptr<unsigned char> msg_text = &avalue[0]; + ap_log_rerror("Apache.Web", 0, loglevel | (rv ? 0 : APLOG_NOERRNO), + rv, rr, "mod_aspdotnet: %s", (char*) msg_text, NULL); } - // Instantiates a new Apache.Web.WorkerRequest object from the given request_rec* + // Instantiates a new Apache.Web.WorkerRequest object from the given + // request_rec* int HandleRequest(UINT_PTR ReqRecordPtr) { try { - WorkerRequest *request = new WorkerRequest(ReqRecordPtr, this); + WorkerRequest ^request = gcnew WorkerRequest(ReqRecordPtr, + this); int status = request->Handler(); return status; } - catch (Exception *e) { + catch (Exception ^e) { LogRequestError(L"Failed to create ASP.NET Request, " L"Exception follows", APLOG_ERR, 0, - (request_rec __nogc *)ReqRecordPtr); + (request_rec *)ReqRecordPtr); LogRequestError(e->ToString(), APLOG_ERR, 0, - (request_rec __nogc *)ReqRecordPtr); + (request_rec *)ReqRecordPtr); return 500; } } // Returns the Virtual URI-path of this host, with no trailing slash - String *GetVirtualPath(void) { + String ^ GetVirtualPath(void) { return virtualPath; } - // Returns the Physical filesystem path of this host, with no trailing slash - String *GetPhysicalPath(void) { + // Returns the Physical filesystem path of this host, + // with no trailing slash + String ^ GetPhysicalPath(void) { return physicalPath; } - // Translate the given URI-path in this host's Virtual path to a filesystem path - String *MapPath(String *path, request_rec __nogc *rr) { + // Translate the given URI-path in this host's Virtual path to + // a filesystem path + String ^ MapPath(String ^path, request_rec *rr) { // - // ...relative to this host's Physical path. The function returns NULL - // if the given URI-path is outside of the Virtual path of this host. + // ...relative to this host's Physical path. The function + // returns NULL if the given URI-path is outside of the Virtual + // path of this host. // - String *buildpath; + String ^buildpath; - if (!path || (path->get_Length() <= 0)) { + if (!path || (path->Length <= 0)) { return physicalPath; } else { buildpath = path->Replace(L'/', L'\\'); } - String *testpath = path->Replace(L'\\', L'/'); + String ^testpath = path->Replace(L'\\', L'/'); - if (testpath->get_Chars(0) == L'/') { + if (testpath[0] == L'/') { if (String::Compare(testpath, 0, virtualPath, 0, - virtualPath->get_Length(), + virtualPath->Length, true, nullCulture)) { - String *res = String::Concat(L"MapPath: could not map ", path, - L" within ", virtualPath); + String ^res = String::Concat(L"MapPath: could not map ", + path, L" within ", + virtualPath); LogRequestError(res, APLOG_DEBUG, 0, rr); - return NULL; + return nullptr; } else { - if (testpath->get_Length() > virtualPath->get_Length()) { + if (testpath->Length > virtualPath->Length) { buildpath = String::Concat(physicalPath, buildpath->Substring( - virtualPath->get_Length())); + virtualPath->Length)); } else { buildpath = physicalPath; @@ -171,7 +179,7 @@ else { buildpath = String::Concat(physicalPath, L"\\", buildpath->Substring( - virtualPath->get_Length())); + virtualPath->Length)); } return buildpath; } Modified: mod_aspdotnet2/trunk/Apache.Web/HostFactory.h =================================================================== --- mod_aspdotnet2/trunk/Apache.Web/HostFactory.h 2007-08-15 07:17:13 UTC (rev 199) +++ mod_aspdotnet2/trunk/Apache.Web/HostFactory.h 2007-08-15 07:18:36 UTC (rev 200) @@ -1,4 +1,4 @@ -/* Copyright 2002-2006 Covalent Technologies +/* Copyright 2007 Covalent Technologies * * Covalent Technologies licenses this file to You under the Apache * Software Foundation's Apache License, Version 2.0 (the "License"); @@ -14,7 +14,8 @@ * limitations under the License. */ -// Apache::Web::HostFactory.h managed host engine for mod_aspdotnet initialization +// Apache::Web::HostFactory.h managed host engine for mod_aspdotnet +// initialization #pragma once @@ -28,26 +29,26 @@ namespace Web { // Forward declare a Host - public __gc class Host; + ref class Host; // The HostFactory engine to instantiate new Host objects - public __gc class HostFactory + public ref class HostFactory : public IApacheWebHostFactory, public MarshalByRefObject { private: // Create our utf8-encoding to handle utf8->unicode names - Encoding* utf8_encoding; - ArrayList* hostURI; - ArrayList* hostDir; - ArrayList* hostObj; - ArrayList* hostSvr; + Encoding ^utf8_encoding; + ArrayList ^hostURI; + ArrayList ^hostDir; + ArrayList ^hostObj; + ArrayList ^hostSvr; private: // Reports an error message in the error log - void LogServerError(String *msg, int loglevel, int rv, server_rec __nogc *s) + void LogServerError(String ^msg, int loglevel, int rv, server_rec *s) { - unsigned char avalue __gc[] = utf8_encoding->GetBytes(msg); - unsigned char __pin *msg_text = &avalue[0]; + array<unsigned char> ^avalue = utf8_encoding->GetBytes(msg); + pin_ptr<unsigned char> msg_text = &avalue[0]; ap_log_error("Apache.Web", 0, loglevel|(rv ? 0 : APLOG_NOERRNO), rv, s, "mod_aspdotnet: %s", (char*) msg_text, NULL); } @@ -55,18 +56,19 @@ public: HostFactory() { - utf8_encoding = new UTF8Encoding(false); - hostURI = new ArrayList(); - hostDir = new ArrayList(); - hostObj = new ArrayList(); - hostSvr = new ArrayList(); + utf8_encoding = gcnew UTF8Encoding(false); + hostURI = gcnew ArrayList(); + hostDir = gcnew ArrayList(); + hostObj = gcnew ArrayList(); + hostSvr = gcnew ArrayList(); } - virtual Object* InitializeLifetimeService() + virtual Object ^ InitializeLifetimeService() override { - ILease *lease - = __try_cast<ILease*>(MarshalByRefObject::InitializeLifetimeService()); - if (lease->CurrentState == System::Runtime::Remoting::Lifetime::LeaseState::Initial) { + ILease ^lease = dynamic_cast<ILease^> + (MarshalByRefObject::InitializeLifetimeService()); + if (lease->CurrentState + == System::Runtime::Remoting::Lifetime::LeaseState::Initial) { lease->InitialLeaseTime = TimeSpan::FromDays(366); lease->SponsorshipTimeout = TimeSpan::FromMinutes(2); lease->RenewOnCallTime = TimeSpan::FromMinutes(1); @@ -74,8 +76,9 @@ return lease; } - // Returns E_FAIL if HostFactory cannot be configured; path is a noop argument - HRESULT Configure(String *path) + // Returns E_FAIL if HostFactory cannot be configured; + // path is a noop argument + virtual HRESULT Configure(String ^path) { #ifdef _DEBUG if (!WorkerRequest::CodeValidate()) @@ -85,101 +88,101 @@ return S_OK; } - void Destroy(void) + virtual void Destroy(void) { if (utf8_encoding) { - utf8_encoding = NULL; - int hosts = hostObj->get_Count(); + utf8_encoding = nullptr; + int hosts = hostObj->Count; for (int i = 0; i < hosts; ++i) { // Don't fault if the hostObj is already destroyed try { - hostObj->set_Item(i, NULL); + hostObj[i] = nullptr; } - catch (Exception * /*e*/) { + catch (Exception ^ /*e*/) { } } - hostURI = NULL; - hostDir = NULL; - hostObj = NULL; - hostSvr = NULL; + hostURI = nullptr; + hostDir = nullptr; + hostObj = nullptr; + hostSvr = nullptr; } } // Instantiate a new Host object; trailing slashes are acceptable bool ConnectHost(int HostKey) { - Type* hostType = __typeof(Host); - Object* newHost; + Type ^hostType = Host::typeid; + Object ^newHost; try { newHost = ApplicationHost::CreateApplicationHost(hostType, - __try_cast<String*>(hostURI->get_Item(HostKey)), - __try_cast<String*>(hostDir->get_Item(HostKey))); - hostObj->set_Item(HostKey, newHost); + dynamic_cast<String^>(hostURI[HostKey]), + dynamic_cast<String^>(hostDir[HostKey])); + hostObj[HostKey] = newHost; if (newHost) { - Host *host = __try_cast<Host*>(newHost); + Host ^host = dynamic_cast<Host^>(newHost); host->Configure( - __try_cast<String*>(hostURI->get_Item(HostKey)), - __try_cast<String*>(hostDir->get_Item(HostKey)), + dynamic_cast<String^>(hostURI[HostKey]), + dynamic_cast<String^>(hostDir[HostKey]), this, HostKey); return true; } else { - server_rec __nogc *s = (server_rec __nogc *) - (*__try_cast<__box int*>(hostSvr->get_Item(HostKey))); + server_rec *s = + (server_rec *)(static_cast<UINT_PTR>(hostSvr[HostKey])); LogServerError(L"mod_aspdotnet: CreateApplicationHost " L"returned NULL, perhaps the AspNetMount " L"paths were invalid", APLOG_ERR, 0, s); } } - catch (Exception *e) { - server_rec __nogc *s = (server_rec __nogc *) - (*__try_cast<__box int*>(hostSvr->get_Item(HostKey))); + catch (Exception ^e) { + server_rec *s = (server_rec *) + (server_rec *)(static_cast<UINT_PTR>(hostSvr[HostKey])); LogServerError(L"mod_aspdotnet: CreateApplicationHost failed, " L"Exception follows", APLOG_ERR, 0, s); LogServerError(e->ToString(), APLOG_ERR, 0, s); - hostObj->set_Item(HostKey, NULL); + hostObj[HostKey] = nullptr; } return false; } - void HostFinalized(int HostKey, Host *thisHost) + void HostFinalized(int HostKey, Host ^thisHost) { // Destroy only the correct host Threading::Monitor::Enter(this); - if (thisHost->Equals(hostObj->get_Item(HostKey))) + if (thisHost->Equals(hostObj[HostKey])) { try { - hostObj->set_Item(HostKey, NULL); + hostObj[HostKey] = nullptr; } - catch (Exception * /*e*/) { + catch (Exception ^ /*e*/) { } } Threading::Monitor::Exit(this); } // Instantiate a new Host object; trailing slashes are acceptable - int CreateHost(String* virtualPath, String* physicalPath, UINT_PTR ServerRecPtr) + virtual int CreateHost(String ^virtualPath, String ^physicalPath, + UINT_PTR ServerRecPtr) { int newHostKey; physicalPath = physicalPath->Replace(L'/', L'\\'); - newHostKey = hostObj->get_Count(); - // TODO: WHY are we boxing an int? - hostSvr->Add(__box(ServerRecPtr)); + newHostKey = hostObj->Count; + hostSvr->Add(ServerRecPtr); hostURI->Add(virtualPath); hostDir->Add(physicalPath); - hostObj->Add(NULL); + hostObj->Add(nullptr); if (!ConnectHost(newHostKey)) { - server_rec __nogc *s = (server_rec __nogc *)ServerRecPtr; - String *msg = String::Concat(L"Mount failure creating host ", - __try_cast<String*>(hostURI->get_Item(newHostKey)), + server_rec *s = (server_rec *)ServerRecPtr; + String ^msg = String::Concat(L"Mount failure creating host ", + dynamic_cast<String^>(hostURI[newHostKey]), L" mapped to ", - __try_cast<String*>(hostDir->get_Item(newHostKey))); + dynamic_cast<String^>(hostDir[newHostKey])); LogServerError(msg, APLOG_ERR, 0, s); newHostKey = -1; } @@ -187,30 +190,30 @@ return newHostKey; } - int HandleHostRequest(int HostKey, UINT_PTR ReqRecordPtr) { - request_rec __nogc *rr = (request_rec __nogc *)ReqRecordPtr; - String* msg; + virtual int HandleHostRequest(int HostKey, UINT_PTR ReqRecordPtr) { + request_rec *rr = (request_rec *)ReqRecordPtr; + String ^msg; - Object* obj = hostObj->get_Item(HostKey); - if (obj != NULL) { + Object ^obj = hostObj[HostKey]; + if (obj != nullptr) { try { - Host* host = __try_cast<Host*>(obj); + Host ^host = dynamic_cast<Host^>(obj); int status = host->HandleRequest(ReqRecordPtr); return status; } // Presume all Remoting/AppDomainUnloadedExceptions // require us to recreate the Host. Fall through... - catch (System::Runtime::Remoting::RemotingException *e) { + catch (System::Runtime::Remoting::RemotingException ^e) { msg = String::Concat(L"RemotingException; ", e->ToString()); LogServerError(msg, APLOG_DEBUG, 0, rr->server); } - catch (System::AppDomainUnloadedException *e) { + catch (System::AppDomainUnloadedException ^e) { msg = String::Concat(L"AppDomainUnloadedException; ", e->ToString()); LogServerError(msg, APLOG_DEBUG, 0, rr->server); } - catch (Exception *e) { + catch (Exception ^e) { msg = String::Concat(L"HandleRequest: Failed with " L"unexpected Exception; ", e->ToString()); @@ -220,62 +223,64 @@ } msg = String::Concat(L"Restarting host of ", - __try_cast<String*>(hostURI->get_Item(HostKey)), + dynamic_cast<String^>(hostURI[HostKey]), L" mapped to ", - __try_cast<String*>(hostDir->get_Item(HostKey))); + dynamic_cast<String^>(hostDir[HostKey])); LogServerError(msg, APLOG_INFO, 0, rr->server); int welocked = 0; try { Threading::Monitor::Enter(this); welocked = 1; - Object* tryobj = hostObj->get_Item(HostKey); + Object ^tryobj = hostObj[HostKey]; if (tryobj == obj) { // Release all stale obj references and catch any // sort of dispatch exceptions (and ignore them). try { - hostObj->set_Item(HostKey, NULL); + hostObj[HostKey] = nullptr; } - catch (Exception * /*e*/) { + catch (Exception ^ /*e*/) { } try { obj = tryobj; } - catch (Exception * /*e*/) { + catch (Exception ^ /*e*/) { } } - if (obj == NULL) { + if (obj == nullptr) { if (!ConnectHost(HostKey)) { Threading::Monitor::Exit(this); - msg = String::Concat(L"Mount failed to connect restarting host ", - __try_cast<String*>(hostURI->get_Item(HostKey)), + msg = String::Concat(L"Mount failed to connect ", + L"to the restarting host ", + dynamic_cast<String^>(hostURI[HostKey]), L" mapped to ", - __try_cast<String*>(hostDir->get_Item(HostKey))); + dynamic_cast<String^>(hostDir[HostKey])); LogServerError(msg, APLOG_ERR, 0, rr->server); return 500; } - obj = hostObj->get_Item(HostKey); + obj = hostObj[HostKey]; if (!obj) { Threading::Monitor::Exit(this); - msg = String::Concat(L"Mount failed to query restarting host ", - __try_cast<String*>(hostURI->get_Item(HostKey)), + msg = String::Concat(L"Mount failed to query ", + L"the restarting host ", + dynamic_cast<String^>(hostURI[HostKey]), L" mapped to ", - __try_cast<String*>(hostDir->get_Item(HostKey))); + dynamic_cast<String^>(hostDir[HostKey])); LogServerError(msg, APLOG_ERR, 0, rr->server); return 500; } } Threading::Monitor::Exit(this); } - catch (Exception *e) { + catch (Exception ^e) { if (welocked) { Threading::Monitor::Exit(this); } msg = String::Concat(L"Mount failure restarting host ", - __try_cast<String*>(hostURI->get_Item(HostKey)), + dynamic_cast<String^>(hostURI[HostKey]), L" mapped to ", - __try_cast<String*>(hostDir->get_Item(HostKey))); + dynamic_cast<String^>(hostDir[HostKey])); LogServerError(msg, APLOG_ERR, 0, rr->server); msg = String::Concat(L"Mount failure exception restarting " L"host; ", e->ToString()); @@ -284,11 +289,11 @@ } try { - Host* host = __try_cast<Host*>(obj); + Host ^host = dynamic_cast<Host^>(obj); int status = host->HandleRequest(ReqRecordPtr); return status; } - catch (Exception *e) { + catch (Exception ^e) { msg = String::Concat(L"RequestHandler; failure following " L"host restart; ", e->ToString()); LogServerError(msg, APLOG_ERR, 0, rr->server); @@ -297,7 +302,7 @@ } protected: - void ~HostFactory() + ~HostFactory() { Destroy(); } Modified: mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.cpp =================================================================== --- mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.cpp 2007-08-15 07:17:13 UTC (rev 199) +++ mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.cpp 2007-08-15 07:18:36 UTC (rev 200) @@ -29,59 +29,59 @@ try { thisFactory->HostFinalized(thisHostKey, this); } - catch (Exception * /*e*/) { + catch (Exception ^ /*e*/) { } } -Apache::Web::WorkerRequest::WorkerRequest(UINT_PTR Req, Host *ThisHost) - : SimpleWorkerRequest(String::Empty, String::Empty, 0) +Apache::Web::WorkerRequest::WorkerRequest(UINT_PTR Req, Host ^ThisHost) + : SimpleWorkerRequest(String::Empty, String::Empty, nullptr) { // Initialize empty placeholders - request_headers_value = new String* [RequestHeaderMaximum]; - unk_req_header_name = new ArrayList(); - unk_req_header_index = new ArrayList(); - unk_req_header_value = new ArrayList(); - env_name = new ArrayList(); - env_value = new ArrayList(); - serverName = NULL; - remoteName = NULL; + request_headers_value = gcnew array<String^>(RequestHeaderMaximum); + unk_req_header_name = gcnew ArrayList(); + unk_req_header_index = gcnew ArrayList(); + unk_req_header_value = gcnew ArrayList(); + env_name = gcnew ArrayList(); + env_value = gcnew ArrayList(); + serverName = nullptr; + remoteName = nullptr; seen_eos = 0; body_sent = 0; bytes_read = 0; // Initialize state pointers to our encoding, request and host - rr = (request_rec __nogc *)Req; + rr = (request_rec *)Req; host = ThisHost; // Deal with the usual request variables - uri = rr->uri; - unparsed_uri = rr->unparsed_uri; + uri = gcnew String(rr->uri); + unparsed_uri = gcnew String(rr->unparsed_uri); - queryargs = rr->args; + queryargs = gcnew String(rr->args); if (!rr->args || !*rr->args) { - query_raw = new unsigned char __gc[0]; + query_raw = gcnew array<unsigned char>(0); } else { apr_size_t len = strlen(rr->args); - query_raw = new unsigned char __gc[len]; - unsigned char __pin *foo = &query_raw[0]; + query_raw = gcnew array<unsigned char>(len); + pin_ptr<unsigned char> foo = &query_raw[0]; memcpy(foo, rr->args, len); } // rr->filename is utf-8 encoded for Apache 2.0/WinNT - filename = new String(rr->filename ? rr->filename : "", 0, - rr->filename ? strlen(rr->filename) : 0, - utf8_encoding); + filename = gcnew String(rr->filename ? rr->filename : "", 0, + rr->filename ? strlen(rr->filename) : 0, + utf8_encoding); filename = filename->Replace(L'/', L'\\'); // Now deal with the client's request headers - const apr_array_header_t __nogc* arr = apr_table_elts(rr->headers_in); - const char __nogc* elt = arr->elts; + const apr_array_header_t *arr = apr_table_elts(rr->headers_in); + const char *elt = arr->elts; for (int i = 0; i < arr->nelts; ++i, elt += arr->elt_size) { - apr_table_entry_t __nogc* pair = (apr_table_entry_t *)(void*)(elt); - String* key(pair->key); - String* val(pair->val); - String* key_index(key->ToLower(nullCulture)); + apr_table_entry_t *pair = (apr_table_entry_t *)(void*)(elt); + String ^key = gcnew String(pair->key); + String ^val = gcnew String(pair->val); + String ^key_index = gcnew String(key->ToLower(nullCulture)); int ent = Array::IndexOf(request_headers_index_s, key_index); if (ent >= 0) { request_headers_value[ent] = val; @@ -93,22 +93,22 @@ } } - int elts = unk_req_header_value->get_Count(); - unk_req_hdr_arr = new _gcA_gcA_gcString(elts); + int elts = unk_req_header_value->Count; + unk_req_hdr_arr = gcnew array<array<String^>^>(elts); for (int i = 0; i < elts; ++i) { - String __gc* ent __gc[] = new String __gc* __gc[2]; - ent[0] = static_cast<String *>(unk_req_header_name->get_Item(i)); - ent[1] = static_cast<String *>(unk_req_header_value->get_Item(i)); - unk_req_hdr_arr->Set(i, ent); + array<String^> ^ent = gcnew array<String^>(2); + ent[0] = static_cast<String ^>(unk_req_header_name[i]); + ent[1] = static_cast<String ^>(unk_req_header_value[i]); + unk_req_hdr_arr[i] = ent; } arr = apr_table_elts(rr->subprocess_env); elt = arr->elts; for (int i = 0; i < arr->nelts; ++i, elt += arr->elt_size) { - apr_table_entry_t __nogc* pair = (apr_table_entry_t *)(void*)(elt); - String* var(pair->key); - String* val(pair->val); + apr_table_entry_t *pair = (apr_table_entry_t *)(void*)(elt); + String ^var = gcnew String(pair->key); + String ^val = gcnew String(pair->val); env_name->Add(var); env_value->Add(val); } @@ -119,53 +119,55 @@ // after Apache::Web::WorkerRequest // -void Apache::Web::WorkerRequest::LogRequestError(String *msg, int loglevel, int rv) { +void Apache::Web::WorkerRequest::LogRequestError(String ^msg, int loglevel, + int rv) { host->LogRequestError(msg, loglevel, rv, rr); } -String* Apache::Web::WorkerRequest::MapPath(String* path) +String ^ Apache::Web::WorkerRequest::MapPath(String ^path) { - String *mapped = host->MapPath(path, rr); + String ^mapped = host->MapPath(path, rr); #ifdef _DEBUG - String *res = String::Concat(L"MapPath: ", path, + String ^res = String::Concat(L"MapPath: ", path, L" mapped to ", mapped); LogRequestError(res, APLOG_DEBUG, 0); #endif return mapped; } -String* Apache::Web::WorkerRequest::GetAppPath(void) +String ^ Apache::Web::WorkerRequest::GetAppPath(void) { #ifdef _DEBUG - String *res = String::Concat(L"GetAppPath: returns ", host->GetVirtualPath()); + String ^res = String::Concat(L"GetAppPath: returns ", + host->GetVirtualPath()); LogRequestError(res, APLOG_DEBUG, 0); #endif return host->GetVirtualPath(); } -String* Apache::Web::WorkerRequest::GetAppPathTranslated(void) +String ^ Apache::Web::WorkerRequest::GetAppPathTranslated(void) { - String *bslashed = host->GetPhysicalPath(); - bslashed = bslashed->Insert(bslashed->get_Length(), L"\\"); + String ^bslashed = host->GetPhysicalPath(); + bslashed = bslashed->Insert(bslashed->Length, L"\\"); #ifdef _DEBUG - String *res = String::Concat(L"GetAppPathTranslated: returns ", bslashed); + String ^res = String::Concat(L"GetAppPathTranslated: returns ", bslashed); LogRequestError(res, APLOG_DEBUG, 0); #endif return bslashed; } -String* Apache::Web::WorkerRequest::GetFilePath(void) +String ^ Apache::Web::WorkerRequest::GetFilePath(void) { // Break URI matching filename, ignoring path_info - String* strip = host->GetPhysicalPath(); - String* path = filename; + String ^strip = host->GetPhysicalPath(); + String ^path = filename; if (path->StartsWith(strip)) { - path = path->Substring(strip->get_Length()); + path = path->Substring(strip->Length); path = path->Insert(0, host->GetVirtualPath()); path = path->Replace(L'\\', L'/'); } #ifdef _DEBUG - String *res = String::Concat(L"GetFilePath: returns ", path); + String ^res = String::Concat(L"GetFilePath: returns ", path); LogRequestError(res, APLOG_DEBUG, 0); #endif return path; @@ -173,11 +175,11 @@ #pragma unmanaged -static apr_status_t InternalFlushResponse(request_rec __nogc *rr) +static apr_status_t InternalFlushResponse(request_rec *rr) { - conn_rec __nogc *c = rr->connection; - apr_bucket_brigade __nogc *bb; - apr_bucket __nogc *b; + conn_rec *c = rr->connection; + apr_bucket_brigade *bb; + apr_bucket *b; bb = apr_brigade_create(rr->pool, c->bucket_alloc); b = apr_bucket_eos_create(c->bucket_alloc); @@ -197,7 +199,7 @@ // Report completion if (eosnCallback) { eosnCallback->Invoke(this, eosnExtra); - eosnCallback = NULL; + eosnCallback = nullptr; } #ifdef _DEBUG LogRequestError(L"FlushResponse: final", APLOG_DEBUG, 0); @@ -212,13 +214,13 @@ #pragma unmanaged -static apr_status_t InternalResponseFromMemory(request_rec __nogc *rr, - const char __nogc *buf_data, +static apr_status_t InternalResponseFromMemory(request_rec *rr, + const char *buf_data, int length) { - conn_rec __nogc *c = rr->connection; - apr_bucket_brigade __nogc *bb; - apr_bucket __nogc *b; + conn_rec *c = rr->connection; + apr_bucket_brigade *bb; + apr_bucket *b; bb = apr_brigade_create(rr->pool, c->bucket_alloc); b = apr_bucket_transient_create(buf_data, length, c->bucket_alloc); @@ -234,15 +236,16 @@ { if (!length) { #ifdef _DEBUG - LogRequestError("SendResponseFromMemory: passed zero byte buffer!", APLOG_DEBUG, 0); + LogRequestError("SendResponseFromMemory: passed zero byte buffer!", + APLOG_DEBUG, 0); #endif return; } - const char __nogc *buf_data - = static_cast<const char __nogc *>(data.ToPointer()); + const char *buf_data + = static_cast<const char *>(data.ToPointer()); #ifdef _DEBUG - String *res = String::Concat(L"SendResponseFromMemory: passed ", + String ^res = String::Concat(L"SendResponseFromMemory: passed ", (new Int32(length))->ToString(), L" byte buffer"); LogRequestError(res, APLOG_DEBUG, 0); @@ -259,13 +262,13 @@ } #pragma unmanaged -static apr_status_t InternalResponseFromFile(request_rec __nogc *rr, HANDLE hv, +static apr_status_t InternalResponseFromFile(request_rec *rr, HANDLE hv, __int64 offset, __int64 length) { - conn_rec __nogc *c = rr->connection; - apr_bucket_brigade __nogc *bb; - apr_bucket __nogc *b; - apr_file_t __nogc *fd; + conn_rec *c = rr->connection; + apr_bucket_brigade *bb; + apr_bucket *b; + apr_file_t *fd; apr_off_t fsize; apr_status_t rv; @@ -319,13 +322,14 @@ { if (!length) { #ifdef _DEBUG - LogRequestError("SendResponseFromFile: passed zero byte length!", APLOG_DEBUG, 0); + LogRequestError("SendResponseFromFile: passed zero byte length!", + APLOG_DEBUG, 0); #endif return; } #ifdef _DEBUG - String *res = String::Concat(L"SendResponseFromFile: passed ", + String ^res = String::Concat(L"SendResponseFromFile: passed ", (new Int64(length))->ToString(), L" byte request starting at offset ", (new Int64(offset))->ToString()); @@ -347,9 +351,9 @@ #pragma unmanaged -static apr_status_t InternalReadEntityBody(request_rec __nogc* rr, char __nogc* curptr, - apr_size_t size, int __nogc* bytes_read, - int __nogc* overflow, int __nogc* seen_eos) +static apr_status_t InternalReadEntityBody(request_rec *rr, char *curptr, + apr_size_t size, int *bytes_read, + int *overflow, int *seen_eos) { apr_bucket_brigade *bb; apr_status_t rv; @@ -357,15 +361,15 @@ *bytes_read = 0; // Reader-Writer helpers - apr_bucket __nogc *dummy_flush_bucket; - apr_bucket __nogc *dummy_eos_bucket; + apr_bucket *dummy_flush_bucket; + apr_bucket *dummy_eos_bucket; dummy_flush_bucket = apr_bucket_flush_create(rr->connection->bucket_alloc); dummy_eos_bucket = apr_bucket_eos_create(rr->connection->bucket_alloc); bb = apr_brigade_create(rr->pool, rr->connection->bucket_alloc); do { apr_bucket *bucket; - apr_size_t size_one = (HUGE_STRING_LEN <= size ? HUGE_STRING_LEN : size); + apr_size_t size_one = (HUGE_STRING_LEN <= size? HUGE_STRING_LEN: size); if ((rv = ap_get_brigade(rr->input_filters, bb, AP_MODE_READBYTES, @@ -414,22 +418,24 @@ #pragma managed -int Apache::Web::WorkerRequest::ReadEntityBody(unsigned char buffer __gc[], - int size) +int Apache::Web::WorkerRequest::ReadEntityBody(array<unsigned char> ^buffer, + int size) { - if (buffer->get_Length() < 1) { + if (buffer->Length < 1) { #ifdef _DEBUG - LogRequestError(L"ReadEntityBody: noread (passed 0 byte buffer)", APLOG_DEBUG, 0); + LogRequestError(L"ReadEntityBody: noread (passed 0 byte buffer)", + APLOG_DEBUG, 0); #endif return 0; } - int __pin *eos = &seen_eos; + pin_ptr<int> eos = &seen_eos; int read; int overflow; - unsigned char __pin *lockbuff = &buffer[0]; - void *startptr = static_cast<void __nogc*>(lockbuff); - apr_status_t rv = InternalReadEntityBody(rr, static_cast<char __nogc*>(startptr), - (apr_size_t)size, &read, &overflow, eos); + pin_ptr<unsigned char> lockbuff = &buffer[0]; + void *startptr = static_cast<void *>(lockbuff); + apr_status_t rv = InternalReadEntityBody(rr, static_cast<char *>(startptr), + (apr_size_t)size, &read, &overflow, + eos); bytes_read += read; if (rv != APR_SUCCESS) { LogRequestError(L"ReadEntityBody: brigade read failure " @@ -440,7 +446,7 @@ L"reading the request body", APLOG_ERR, rv); } #ifdef _DEBUG - String *res = String::Concat(L"ReadEntityBody: read ", + String ^res = String::Concat(L"ReadEntityBody: read ", (new Int32(read))->ToString(), L" bytes"); LogRequestError(res, APLOG_DEBUG, 0); @@ -451,8 +457,8 @@ int Apache::Web::WorkerRequest::Handler(void) { - wait_complete = new System::Threading::ManualResetEvent(false); - apr_bucket_brigade __nogc* bb; + wait_complete = gcnew System::Threading::ManualResetEvent(false); + apr_bucket_brigade *bb; apr_status_t rv; apr_size_t size = 0; @@ -460,18 +466,18 @@ // // Yes, this code is remarkably similar to InternalReadEntityBody, // however, for speed that code is entirely managed and incapable - // of allocating a char __gc[] that we need below. In the code - // below, we allocate exactly the correct __gc[] required to + // of allocating a char ref [] that we need below. In the code + // below, we allocate exactly the correct ref [] required to // store the initial bytes, up to the MS semi-standard 49152. // - apr_bucket __nogc *dummy_flush_bucket; - apr_bucket __nogc *dummy_eos_bucket; + apr_bucket *dummy_flush_bucket; + apr_bucket *dummy_eos_bucket; dummy_flush_bucket = apr_bucket_flush_create(rr->connection->bucket_alloc); dummy_eos_bucket = apr_bucket_eos_create(rr->connection->bucket_alloc); bb = apr_brigade_create(rr->pool, rr->connection->bucket_alloc); - apr_bucket __nogc* bucket; + apr_bucket *bucket; if ((rv = ap_get_brigade(rr->input_filters, bb, AP_MODE_READBYTES, @@ -480,13 +486,13 @@ apr_off_t sz; rv = apr_brigade_length(bb, 1, &sz); size = (apr_size_t)sz; - preread_body = new unsigned char __gc[size]; - unsigned char __pin *lockbuff; - char __nogc *curptr = NULL; + preread_body = gcnew array<unsigned char>(size); + pin_ptr<unsigned char> lockbuff; + char *curptr = NULL; if (size > 0) { lockbuff = &preread_body[0]; - void *startptr = static_cast<void __nogc*>(lockbuff); - curptr = static_cast<char __nogc*>(startptr); + void *startptr = static_cast<void *>(lockbuff); + curptr = static_cast<char *>(startptr); } while (!APR_BRIGADE_EMPTY(bb)) { bucket = APR_BRIGADE_FIRST(bb); @@ -523,7 +529,7 @@ } apr_brigade_cleanup(bb); #ifdef _DEBUG - String *res = String::Concat(L"Handler: preread ", + String ^res = String::Concat(L"Handler: preread ", (new Int64(bytes_read))->ToString(), L" request body bytes"); LogRequestError(res, APLOG_DEBUG, 0); @@ -538,12 +544,12 @@ try { HttpRuntime::ProcessRequest(this); } - catch (Exception *e) { + catch (Exception ^e) { if (!body_sent) { rr->status = 500; rr->status_line = ap_get_status_line(rr->status); } - String *msg = String::Concat(L"ProcessRequest: fatal exception " + String ^msg = String::Concat(L"ProcessRequest: fatal exception " L"processing request ", uri, L" exception follows;"); LogRequestError(msg, APLOG_ERR, 0); Modified: mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.h =================================================================== --- mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.h 2007-08-15 07:17:13 UTC (rev 199) +++ mod_aspdotnet2/trunk/Apache.Web/WorkerRequest.h 2007-08-15 07:18:36 UTC (rev 200) @@ -1,4 +1,4 @@ -/* Copyright 2002-2006 Covalent Technologies +/* Copyright 2007 Covalent Technologies * * Covalent Technologies licenses this file to You under the Apache * Software Foundation's Apache License, Version 2.0 (the "License"); @@ -25,123 +25,129 @@ #include "http_header_arrays.h" -using namespace Apache::Web::Helpers; using namespace System::Collections; using namespace System::Globalization; +using namespace cli; namespace Apache { namespace Web { // Forward declare a Host - public __gc class Host; + ref class Host; - public __gc class WorkerRequest : public SimpleWorkerRequest + public ref class WorkerRequest : public SimpleWorkerRequest { private: - static const char __nogc *response_headers_name_c __nogc[] = { + static array<const char *> ^response_headers_name_c = { response_headers_m("") }; - // static const char __nogc *request_headers_name_c __nogc[] = { + //* Unused variant, but trivial to enable later + // static array<const char *> ^request_headers_name_c = { // request_headers_m("") // }; - static String* response_headers_name_s[] = { + static array<String^> ^response_headers_name_s = { response_headers_m(L) }; - static String* request_headers_name_s[] = { + static array<String^> ^request_headers_name_s = { request_headers_m(L) }; - static String* response_headers_index_s[] = { + static array<String^> ^response_headers_index_s = { response_headers_index_m(L) }; - static String* request_headers_index_s[] = { + static array<String^> ^request_headers_index_s = { request_headers_index_m(L) }; // Create our utf8-encoding to handle utf8->unicode names - static Encoding *utf8_encoding = new UTF8Encoding(false); + static Encoding ^utf8_encoding = gcnew UTF8Encoding(false); // Create our invariant culture for handling ASCII case - static CultureInfo *nullCulture = CultureInfo::InvariantCulture; + static CultureInfo ^nullCulture = CultureInfo::InvariantCulture; - String* uri; - String* unparsed_uri; - String* queryargs; - String* filename; - String* remoteName; - String* serverName; + String ^uri; + String ^unparsed_uri; + String ^queryargs; + String ^filename; + String ^remoteName; + String ^serverName; - unsigned char query_raw __gc[]; + array<unsigned char> ^query_raw; - String* request_headers_value[]; - ArrayList* unk_req_header_name; - ArrayList* unk_req_header_index; - ArrayList* unk_req_header_value; - ArrayList* env_name; - ArrayList* env_value; + array<String^> ^request_headers_value; + ArrayList ^unk_req_header_name; + ArrayList ^unk_req_header_index; + ArrayList ^unk_req_header_value; + ArrayList ^env_name; + ArrayList ^env_value; - _gcA_gcA_gcString *unk_req_hdr_arr; + array<array<String^>^> ^unk_req_hdr_arr; - request_rec __nogc *rr; + request_rec *rr; - Host* host; - System::Threading::ManualResetEvent* wait_complete; - EndOfSendNotification *eosnCallback; - Object* eosnExtra; + Host ^host; + System::Threading::ManualResetEvent ^wait_complete; + EndOfSendNotification ^eosnCallback; + Object ^eosnExtra; - unsigned char preread_body __gc[]; + array<unsigned char> ^preread_body; int seen_eos; int body_sent; __int64 bytes_read; // Reports an error message in the error log - void LogRequestError(String *msg, int loglevel, apr_status_t rv); + void LogRequestError(String ^msg, int loglevel, apr_status_t rv); public: static bool CodeValidate() { - if (response_headers_name_s->get_Length() != ResponseHeaderMaximum) + if (response_headers_name_s->Length != ResponseHeaderMaximum) return false; - if (response_headers_index_s->get_Length() != ResponseHeaderMaximum) + if (response_headers_index_s->Length != ResponseHeaderMaximum) return false; for (int i = 0; i < ResponseHeaderMaximum; ++i) { - String *s = HttpWorkerRequest::GetKnownResponseHeaderName(i); + String ^s = HttpWorkerRequest::GetKnownResponseHeaderName(i); if (response_headers_name_s[i]->CompareTo(s) != 0) return false; - if (response_headers_index_s[i]->CompareTo(s->ToLower(nullCulture)) != 0) + if (response_headers_index_s[i]->CompareTo( + s->ToLower(nullCulture)) + != 0) return false; } - if (request_headers_name_s->get_Length() != RequestHeaderMaximum) + if (request_headers_name_s->Length != RequestHeaderMaximum) return false; - if (request_headers_index_s->get_Length() != RequestHeaderMaximum) + if (request_headers_index_s->Length != RequestHeaderMaximum) return false; for (int i = 0; i < RequestHeaderMaximum; ++i) { - String *s = HttpWorkerRequest::GetKnownRequestHeaderName(i); + String ^s = HttpWorkerRequest::GetKnownRequestHeaderName(i); if (request_headers_name_s[i]->CompareTo(s) != 0) return false; - if (request_headers_index_s[i]->CompareTo(s->ToLower(nullCulture)) != 0) + if (request_headers_index_s[i]->CompareTo( + s->ToLower(nullCulture)) + != 0) return false; } return true; - } + }; // Cannot be declared inline, we don't have Host defined - virtual String* GetAppPath(void); - virtual String* GetAppPathTranslated(void); + virtual String ^ GetAppPath(void) override ; + virtual String ^ GetAppPathTranslated(void) override; - WorkerRequest(UINT_PTR ReqRecordPtr, Host *ThisHost); + WorkerRequest(UINT_PTR ReqRecordPtr, Host ^ThisHost); int Handler(void); [ComVisible(false)] virtual void SetEndOfSendNotification( - HttpWorkerRequest::EndOfSendNotification *callback, - Object* extraData) + HttpWorkerRequest::EndOfSendNotification ^callback, + Object ^extraData) override { #ifdef _DEBUG - LogRequestError(L"SetEndOfSendNotification: initialized", APLOG_DEBUG, 0); + LogRequestError(L"SetEndOfSendNotification: initialized", + APLOG_DEBUG, 0); #endif } - virtual void EndOfRequest(void) + virtual void EndOfRequest(void) override { // If ProcessRequest() in Handler completed before the request // request processing completes, it blocks on wait_complete, @@ -149,10 +155,11 @@ // or would block on upon return from ProcessRequest(). if (eosnCallback) { #ifdef _DEBUG - LogRequestError(L"EndOfRequest: invoked EndOfSendNotification", APLOG_DEBUG, 0); + LogRequestError(L"EndOfRequest: invoked EndOfSendNotification", + APLOG_DEBUG, 0); #endif eosnCallback->Invoke(this, eosnExtra); - eosnCallback = NULL; + eosnCallback = nullptr; } #ifdef _DEBUG else @@ -161,222 +168,228 @@ wait_complete->Set(); } - virtual String* GetUriPath(void) + virtual String ^ GetUriPath(void) override { #ifdef _DEBUG - String *res = String::Concat(L"GetUriPath: returns ", uri); + String ^res = String::Concat(L"GetUriPath: returns ", uri); LogRequestError(res, APLOG_DEBUG, 0); #endif return uri; } - virtual String* GetQueryString(void) + virtual String ^ GetQueryString(void) override { #ifdef _DEBUG - String *res = String::Concat(L"GetQueryString: returns ", queryargs); + String ^res = String::Concat(L"GetQueryString: returns ", + queryargs); LogRequestError(res, APLOG_DEBUG, 0); #endif return queryargs; } - virtual unsigned char GetQueryStringRawBytes(void) __gc[] + virtual array<unsigned char> ^ GetQueryStringRawBytes(void) override { #ifdef _DEBUG - String *res = String::Concat(L"GetQueryStringRawBytes: returns ", - (new Int32(query_raw->get_Length()))->ToString(), + String ^res = String::Concat(L"GetQueryStringRawBytes: returns ", + (new Int32(query_raw->Length))->ToString(), L" raw characters"); LogRequestError(res, APLOG_DEBUG, 0); #endif return query_raw; } - virtual String* GetRawUrl(void) + virtual String ^ GetRawUrl(void) override { #ifdef _DEBUG - String *res = String::Concat(L"GetRawUrl: returns ", unparsed_uri); + String ^res = String::Concat(L"GetRawUrl: returns ", unparsed_uri); LogRequestError(res, APLOG_DEBUG, 0); #endif return unparsed_uri; } - virtual String* GetHttpVerbName(void) + virtual String ^ GetHttpVerbName(void) override { - String* verb = new String(rr->method); + String ^verb = gcnew String(rr->method); #ifdef _DEBUG - String *res = String::Concat(L"GetHttpVerbName: returns ", verb); + String ^res = String::Concat(L"GetHttpVerbName: returns ", verb); LogRequestError(res, APLOG_DEBUG, 0); #endif return verb; } - virtual String* GetHttpVersion(void) + virtual String ^ GetHttpVersion(void) override { - String* version = new String(rr->protocol); + String ^version = gcnew String(rr->protocol); #ifdef _DEBUG - String *res = String::Concat(L"GetHttpVersion: returns ", version); + String ^res = String::Concat(L"GetHttpVersion: returns ", version); LogRequestError(res, APLOG_DEBUG, 0); #endif return version; } - virtual String* GetProtocol(void) + virtual String ^ GetProtocol(void) override { #if MODULE_MAGIC_NUMBER_MAJOR >= 20050101 // Fixes in httpd-2.1-dev - const char __nogc *method = ap_http_scheme(rr); + const char *method = ap_http_scheme(rr); #else - const char __nogc *method = ap_http_method(rr); + const char *method = ap_http_method(rr); #endif - String *scheme(method); + String ^scheme = gcnew String(method); // For some silly reason, the ASP.NET team thought that schemes // are upper case entities; scheme = scheme->ToUpper(nullCulture); #ifdef _DEBUG - String *schemeMsg = String::Concat(L"GetProtocol: returns ", scheme); - LogRequestError(schemeMsg, APLOG_DEBUG, 0); + String ^res = String::Concat(L"GetProtocol: returns ", scheme); + LogRequestError(res, APLOG_DEBUG, 0); #endif return scheme; } - virtual String* GetRemoteAddress(void) + virtual String ^ GetRemoteAddress(void) override { - String* addr = new String(rr->connection->remote_ip); + String ^addr = gcnew String(rr->connection->remote_ip); #ifdef _DEBUG - String *res = String::Concat(L"GetRemoteAddress: returns ", addr); + String ^res = String::Concat(L"GetRemoteAddress: returns ", addr); LogRequestError(res, APLOG_DEBUG, 0); #endif return addr; } - virtual int GetRemotePort(void) + virtual int GetRemotePort(void) override { #ifdef _DEBUG - String *res = String::Concat(L"GetRemotePort: returns ", + String ^res = String::Concat(L"GetRemotePort: returns ", (new Int32(rr->connection->remote_addr->port))->ToString()); LogRequestError(res, APLOG_DEBUG, 0); #endif return rr->connection->remote_addr->port; } - virtual String* GetRemoteName(void) + virtual String ^ GetRemoteName(void) override { if (!remoteName) { - const char __nogc *name = ap_get_remote_host(rr->connection, - rr->per_dir_config, - REMOTE_HOST, NULL); + const char *name = ap_get_remote_host(rr->connection, + rr->per_dir_config, + REMOTE_HOST, NULL); if (!name) remoteName = String::Empty; else - remoteName = new String(name); + remoteName = gcnew String(name); } #ifdef _DEBUG - String *res = String::Concat(L"GetRemoteName: returns ", remoteName); + String ^res = String::Concat(L"GetRemoteName: returns ", + remoteName); LogRequestError(res, APLOG_DEBUG, 0); #endif return remoteName; } - virtual String* GetServerName(void) + virtual String ^ GetServerName(void) override { if (!serverName) { - const char __no... [truncated message content] |
From: <wr...@us...> - 2007-08-15 07:17:18
|
Revision: 199 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=199&view=rev Author: wrowe Date: 2007-08-15 00:17:13 -0700 (Wed, 15 Aug 2007) Log Message: ----------- Fold at 80, trim out commentary Modified Paths: -------------- mod_aspdotnet2/trunk/Apache.Web/AssemblyInfo.cpp Modified: mod_aspdotnet2/trunk/Apache.Web/AssemblyInfo.cpp =================================================================== --- mod_aspdotnet2/trunk/Apache.Web/AssemblyInfo.cpp 2007-08-15 07:15:30 UTC (rev 198) +++ mod_aspdotnet2/trunk/Apache.Web/AssemblyInfo.cpp 2007-08-15 07:17:13 UTC (rev 199) @@ -23,55 +23,19 @@ using namespace System::Reflection; using namespace System::Runtime::CompilerServices; -// -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -// [assembly:AssemblyTitleAttribute("Apache.Web")]; -[assembly:AssemblyDescriptionAttribute("Apache Web Hosting Architecture for Microsoft ASP.NET")]; +[assembly:AssemblyDescriptionAttribute("Apache Web Hosting Architecture " + "for Microsoft ASP.NET")]; [assembly:AssemblyCompanyAttribute("Covalent Technologies")]; [assembly:AssemblyProductAttribute("mod_aspdotnet")]; [assembly:AssemblyCopyrightAttribute("Copyright \xA9 2007 Covalent Technologies")]; [assembly:AssemblyTrademarkAttribute("")]; [assembly:AssemblyCultureAttribute("")]; [assembly:AssemblyConfigurationAttribute("")]; - -// -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the value or you can default the Revision and Build Numbers -// by using the '*' as shown below: - [assembly:AssemblyVersionAttribute(APACHE_WEB_VERSION)]; -// -// In order to sign your assembly you must specify a key to use. Refer to the -// Microsoft .NET Framework documentation for more information on assembly signing. -// -// Use the attributes below to control which key is used for signing. -// -// Notes: -// (*) If no key is specified, the assembly is not signed. -// (*) KeyName refers to a key that has been installed in the Crypto Service -// Provider (CSP) on your machine. KeyFile refers to a file which contains -// a key. -// (*) If the KeyFile and the KeyName values are both specified, the -// following processing occurs: -// (1) If the KeyName can be found in the CSP, that key is used. -// (2) If the KeyName does not exist and the KeyFile does exist, the key -// in the KeyFile is installed into the CSP and used. -// (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility. -// When specifying the KeyFile, the location of the KeyFile should be -// relative to the project directory. -// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework -// documentation for more information on this. -// +// Package is compiled, linked, then the manifest is embedded. +// It must be signed afterwards. [assembly:AssemblyDelaySignAttribute(true)]; [assembly:AssemblyKeyFileAttribute("Apache.Web.snk")]; [assembly:AssemblyKeyNameAttribute("")]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wr...@us...> - 2007-08-15 07:15:32
|
Revision: 198 http://mod-aspdotnet.svn.sourceforge.net/mod-aspdotnet/?rev=198&view=rev Author: wrowe Date: 2007-08-15 00:15:30 -0700 (Wed, 15 Aug 2007) Log Message: ----------- Trim and fold at 80 Modified Paths: -------------- mod_aspdotnet2/trunk/Apache.Web/Apache.Web.Version.h Modified: mod_aspdotnet2/trunk/Apache.Web/Apache.Web.Version.h =================================================================== --- mod_aspdotnet2/trunk/Apache.Web/Apache.Web.Version.h 2007-08-15 06:26:28 UTC (rev 197) +++ mod_aspdotnet2/trunk/Apache.Web/Apache.Web.Version.h 2007-08-15 07:15:30 UTC (rev 198) @@ -46,7 +46,7 @@ // The n.n.n.BUILD must be bumped every time Apache.Web class interfaces change. // This ensures that a specific build of mod_aspdotnet loads it's correponding -// build of Apache.Web, and that multiple builds of Apache.Web coexist in the GAC. +// build of Apache.Web, and multiple builds of Apache.Web coexist in the GAC. // This also ensures we use the most recent 'build' of the module for the given // Apache core version. // This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |