v3.2.6

Reverted dynamic HttpModule creation introduced in v3.2.0 to improve
performance.


Former-commit-id: 16a0496650d12d7e468036a3c8cab5fe825429b2

build/Build.bat

@@ -1,6 +1,6 @@
 @ECHO OFF
 SET version=1.9.2.0
-SET webversion=3.2.5.0
+SET webversion=3.2.6.0
 SET webconfigversion=1.1.1.0
 
 ECHO Building ImageProcessor %version%, ImageProcess.Web %webversion% and ImageProcess.Web.Config %webconfigversion%

build/NuSpecs/ImageProcessor.Web.Config.nuspec

@@ -6,7 +6,7 @@
         <title>ImageProcessor.Web.Config</title>
         <authors>James South</authors>
         <owners>James South</owners>
-        <projectUrl>http://jimbobsquarepants.github.com/ImageProcessor/</projectUrl>
+        <projectUrl>http://imageprocessor.org</projectUrl>
         <iconUrl>http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Adds configuration to your ImageProcessor.Web solution to allow you to override the default settings.

build/NuSpecs/ImageProcessor.Web.nuspec

@@ -6,7 +6,7 @@
         <title>ImageProcessor.Web</title>
         <authors>James South</authors>
         <owners>James South</owners>
-        <projectUrl>http://jimbobsquarepants.github.com/ImageProcessor/</projectUrl>
+        <projectUrl>http://imageprocessor.org</projectUrl>
         <iconUrl>http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>ImageProcessor.Web adds a configurable HttpModule to your website which allows on-the-fly processing of image files. The module also comes with a file and browser based cache that can handle millions of images, increasing your processing output and saving precious server memory.
@@ -27,11 +27,9 @@ Feedback is always welcome</description>
             <group targetFramework=".NETFramework4.0">
                 <dependency id="Microsoft.Bcl.Async" version="1.0.168" />
                 <dependency id="Microsoft.Bcl" version="1.1.8" />
-                <dependency id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
                 <dependency id="ImageProcessor" version="1.9.2.0" />
             </group>
             <group targetFramework=".NETFramework4.5">
-                <dependency id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
                 <dependency id="ImageProcessor" version="1.9.2.0" />
             </group>
         </dependencies>

build/NuSpecs/ImageProcessor.nuspec

@@ -6,7 +6,7 @@
         <title>ImageProcessor</title>
         <authors>James South</authors>
         <owners>James South</owners>
-        <projectUrl>http://jimbobsquarepants.github.com/ImageProcessor/</projectUrl>
+        <projectUrl>http://imageprocessor.org</projectUrl>
         <iconUrl>http://raw.githubusercontent.com/JimBobSquarePants/ImageProcessor/master/build/content/imageprocessor.128.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Image Processor is an easy to use and extend processing library written in C#. Its fluent API makes common imaging tasks very simple to perform. 

build/content/ImageProcessor.Web/web.config.transform

@@ -1,6 +1,14 @@
 <?xml version="1.0"?>
-<configuration>
+<configuration> 
+  <system.web>
+    <httpModules>
+      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
+    </httpModules>
+  </system.web>
   <system.webServer>
-    <modules runAllManagedModulesForAllRequests="true"/>
+    <validation validateIntegratedModeConfiguration="false" />
+    <modules>
+      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
+    </modules>
   </system.webServer>
-</configuration>
+</configuration>

src/ImageProcessor.Web/NET4/ImageProcessor.Web_NET4.csproj

@@ -54,10 +54,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -97,9 +93,6 @@
     <Compile Include="..\NET45\Helpers\ResourceHelpers.cs">
       <Link>ResourceHelpers.cs</Link>
     </Compile>
-    <Compile Include="..\NET45\Helpers\StartUp.cs">
-      <Link>StartUp.cs</Link>
-    </Compile>
     <Compile Include="..\NET45\Helpers\TaskHelpers.cs" />
     <Compile Include="..\NET45\HttpModules\ImageProcessingModule.cs" />
     <Compile Include="..\NET45\ImageFactoryExtensions.cs" />

src/ImageProcessor.Web/NET4/packages.config

@@ -3,5 +3,4 @@
   <package id="Microsoft.Bcl" version="1.1.8" targetFramework="net40" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net40" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
 </packages>

src/ImageProcessor.Web/NET45/Helpers/StartUp.cs

@@ -1,31 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="StartUp.cs" company="James South">
-//   Copyright (c) James South.
-//   Licensed under the Apache License, Version 2.0.
-// </copyright>
-// <summary>
-//   Provides methods to handle startup events.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-[assembly: System.Web.PreApplicationStartMethod(typeof(ImageProcessor.Web.Helpers.StartUp), "PreApplicationStart")]
-
-namespace ImageProcessor.Web.Helpers
-{
-    using ImageProcessor.Web.HttpModules;
-    using Microsoft.Web.Infrastructure.DynamicModuleHelper;
-
-    /// <summary>
-    /// Provides methods to handle startup events.
-    /// </summary>
-    public static class StartUp
-    {
-        /// <summary>
-        /// The pre application start.
-        /// </summary>
-        public static void PreApplicationStart()
-        {
-            DynamicModuleUtility.RegisterModule(typeof(ImageProcessingModule));
-        }
-    }
-}

src/ImageProcessor.Web/NET45/ImageProcessor.Web_NET45.csproj

@@ -32,10 +32,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -58,7 +54,6 @@
     <Compile Include="Config\ImageProcessorConfig.cs" />
     <Compile Include="Config\ImageSecuritySection.cs" />
     <Compile Include="Helpers\ResourceHelpers.cs" />
-    <Compile Include="Helpers\StartUp.cs" />
     <Compile Include="Helpers\ImageHelpers.cs" />
     <Compile Include="Helpers\RemoteFile.cs" />
     <Compile Include="Helpers\TaskHelpers.cs" />
@@ -80,7 +75,6 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Config\Resources\security.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs

@@ -35,5 +35,5 @@ using ImageProcessor.Web.HttpModules;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.2.5.0")]
+[assembly: AssemblyVersion("3.2.6.0")]
-[assembly: AssemblyFileVersion("3.2.5.0")]
+[assembly: AssemblyFileVersion("3.2.6.0")]

src/ImageProcessor.Web/NET45/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-</packages>

src/TestWebsites/NET4/Web.config

@@ -45,12 +45,17 @@
         <add namespace="System.Web.WebPages" />
       </namespaces>
     </pages>
+    <httpModules>
+      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
+    </httpModules>
     <!--Set the trust level.-->
     <!--<trust level="Medium"/>-->
   </system.web>
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false" />
-    <modules runAllManagedModulesForAllRequests="true" />   
+    <modules>
+      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
+    </modules>
   </system.webServer>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

src/TestWebsites/NET45/Test_Website_NET45/Web.config

@@ -41,9 +41,13 @@
         <add namespace="System.Web.WebPages" />
       </namespaces>
     </pages>
+    <httpModules>
+      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
+    </httpModules>
   </system.web>
 
   <system.webServer>
+    <validation validateIntegratedModeConfiguration="false"/>
     <handlers>
       <remove name="ExtensionlessUrlHandler-ISAPI-4.0_32bit" />
       <remove name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" />
@@ -52,7 +56,9 @@
       <add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
       <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE,PATCH,OPTIONS" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
     </handlers>
+    <modules>
+      <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web"/>
+    </modules>
 
-    <modules runAllManagedModulesForAllRequests="true"/>
   </system.webServer>
 </configuration>

src/TestWebsites/NET45/Test_Website_Webforms_NET45/Web.config

@@ -62,9 +62,9 @@
         <add name="DefaultSessionProvider" type="System.Web.Providers.DefaultSessionStateProvider, System.Web.Providers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" connectionStringName="DefaultConnection" />
       </providers>
     </sessionState>
-    <!--<httpModules>
+    <httpModules>
       <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
-    </httpModules>-->
+    </httpModules>
   </system.web>
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false" />

src/packages/repositories.config

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <repositories>
   <repository path="..\ImageProcessor.Web\NET4\packages.config" />
-  <repository path="..\ImageProcessor.Web\NET45\packages.config" />
   <repository path="..\TestWebsites\NET4\packages.config" />
-  <repository path="..\TestWebsites\NET45\Test_Website_MVC5_NET45\packages.config" />
   <repository path="..\TestWebsites\NET45\Test_Website_NET45\packages.config" />
   <repository path="..\TestWebsites\NET45\Test_Website_Webforms_NET45\packages.config" />
 </repositories>