diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index cc205852e6..f0a760d1f1 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -303,15 +303,10 @@ jobs: displayName: Install SQL Server 2016 Express LocalDB - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1" displayName: Setup IISExpress test certificates and schema - - powershell: "& ./.azure/pipelines/tools/SetupTestEnvironment.ps1 Setup signalrclienttests.exe" - displayName: Start AppVerifier afterBuild: - powershell: "& ./build.ps1 -CI -NoBuild -Test /p:RunFlakyTests=true" displayName: Run Flaky Tests continueOnError: true - - powershell: "& ./.azure/pipelines/tools/SetupTestEnvironment.ps1 Shutdown signalrclienttests.exe" - displayName: Stop AppVerifier - condition: always() artifacts: - name: Windows_Test_Logs path: artifacts/logs/ diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 5b78c082ca..2c8d2ea0fc 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -189,13 +189,21 @@ jobs: buildConfiguration: $(BuildConfiguration) buildPlatform: $(AgentOsName) - task: PublishTestResults@2 - displayName: Publish junit test results + displayName: Publish js test results condition: always() inputs: testRunner: junit testResultsFiles: '**/artifacts/logs/**/*.junit.xml' buildConfiguration: $(BuildConfiguration) buildPlatform: $(AgentOsName) + - task: PublishTestResults@2 + displayName: Publish Java test results + condition: always() + inputs: + testRunner: junit + testResultsFiles: '**/TEST-com.microsoft.signalr*.xml' + buildConfiguration: $(BuildConfiguration) + buildPlatform: $(AgentOsName) - ${{ each artifact in parameters.artifacts }}: - task: PublishBuildArtifacts@1 displayName: Upload artifacts from ${{ artifact.path }} diff --git a/.azure/pipelines/signalr-daily-tests.yml b/.azure/pipelines/signalr-daily-tests.yml index 3269b2657a..2e74597f73 100644 --- a/.azure/pipelines/signalr-daily-tests.yml +++ b/.azure/pipelines/signalr-daily-tests.yml @@ -14,11 +14,4 @@ jobs: agentOs: Windows jobName: SignalRDailyTests jobDisplayName: "SignalR Daily Tests" - beforeBuild: - - powershell: "& ./.azure/pipelines/tools/SetupTestEnvironment.ps1 Setup signalrclienttests.exe" - displayName: Start AppVerifier - afterBuild: - - powershell: "& ./.azure/pipelines/tools/SetupTestEnvironment.ps1 Shutdown signalrclienttests.exe" - displayName: Stop AppVerifier - condition: always() diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c4e6085b10..719f153297 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,18 +1,18 @@ # Users referenced in this file will automatically be requested as reviewers for PRs that modify the given paths. # See https://help.github.com/articles/about-code-owners/ -/.azure/ @dougbu -/.config/ @dougbu -/build/ @dougbu -/eng/ @dougbu -/src/Components/ @SteveSandersonMS -/src/DefaultBuilder/ @tratcher @anurse -/src/Hosting/ @tratcher @anurse -/src/Http/ @tratcher @jkotalik @anurse -/src/Middleware/ @tratcher @anurse -/src/ProjectTemplates/ @ryanbrandenburg -/src/Security/ @tratcher @anurse -/src/Servers/ @tratcher @jkotalik @anurse -/src/Middleware/Rewrite @jkotalik @anurse -/src/Middleware/HttpsPolicy @jkotalik @anurse -/src/SignalR/ @mikaelm12 @BrennanConroy @halter73 @anurse +/.azure/ @aspnet/build +/.config/ @aspnet/build +/build/ @aspnet/build +/eng/ @aspnet/build +/src/Components/ @SteveSandersonMS +/src/DefaultBuilder/ @tratcher @anurse +/src/Hosting/ @tratcher @anurse +/src/Http/ @tratcher @jkotalik @anurse +/src/Middleware/ @tratcher @anurse +/src/ProjectTemplates/ @ryanbrandenburg +/src/Security/ @tratcher @anurse +/src/Servers/ @tratcher @jkotalik @anurse +/src/Middleware/Rewrite @jkotalik @anurse +/src/Middleware/HttpsPolicy @jkotalik @anurse +/src/SignalR/ @mikaelm12 @BrennanConroy @halter73 @anurse diff --git a/Directory.Build.targets b/Directory.Build.targets index efafc9f288..e90a905671 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -98,6 +98,35 @@ + + + + + + + <_Pattern>(https://dnceng%40dev\.azure\.com/dnceng/internal/_git|https://dev\.azure\.com/dnceng/internal/_git|https://dnceng\.visualstudio\.com/internal/_git|dnceng%40vs-ssh\.visualstudio\.com:v3/dnceng/internal|git%40ssh\.dev\.azure\.com:v3/dnceng/internal)/([^/-]+)-(.+) + <_Replacement>https://github.com/$2/$3 + + + + $([System.Text.RegularExpressions.Regex]::Replace($(ScmRepositoryUrl), $(_Pattern), $(_Replacement))) + + + + + $([System.Text.RegularExpressions.Regex]::Replace(%(SourceRoot.ScmRepositoryUrl), $(_Pattern), $(_Replacement))) + + + + diff --git a/build/repo.props b/build/repo.props index f453c3c5c8..1452299ad8 100644 --- a/build/repo.props +++ b/build/repo.props @@ -54,8 +54,6 @@ $(RepositoryRoot)src\Tools\dotnet-watch\test\TestProjects\**\*.csproj; $(RepositoryRoot)src\Razor\Razor.Design\test\testassets\**\*.*proj; $(RepositoryRoot)src\submodules\**\*.*proj; - $(RepositoryRoot)src\SignalR\clients\cpp\samples\**\*.*proj; - $(RepositoryRoot)src\SignalR\clients\cpp\test\signalrclient-testhost\**\*.*proj; $(RepositoryRoot)src\Installers\**\*.*proj; $(RepositoryRoot)src\SignalR\clients\ts\**\node_modules\**\*.*proj; $(RepositoryRoot)src\Components\Blazor\Templates\src\content\**\*.*proj; diff --git a/build/sources.props b/build/sources.props index 717242fc60..29a3b61a6d 100644 --- a/build/sources.props +++ b/build/sources.props @@ -20,6 +20,7 @@ https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; https://dotnet.myget.org/F/blazor-dev/api/v3/index.json; https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; + https://dotnet.myget.org/F/nuget-build/api/v3/index.json; https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json; https://dotnet.myget.org/F/roslyn/api/v3/index.json; https://vside.myget.org/F/devcore/api/v3/index.json; diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index 8615952bb7..cee6fea25f 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -12,7 +12,7 @@ - + diff --git a/docs/BuildErrors.md b/docs/BuildErrors.md new file mode 100644 index 0000000000..be5f94a560 --- /dev/null +++ b/docs/BuildErrors.md @@ -0,0 +1,17 @@ +Build Errors +------------ + +This document is for common build errors and how to resolve them. + +### Warning BUILD001 + +> warning BUILD001: Package references changed since the last release... + +This warning indicates a breaking change might have been made to a package or assembly due to the removal of a reference which was used +in a previous release of this assembly. See <./ReferenceResolution.md> for how to suppress. + +### Error BUILD002 + +> error BUILD002: Package references changed since the last release... + +Similar to BUILD001, but this error is not suppressable. This error only appears in servicing builds, which should not change references between assemblies or packages. diff --git a/docs/BuildFromSource.md b/docs/BuildFromSource.md index 6d3f6631d4..765a062dad 100644 --- a/docs/BuildFromSource.md +++ b/docs/BuildFromSource.md @@ -19,9 +19,8 @@ Building ASP.NET Core on Windows requires: PS> ./eng/scripts/InstallVisualStudio.ps1 ``` * Git. -* (Optional) some optional components, like the SignalR Java client, may require - * NodeJS. LTS version of 10.14.2 or newer recommended - * Java Development Kit (JDK) v8 with Java Runtime Environment (JRE) v8. See https://www.oracle.com/technetwork/java/javase/downloads/index.html +* NodeJS. LTS version of 10.14.2 or newer +* Java Development Kit (JDK) v8 with Java Runtime Environment (JRE) v8. See https://www.oracle.com/technetwork/java/javase/downloads/index.html ### macOS/Linux @@ -31,11 +30,10 @@ Building ASP.NET Core on macOS or Linux requires: * If using Linux, you need a machine with all .NET Core Linux prerequisites: * At least 10 GB of disk space and a good internet connection (our build scripts download a lot of tools and dependencies) * Git -* (Optional) some optional components, like the SignalR Java client, may require - * NodeJS. LTS version of 10.14.2 or newer recommended - * Java Development Kit 10 or newer. Either: - * OpenJDK - * Oracle's JDK +* NodeJS. LTS version of 10.14.2 or newer +* Java Development Kit 10 or newer. Either: + * OpenJDK + * Oracle's JDK ## Clone the source code diff --git a/docs/DailyBuilds.md b/docs/DailyBuilds.md index d41e64772d..08ff052f20 100644 --- a/docs/DailyBuilds.md +++ b/docs/DailyBuilds.md @@ -14,6 +14,10 @@ If you want to download the latest daily build and use it in a project, then you + + + + @@ -23,3 +27,10 @@ If you want to download the latest daily build and use it in a project, then you Some features, such as new target frameworks, may require prerelease tooling builds for Visual Studio. These are available in the [Visual Studio Preview](https://www.visualstudio.com/vs/preview/). + +#### To debug daily builds using Visual Studio + +* *Enable Source Link support* in Visual Studio should be enabled. +* *Enable source server support* in Visual should be enabled. +* *Enable Just My Code* should be disabled +* Add https://dotnet.myget.org/F/aspnetcore-dev/symbols to the list of symbol servers in the Visual Studio Debugging options diff --git a/docs/ReferenceResolution.md b/docs/ReferenceResolution.md index 4acb23b2b8..7d1e20c0cc 100644 --- a/docs/ReferenceResolution.md +++ b/docs/ReferenceResolution.md @@ -25,6 +25,7 @@ The requirements that led to this system are: * Name the .csproj file to match the assembly name. * Run `build.cmd /t:GenerateProjectList` when adding new projects * Use [eng/tools/BaseLineGenerator/](/eng/tools/BaselineGenerator/README.md) if you need to update baselines. +* If you need to make a breaking change to dependencies, you may need to add ``. ## Important files @@ -67,3 +68,16 @@ Steps for adding a new package dependency to an existing project. Let's say I'm If you don't know the commit hash of the source code used to produce "0.0.1-beta-1", you can use `000000` as a placeholder for `Sha` as its value is unimportant and will be updated the next time the bot runs. + +## Example: make a breaking change to references + +If Microsoft.AspNetCore.Banana in 2.1 had a reference to `Microsoft.AspNetCore.Orange`, but in 3.0 this reference is changing to `Microsoft.AspNetCore.BetterThanOrange`, you would need to make these changes to the .csproj file + +```diff + + +- ++ ++ + +``` diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 42f13a684a..d8730cc347 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.3 + 2.2.4 @@ -81,7 +81,7 @@ - 2.2.2 + 2.2.4 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index aea4789e6c..c9ebacb3b9 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. --> - + @@ -13,7 +13,7 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. - + diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 1b7c23f977..c44676b170 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -36,6 +36,15 @@ Later on, this will be checked using this condition: @aspnet/signalr; + Microsoft.AspNetCore.AspNetCoreModuleV2; + + + Microsoft.AspNetCore.AspNetCoreModule; + Microsoft.AspNetCore.AspNetCoreModuleV2; + java:signalr; + + + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index 098333666e..60692756fa 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -119,6 +119,7 @@ + diff --git a/eng/SharedFramework.Local.props b/eng/SharedFramework.Local.props index 4a27b6b0d5..e61c6e5a85 100644 --- a/eng/SharedFramework.Local.props +++ b/eng/SharedFramework.Local.props @@ -11,6 +11,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04ff079b8f..c11a087891 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,384 +9,384 @@ --> - + https://github.com/aspnet/AspNetCore-Tooling - 5ec5b0c8894e758ef2a41fd534746500bbcf00ad + d4ef2a1d4a68428e29a86cafc24837a45aef7e0d - + https://github.com/aspnet/AspNetCore-Tooling - 5ec5b0c8894e758ef2a41fd534746500bbcf00ad + d4ef2a1d4a68428e29a86cafc24837a45aef7e0d - + https://github.com/aspnet/AspNetCore-Tooling - 5ec5b0c8894e758ef2a41fd534746500bbcf00ad + d4ef2a1d4a68428e29a86cafc24837a45aef7e0d - + https://github.com/aspnet/AspNetCore-Tooling - 5ec5b0c8894e758ef2a41fd534746500bbcf00ad + d4ef2a1d4a68428e29a86cafc24837a45aef7e0d - + https://github.com/aspnet/EntityFrameworkCore - a4d2bafcdfaf0ed6b451056b7d9d75f53ee8c4df + b191c93d850ff31445534eb5cd6184599f40bbb4 - + https://github.com/aspnet/EntityFrameworkCore - a4d2bafcdfaf0ed6b451056b7d9d75f53ee8c4df + b191c93d850ff31445534eb5cd6184599f40bbb4 - + https://github.com/aspnet/EntityFrameworkCore - a4d2bafcdfaf0ed6b451056b7d9d75f53ee8c4df + b191c93d850ff31445534eb5cd6184599f40bbb4 - + https://github.com/aspnet/EntityFrameworkCore - a4d2bafcdfaf0ed6b451056b7d9d75f53ee8c4df + b191c93d850ff31445534eb5cd6184599f40bbb4 - + https://github.com/aspnet/EntityFrameworkCore - a4d2bafcdfaf0ed6b451056b7d9d75f53ee8c4df + b191c93d850ff31445534eb5cd6184599f40bbb4 - + https://github.com/aspnet/EntityFrameworkCore - a4d2bafcdfaf0ed6b451056b7d9d75f53ee8c4df + b191c93d850ff31445534eb5cd6184599f40bbb4 - + https://github.com/aspnet/EntityFrameworkCore - a4d2bafcdfaf0ed6b451056b7d9d75f53ee8c4df + b191c93d850ff31445534eb5cd6184599f40bbb4 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/dotnet/core-setup - ee54d4cbd2b305eadf6f341bdc9d4abccdb50559 + b159f4bf9614203a0c60a20f5469d5226f3f12e7 - + https://github.com/dotnet/core-setup - ee54d4cbd2b305eadf6f341bdc9d4abccdb50559 + b159f4bf9614203a0c60a20f5469d5226f3f12e7 - + https://github.com/dotnet/corefx - dc522ef97fac72e64cd74825b7ef497f82af4624 + fe5c12ad8315e043e62285117a56bba1784756d1 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 - + https://github.com/dotnet/arcade - b1f9e12fe3ee71c48ea60b15968745850ac0a4a7 + 517bf671ea342965d007aa48f5bfd4926e58d582 - + https://github.com/aspnet/Extensions - fd0366daae4c9d47eba72ea6034002cbd7492018 + 0b1aa473a7a722cd3f0aab5166fbe9e5203f0582 diff --git a/eng/Versions.props b/eng/Versions.props index e2f1cd6122..332e0bbefe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,106 +17,106 @@ --> - 1.0.0-beta.19207.1 + 1.0.0-beta.19215.12 - 3.0.0-preview4-27615-11 - 3.0.0-preview4-27615-11 + 3.0.0-preview5-27611-18 + 3.0.0-preview5-27611-18 - 4.6.0-preview4.19212.13 - 4.6.0-preview4.19212.13 - 4.6.0-preview4.19212.13 - 4.6.0-preview4.19212.13 - 4.7.0-preview4.19212.13 - 4.6.0-preview4.19212.13 - 4.6.0-preview4.19212.13 - 4.6.0-preview4.19212.13 - 4.6.0-preview4.19212.13 - 1.7.0-preview4.19212.13 - 4.6.0-preview4.19212.13 - 4.6.0-preview4.19212.13 - 4.6.0-preview4.19212.13 - 4.6.0-preview4.19212.13 - 4.6.0-preview4.19212.13 - 4.6.0-preview4.19212.13 - 4.6.0-preview4.19212.13 - 4.6.0-preview4.19212.13 - 4.6.0-preview4.19212.13 + 4.6.0-preview5.19211.22 + 4.6.0-preview5.19211.22 + 4.6.0-preview5.19211.22 + 4.6.0-preview5.19211.22 + 4.7.0-preview5.19211.22 + 4.6.0-preview5.19211.22 + 4.6.0-preview5.19211.22 + 4.6.0-preview5.19211.22 + 4.6.0-preview5.19211.22 + 1.7.0-preview5.19211.22 + 4.6.0-preview5.19211.22 + 4.6.0-preview5.19211.22 + 4.6.0-preview5.19211.22 + 4.6.0-preview5.19211.22 + 4.6.0-preview5.19211.22 + 4.6.0-preview5.19211.22 + 4.6.0-preview5.19211.22 + 4.6.0-preview5.19211.22 + 4.6.0-preview5.19211.22 - 3.0.0-preview4.19212.13 + 3.0.0-preview5.19211.22 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 + 3.0.0-preview5.19212.9 - 3.0.0-preview4.19216.3 - 3.0.0-preview4.19216.3 - 3.0.0-preview4.19216.3 - 3.0.0-preview4.19216.3 - 3.0.0-preview4.19216.3 - 3.0.0-preview4.19216.3 - 3.0.0-preview4.19216.3 + 3.0.0-preview5.19213.2 + 3.0.0-preview5.19213.2 + 3.0.0-preview5.19213.2 + 3.0.0-preview5.19213.2 + 3.0.0-preview5.19213.2 + 3.0.0-preview5.19213.2 + 3.0.0-preview5.19213.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 - 3.0.0-preview4.19216.2 + 3.0.0-preview5.19214.1 + 3.0.0-preview5.19214.1 + 3.0.0-preview5.19214.1 + 3.0.0-preview5.19214.1 + + - false @@ -19,5 +17,25 @@ + + + <_PublishFiles Include="$(MSBuildThisFileDirectory)..\testassets\AzureAD.WebSite\bin\$(Configuration)\netcoreapp3.0\AzureAD.WebSite.deps.json" /> + + + + + + + diff --git a/src/Components/Components/src/Forms/ValidationMessage.cs b/src/Components/Components/src/Forms/ValidationMessage.cs index bb2c861de0..52b86551dc 100644 --- a/src/Components/Components/src/Forms/ValidationMessage.cs +++ b/src/Components/Components/src/Forms/ValidationMessage.cs @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Components.Forms [Parameter] public Expression> For { get; private set; } /// ` - /// Constructs an instance of . + /// Constructs an instance of . /// public ValidationMessage() { diff --git a/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj b/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj index 2c1bf87bb7..98f54b4a53 100644 --- a/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj +++ b/src/Components/test/testassets/ComponentsApp.Server/ComponentsApp.Server.csproj @@ -10,6 +10,7 @@ + diff --git a/src/Hosting/Hosting/src/GenericHost/GenericWebHostBuilder.cs b/src/Hosting/Hosting/src/GenericHost/GenericWebHostBuilder.cs index 894214137c..788995b320 100644 --- a/src/Hosting/Hosting/src/GenericHost/GenericWebHostBuilder.cs +++ b/src/Hosting/Hosting/src/GenericHost/GenericWebHostBuilder.cs @@ -268,7 +268,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal // _builder.ConfigureContainer(ConfigureContainer); typeof(IHostBuilder).GetMethods().First(m => m.Name == nameof(IHostBuilder.ConfigureContainer)) .MakeGenericMethod(containerType) - .Invoke(_builder, new object[] { configureCallback }); + .InvokeWithoutWrappingExceptions(_builder, new object[] { configureCallback }); } // Resolve Configure after calling ConfigureServices and ConfigureContainer diff --git a/src/Hosting/Hosting/src/Internal/ConfigureBuilder.cs b/src/Hosting/Hosting/src/Internal/ConfigureBuilder.cs index 37b715c5b0..0daaa0567c 100644 --- a/src/Hosting/Hosting/src/Internal/ConfigureBuilder.cs +++ b/src/Hosting/Hosting/src/Internal/ConfigureBuilder.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Globalization; using System.Reflection; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; @@ -52,8 +53,9 @@ namespace Microsoft.AspNetCore.Hosting.Internal } } } - MethodInfo.Invoke(instance, parameters); + + MethodInfo.InvokeWithoutWrappingExceptions(instance, parameters); } } } -} \ No newline at end of file +} diff --git a/src/Hosting/Hosting/src/Internal/ConfigureContainerBuilder.cs b/src/Hosting/Hosting/src/Internal/ConfigureContainerBuilder.cs index 8791a918ab..c50d66b18f 100644 --- a/src/Hosting/Hosting/src/Internal/ConfigureContainerBuilder.cs +++ b/src/Hosting/Hosting/src/Internal/ConfigureContainerBuilder.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal var arguments = new object[1] { container }; - MethodInfo.Invoke(instance, arguments); + MethodInfo.InvokeWithoutWrappingExceptions(instance, arguments); } } -} \ No newline at end of file +} diff --git a/src/Hosting/Hosting/src/Internal/ConfigureServicesBuilder.cs b/src/Hosting/Hosting/src/Internal/ConfigureServicesBuilder.cs index cf9a69327d..49e07c48f8 100644 --- a/src/Hosting/Hosting/src/Internal/ConfigureServicesBuilder.cs +++ b/src/Hosting/Hosting/src/Internal/ConfigureServicesBuilder.cs @@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal arguments[0] = services; } - return MethodInfo.Invoke(instance, arguments) as IServiceProvider; + return MethodInfo.InvokeWithoutWrappingExceptions(instance, arguments) as IServiceProvider; } } -} \ No newline at end of file +} diff --git a/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs b/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs index 82d825ea2b..bf09fa4dcb 100644 --- a/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs +++ b/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs @@ -273,6 +273,8 @@ namespace Microsoft.AspNetCore.Hosting.Internal } } + _diagnosticListener.OnActivityImport(activity, httpContext); + if (_diagnosticListener.IsEnabled(ActivityStartKey)) { _diagnosticListener.StartActivity(activity, new { HttpContext = httpContext }); diff --git a/src/Hosting/Hosting/src/Internal/MethodInfoExtensions.cs b/src/Hosting/Hosting/src/Internal/MethodInfoExtensions.cs new file mode 100644 index 0000000000..fe9b7690af --- /dev/null +++ b/src/Hosting/Hosting/src/Internal/MethodInfoExtensions.cs @@ -0,0 +1,20 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Reflection; + +namespace Microsoft.AspNetCore.Hosting.Internal +{ + internal static class MethodInfoExtensions + { + // This version of MethodInfo.Invoke removes TargetInvocationExceptions + public static object InvokeWithoutWrappingExceptions(this MethodInfo methodInfo, object obj, object[] parameters) + { + // These are the default arguments passed when methodInfo.Invoke(obj, parameters) are called. We do the same + // here but specify BindingFlags.DoNotWrapExceptions to avoid getting TAE (TargetInvocationException) + // methodInfo.Invoke(obj, BindingFlags.Default, binder: null, parameters: parameters, culture: null) + + return methodInfo.Invoke(obj, BindingFlags.DoNotWrapExceptions, binder: null, parameters: parameters, culture: null); + } + } +} diff --git a/src/Hosting/Hosting/src/WebHostBuilder.cs b/src/Hosting/Hosting/src/WebHostBuilder.cs index da27a76c3c..737eae8d67 100644 --- a/src/Hosting/Hosting/src/WebHostBuilder.cs +++ b/src/Hosting/Hosting/src/WebHostBuilder.cs @@ -175,6 +175,10 @@ namespace Microsoft.AspNetCore.Hosting { host.Initialize(); + // resolve configuration explicitly once to mark it as resolved within the + // service provider, ensuring it will be properly disposed with the provider + _ = host.Services.GetService(); + var logger = host.Services.GetRequiredService>(); // Warn about duplicate HostingStartupAssemblies @@ -264,12 +268,13 @@ namespace Microsoft.AspNetCore.Hosting var builder = new ConfigurationBuilder() .SetBasePath(_hostingEnvironment.ContentRootPath) - .AddConfiguration(_config); + .AddConfiguration(_config, shouldDisposeConfiguration: true); _configureAppConfigurationBuilder?.Invoke(_context, builder); var configuration = builder.Build(); - services.AddSingleton(configuration); + // register configuration as factory to make it dispose with the service provider + services.AddSingleton(_ => configuration); _context.Configuration = configuration; var listener = new DiagnosticListener("Microsoft.AspNetCore"); diff --git a/src/Hosting/Hosting/test/HostingApplicationTests.cs b/src/Hosting/Hosting/test/HostingApplicationTests.cs index 002421a90d..dbb1cb2d23 100644 --- a/src/Hosting/Hosting/test/HostingApplicationTests.cs +++ b/src/Hosting/Hosting/test/HostingApplicationTests.cs @@ -11,8 +11,6 @@ using Microsoft.AspNetCore.Hosting.Internal; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.ObjectPool; -using Microsoft.Extensions.Options; using Moq; using Xunit; @@ -304,6 +302,34 @@ namespace Microsoft.AspNetCore.Hosting.Tests Assert.Contains(Activity.Current.Baggage, pair => pair.Key == "Key2" && pair.Value == "value2"); } + [Fact] + public void ActivityOnExportHookIsCalled() + { + var diagnosticSource = new DiagnosticListener("DummySource"); + var hostingApplication = CreateApplication(out var features, diagnosticSource: diagnosticSource); + + bool onActivityImportCalled = false; + diagnosticSource.Subscribe( + observer: new CallbackDiagnosticListener(pair => { }), + isEnabled: (s, o, _) => true, + onActivityImport: (activity, context) => + { + onActivityImportCalled = true; + Assert.Null(Activity.Current); + Assert.Equal("Microsoft.AspNetCore.Hosting.HttpRequestIn", activity.OperationName); + Assert.NotNull(context); + Assert.IsAssignableFrom(context); + + activity.ActivityTraceFlags = ActivityTraceFlags.Recorded; + }); + + hostingApplication.CreateContext(features); + + Assert.True(onActivityImportCalled); + Assert.NotNull(Activity.Current); + Assert.True(Activity.Current.Recorded); + } + private static void AssertProperty(object o, string name) { diff --git a/src/Hosting/Hosting/test/StartupManagerTests.cs b/src/Hosting/Hosting/test/StartupManagerTests.cs index 8f64fb37e5..f336b3cc8d 100644 --- a/src/Hosting/Hosting/test/StartupManagerTests.cs +++ b/src/Hosting/Hosting/test/StartupManagerTests.cs @@ -500,8 +500,36 @@ namespace Microsoft.AspNetCore.Hosting.Tests var app = new ApplicationBuilder(services); app.ApplicationServices = startup.ConfigureServicesDelegate(serviceCollection); - var ex = Assert.Throws(() => startup.ConfigureDelegate(app)); - Assert.IsAssignableFrom(ex.InnerException); + Assert.Throws(() => startup.ConfigureDelegate(app)); + } + + [Fact] + public void ConfigureServicesThrowingDoesNotThrowTargetInvocationException() + { + var serviceCollection = new ServiceCollection(); + serviceCollection.AddSingleton, DefaultServiceProviderFactory>(); + var services = serviceCollection.BuildServiceProvider(); + + var startup = StartupLoader.LoadMethods(services, typeof(StartupConfigureServicesThrows), environmentName: null); + + var app = new ApplicationBuilder(services); + + Assert.Throws(() => startup.ConfigureServicesDelegate(serviceCollection)); + } + + [Fact] + public void ConfigureThrowingDoesNotThrowTargetInvocationException() + { + var serviceCollection = new ServiceCollection(); + serviceCollection.AddSingleton, DefaultServiceProviderFactory>(); + var services = serviceCollection.BuildServiceProvider(); + + var startup = StartupLoader.LoadMethods(services, typeof(StartupConfigureThrows), environmentName: null); + + var app = new ApplicationBuilder(services); + app.ApplicationServices = startup.ConfigureServicesDelegate(serviceCollection); + + Assert.Throws(() => startup.ConfigureDelegate(app)); } [Fact] diff --git a/src/Hosting/Hosting/test/WebHostTests.cs b/src/Hosting/Hosting/test/WebHostTests.cs index 2b55a00bcb..db2880f1c3 100644 --- a/src/Hosting/Hosting/test/WebHostTests.cs +++ b/src/Hosting/Hosting/test/WebHostTests.cs @@ -975,6 +975,54 @@ namespace Microsoft.AspNetCore.Hosting Assert.Contains("ConfigureServices", ex.Message); } + [Fact] + public void Dispose_DisposesAppConfiguration() + { + var providerMock = new Mock().As(); + providerMock.Setup(d => d.Dispose()); + + var sourceMock = new Mock(); + sourceMock.Setup(s => s.Build(It.IsAny())) + .Returns((ConfigurationProvider)providerMock.Object); + + var host = CreateBuilder() + .ConfigureAppConfiguration(configuration => + { + configuration.Add(sourceMock.Object); + }) + .Build(); + + providerMock.Verify(c => c.Dispose(), Times.Never); + + host.Dispose(); + + providerMock.Verify(c => c.Dispose(), Times.AtLeastOnce()); + } + + [Fact] + public async Task DisposeAsync_DisposesAppConfiguration() + { + var providerMock = new Mock().As(); + providerMock.Setup(d => d.Dispose()); + + var sourceMock = new Mock(); + sourceMock.Setup(s => s.Build(It.IsAny())) + .Returns((ConfigurationProvider)providerMock.Object); + + var host = CreateBuilder() + .ConfigureAppConfiguration(configuration => + { + configuration.Add(sourceMock.Object); + }) + .Build(); + + providerMock.Verify(c => c.Dispose(), Times.Never); + + await ((IAsyncDisposable)host).DisposeAsync(); + + providerMock.Verify(c => c.Dispose(), Times.AtLeastOnce()); + } + public class BadConfigureServicesStartup { public void ConfigureServices(IServiceCollection services, int gunk) { } diff --git a/src/Http/Http.Abstractions/src/Internal/ParsingHelpers.cs b/src/Http/Http.Abstractions/src/Internal/ParsingHelpers.cs index 971447fa44..60c3197e3c 100644 --- a/src/Http/Http.Abstractions/src/Internal/ParsingHelpers.cs +++ b/src/Http/Http.Abstractions/src/Internal/ParsingHelpers.cs @@ -19,11 +19,9 @@ namespace Microsoft.AspNetCore.Http.Internal public static StringValues GetHeaderSplit(IHeaderDictionary headers, string key) { var values = GetHeaderUnmodified(headers, key); - return new StringValues(GetHeaderSplitImplementation(values).ToArray()); - } - private static IEnumerable GetHeaderSplitImplementation(StringValues values) - { + StringValues result = default; + foreach (var segment in new HeaderSegmentCollection(values)) { if (!StringSegment.IsNullOrEmpty(segment.Data)) @@ -31,10 +29,12 @@ namespace Microsoft.AspNetCore.Http.Internal var value = DeQuote(segment.Data.Value); if (!string.IsNullOrEmpty(value)) { - yield return value; + result = StringValues.Concat(in result, value); } } } + + return result; } public static StringValues GetHeaderUnmodified(IHeaderDictionary headers, string key) diff --git a/src/Http/Http/ref/Microsoft.AspNetCore.Http.netcoreapp3.0.cs b/src/Http/Http/ref/Microsoft.AspNetCore.Http.netcoreapp3.0.cs index c2ac47f401..4070311a3b 100644 --- a/src/Http/Http/ref/Microsoft.AspNetCore.Http.netcoreapp3.0.cs +++ b/src/Http/Http/ref/Microsoft.AspNetCore.Http.netcoreapp3.0.cs @@ -406,7 +406,7 @@ namespace Microsoft.AspNetCore.Http.Internal { public ItemsDictionary() { } public ItemsDictionary(System.Collections.Generic.IDictionary items) { } - public System.Collections.Generic.IDictionary Items { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } + public System.Collections.Generic.IDictionary Items { get { throw null; } } int System.Collections.Generic.ICollection>.Count { get { throw null; } } bool System.Collections.Generic.ICollection>.IsReadOnly { get { throw null; } } object System.Collections.Generic.IDictionary.this[object key] { get { throw null; } set { } } diff --git a/src/Http/Http/src/Internal/ItemsDictionary.cs b/src/Http/Http/src/Internal/ItemsDictionary.cs index 4821912240..7f5f458ba1 100644 --- a/src/Http/Http/src/Internal/ItemsDictionary.cs +++ b/src/Http/Http/src/Internal/ItemsDictionary.cs @@ -8,111 +8,155 @@ namespace Microsoft.AspNetCore.Http.Internal { public class ItemsDictionary : IDictionary { + private IDictionary _items; + public ItemsDictionary() - : this(new Dictionary()) - { - } + {} public ItemsDictionary(IDictionary items) { - Items = items; + _items = items; } - public IDictionary Items { get; } + public IDictionary Items => this; // Replace the indexer with one that returns null for missing values object IDictionary.this[object key] { get { - object value; - if (Items.TryGetValue(key, out value)) + if (_items != null && _items.TryGetValue(key, out var value)) { return value; } return null; } - set { Items[key] = value; } + set + { + EnsureDictionary(); + _items[key] = value; + } } void IDictionary.Add(object key, object value) { - Items.Add(key, value); + EnsureDictionary(); + _items.Add(key, value); } bool IDictionary.ContainsKey(object key) - { - return Items.ContainsKey(key); - } + => _items != null && _items.ContainsKey(key); ICollection IDictionary.Keys { - get { return Items.Keys; } + get + { + if (_items == null) + { + return EmptyDictionary.Dictionary.Keys; + } + + return _items.Keys; + } } bool IDictionary.Remove(object key) - { - return Items.Remove(key); - } + => _items != null && _items.Remove(key); bool IDictionary.TryGetValue(object key, out object value) { - return Items.TryGetValue(key, out value); + value = null; + return _items != null && _items.TryGetValue(key, out value); } ICollection IDictionary.Values { - get { return Items.Values; } + get + { + if (_items == null) + { + return EmptyDictionary.Dictionary.Values; + } + + return _items.Values; + } } void ICollection>.Add(KeyValuePair item) { - Items.Add(item); + EnsureDictionary(); + _items.Add(item); } - void ICollection>.Clear() - { - Items.Clear(); - } + void ICollection>.Clear() => _items?.Clear(); bool ICollection>.Contains(KeyValuePair item) - { - return Items.Contains(item); - } + => _items != null && _items.Contains(item); void ICollection>.CopyTo(KeyValuePair[] array, int arrayIndex) { - Items.CopyTo(array, arrayIndex); + if (_items == null) + { + //Delegate to Empty Dictionary to do the argument checking. + EmptyDictionary.Collection.CopyTo(array, arrayIndex); + } + + _items.CopyTo(array, arrayIndex); } - int ICollection>.Count - { - get { return Items.Count; } - } + int ICollection>.Count => _items?.Count ?? 0; - bool ICollection>.IsReadOnly - { - get { return Items.IsReadOnly; } - } + bool ICollection>.IsReadOnly => _items?.IsReadOnly ?? false; bool ICollection>.Remove(KeyValuePair item) { - object value; - if (Items.TryGetValue(item.Key, out value) && Equals(item.Value, value)) + if (_items == null) { - return Items.Remove(item.Key); + return false; + } + + if (_items.TryGetValue(item.Key, out var value) && Equals(item.Value, value)) + { + return _items.Remove(item.Key); } return false; } - IEnumerator> IEnumerable>.GetEnumerator() + private void EnsureDictionary() { - return Items.GetEnumerator(); + if (_items == null) + { + _items = new Dictionary(); + } } - IEnumerator IEnumerable.GetEnumerator() + IEnumerator> IEnumerable>.GetEnumerator() + => _items?.GetEnumerator() ?? EmptyEnumerator.Instance; + + IEnumerator IEnumerable.GetEnumerator() => _items.GetEnumerator() ?? EmptyEnumerator.Instance; + + private class EmptyEnumerator : IEnumerator> { - return Items.GetEnumerator(); + // In own class so only initalized if GetEnumerator is called on an empty ItemsDictionary + public readonly static IEnumerator> Instance = new EmptyEnumerator(); + public KeyValuePair Current => default; + + object IEnumerator.Current => null; + + public void Dispose() + { } + + public bool MoveNext() => false; + + public void Reset() + { } + } + + private static class EmptyDictionary + { + // In own class so only initalized if CopyTo is called on an empty ItemsDictionary + public readonly static IDictionary Dictionary = new Dictionary(); + public static ICollection> Collection => Dictionary; } } } \ No newline at end of file diff --git a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.netcoreapp3.0.cs b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.netcoreapp3.0.cs index b83aa2efeb..3827225df0 100644 --- a/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.netcoreapp3.0.cs +++ b/src/Http/Routing/ref/Microsoft.AspNetCore.Routing.netcoreapp3.0.cs @@ -491,71 +491,19 @@ namespace Microsoft.AspNetCore.Routing.Constraints } namespace Microsoft.AspNetCore.Routing.Internal { - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct BufferValue - { - private readonly object _dummy; - private readonly int _dummyPrimitive; - public BufferValue(string value, bool requiresEncoding) { throw null; } - public bool RequiresEncoding { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public string Value { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } public partial class DfaGraphWriter { public DfaGraphWriter(System.IServiceProvider services) { } public void Write(Microsoft.AspNetCore.Routing.EndpointDataSource dataSource, System.IO.TextWriter writer) { } } - [System.Diagnostics.DebuggerDisplayAttribute("{DebuggerDisplayString,nq}")] - public partial class LinkGenerationDecisionTree - { - public LinkGenerationDecisionTree(System.Collections.Generic.IReadOnlyList entries) { } - public System.Collections.Generic.IList GetMatches(Microsoft.AspNetCore.Routing.RouteValueDictionary values, Microsoft.AspNetCore.Routing.RouteValueDictionary ambientValues) { throw null; } - } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public readonly partial struct OutboundMatchResult - { - private readonly object _dummy; - private readonly int _dummyPrimitive; - public OutboundMatchResult(Microsoft.AspNetCore.Routing.Tree.OutboundMatch match, bool isFallbackMatch) { throw null; } - public bool IsFallbackMatch { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - public Microsoft.AspNetCore.Routing.Tree.OutboundMatch Match { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } - } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public partial struct PathTokenizer : System.Collections.Generic.IEnumerable, System.Collections.Generic.IReadOnlyCollection, System.Collections.Generic.IReadOnlyList, System.Collections.IEnumerable - { - private object _dummy; - private int _dummyPrimitive; - public PathTokenizer(Microsoft.AspNetCore.Http.PathString path) { throw null; } - public int Count { get { throw null; } } - public Microsoft.Extensions.Primitives.StringSegment this[int index] { get { throw null; } } - public Microsoft.AspNetCore.Routing.Internal.PathTokenizer.Enumerator GetEnumerator() { throw null; } - System.Collections.Generic.IEnumerator System.Collections.Generic.IEnumerable.GetEnumerator() { throw null; } - System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; } - [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] - public partial struct Enumerator : System.Collections.Generic.IEnumerator, System.Collections.IEnumerator, System.IDisposable - { - private object _dummy; - private int _dummyPrimitive; - public Enumerator(Microsoft.AspNetCore.Routing.Internal.PathTokenizer tokenizer) { throw null; } - public Microsoft.Extensions.Primitives.StringSegment Current { get { throw null; } } - object System.Collections.IEnumerator.Current { get { throw null; } } - public void Dispose() { } - public bool MoveNext() { throw null; } - public void Reset() { } - } - } + [System.ObsoleteAttribute("This type will be marked as internal in a future release.")] public enum SegmentState { Beginning = 0, Inside = 1, } - public partial class UriBuilderContextPooledObjectPolicy : Microsoft.Extensions.ObjectPool.IPooledObjectPolicy - { - public UriBuilderContextPooledObjectPolicy() { } - public Microsoft.AspNetCore.Routing.Internal.UriBuildingContext Create() { throw null; } - public bool Return(Microsoft.AspNetCore.Routing.Internal.UriBuildingContext obj) { throw null; } - } [System.Diagnostics.DebuggerDisplayAttribute("{DebuggerToString(),nq}")] + [System.ObsoleteAttribute("This type will be marked as internal in a future release.")] public partial class UriBuildingContext { public UriBuildingContext(System.Text.Encodings.Web.UrlEncoder urlEncoder) { } @@ -808,13 +756,21 @@ namespace Microsoft.AspNetCore.Routing.Template } public partial class TemplateBinder { + [System.ObsoleteAttribute("This constructor is obsolete and will be marked internal in a future release. Use the TemplateBinderFactory service to create TemplateBinder instances.")] public TemplateBinder(System.Text.Encodings.Web.UrlEncoder urlEncoder, Microsoft.Extensions.ObjectPool.ObjectPool pool, Microsoft.AspNetCore.Routing.Patterns.RoutePattern pattern, Microsoft.AspNetCore.Routing.RouteValueDictionary defaults, System.Collections.Generic.IEnumerable requiredKeys, System.Collections.Generic.IEnumerable> parameterPolicies) { } + [System.ObsoleteAttribute("This constructor is obsolete and will be marked internal in a furture release. Use the TemplateBinderFactory service to create TemplateBinder instances.")] public TemplateBinder(System.Text.Encodings.Web.UrlEncoder urlEncoder, Microsoft.Extensions.ObjectPool.ObjectPool pool, Microsoft.AspNetCore.Routing.Template.RouteTemplate template, Microsoft.AspNetCore.Routing.RouteValueDictionary defaults) { } public string BindValues(Microsoft.AspNetCore.Routing.RouteValueDictionary acceptedValues) { throw null; } public Microsoft.AspNetCore.Routing.Template.TemplateValuesResult GetValues(Microsoft.AspNetCore.Routing.RouteValueDictionary ambientValues, Microsoft.AspNetCore.Routing.RouteValueDictionary values) { throw null; } public static bool RoutePartsEqual(object a, object b) { throw null; } public bool TryProcessConstraints(Microsoft.AspNetCore.Http.HttpContext httpContext, Microsoft.AspNetCore.Routing.RouteValueDictionary combinedValues, out string parameterName, out Microsoft.AspNetCore.Routing.IRouteConstraint constraint) { throw null; } } + public abstract partial class TemplateBinderFactory + { + protected TemplateBinderFactory() { } + public abstract Microsoft.AspNetCore.Routing.Template.TemplateBinder Create(Microsoft.AspNetCore.Routing.Patterns.RoutePattern pattern); + public abstract Microsoft.AspNetCore.Routing.Template.TemplateBinder Create(Microsoft.AspNetCore.Routing.Template.RouteTemplate template, Microsoft.AspNetCore.Routing.RouteValueDictionary defaults); + } public partial class TemplateMatcher { public TemplateMatcher(Microsoft.AspNetCore.Routing.Template.RouteTemplate template, Microsoft.AspNetCore.Routing.RouteValueDictionary defaults) { } @@ -901,6 +857,7 @@ namespace Microsoft.AspNetCore.Routing.Tree } public partial class TreeRouteBuilder { + [System.ObsoleteAttribute("This constructor will be marked internal in a future release. Use the service provider to create instances of TreeRouteBuilder.")] public TreeRouteBuilder(Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.Extensions.ObjectPool.ObjectPool objectPool, Microsoft.AspNetCore.Routing.IInlineConstraintResolver constraintResolver) { } public System.Collections.Generic.IList InboundEntries { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public System.Collections.Generic.IList OutboundEntries { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } @@ -913,6 +870,7 @@ namespace Microsoft.AspNetCore.Routing.Tree public partial class TreeRouter : Microsoft.AspNetCore.Routing.IRouter { public static readonly string RouteGroupKey; + [System.ObsoleteAttribute("This constructor will be marked obsolete in a future release. Use the TreeRouterBuilder to create instances of TreeRouter.")] public TreeRouter(Microsoft.AspNetCore.Routing.Tree.UrlMatchingTree[] trees, System.Collections.Generic.IEnumerable linkGenerationEntries, System.Text.Encodings.Web.UrlEncoder urlEncoder, Microsoft.Extensions.ObjectPool.ObjectPool objectPool, Microsoft.Extensions.Logging.ILogger routeLogger, Microsoft.Extensions.Logging.ILogger constraintLogger, int version) { } public int Version { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public Microsoft.AspNetCore.Routing.VirtualPathData GetVirtualPath(Microsoft.AspNetCore.Routing.VirtualPathContext context) { throw null; } diff --git a/src/Http/Routing/src/Internal/ArrayBuilder.cs b/src/Http/Routing/src/ArrayBuilder.cs similarity index 97% rename from src/Http/Routing/src/Internal/ArrayBuilder.cs rename to src/Http/Routing/src/ArrayBuilder.cs index 868b3cfc27..ff20c2e64d 100644 --- a/src/Http/Routing/src/Internal/ArrayBuilder.cs +++ b/src/Http/Routing/src/ArrayBuilder.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. @@ -10,7 +10,7 @@ using System; using System.Diagnostics; -namespace Microsoft.AspNetCore.Routing.Internal +namespace Microsoft.AspNetCore.Routing { /// /// Helper type for avoiding allocations while building arrays. @@ -166,4 +166,4 @@ namespace Microsoft.AspNetCore.Routing.Internal _array = next; } } -} \ No newline at end of file +} diff --git a/src/Http/Routing/src/DefaultLinkGenerator.cs b/src/Http/Routing/src/DefaultLinkGenerator.cs index 21f36cac63..aae057a3ac 100644 --- a/src/Http/Routing/src/DefaultLinkGenerator.cs +++ b/src/Http/Routing/src/DefaultLinkGenerator.cs @@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Routing internal sealed class DefaultLinkGenerator : LinkGenerator, IDisposable { private readonly ParameterPolicyFactory _parameterPolicyFactory; - private readonly ObjectPool _uriBuildingContextPool; + private readonly TemplateBinderFactory _binderFactory; private readonly ILogger _logger; private readonly IServiceProvider _serviceProvider; @@ -38,14 +38,14 @@ namespace Microsoft.AspNetCore.Routing public DefaultLinkGenerator( ParameterPolicyFactory parameterPolicyFactory, + TemplateBinderFactory binderFactory, EndpointDataSource dataSource, - ObjectPool uriBuildingContextPool, IOptions routeOptions, ILogger logger, IServiceProvider serviceProvider) { _parameterPolicyFactory = parameterPolicyFactory; - _uriBuildingContextPool = uriBuildingContextPool; + _binderFactory = binderFactory; _logger = logger; _serviceProvider = serviceProvider; @@ -282,40 +282,7 @@ namespace Microsoft.AspNetCore.Routing private TemplateBinder CreateTemplateBinder(RouteEndpoint endpoint) { - // Now create the constraints and parameter transformers from the pattern - var policies = new List<(string parameterName, IParameterPolicy policy)>(); - foreach (var kvp in endpoint.RoutePattern.ParameterPolicies) - { - var parameterName = kvp.Key; - - // It's possible that we don't have an actual route parameter, we need to support that case. - var parameter = endpoint.RoutePattern.GetParameter(parameterName); - - // Use the first parameter transformer per parameter - var foundTransformer = false; - for (var i = 0; i < kvp.Value.Count; i++) - { - var parameterPolicy = _parameterPolicyFactory.Create(parameter, kvp.Value[i]); - if (!foundTransformer && parameterPolicy is IOutboundParameterTransformer parameterTransformer) - { - policies.Add((parameterName, parameterTransformer)); - foundTransformer = true; - } - - if (parameterPolicy is IRouteConstraint constraint) - { - policies.Add((parameterName, constraint)); - } - } - } - - return new TemplateBinder( - UrlEncoder.Default, - _uriBuildingContextPool, - endpoint.RoutePattern, - new RouteValueDictionary(endpoint.RoutePattern.Defaults), - endpoint.RoutePattern.RequiredValues.Keys, - policies); + return _binderFactory.Create(endpoint.RoutePattern); } // Internal for testing diff --git a/src/Http/Routing/src/DependencyInjection/RoutingServiceCollectionExtensions.cs b/src/Http/Routing/src/DependencyInjection/RoutingServiceCollectionExtensions.cs index 94c1efdd26..8a9d10a45f 100644 --- a/src/Http/Routing/src/DependencyInjection/RoutingServiceCollectionExtensions.cs +++ b/src/Http/Routing/src/DependencyInjection/RoutingServiceCollectionExtensions.cs @@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Routing.Internal; using Microsoft.AspNetCore.Routing.Matching; using Microsoft.AspNetCore.Routing.Patterns; +using Microsoft.AspNetCore.Routing.Template; using Microsoft.AspNetCore.Routing.Tree; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Logging; @@ -34,6 +35,7 @@ namespace Microsoft.Extensions.DependencyInjection services.TryAddTransient(); services.TryAddTransient(); +#pragma warning disable CS0618 // Type or member is obsolete services.TryAddSingleton>(s => { var provider = s.GetRequiredService(); @@ -49,6 +51,7 @@ namespace Microsoft.Extensions.DependencyInjection var constraintResolver = s.GetRequiredService(); return new TreeRouteBuilder(loggerFactory, objectPool, constraintResolver); })); +#pragma warning restore CS0618 // Type or member is obsolete services.TryAddSingleton(typeof(RoutingMarkerService)); @@ -88,6 +91,7 @@ namespace Microsoft.Extensions.DependencyInjection // // Misc infrastructure // + services.TryAddSingleton(); services.TryAddSingleton(); return services; } diff --git a/src/Http/Routing/src/Internal/BufferValue.cs b/src/Http/Routing/src/Internal/BufferValue.cs deleted file mode 100644 index f71617038d..0000000000 --- a/src/Http/Routing/src/Internal/BufferValue.cs +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.AspNetCore.Routing.Internal -{ - public readonly struct BufferValue - { - public BufferValue(string value, bool requiresEncoding) - { - Value = value; - RequiresEncoding = requiresEncoding; - } - - public bool RequiresEncoding { get; } - - public string Value { get; } - } -} diff --git a/src/Http/Routing/src/Internal/SegmentState.cs b/src/Http/Routing/src/Internal/SegmentState.cs index 35076a0678..6431f01059 100644 --- a/src/Http/Routing/src/Internal/SegmentState.cs +++ b/src/Http/Routing/src/Internal/SegmentState.cs @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; + namespace Microsoft.AspNetCore.Routing.Internal { // Segments are treated as all-or-none. We should never output a partial segment. @@ -9,6 +11,7 @@ namespace Microsoft.AspNetCore.Routing.Internal // used a value for {p1}, we have to output the entire segment up to the next "/". // Otherwise we could end up with the partial segment "v1" instead of the entire // segment "v1-v2.xml". + [Obsolete("This type will be marked as internal in a future release.")] public enum SegmentState { Beginning, diff --git a/src/Http/Routing/src/Internal/UriBuildingContext.cs b/src/Http/Routing/src/Internal/UriBuildingContext.cs index 82e0b4137b..dcfde1d866 100644 --- a/src/Http/Routing/src/Internal/UriBuildingContext.cs +++ b/src/Http/Routing/src/Internal/UriBuildingContext.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; @@ -10,6 +11,7 @@ using Microsoft.AspNetCore.Http; namespace Microsoft.AspNetCore.Routing.Internal { + [Obsolete("This type will be marked as internal in a future release.")] [DebuggerDisplay("{DebuggerToString(),nq}")] public class UriBuildingContext { @@ -321,5 +323,18 @@ namespace Microsoft.AspNetCore.Routing.Internal { return string.Format("{{Accepted: '{0}' Buffered: '{1}'}}", _path, string.Join("", _buffer)); } + + private readonly struct BufferValue + { + public BufferValue(string value, bool requiresEncoding) + { + Value = value; + RequiresEncoding = requiresEncoding; + } + + public bool RequiresEncoding { get; } + + public string Value { get; } + } } } diff --git a/src/Http/Routing/src/Internal/NullRouter.cs b/src/Http/Routing/src/NullRouter.cs similarity index 100% rename from src/Http/Routing/src/Internal/NullRouter.cs rename to src/Http/Routing/src/NullRouter.cs diff --git a/src/Http/Routing/src/Internal/ParameterPolicyActivator.cs b/src/Http/Routing/src/ParameterPolicyActivator.cs similarity index 98% rename from src/Http/Routing/src/Internal/ParameterPolicyActivator.cs rename to src/Http/Routing/src/ParameterPolicyActivator.cs index c04de5ba60..ab18e7efe8 100644 --- a/src/Http/Routing/src/Internal/ParameterPolicyActivator.cs +++ b/src/Http/Routing/src/ParameterPolicyActivator.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -9,7 +9,7 @@ using System.Reflection; using System.Text; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNetCore.Routing.Internal +namespace Microsoft.AspNetCore.Routing { internal static class ParameterPolicyActivator { diff --git a/src/Http/Routing/src/Internal/PathTokenizer.cs b/src/Http/Routing/src/PathTokenizer.cs similarity index 98% rename from src/Http/Routing/src/Internal/PathTokenizer.cs rename to src/Http/Routing/src/PathTokenizer.cs index 9418989fdb..307dfb1159 100644 --- a/src/Http/Routing/src/Internal/PathTokenizer.cs +++ b/src/Http/Routing/src/PathTokenizer.cs @@ -8,9 +8,9 @@ using System.Diagnostics; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNetCore.Routing.Internal +namespace Microsoft.AspNetCore.Routing { - public struct PathTokenizer : IReadOnlyList + internal struct PathTokenizer : IReadOnlyList { private readonly string _path; private int _count; diff --git a/src/Http/Routing/src/RouteBase.cs b/src/Http/Routing/src/RouteBase.cs index 2659e7fac4..c12eaae75b 100644 --- a/src/Http/Routing/src/RouteBase.cs +++ b/src/Http/Routing/src/RouteBase.cs @@ -246,14 +246,16 @@ namespace Microsoft.AspNetCore.Routing } } +#pragma warning disable CS0618 // Type or member is obsolete private void EnsureBinder(HttpContext context) { if (_binder == null) { - var pool = context.RequestServices.GetRequiredService>(); - _binder = new TemplateBinder(UrlEncoder.Default, pool, ParsedTemplate, Defaults); + var binderFactory = context.RequestServices.GetRequiredService(); + _binder = binderFactory.Create(ParsedTemplate, Defaults); } } +#pragma warning restore CS0618 // Type or member is obsolete private void EnsureLoggers(HttpContext context) { diff --git a/src/Http/Routing/src/Internal/RoutingMarkerService.cs b/src/Http/Routing/src/RoutingMarkerService.cs similarity index 90% rename from src/Http/Routing/src/Internal/RoutingMarkerService.cs rename to src/Http/Routing/src/RoutingMarkerService.cs index c7bed9df18..ab876b0c39 100644 --- a/src/Http/Routing/src/Internal/RoutingMarkerService.cs +++ b/src/Http/Routing/src/RoutingMarkerService.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNetCore.Routing.Internal +namespace Microsoft.AspNetCore.Routing { /// /// A marker class used to determine if all the routing services were added @@ -12,4 +12,4 @@ namespace Microsoft.AspNetCore.Routing.Internal internal class RoutingMarkerService { } -} \ No newline at end of file +} diff --git a/src/Http/Routing/src/Template/DefaultTemplateBinderFactory.cs b/src/Http/Routing/src/Template/DefaultTemplateBinderFactory.cs new file mode 100644 index 0000000000..86e33e04a3 --- /dev/null +++ b/src/Http/Routing/src/Template/DefaultTemplateBinderFactory.cs @@ -0,0 +1,95 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.Text.Encodings.Web; +using Microsoft.AspNetCore.Routing.Internal; +using Microsoft.AspNetCore.Routing.Patterns; +using Microsoft.Extensions.ObjectPool; + +namespace Microsoft.AspNetCore.Routing.Template +{ + internal sealed class DefaultTemplateBinderFactory : TemplateBinderFactory + { + private readonly ParameterPolicyFactory _policyFactory; +#pragma warning disable CS0618 // Type or member is obsolete + private readonly ObjectPool _pool; +#pragma warning restore CS0618 // Type or member is obsolete + + public DefaultTemplateBinderFactory( + ParameterPolicyFactory policyFactory, +#pragma warning disable CS0618 // Type or member is obsolete + ObjectPool pool) +#pragma warning restore CS0618 // Type or member is obsolete + { + if (policyFactory == null) + { + throw new ArgumentNullException(nameof(policyFactory)); + } + + if (pool == null) + { + throw new ArgumentNullException(nameof(pool)); + } + + _policyFactory = policyFactory; + _pool = pool; + + } + + public override TemplateBinder Create(RouteTemplate template, RouteValueDictionary defaults) + { + if (template == null) + { + throw new ArgumentNullException(nameof(template)); + } + + if (defaults == null) + { + throw new ArgumentNullException(nameof(defaults)); + } + +#pragma warning disable CS0618 // Type or member is obsolete + return new TemplateBinder(UrlEncoder.Default, _pool, template, defaults); +#pragma warning restore CS0618 // Type or member is obsolete + } + + public override TemplateBinder Create(RoutePattern pattern) + { + if (pattern == null) + { + throw new ArgumentNullException(nameof(pattern)); + } + + // Now create the constraints and parameter transformers from the pattern + var policies = new List<(string parameterName, IParameterPolicy policy)>(); + foreach (var kvp in pattern.ParameterPolicies) + { + var parameterName = kvp.Key; + + // It's possible that we don't have an actual route parameter, we need to support that case. + var parameter = pattern.GetParameter(parameterName); + + // Use the first parameter transformer per parameter + var foundTransformer = false; + for (var i = 0; i < kvp.Value.Count; i++) + { + var parameterPolicy = _policyFactory.Create(parameter, kvp.Value[i]); + if (!foundTransformer && parameterPolicy is IOutboundParameterTransformer parameterTransformer) + { + policies.Add((parameterName, parameterTransformer)); + foundTransformer = true; + } + + if (parameterPolicy is IRouteConstraint constraint) + { + policies.Add((parameterName, constraint)); + } + } + } + + return new TemplateBinder(UrlEncoder.Default, _pool, pattern, policies); + } + } +} diff --git a/src/Http/Routing/src/Template/TemplateBinder.cs b/src/Http/Routing/src/Template/TemplateBinder.cs index c78573ab98..efc46f3781 100644 --- a/src/Http/Routing/src/Template/TemplateBinder.cs +++ b/src/Http/Routing/src/Template/TemplateBinder.cs @@ -19,7 +19,9 @@ namespace Microsoft.AspNetCore.Routing.Template public class TemplateBinder { private readonly UrlEncoder _urlEncoder; +#pragma warning disable CS0618 // Type or member is obsolete private readonly ObjectPool _pool; +#pragma warning restore CS0618 // Type or member is obsolete private readonly (string parameterName, IRouteConstraint constraint)[] _constraints; private readonly RouteValueDictionary _defaults; @@ -40,6 +42,9 @@ namespace Microsoft.AspNetCore.Routing.Template /// The . /// The to bind values to. /// The default values for . + [Obsolete( + "This constructor is obsolete and will be marked internal in a furture release. Use the TemplateBinderFactory service " + + "to create TemplateBinder instances.")] public TemplateBinder( UrlEncoder urlEncoder, ObjectPool pool, @@ -60,6 +65,9 @@ namespace Microsoft.AspNetCore.Routing.Template /// /// A list of (, ) pairs to evalute when producing a URI. /// + [Obsolete( + "This constructor is obsolete and will be marked internal in a future release. Use the TemplateBinderFactory service " + + "to create TemplateBinder instances.")] public TemplateBinder( UrlEncoder urlEncoder, ObjectPool pool, @@ -110,6 +118,58 @@ namespace Microsoft.AspNetCore.Routing.Template _slots = AssignSlots(_pattern, _filters); } + internal TemplateBinder( + UrlEncoder urlEncoder, +#pragma warning disable CS0618 // Type or member is obsolete + ObjectPool pool, +#pragma warning restore CS0618 // Type or member is obsolete + RoutePattern pattern, + IEnumerable<(string parameterName, IParameterPolicy policy)> parameterPolicies) + { + if (urlEncoder == null) + { + throw new ArgumentNullException(nameof(urlEncoder)); + } + + if (pool == null) + { + throw new ArgumentNullException(nameof(pool)); + } + + if (pattern == null) + { + throw new ArgumentNullException(nameof(pattern)); + } + + // Parameter policies can be null. + + _urlEncoder = urlEncoder; + _pool = pool; + _pattern = pattern; + _defaults = new RouteValueDictionary(pattern.Defaults); + _requiredKeys = pattern.RequiredValues.Keys.ToArray(); + + // Any default that doesn't have a corresponding parameter is a 'filter' and if a value + // is provided for that 'filter' it must match the value in defaults. + var filters = new RouteValueDictionary(_defaults); + for (var i = 0; i < pattern.Parameters.Count; i++) + { + filters.Remove(pattern.Parameters[i].Name); + } + _filters = filters.ToArray(); + + _constraints = parameterPolicies + ?.Where(p => p.policy is IRouteConstraint) + .Select(p => (p.parameterName, (IRouteConstraint)p.policy)) + .ToArray() ?? Array.Empty<(string, IRouteConstraint)>(); + _parameterTransformers = parameterPolicies + ?.Where(p => p.policy is IOutboundParameterTransformer) + .Select(p => (p.parameterName, (IOutboundParameterTransformer)p.policy)) + .ToArray() ?? Array.Empty<(string, IOutboundParameterTransformer)>(); + + _slots = AssignSlots(_pattern, _filters); + } + // Step 1: Get the list of values we're going to try to use to match and generate this URI public TemplateValuesResult GetValues(RouteValueDictionary ambientValues, RouteValueDictionary values) { @@ -442,6 +502,7 @@ namespace Microsoft.AspNetCore.Routing.Template } } +#pragma warning disable CS0618 // Type or member is obsolete private bool TryBindValuesCore(UriBuildingContext context, RouteValueDictionary acceptedValues) { // If we have any output parameter transformers, allow them a chance to influence the parameter values @@ -578,6 +639,7 @@ namespace Microsoft.AspNetCore.Routing.Template } return false; } +#pragma warning restore CS0618 // Type or member is obsolete /// /// Compares two objects for equality as parts of a case-insensitive path. diff --git a/src/Http/Routing/src/Template/TemplateBinderFactory.cs b/src/Http/Routing/src/Template/TemplateBinderFactory.cs new file mode 100644 index 0000000000..273b4c4a68 --- /dev/null +++ b/src/Http/Routing/src/Template/TemplateBinderFactory.cs @@ -0,0 +1,29 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Routing.Patterns; + +namespace Microsoft.AspNetCore.Routing.Template +{ + /// + /// A factory used to create instances. + /// + public abstract class TemplateBinderFactory + { + /// + /// Creates a new from the provided and + /// . + /// + /// The route template. + /// A collection of extra default values that do not appear in the route template. + /// A . + public abstract TemplateBinder Create(RouteTemplate template, RouteValueDictionary defaults); + + /// + /// Creates a new from the provided . + /// + /// The . + /// A . + public abstract TemplateBinder Create(RoutePattern pattern); + } +} diff --git a/src/Http/Routing/src/Internal/LinkGenerationDecisionTree.cs b/src/Http/Routing/src/Tree/LinkGenerationDecisionTree.cs similarity index 98% rename from src/Http/Routing/src/Internal/LinkGenerationDecisionTree.cs rename to src/Http/Routing/src/Tree/LinkGenerationDecisionTree.cs index effc1f0b24..8b8315285f 100644 --- a/src/Http/Routing/src/Internal/LinkGenerationDecisionTree.cs +++ b/src/Http/Routing/src/Tree/LinkGenerationDecisionTree.cs @@ -8,13 +8,12 @@ using System.Linq; using System.Text; using Microsoft.AspNetCore.Routing.DecisionTree; using Microsoft.AspNetCore.Routing.Patterns; -using Microsoft.AspNetCore.Routing.Tree; -namespace Microsoft.AspNetCore.Routing.Internal +namespace Microsoft.AspNetCore.Routing.Tree { // A decision tree that matches link generation entries based on route data. [DebuggerDisplay("{DebuggerDisplayString,nq}")] - public class LinkGenerationDecisionTree + internal class LinkGenerationDecisionTree { // Fallback value for cases where the ambient values weren't provided. // diff --git a/src/Http/Routing/src/Internal/OutboundMatchResult.cs b/src/Http/Routing/src/Tree/OutboundMatchResult.cs similarity index 76% rename from src/Http/Routing/src/Internal/OutboundMatchResult.cs rename to src/Http/Routing/src/Tree/OutboundMatchResult.cs index 1b221013ba..ba19555524 100644 --- a/src/Http/Routing/src/Internal/OutboundMatchResult.cs +++ b/src/Http/Routing/src/Tree/OutboundMatchResult.cs @@ -1,11 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNetCore.Routing.Tree; - -namespace Microsoft.AspNetCore.Routing.Internal +namespace Microsoft.AspNetCore.Routing.Tree { - public readonly struct OutboundMatchResult + internal readonly struct OutboundMatchResult { public OutboundMatchResult(OutboundMatch match, bool isFallbackMatch) { diff --git a/src/Http/Routing/src/Tree/TreeRouteBuilder.cs b/src/Http/Routing/src/Tree/TreeRouteBuilder.cs index a8a11d803b..ba4bdefdfa 100644 --- a/src/Http/Routing/src/Tree/TreeRouteBuilder.cs +++ b/src/Http/Routing/src/Tree/TreeRouteBuilder.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Text.Encodings.Web; using Microsoft.AspNetCore.Routing.Internal; @@ -21,7 +20,9 @@ namespace Microsoft.AspNetCore.Routing.Tree private readonly ILogger _logger; private readonly ILogger _constraintLogger; private readonly UrlEncoder _urlEncoder; +#pragma warning disable CS0618 // Type or member is obsolete private readonly ObjectPool _objectPool; +#pragma warning restore CS0618 // Type or member is obsolete private readonly IInlineConstraintResolver _constraintResolver; /// @@ -30,9 +31,12 @@ namespace Microsoft.AspNetCore.Routing.Tree /// The . /// The . /// The . + [Obsolete("This constructor will be marked internal in a future release. Use the service provider to create instances of TreeRouteBuilder.")] public TreeRouteBuilder( ILoggerFactory loggerFactory, +#pragma warning disable CS0618 // Type or member is obsolete ObjectPool objectPool, +#pragma warning restore CS0618 // Type or member is obsolete IInlineConstraintResolver constraintResolver) { if (loggerFactory == null) @@ -240,6 +244,7 @@ namespace Microsoft.AspNetCore.Routing.Tree tree.AddEntry(entry); } +#pragma warning disable CS0618 // Type or member is obsolete return new TreeRouter( trees.Values.OrderBy(tree => tree.Order).ToArray(), OutboundEntries, @@ -248,6 +253,7 @@ namespace Microsoft.AspNetCore.Routing.Tree _logger, _constraintLogger, version); +#pragma warning restore CS0618 // Type or member is obsolete } /// diff --git a/src/Http/Routing/src/Tree/TreeRouter.cs b/src/Http/Routing/src/Tree/TreeRouter.cs index 47fbf3802e..46828b94dd 100644 --- a/src/Http/Routing/src/Tree/TreeRouter.cs +++ b/src/Http/Routing/src/Tree/TreeRouter.cs @@ -40,11 +40,14 @@ namespace Microsoft.AspNetCore.Routing.Tree /// The instance used /// in . /// The version of this route. + [Obsolete("This constructor will be marked obsolete in a future release. Use the TreeRouterBuilder to create instances of TreeRouter.")] public TreeRouter( UrlMatchingTree[] trees, IEnumerable linkGenerationEntries, UrlEncoder urlEncoder, +#pragma warning disable CS0618 // Type or member is obsolete ObjectPool objectPool, +#pragma warning restore CS0618 // Type or member is obsolete ILogger routeLogger, ILogger constraintLogger, int version) diff --git a/src/Http/Routing/src/Internal/UriBuilderContextPooledObjectPolicy.cs b/src/Http/Routing/src/UriBuilderContextPooledObjectPolicy.cs similarity index 62% rename from src/Http/Routing/src/Internal/UriBuilderContextPooledObjectPolicy.cs rename to src/Http/Routing/src/UriBuilderContextPooledObjectPolicy.cs index 953d6a86c4..7ed7021d1f 100644 --- a/src/Http/Routing/src/Internal/UriBuilderContextPooledObjectPolicy.cs +++ b/src/Http/Routing/src/UriBuilderContextPooledObjectPolicy.cs @@ -2,11 +2,13 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Text.Encodings.Web; +using Microsoft.AspNetCore.Routing.Internal; using Microsoft.Extensions.ObjectPool; -namespace Microsoft.AspNetCore.Routing.Internal +namespace Microsoft.AspNetCore.Routing { - public class UriBuilderContextPooledObjectPolicy : IPooledObjectPolicy +#pragma warning disable CS0618 // Type or member is obsolete + internal class UriBuilderContextPooledObjectPolicy : IPooledObjectPolicy { public UriBuildingContext Create() { @@ -19,4 +21,5 @@ namespace Microsoft.AspNetCore.Routing.Internal return true; } } +#pragma warning restore CS0618 // Type or member is obsolete } diff --git a/src/Http/Routing/test/UnitTests/Internal/UriBuildingContextTest.cs b/src/Http/Routing/test/UnitTests/Internal/UriBuildingContextTest.cs index cfd1531a5d..f9f0be2ab8 100644 --- a/src/Http/Routing/test/UnitTests/Internal/UriBuildingContextTest.cs +++ b/src/Http/Routing/test/UnitTests/Internal/UriBuildingContextTest.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.Extensions.WebEncoders.Testing; @@ -6,6 +6,7 @@ using Xunit; namespace Microsoft.AspNetCore.Routing.Internal { +#pragma warning disable CS0618 // Type or member is obsolete public class UriBuildingContextTest { [Fact] @@ -16,7 +17,7 @@ namespace Microsoft.AspNetCore.Routing.Internal var value = "a/b b1/c"; var expected = "/UrlEncode[[a/b b1/c]]"; var uriBuilldingContext = new UriBuildingContext(urlTestEncoder); - + // Act uriBuilldingContext.EncodeValue(value, 0, value.Length, encodeSlashes: true); @@ -97,4 +98,5 @@ namespace Microsoft.AspNetCore.Routing.Internal Assert.Equal(expected, uriBuilldingContext.ToPathString().Value); } } +#pragma warning restore CS0618 // Type or member is obsolete } diff --git a/src/Http/Routing/test/UnitTests/LinkGeneratorTestBase.cs b/src/Http/Routing/test/UnitTests/LinkGeneratorTestBase.cs index 202238e5b8..19ded38c8b 100644 --- a/src/Http/Routing/test/UnitTests/LinkGeneratorTestBase.cs +++ b/src/Http/Routing/test/UnitTests/LinkGeneratorTestBase.cs @@ -5,6 +5,7 @@ using System; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Routing.Internal; +using Microsoft.AspNetCore.Routing.Template; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.ObjectPool; @@ -82,8 +83,8 @@ namespace Microsoft.AspNetCore.Routing return new DefaultLinkGenerator( new DefaultParameterPolicyFactory(routeOptions, serviceProvider), + serviceProvider.GetRequiredService(), new CompositeEndpointDataSource(routeOptions.Value.EndpointDataSources), - new DefaultObjectPool(new UriBuilderContextPooledObjectPolicy()), routeOptions, NullLogger.Instance, serviceProvider); diff --git a/src/Http/Routing/test/UnitTests/Matching/TreeRouterMatcherBuilder.cs b/src/Http/Routing/test/UnitTests/Matching/TreeRouterMatcherBuilder.cs index b6346b0f14..5d4e25dfff 100644 --- a/src/Http/Routing/test/UnitTests/Matching/TreeRouterMatcherBuilder.cs +++ b/src/Http/Routing/test/UnitTests/Matching/TreeRouterMatcherBuilder.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -32,10 +32,12 @@ namespace Microsoft.AspNetCore.Routing.Matching public override Matcher Build() { +#pragma warning disable CS0618 // Type or member is obsolete var builder = new TreeRouteBuilder( NullLoggerFactory.Instance, new DefaultObjectPool(new UriBuilderContextPooledObjectPolicy()), new DefaultInlineConstraintResolver(Options.Create(new RouteOptions()), new TestServiceProvider())); +#pragma warning restore CS0618 // Type or member is obsolete var selector = new DefaultEndpointSelector(); diff --git a/src/Http/Routing/test/UnitTests/RouteTest.cs b/src/Http/Routing/test/UnitTests/RouteTest.cs index 4c0f647caf..db7bce321e 100644 --- a/src/Http/Routing/test/UnitTests/RouteTest.cs +++ b/src/Http/Routing/test/UnitTests/RouteTest.cs @@ -658,6 +658,7 @@ namespace Microsoft.AspNetCore.Routing var expected = "/Home/Index?name=" + UrlEncoder.Default.Encode(nameRouteValue); var services = new ServiceCollection(); services.AddSingleton(NullLoggerFactory.Instance); + services.AddOptions(); services.AddRouting(); // This test encoder should not be used by Routing and should always use the default one. services.AddSingleton(new UrlTestEncoder()); @@ -1520,6 +1521,7 @@ namespace Microsoft.AspNetCore.Routing { var services = new ServiceCollection(); services.AddSingleton(NullLoggerFactory.Instance); + services.AddOptions(); services.AddRouting(); var context = new DefaultHttpContext diff --git a/src/Http/Routing/test/UnitTests/Template/TemplateBinderTests.cs b/src/Http/Routing/test/UnitTests/Template/TemplateBinderTests.cs index f5f497e4b2..0ae7eb7e5b 100644 --- a/src/Http/Routing/test/UnitTests/Template/TemplateBinderTests.cs +++ b/src/Http/Routing/test/UnitTests/Template/TemplateBinderTests.cs @@ -16,6 +16,7 @@ using Xunit; namespace Microsoft.AspNetCore.Routing.Template.Tests { +#pragma warning disable CS0618 // Type or member is obsolete public class TemplateBinderTests { private readonly IInlineConstraintResolver _inlineConstraintResolver = GetInlineConstraintResolver(); @@ -1480,4 +1481,5 @@ namespace Microsoft.AspNetCore.Routing.Template.Tests public Dictionary Parameters { get; private set; } } } +#pragma warning restore CS0618 // Type or member is obsolete } diff --git a/src/Http/Routing/test/UnitTests/Tree/TreeRouteBuilderTest.cs b/src/Http/Routing/test/UnitTests/Tree/TreeRouteBuilderTest.cs index dc9d2c7594..665e11f07e 100644 --- a/src/Http/Routing/test/UnitTests/Tree/TreeRouteBuilderTest.cs +++ b/src/Http/Routing/test/UnitTests/Tree/TreeRouteBuilderTest.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Text.Encodings.Web; @@ -248,10 +248,12 @@ namespace Microsoft.AspNetCore.Routing.Tree var objectPool = objectPoolProvider.Create(objectPolicy); var constraintResolver = GetInlineConstraintResolver(); +#pragma warning disable CS0618 // Type or member is obsolete var builder = new TreeRouteBuilder( NullLoggerFactory.Instance, objectPool, constraintResolver); +#pragma warning restore CS0618 // Type or member is obsolete return builder; } diff --git a/src/Http/Routing/test/UnitTests/Tree/TreeRouterTest.cs b/src/Http/Routing/test/UnitTests/Tree/TreeRouterTest.cs index b655941c00..d8bd30ae4f 100644 --- a/src/Http/Routing/test/UnitTests/Tree/TreeRouterTest.cs +++ b/src/Http/Routing/test/UnitTests/Tree/TreeRouterTest.cs @@ -23,8 +23,10 @@ namespace Microsoft.AspNetCore.Routing.Tree { private static readonly RequestDelegate NullHandler = (c) => Task.CompletedTask; +#pragma warning disable CS0618 // Type or member is obsolete private static ObjectPool Pool = new DefaultObjectPoolProvider().Create( new UriBuilderContextPooledObjectPolicy()); +#pragma warning restore CS0618 // Type or member is obsolete [Theory] [InlineData("template/5", "template/{parameter:int}")] @@ -2073,6 +2075,7 @@ namespace Microsoft.AspNetCore.Routing.Tree return new DefaultInlineConstraintResolver(optionsMock.Object, new TestServiceProvider()); } +#pragma warning disable CS0618 // Type or member is obsolete private static TreeRouteBuilder CreateBuilder() { var objectPoolProvider = new DefaultObjectPoolProvider(); @@ -2086,6 +2089,7 @@ namespace Microsoft.AspNetCore.Routing.Tree constraintResolver); return builder; } +#pragma warning restore CS0618 // Type or member is obsolete private static TreeRouter CreateTreeRouter( string firstTemplate, diff --git a/src/Http/perf/Microbenchmarks/AssemblyInfo.cs b/src/Http/perf/Microbenchmarks/AssemblyInfo.cs new file mode 100644 index 0000000000..32248e0d1b --- /dev/null +++ b/src/Http/perf/Microbenchmarks/AssemblyInfo.cs @@ -0,0 +1 @@ +[assembly: BenchmarkDotNet.Attributes.AspNetCoreBenchmark] diff --git a/src/Http/perf/Microbenchmarks/GetHeaderSplitBenchmark.cs b/src/Http/perf/Microbenchmarks/GetHeaderSplitBenchmark.cs new file mode 100644 index 0000000000..9105b5c448 --- /dev/null +++ b/src/Http/perf/Microbenchmarks/GetHeaderSplitBenchmark.cs @@ -0,0 +1,63 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Configs; +using Microsoft.AspNetCore.Http.Internal; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Primitives; + +namespace Microsoft.AspNetCore.Http.Abstractions.Microbenchmarks +{ + public class GetHeaderSplitBenchmark + { + HeaderDictionary _dictionary; + + [GlobalSetup] + public void GlobalSetup() + { + var dict = new Dictionary() + { + { "singleValue", new StringValues("single") }, + { "singleValueQuoted", new StringValues("\"single\"") }, + { "doubleValue", new StringValues(new [] { "first", "second" }) }, + { "manyValue", new StringValues(new [] { "first", "second", "third", "fourth", "fifth", "sixth" }) } + }; + _dictionary = new HeaderDictionary(dict); + } + + [Benchmark] + public void SplitSingleHeader() + { + var values = ParsingHelpers.GetHeaderSplit(_dictionary, "singleValue"); + if (values.Count != 1) + throw new Exception(); + } + + [Benchmark] + public void SplitSingleQuotedHeader() + { + var values = ParsingHelpers.GetHeaderSplit(_dictionary, "singleValueQuoted"); + if (values.Count != 1) + throw new Exception(); + } + + [Benchmark] + public void SplitDoubleHeader() + { + var values = ParsingHelpers.GetHeaderSplit(_dictionary, "doubleValue"); + if (values.Count != 2) + throw new Exception(); + } + + [Benchmark] + public void SplitManyHeaders() + { + var values = ParsingHelpers.GetHeaderSplit(_dictionary, "manyValue"); + if (values.Count != 6) + throw new Exception(); + } + } +} diff --git a/src/Http/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Microbenchmarks.csproj b/src/Http/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Microbenchmarks.csproj new file mode 100644 index 0000000000..7a31f1da5b --- /dev/null +++ b/src/Http/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Microbenchmarks.csproj @@ -0,0 +1,14 @@ + + + + Exe + netcoreapp3.0 + + + + + + + + + diff --git a/src/Identity/samples/IdentitySample.DefaultUI/.config/dotnet-tools.json b/src/Identity/samples/IdentitySample.DefaultUI/.config/dotnet-tools.json new file mode 100644 index 0000000000..f6a8270a15 --- /dev/null +++ b/src/Identity/samples/IdentitySample.DefaultUI/.config/dotnet-tools.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-ef": { + "version": "3.0.0-preview3.19153.1", + "commands": [ + "dotnet-ef" + ] + } + } +} \ No newline at end of file diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.Designer.cs b/src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20190411154115_CreateIdentitySchema.Designer.cs similarity index 83% rename from src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.Designer.cs rename to src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20190411154115_CreateIdentitySchema.Designer.cs index acee5cb362..b12796dd79 100644 --- a/src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.Designer.cs +++ b/src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20190411154115_CreateIdentitySchema.Designer.cs @@ -4,28 +4,26 @@ using IdentitySample.DefaultUI.Data; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Metadata.Internal; using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage; -using Microsoft.EntityFrameworkCore.Storage.Internal; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace IdentitySample.DefaultUI.Data.Migrations { [DbContext(typeof(ApplicationDbContext))] - [Migration("20180126174859_CreateIdentitySchema")] + [Migration("20190411154115_CreateIdentitySchema")] partial class CreateIdentitySchema { protected override void BuildTargetModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "2.1.0-preview1-28153") + .HasAnnotation("ProductVersion", "3.0.0-preview5.19209.2") + .HasAnnotation("Relational:MaxIdentifierLength", 128) .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); modelBuilder.Entity("IdentitySample.DefaultUI.Data.ApplicationUser", b => { - b.Property("Id") - .ValueGeneratedOnAdd(); + b.Property("Id"); b.Property("AccessFailedCount"); @@ -79,8 +77,7 @@ namespace IdentitySample.DefaultUI.Data.Migrations modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => { - b.Property("Id") - .ValueGeneratedOnAdd(); + b.Property("Id"); b.Property("ConcurrencyStamp") .IsConcurrencyToken(); @@ -104,7 +101,8 @@ namespace IdentitySample.DefaultUI.Data.Migrations modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); b.Property("ClaimType"); @@ -123,7 +121,8 @@ namespace IdentitySample.DefaultUI.Data.Migrations modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); b.Property("ClaimType"); @@ -191,47 +190,53 @@ namespace IdentitySample.DefaultUI.Data.Migrations modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole") + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) .WithMany() .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => { - b.HasOne("IdentitySample.DefaultUI.Data.ApplicationUser") + b.HasOne("IdentitySample.DefaultUI.Data.ApplicationUser", null) .WithMany() .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => { - b.HasOne("IdentitySample.DefaultUI.Data.ApplicationUser") + b.HasOne("IdentitySample.DefaultUI.Data.ApplicationUser", null) .WithMany() .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole") + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) .WithMany() .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); - b.HasOne("IdentitySample.DefaultUI.Data.ApplicationUser") + b.HasOne("IdentitySample.DefaultUI.Data.ApplicationUser", null) .WithMany() .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => { - b.HasOne("IdentitySample.DefaultUI.Data.ApplicationUser") + b.HasOne("IdentitySample.DefaultUI.Data.ApplicationUser", null) .WithMany() .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); #pragma warning restore 612, 618 } diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.cs b/src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20190411154115_CreateIdentitySchema.cs similarity index 99% rename from src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.cs rename to src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20190411154115_CreateIdentitySchema.cs index 713e581f6d..091387a0a5 100644 --- a/src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20180126174859_CreateIdentitySchema.cs +++ b/src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/20190411154115_CreateIdentitySchema.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/ApplicationDbContextModelSnapshot.cs index 8eb1302cd7..1e0f6ee68e 100644 --- a/src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/src/Identity/samples/IdentitySample.DefaultUI/Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -4,10 +4,7 @@ using IdentitySample.DefaultUI.Data; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Metadata.Internal; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage; -using Microsoft.EntityFrameworkCore.Storage.Internal; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace IdentitySample.DefaultUI.Data.Migrations { @@ -18,13 +15,13 @@ namespace IdentitySample.DefaultUI.Data.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "2.1.0-preview1-28153") + .HasAnnotation("ProductVersion", "3.0.0-preview5.19209.2") + .HasAnnotation("Relational:MaxIdentifierLength", 128) .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); modelBuilder.Entity("IdentitySample.DefaultUI.Data.ApplicationUser", b => { - b.Property("Id") - .ValueGeneratedOnAdd(); + b.Property("Id"); b.Property("AccessFailedCount"); @@ -78,8 +75,7 @@ namespace IdentitySample.DefaultUI.Data.Migrations modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => { - b.Property("Id") - .ValueGeneratedOnAdd(); + b.Property("Id"); b.Property("ConcurrencyStamp") .IsConcurrencyToken(); @@ -103,7 +99,8 @@ namespace IdentitySample.DefaultUI.Data.Migrations modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); b.Property("ClaimType"); @@ -122,7 +119,8 @@ namespace IdentitySample.DefaultUI.Data.Migrations modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => { b.Property("Id") - .ValueGeneratedOnAdd(); + .ValueGeneratedOnAdd() + .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); b.Property("ClaimType"); @@ -190,47 +188,53 @@ namespace IdentitySample.DefaultUI.Data.Migrations modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole") + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) .WithMany() .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => { - b.HasOne("IdentitySample.DefaultUI.Data.ApplicationUser") + b.HasOne("IdentitySample.DefaultUI.Data.ApplicationUser", null) .WithMany() .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => { - b.HasOne("IdentitySample.DefaultUI.Data.ApplicationUser") + b.HasOne("IdentitySample.DefaultUI.Data.ApplicationUser", null) .WithMany() .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => { - b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole") + b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null) .WithMany() .HasForeignKey("RoleId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); - b.HasOne("IdentitySample.DefaultUI.Data.ApplicationUser") + b.HasOne("IdentitySample.DefaultUI.Data.ApplicationUser", null) .WithMany() .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => { - b.HasOne("IdentitySample.DefaultUI.Data.ApplicationUser") + b.HasOne("IdentitySample.DefaultUI.Data.ApplicationUser", null) .WithMany() .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); }); #pragma warning restore 612, 618 } diff --git a/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj b/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj index 29d2a556c0..843fc86739 100644 --- a/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj +++ b/src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj @@ -31,4 +31,8 @@ + + + + diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Properties/launchSettings.json b/src/Identity/samples/IdentitySample.DefaultUI/Properties/launchSettings.json deleted file mode 100644 index 96ae426d0d..0000000000 --- a/src/Identity/samples/IdentitySample.DefaultUI/Properties/launchSettings.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:54840/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "web": { - "commandName": "web", - "environmentVariables": { - "ASPNET_ENVIRONMENT": "Development" - } - } - } -} \ No newline at end of file diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index 416a366105..bcf3ba3c6d 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -11,6 +11,8 @@ ICE03 true 2.0 + x64 + Win32 @@ -51,6 +53,15 @@ + + + + + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index 49bae9932b..279bb8688a 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -366,66 +366,25 @@ Value=""[IISEXPRESS_INSTALL_PATH]appcmd.exe" set config -section:system.webServer/httpCompression /+"dynamicTypes.[\[]mimeType='text/event-stream',enabled='FALSE'[\]]" /apphostconfig:"[IISEXPRESS_APPHOST_CONFIG_TMP]""/> - - - - + Value="[IISEXPRESS_APPHOST_CONFIG]"/> + + + + - - - - + Property="CA_REMOVE_CONFIGSECTION" + Value="[IISEXPRESS_APPHOST_CONFIG]"/> + + + + - - - - - - + Property="CA_ADD_CONFIGSECTION32" + Value="[IISEXPRESS_APPHOST_CONFIG32]"/> + + + + - - - - + Value="[IISEXPRESS_APPHOST_CONFIG32]"/> + + + + @@ -600,7 +516,9 @@ - + + + @@ -610,6 +528,8 @@ + + @@ -640,7 +560,9 @@ - + + + @@ -650,6 +572,8 @@ + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.cpp b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.cpp index 48d826f720..7b43840c52 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.cpp +++ b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.cpp @@ -2,6 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. #include +#include +#include DECLARE_DEBUG_PRINT_OBJECT( "proxyCA.dll" ); @@ -40,6 +42,137 @@ struct COMPRESSION_MIME_TYPE COMPRESSION_MIME_TYPE gMimeTypes[] = { { L"text/event-stream", FALSE} }; +#define _HR_RET(hr) __pragma(warning(push)) \ + __pragma(warning(disable:26498)) /*disable constexpr warning */ \ + const HRESULT __hrRet = hr; \ + __pragma(warning(pop)) + +#define _GOTO_FINISHED() __pragma(warning(push)) \ + __pragma(warning(disable:26438)) /*disable avoid goto warning*/ \ + goto Finished \ + __pragma(warning(pop)) + +#define RETURN_IF_FAILED(hrr) do { _HR_RET(hrr); if (FAILED(__hrRet)) { hr = __hrRet; IISLogWrite(SETUP_LOG_SEVERITY_INFORMATION, L"Exiting hr=0x%x", hr); return hr; }} while (0, 0) + +// Modifies the configSections to include the aspNetCore section +UINT +WINAPI +AddConfigSection( + IN MSIHANDLE handle +) +{ + HRESULT hr; + CComPtr pXMLDoc; + VARIANT_BOOL variantResult; + IXMLDOMNode* webServerNode; + IXMLDOMNode* aspNetCoreNode; + IXMLDOMNode* tempNode; + IXMLDOMElement* element; + STRU customActionData; + + CComBSTR selectLanguage = SysAllocString(L"SelectionLanguage"); + CComBSTR xPath = SysAllocString(L"XPath"); + CComBSTR webServerPath = SysAllocString(L"//configuration/configSections/sectionGroup[@name=\"system.webServer\"]"); + CComBSTR aspNetCorePath = SysAllocString(L"//configuration/configSections/sectionGroup[@name=\"system.webServer\"]/section[@name=\"aspNetCore\"]"); + CComBSTR section = SysAllocString(L"section"); + CComBSTR name = SysAllocString(L"name"); + CComBSTR aspNetCore = SysAllocString(L"aspNetCore"); + CComBSTR overrideMode = SysAllocString(L"overrideModeDefault"); + CComBSTR allow = SysAllocString(L"Allow"); + + RETURN_IF_FAILED(CoInitialize(NULL)); + + hr = MsiUtilGetProperty(handle, TEXT("CustomActionData"), &customActionData); + + RETURN_IF_FAILED(hr = pXMLDoc.CoCreateInstance(__uuidof(DOMDocument60))); + + RETURN_IF_FAILED(hr = pXMLDoc->put_async(false)); + + RETURN_IF_FAILED(hr = pXMLDoc->load(CComVariant(customActionData.QueryStr()), &variantResult)); + + if (variantResult == VARIANT_FALSE) + { + return ERROR_SUCCESS; + } + + RETURN_IF_FAILED(hr = pXMLDoc->setProperty(selectLanguage, CComVariant(xPath))); + + RETURN_IF_FAILED(hr = pXMLDoc->selectSingleNode(webServerPath, &webServerNode)); + + RETURN_IF_FAILED(hr = pXMLDoc->selectSingleNode(aspNetCorePath, &aspNetCoreNode)); + + if (aspNetCoreNode == NULL) + { + RETURN_IF_FAILED(hr = pXMLDoc->createElement(section, &element)); + + RETURN_IF_FAILED(hr = element->setAttribute(name, CComVariant(aspNetCore))); + + RETURN_IF_FAILED(hr = element->setAttribute(overrideMode, CComVariant(allow))); + + RETURN_IF_FAILED(hr = webServerNode->appendChild(element, &tempNode)); + + RETURN_IF_FAILED(hr = pXMLDoc->save(CComVariant(customActionData.QueryStr()))); + } + + return ERROR_SUCCESS; +} + +// Modifies the configSections to remove the aspNetCore section +UINT +WINAPI +RemoveConfigSection( + IN MSIHANDLE handle +) +{ + HRESULT hr; + CComPtr pXMLDoc; + VARIANT_BOOL variantResult; + IXMLDOMNode* webServerNode; + IXMLDOMNode* aspNetCoreNode; + IXMLDOMNode* tempNode; + STRU customActionData; + + CComBSTR selectLanguage = SysAllocString(L"SelectionLanguage"); + CComBSTR xPath = SysAllocString(L"XPath"); + CComBSTR webServerPath = SysAllocString(L"//configuration/configSections/sectionGroup[@name=\"system.webServer\"]"); + CComBSTR aspNetCorePath = SysAllocString(L"//configuration/configSections/sectionGroup[@name=\"system.webServer\"]/section[@name=\"aspNetCore\"]"); + CComBSTR section = SysAllocString(L"section"); + CComBSTR name = SysAllocString(L"name"); + CComBSTR aspNetCore = SysAllocString(L"aspNetCore"); + CComBSTR overrideMode = SysAllocString(L"overrideModeDefault"); + CComBSTR allow = SysAllocString(L"Allow"); + + RETURN_IF_FAILED(CoInitialize(NULL)); + + hr = MsiUtilGetProperty(handle, TEXT("CustomActionData"), &customActionData); + + RETURN_IF_FAILED(hr = pXMLDoc.CoCreateInstance(__uuidof(DOMDocument60))); + + RETURN_IF_FAILED(hr = pXMLDoc->put_async(false)); + + RETURN_IF_FAILED(hr = pXMLDoc->load(CComVariant(customActionData.QueryStr()), &variantResult)); + + if (variantResult == VARIANT_FALSE) + { + return ERROR_SUCCESS; + } + + RETURN_IF_FAILED(hr = pXMLDoc->setProperty(selectLanguage, CComVariant(xPath))); + + RETURN_IF_FAILED(hr = pXMLDoc->selectSingleNode(webServerPath, &webServerNode)); + + RETURN_IF_FAILED(hr = pXMLDoc->selectSingleNode(aspNetCorePath, &aspNetCoreNode)); + + if (aspNetCoreNode != NULL) + { + RETURN_IF_FAILED(webServerNode->removeChild(aspNetCoreNode, &tempNode)); + + RETURN_IF_FAILED(hr = pXMLDoc->save(CComVariant(customActionData.QueryStr()))); + } + + return ERROR_SUCCESS; +} + UINT WINAPI RegisterANCMCompressionCA( diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.def b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.def index 3518cde35f..ed516a4392 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.def +++ b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.def @@ -18,6 +18,8 @@ EXPORTS ExecuteCleanUpWindowsHotfixCA ScheduleRebootIfRequiredCA + AddConfigSection + RemoveConfigSection RegisterANCMCompressionCA CheckForServicesRunningCA diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj index 8aafdde3c1..da7c3b16b4 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj @@ -48,6 +48,9 @@ true + + + $(IIS-Common)version;$(IIS-Common)Include;$(IIS-Setup)iisca\lib;$(WIX)sdk\$(WixPlatformToolset)\inc;$(AdditionalIncludeDirectories) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj index 3eaa339620..92295eb9db 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj @@ -41,6 +41,9 @@ $(ProjectDir)..\include;$(IncludePath) iiscommon + + + true diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj index b1b76b9b08..a75af0850a 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj @@ -77,6 +77,9 @@ v141 + + + $(IIS-Common)version;$(IIS-Common)Include;$(AdditionalIncludeDirectories) Create diff --git a/src/Installers/Windows/UpgradeLog.htm b/src/Installers/Windows/UpgradeLog.htm new file mode 100644 index 0000000000..f327ebd6ec Binary files /dev/null and b/src/Installers/Windows/UpgradeLog.htm differ diff --git a/src/Middleware/HeaderPropagation/src/HeaderPropagationMessageHandler.cs b/src/Middleware/HeaderPropagation/src/HeaderPropagationMessageHandler.cs index ff47b5ba48..524e29856f 100644 --- a/src/Middleware/HeaderPropagation/src/HeaderPropagationMessageHandler.cs +++ b/src/Middleware/HeaderPropagation/src/HeaderPropagationMessageHandler.cs @@ -53,11 +53,31 @@ namespace Microsoft.AspNetCore.HeaderPropagation { var outputName = string.IsNullOrEmpty(entry?.OutboundHeaderName) ? headerName : entry.OutboundHeaderName; - if (!request.Headers.Contains(outputName) && - _values.Headers.TryGetValue(headerName, out var values) && - !StringValues.IsNullOrEmpty(values)) + var hasContent = request.Content != null; + + if (!request.Headers.TryGetValues(outputName, out var _) && + !(hasContent && request.Content.Headers.TryGetValues(outputName, out var _))) { - request.Headers.TryAddWithoutValidation(outputName, (string[])values); + if (_values.Headers.TryGetValue(headerName, out var stringValues) && + !StringValues.IsNullOrEmpty(stringValues)) + { + if (stringValues.Count == 1) + { + var value = (string)stringValues; + if (!request.Headers.TryAddWithoutValidation(outputName, value) && hasContent) + { + request.Content.Headers.TryAddWithoutValidation(outputName, value); + } + } + else + { + var values = (string[])stringValues; + if (!request.Headers.TryAddWithoutValidation(outputName, values) && hasContent) + { + request.Content.Headers.TryAddWithoutValidation(outputName, values); + } + } + } } } diff --git a/src/Middleware/HeaderPropagation/test/HeaderPropagationMessageHandlerTest.cs b/src/Middleware/HeaderPropagation/test/HeaderPropagationMessageHandlerTest.cs index 320cc108f1..a824fb13d1 100644 --- a/src/Middleware/HeaderPropagation/test/HeaderPropagationMessageHandlerTest.cs +++ b/src/Middleware/HeaderPropagation/test/HeaderPropagationMessageHandlerTest.cs @@ -52,6 +52,63 @@ namespace Microsoft.AspNetCore.HeaderPropagation.Tests Assert.Equal(new[] { "test" }, Handler.Headers.GetValues("out")); } + [Fact] + public async Task HeaderInState_WithMultipleValues_AddAllValues() + { + // Arrange + Configuration.Headers.Add("in", new HeaderPropagationEntry { OutboundHeaderName = "out" }); + State.Headers.Add("in", new[] { "one", "two" }); + + // Act + await Client.SendAsync(new HttpRequestMessage()); + + // Assert + Assert.True(Handler.Headers.Contains("out")); + Assert.Equal(new[] { "one", "two" }, Handler.Headers.GetValues("out")); + } + + [Fact] + public async Task HeaderInState_RequestWithContent_ContentHeaderPresent_DoesNotAddIt() + { + Configuration.Headers.Add("in", new HeaderPropagationEntry() { OutboundHeaderName = "Content-Type" }); + State.Headers.Add("in", "test"); + + // Act + await Client.SendAsync(new HttpRequestMessage() { Content = new StringContent("test") }); + + // Assert + Assert.True(Handler.Content.Headers.Contains("Content-Type")); + Assert.Equal(new[] { "text/plain; charset=utf-8" }, Handler.Content.Headers.GetValues("Content-Type")); + } + + [Fact] + public async Task HeaderInState_RequestWithContent_ContentHeaderNotPresent_AddValue() + { + Configuration.Headers.Add("in", new HeaderPropagationEntry() { OutboundHeaderName = "Content-Language" }); + State.Headers.Add("in", "test"); + + // Act + await Client.SendAsync(new HttpRequestMessage() { Content = new StringContent("test") }); + + // Assert + Assert.True(Handler.Content.Headers.Contains("Content-Language")); + Assert.Equal(new[] { "test" }, Handler.Content.Headers.GetValues("Content-Language")); + } + + [Fact] + public async Task HeaderInState_WithMultipleValues_RequestWithContent_ContentHeaderNotPresent_AddAllValues() + { + Configuration.Headers.Add("in", new HeaderPropagationEntry() { OutboundHeaderName = "Content-Language" }); + State.Headers.Add("in", new[] { "one", "two" }); + + // Act + await Client.SendAsync(new HttpRequestMessage() { Content = new StringContent("test") }); + + // Assert + Assert.True(Handler.Content.Headers.Contains("Content-Language")); + Assert.Equal(new[] { "one", "two" }, Handler.Content.Headers.GetValues("Content-Language")); + } + [Fact] public async Task HeaderInState_NoOutputName_UseInputName() { @@ -168,11 +225,13 @@ namespace Microsoft.AspNetCore.HeaderPropagation.Tests private class SimpleHandler : DelegatingHandler { public HttpHeaders Headers { get; private set; } + public HttpContent Content { get; private set; } protected override Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) { Headers = request.Headers; + Content = request.Content; return Task.FromResult(new HttpResponseMessage()); } } diff --git a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj index 72b68ba13e..e7ba91bc8e 100644 --- a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj @@ -21,12 +21,15 @@ - - - - - - + + + + + + + YarnInstall + + diff --git a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj index 6a1e5fce3f..8987a271df 100644 --- a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj @@ -25,12 +25,15 @@ - - - - - - + + + + + + + YarnInstall + + diff --git a/src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs b/src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs index d82d9ba391..3c124ccefc 100644 --- a/src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs +++ b/src/Mvc/Mvc.Core/src/Infrastructure/ResourceInvoker.cs @@ -57,46 +57,133 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure _cursor = new FilterCursor(filters); } - public virtual async Task InvokeAsync() + public virtual Task InvokeAsync() { + if (_diagnosticListener.IsEnabled() || _logger.IsEnabled(LogLevel.Information)) + { + return Logged(this); + } + + _actionContextAccessor.ActionContext = _actionContext; + var scope = _logger.ActionScope(_actionContext.ActionDescriptor); + + Task task = null; try { - _actionContextAccessor.ActionContext = _actionContext; + task = InvokeFilterPipelineAsync(); + } + catch (Exception exception) + { + return Awaited(this, Task.FromException(exception), scope); + } - _diagnosticListener.BeforeAction( - _actionContext.ActionDescriptor, - _actionContext.HttpContext, - _actionContext.RouteData); + Debug.Assert(task != null); + if (!task.IsCompletedSuccessfully) + { + return Awaited(this, task, scope); + } - using (_logger.ActionScope(_actionContext.ActionDescriptor)) + Exception releaseException = null; + try + { + ReleaseResources(); + } + catch (Exception exception) + { + releaseException = exception; + } + + Exception scopeException = null; + try + { + scope.Dispose(); + } + catch (Exception exception) + { + scopeException = exception; + } + + if (releaseException == null && scopeException == null) + { + return Task.CompletedTask; + } + else if (releaseException != null && scopeException != null) + { + return Task.FromException(new AggregateException(releaseException, scopeException)); + } + else if (releaseException != null) + { + return Task.FromException(releaseException); + } + else + { + return Task.FromException(scopeException); + } + + static async Task Awaited(ResourceInvoker invoker, Task task, IDisposable scope) + { + try { - _logger.ExecutingAction(_actionContext.ActionDescriptor); - - _logger.AuthorizationFiltersExecutionPlan(_filters); - _logger.ResourceFiltersExecutionPlan(_filters); - _logger.ActionFiltersExecutionPlan(_filters); - _logger.ExceptionFiltersExecutionPlan(_filters); - _logger.ResultFiltersExecutionPlan(_filters); - - var stopwatch = ValueStopwatch.StartNew(); - try { - await InvokeFilterPipelineAsync(); + await task; } finally { - ReleaseResources(); - _logger.ExecutedAction(_actionContext.ActionDescriptor, stopwatch.GetElapsedTime()); + invoker.ReleaseResources(); } } + finally + { + scope.Dispose(); + } } - finally + + static async Task Logged(ResourceInvoker invoker) { - _diagnosticListener.AfterAction( - _actionContext.ActionDescriptor, - _actionContext.HttpContext, - _actionContext.RouteData); + var actionContext = invoker._actionContext; + invoker._actionContextAccessor.ActionContext = actionContext; + + try + { + var logger = invoker._logger; + + invoker._diagnosticListener.BeforeAction( + actionContext.ActionDescriptor, + actionContext.HttpContext, + actionContext.RouteData); + + using (logger.ActionScope(actionContext.ActionDescriptor)) + { + logger.ExecutingAction(actionContext.ActionDescriptor); + + var filters = invoker._filters; + logger.AuthorizationFiltersExecutionPlan(filters); + logger.ResourceFiltersExecutionPlan(filters); + logger.ActionFiltersExecutionPlan(filters); + logger.ExceptionFiltersExecutionPlan(filters); + logger.ResultFiltersExecutionPlan(filters); + + var stopwatch = ValueStopwatch.StartNew(); + + try + { + await invoker.InvokeFilterPipelineAsync(); + } + finally + { + invoker.ReleaseResources(); + logger.ExecutedAction(actionContext.ActionDescriptor, stopwatch.GetElapsedTime()); + } + } + } + finally + { + invoker._diagnosticListener.AfterAction( + actionContext.ActionDescriptor, + actionContext.HttpContext, + actionContext.RouteData); + } } } @@ -106,7 +193,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure /// protected abstract void ReleaseResources(); - private async Task InvokeFilterPipelineAsync() + private Task InvokeFilterPipelineAsync() { var next = State.InvokeBegin; @@ -121,30 +208,64 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure // `isCompleted` will be set to true when we've reached a terminal state. var isCompleted = false; - - while (!isCompleted) + try { - await Next(ref next, ref scope, ref state, ref isCompleted); + while (!isCompleted) + { + var lastTask = Next(ref next, ref scope, ref state, ref isCompleted); + if (!lastTask.IsCompletedSuccessfully) + { + return Awaited(this, lastTask, next, scope, state, isCompleted); + } + } + + return Task.CompletedTask; + } + catch (Exception ex) + { + // Wrap non task-wrapped exceptions in a Task, + // as this isn't done automatically since the method is not async. + return Task.FromException(ex); + } + + static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object state, bool isCompleted) + { + await lastTask; + + while (!isCompleted) + { + await invoker.Next(ref next, ref scope, ref state, ref isCompleted); + } } } protected abstract Task InvokeInnerFilterAsync(); - protected virtual async Task InvokeResultAsync(IActionResult result) + protected virtual Task InvokeResultAsync(IActionResult result) { - var actionContext = _actionContext; - - _diagnosticListener.BeforeActionResult(actionContext, result); - _logger.BeforeExecutingActionResult(result); - - try + if (_diagnosticListener.IsEnabled() || _logger.IsEnabled(LogLevel.Trace)) { - await result.ExecuteResultAsync(actionContext); + return Logged(this, result); } - finally + + return result.ExecuteResultAsync(_actionContext); + + static async Task Logged(ResourceInvoker invoker, IActionResult result) { - _diagnosticListener.AfterActionResult(actionContext, result); - _logger.AfterExecutingActionResult(result); + var actionContext = invoker._actionContext; + + invoker._diagnosticListener.BeforeActionResult(actionContext, result); + invoker._logger.BeforeExecutingActionResult(result); + + try + { + await result.ExecuteResultAsync(actionContext); + } + finally + { + invoker._diagnosticListener.AfterActionResult(actionContext, result); + invoker._logger.AfterExecutingActionResult(result); + } } } @@ -207,7 +328,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure filter); var task = filter.OnAuthorizationAsync(authorizationContext); - if (task.Status != TaskStatus.RanToCompletion) + if (!task.IsCompletedSuccessfully) { next = State.AuthorizationAsyncEnd; return task; @@ -344,7 +465,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure filter); var task = filter.OnResourceExecutionAsync(resourceExecutingContext, InvokeNextResourceFilterAwaitedAsync); - if (task.Status != TaskStatus.RanToCompletion) + if (!task.IsCompletedSuccessfully) { next = State.ResourceAsyncEnd; return task; @@ -418,7 +539,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } var task = InvokeNextResourceFilter(); - if (task.Status != TaskStatus.RanToCompletion) + if (!task.IsCompletedSuccessfully) { next = State.ResourceSyncEnd; return task; @@ -463,7 +584,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure _result = _resourceExecutingContext.Result; var task = InvokeAlwaysRunResultFilters(); - if (task.Status != TaskStatus.RanToCompletion) + if (!task.IsCompletedSuccessfully) { next = State.ResourceEnd; return task; @@ -512,7 +633,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure case State.ExceptionAsyncBegin: { var task = InvokeNextExceptionFilterAsync(); - if (task.Status != TaskStatus.RanToCompletion) + if (!task.IsCompletedSuccessfully) { next = State.ExceptionAsyncResume; return task; @@ -539,7 +660,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure filter); var task = filter.OnExceptionAsync(exceptionContext); - if (task.Status != TaskStatus.RanToCompletion) + if (!task.IsCompletedSuccessfully) { next = State.ExceptionAsyncEnd; return task; @@ -579,7 +700,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure case State.ExceptionSyncBegin: { var task = InvokeNextExceptionFilterAsync(); - if (task.Status != TaskStatus.RanToCompletion) + if (!task.IsCompletedSuccessfully) { next = State.ExceptionSyncEnd; return task; @@ -650,7 +771,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure _result = _exceptionContext.Result; var task = InvokeAlwaysRunResultFilters(); - if (task.Status != TaskStatus.RanToCompletion) + if (!task.IsCompletedSuccessfully) { next = State.ResourceInsideEnd; return task; @@ -683,7 +804,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } var task = InvokeResultFilters(); - if (task.Status != TaskStatus.RanToCompletion) + if (!task.IsCompletedSuccessfully) { next = State.ResourceInsideEnd; return task; @@ -694,7 +815,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure case State.ActionBegin: { var task = InvokeInnerFilterAsync(); - if (task.Status != TaskStatus.RanToCompletion) + if (!task.IsCompletedSuccessfully) { next = State.ActionEnd; return task; @@ -715,7 +836,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure Debug.Assert(scope == Scope.Invoker || scope == Scope.Resource); var task = InvokeResultFilters(); - if (task.Status != TaskStatus.RanToCompletion) + if (!task.IsCompletedSuccessfully) { next = State.ResourceInsideEnd; return task; @@ -763,13 +884,35 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } } - private async Task InvokeNextResourceFilterAwaitedAsync() + private Task InvokeNextResourceFilterAwaitedAsync() { Debug.Assert(_resourceExecutingContext != null); if (_resourceExecutingContext.Result != null) { // If we get here, it means that an async filter set a result AND called next(). This is forbidden. + return Throw(); + } + + var task = InvokeNextResourceFilter(); + if (!task.IsCompletedSuccessfully) + { + return Awaited(this, task); + } + + Debug.Assert(_resourceExecutedContext != null); + return Task.FromResult(_resourceExecutedContext); + + static async Task Awaited(ResourceInvoker invoker, Task task) + { + await task; + + Debug.Assert(invoker._resourceExecutedContext != null); + return invoker._resourceExecutedContext; + } +#pragma warning disable CS1998 + static async Task Throw() + { var message = Resources.FormatAsyncResourceFilter_InvalidShortCircuit( typeof(IAsyncResourceFilter).Name, nameof(ResourceExecutingContext.Result), @@ -777,14 +920,10 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure typeof(ResourceExecutionDelegate).Name); throw new InvalidOperationException(message); } - - await InvokeNextResourceFilter(); - - Debug.Assert(_resourceExecutedContext != null); - return _resourceExecutedContext; +#pragma warning restore CS1998 } - private async Task InvokeNextResourceFilter() + private Task InvokeNextResourceFilter() { try { @@ -792,9 +931,14 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure var next = State.ResourceNext; var state = (object)null; var isCompleted = false; + while (!isCompleted) { - await Next(ref next, ref scope, ref state, ref isCompleted); + var lastTask = Next(ref next, ref scope, ref state, ref isCompleted); + if (!lastTask.IsCompletedSuccessfully) + { + return Awaited(this, lastTask, next, scope, state, isCompleted); + } } } catch (Exception exception) @@ -806,9 +950,32 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } Debug.Assert(_resourceExecutedContext != null); + return Task.CompletedTask; + + static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object state, bool isCompleted) + { + try + { + await lastTask; + + while (!isCompleted) + { + await invoker.Next(ref next, ref scope, ref state, ref isCompleted); + } + } + catch (Exception exception) + { + invoker._resourceExecutedContext = new ResourceExecutedContext(invoker._resourceExecutingContext, invoker._filters) + { + ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception), + }; + } + + Debug.Assert(invoker._resourceExecutedContext != null); + } } - private async Task InvokeNextExceptionFilterAsync() + private Task InvokeNextExceptionFilterAsync() { try { @@ -816,43 +983,119 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure var state = (object)null; var scope = Scope.Exception; var isCompleted = false; + while (!isCompleted) { - await Next(ref next, ref scope, ref state, ref isCompleted); + var lastTask = Next(ref next, ref scope, ref state, ref isCompleted); + if (!lastTask.IsCompletedSuccessfully) + { + return Awaited(this, lastTask, next, scope, state, isCompleted); + } + } + + return Task.CompletedTask; + } + catch (Exception ex) + { + // Wrap non task-wrapped exceptions in a Task, + // as this isn't done automatically since the method is not async. + return Task.FromException(ex); + } + + static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object state, bool isCompleted) + { + try + { + await lastTask; + + while (!isCompleted) + { + await invoker.Next(ref next, ref scope, ref state, ref isCompleted); + } + } + catch (Exception exception) + { + invoker._exceptionContext = new ExceptionContext(invoker._actionContext, invoker._filters) + { + ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception), + }; } } - catch (Exception exception) + } + + private Task InvokeAlwaysRunResultFilters() + { + try { - _exceptionContext = new ExceptionContext(_actionContext, _filters) + var next = State.ResultBegin; + var scope = Scope.Invoker; + var state = (object)null; + var isCompleted = false; + + while (!isCompleted) { - ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception), - }; + var lastTask = ResultNext(ref next, ref scope, ref state, ref isCompleted); + if (!lastTask.IsCompletedSuccessfully) + { + return Awaited(this, lastTask, next, scope, state, isCompleted); + } + } + + return Task.CompletedTask; + } + catch (Exception ex) + { + // Wrap non task-wrapped exceptions in a Task, + // as this isn't done automatically since the method is not async. + return Task.FromException(ex); + } + + static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object state, bool isCompleted) + { + await lastTask; + + while (!isCompleted) + { + await invoker.ResultNext(ref next, ref scope, ref state, ref isCompleted); + } } } - private async Task InvokeAlwaysRunResultFilters() + private Task InvokeResultFilters() { - var next = State.ResultBegin; - var scope = Scope.Invoker; - var state = (object)null; - var isCompleted = false; - - while (!isCompleted) + try { - await ResultNext(ref next, ref scope, ref state, ref isCompleted); + var next = State.ResultBegin; + var scope = Scope.Invoker; + var state = (object)null; + var isCompleted = false; + + while (!isCompleted) + { + var lastTask = ResultNext(ref next, ref scope, ref state, ref isCompleted); + if (!lastTask.IsCompletedSuccessfully) + { + return Awaited(this, lastTask, next, scope, state, isCompleted); + } + } + + return Task.CompletedTask; } - } - - private async Task InvokeResultFilters() - { - var next = State.ResultBegin; - var scope = Scope.Invoker; - var state = (object)null; - var isCompleted = false; - - while (!isCompleted) + catch (Exception ex) { - await ResultNext(ref next, ref scope, ref state, ref isCompleted); + // Wrap non task-wrapped exceptions in a Task, + // as this isn't done automatically since the method is not async. + return Task.FromException(ex); + } + + static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object state, bool isCompleted) + { + await lastTask; + + while (!isCompleted) + { + await invoker.ResultNext(ref next, ref scope, ref state, ref isCompleted); + } } } @@ -916,7 +1159,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure filter); var task = filter.OnResultExecutionAsync(resultExecutingContext, InvokeNextResultFilterAwaitedAsync); - if (task.Status != TaskStatus.RanToCompletion) + if (!task.IsCompletedSuccessfully) { next = State.ResultAsyncEnd; return task; @@ -998,7 +1241,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } var task = InvokeNextResultFilterAsync(); - if (task.Status != TaskStatus.RanToCompletion) + if (!task.IsCompletedSuccessfully) { next = State.ResultSyncEnd; return task; @@ -1048,7 +1291,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } var task = InvokeResultAsync(_result); - if (task.Status != TaskStatus.RanToCompletion) + if (!task.IsCompletedSuccessfully) { next = State.ResultEnd; return task; @@ -1081,7 +1324,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } } - private async Task InvokeNextResultFilterAsync() + private Task InvokeNextResultFilterAsync() where TFilter : class, IResultFilter where TFilterAsync : class, IAsyncResultFilter { @@ -1093,7 +1336,11 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure var isCompleted = false; while (!isCompleted) { - await ResultNext(ref next, ref scope, ref state, ref isCompleted); + var lastTask = ResultNext(ref next, ref scope, ref state, ref isCompleted); + if (!lastTask.IsCompletedSuccessfully) + { + return Awaited(this, lastTask, next, scope, state, isCompleted); + } } } catch (Exception exception) @@ -1105,9 +1352,33 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure } Debug.Assert(_resultExecutedContext != null); + + return Task.CompletedTask; + + static async Task Awaited(ResourceInvoker invoker, Task lastTask, State next, Scope scope, object state, bool isCompleted) + { + try + { + await lastTask; + + while (!isCompleted) + { + await invoker.ResultNext(ref next, ref scope, ref state, ref isCompleted); + } + } + catch (Exception exception) + { + invoker._resultExecutedContext = new ResultExecutedContext(invoker._actionContext, invoker._filters, invoker._result, invoker._instance) + { + ExceptionDispatchInfo = ExceptionDispatchInfo.Capture(exception), + }; + } + + Debug.Assert(invoker._resultExecutedContext != null); + } } - private async Task InvokeNextResultFilterAwaitedAsync() + private Task InvokeNextResultFilterAwaitedAsync() where TFilter : class, IResultFilter where TFilterAsync : class, IAsyncResultFilter { @@ -1116,6 +1387,28 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure { // If we get here, it means that an async filter set cancel == true AND called next(). // This is forbidden. + return Throw(); + } + + var task = InvokeNextResultFilterAsync(); + if (!task.IsCompletedSuccessfully) + { + return Awaited(this, task); + } + + Debug.Assert(_resultExecutedContext != null); + return Task.FromResult(_resultExecutedContext); + + static async Task Awaited(ResourceInvoker invoker, Task task) + { + await task; + + Debug.Assert(invoker._resultExecutedContext != null); + return invoker._resultExecutedContext; + } +#pragma warning disable CS1998 + static async Task Throw() + { var message = Resources.FormatAsyncResultFilter_InvalidShortCircuit( typeof(IAsyncResultFilter).Name, nameof(ResultExecutingContext.Cancel), @@ -1124,13 +1417,10 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure throw new InvalidOperationException(message); } - - await InvokeNextResultFilterAsync(); - - Debug.Assert(_resultExecutedContext != null); - return _resultExecutedContext; +#pragma warning restore CS1998 } + private static void Rethrow(ResourceExecutedContext context) { if (context == null) diff --git a/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvokerProvider.cs b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvokerProvider.cs index 7e8cd9be60..08c388392c 100644 --- a/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvokerProvider.cs +++ b/src/Mvc/Mvc.RazorPages/src/Infrastructure/PageActionInvokerProvider.cs @@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure private readonly IModelMetadataProvider _modelMetadataProvider; private readonly ITempDataDictionaryFactory _tempDataFactory; private readonly MvcOptions _mvcOptions; - private readonly HtmlHelperOptions _htmlHelperOptions; + private readonly MvcViewOptions _mvcViewOptions; private readonly IPageHandlerMethodSelector _selector; private readonly DiagnosticListener _diagnosticListener; private readonly ILogger _logger; @@ -52,7 +52,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure IModelBinderFactory modelBinderFactory, ITempDataDictionaryFactory tempDataFactory, IOptions mvcOptions, - IOptions htmlHelperOptions, + IOptions mvcViewOptions, IPageHandlerMethodSelector selector, DiagnosticListener diagnosticListener, ILoggerFactory loggerFactory, @@ -69,7 +69,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure modelBinderFactory, tempDataFactory, mvcOptions, - htmlHelperOptions, + mvcViewOptions, selector, diagnosticListener, loggerFactory, @@ -90,7 +90,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure IModelBinderFactory modelBinderFactory, ITempDataDictionaryFactory tempDataFactory, IOptions mvcOptions, - IOptions htmlHelperOptions, + IOptions mvcViewOptions, IPageHandlerMethodSelector selector, DiagnosticListener diagnosticListener, ILoggerFactory loggerFactory, @@ -109,7 +109,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure _modelMetadataProvider = modelMetadataProvider; _tempDataFactory = tempDataFactory; _mvcOptions = mvcOptions.Value; - _htmlHelperOptions = htmlHelperOptions.Value; + _mvcViewOptions = mvcViewOptions.Value; _selector = selector; _diagnosticListener = diagnosticListener; _logger = loggerFactory.CreateLogger(); @@ -214,7 +214,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure cacheEntry, _parameterBinder, _tempDataFactory, - _htmlHelperOptions); + _mvcViewOptions.HtmlHelperOptions); } private PageActionInvokerCacheEntry CreateCacheEntry( diff --git a/src/Mvc/Mvc.RazorPages/test/Infrastructure/PageActionInvokerProviderTest.cs b/src/Mvc/Mvc.RazorPages/test/Infrastructure/PageActionInvokerProviderTest.cs index 550c66e8c7..fd6458d3f0 100644 --- a/src/Mvc/Mvc.RazorPages/test/Infrastructure/PageActionInvokerProviderTest.cs +++ b/src/Mvc/Mvc.RazorPages/test/Infrastructure/PageActionInvokerProviderTest.cs @@ -532,7 +532,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure modelBinderFactory, tempDataFactory.Object, Options.Create(mvcOptions), - Options.Create(new HtmlHelperOptions()), + Options.Create(new MvcViewOptions()), Mock.Of(), new DiagnosticListener("Microsoft.AspNetCore"), NullLoggerFactory.Instance, diff --git a/src/Mvc/Mvc.ViewFeatures/src/Filters/SaveTempDataFilter.cs b/src/Mvc/Mvc.ViewFeatures/src/Filters/SaveTempDataFilter.cs index 0ab2ec33a1..ff677f68f5 100644 --- a/src/Mvc/Mvc.ViewFeatures/src/Filters/SaveTempDataFilter.cs +++ b/src/Mvc/Mvc.ViewFeatures/src/Filters/SaveTempDataFilter.cs @@ -14,6 +14,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters /// internal class SaveTempDataFilter : IResourceFilter, IResultFilter { + private static readonly Func OnStartingCallback = (state) => OnStarting((HttpContext)state); // Internal for unit testing internal static readonly object SaveTempDataFilterContextKey = new object(); @@ -43,38 +44,39 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters if (!context.HttpContext.Response.HasStarted) { - context.HttpContext.Response.OnStarting((state) => - { - var httpContext = (HttpContext)state; - - var saveTempDataContext = GetTempDataContext(context.HttpContext); - if (saveTempDataContext.RequestHasUnhandledException) - { - return Task.CompletedTask; - } - - // If temp data was already saved, skip trying to save again as the calls here would potentially fail - // because the session feature might not be available at this point. - // Example: An action returns NoContentResult and since NoContentResult does not write anything to - // the body of the response, this delegate would get executed way late in the pipeline at which point - // the session feature would have been removed. - if (saveTempDataContext.TempDataSaved) - { - return Task.CompletedTask; - } - - SaveTempData( - result: null, - factory: saveTempDataContext.TempDataDictionaryFactory, - filters: saveTempDataContext.Filters, - httpContext: httpContext); - - return Task.CompletedTask; - }, - state: context.HttpContext); + context.HttpContext.Response.OnStarting( + callback: OnStartingCallback, + state: context.HttpContext); } } + private static Task OnStarting(HttpContext httpContext) + { + var saveTempDataContext = GetTempDataContext(httpContext); + if (saveTempDataContext.RequestHasUnhandledException) + { + return Task.CompletedTask; + } + + // If temp data was already saved, skip trying to save again as the calls here would potentially fail + // because the session feature might not be available at this point. + // Example: An action returns NoContentResult and since NoContentResult does not write anything to + // the body of the response, this delegate would get executed way late in the pipeline at which point + // the session feature would have been removed. + if (saveTempDataContext.TempDataSaved) + { + return Task.CompletedTask; + } + + SaveTempData( + result: null, + factory: saveTempDataContext.TempDataDictionaryFactory, + filters: saveTempDataContext.Filters, + httpContext: httpContext); + + return Task.CompletedTask; + } + /// public void OnResourceExecuted(ResourceExecutedContext context) { @@ -115,7 +117,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters } } - private SaveTempDataContext GetTempDataContext(HttpContext httpContext) + private static SaveTempDataContext GetTempDataContext(HttpContext httpContext) { SaveTempDataContext saveTempDataContext = null; if (httpContext.Items.TryGetValue(SaveTempDataFilterContextKey, out var value)) diff --git a/src/Mvc/Mvc.ViewFeatures/src/TempDataDictionary.cs b/src/Mvc/Mvc.ViewFeatures/src/TempDataDictionary.cs index 95abb49bb4..26b963b3ee 100644 --- a/src/Mvc/Mvc.ViewFeatures/src/TempDataDictionary.cs +++ b/src/Mvc/Mvc.ViewFeatures/src/TempDataDictionary.cs @@ -146,22 +146,15 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures return; } - // Because it is not possible to delete while enumerating, a copy of the keys must be taken. - // Use the size of the dictionary as an upper bound to avoid creating more than one copy of the keys. - var removeCount = 0; - var keys = new string[_data.Count]; + // In .NET Core 3.0 a Dictionary can have items removed during enumeration + // https://github.com/dotnet/coreclr/pull/18854 foreach (var entry in _data) { if (!_initialKeys.Contains(entry.Key) && !_retainedKeys.Contains(entry.Key)) { - keys[removeCount] = entry.Key; - removeCount++; + _data.Remove(entry.Key); } } - for (var i = 0; i < removeCount; i++) - { - _data.Remove(keys[i]); - } _provider.SaveTempData(_context, _data); } diff --git a/src/Mvc/test/Mvc.FunctionalTests/ClientValidationOptionsTests.cs b/src/Mvc/test/Mvc.FunctionalTests/ClientValidationOptionsTests.cs new file mode 100644 index 0000000000..4b728c2979 --- /dev/null +++ b/src/Mvc/test/Mvc.FunctionalTests/ClientValidationOptionsTests.cs @@ -0,0 +1,34 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting; +using Xunit; + +namespace Microsoft.AspNetCore.Mvc.FunctionalTests +{ + public class ClientValidationOptionsTests : IClassFixture> + { + public ClientValidationOptionsTests(MvcTestFixture fixture) => + Fixture = fixture; + + public MvcTestFixture Fixture { get; } + + [Fact] + public async Task DisablingClientValidation_DisablesItForPagesAndViews() + { + // Arrange + var client = Fixture + .WithWebHostBuilder(whb => whb.UseStartup()) + .CreateClient(); + + // Act + var view = await client.GetStringAsync("Controller/ClientValidationDisabled"); + var page = await client.GetStringAsync("ClientvalidationDisabled"); + + // Assert + Assert.Equal("ClientValidationDisabled", view); + Assert.Equal("ClientValidationDisabled", page); + } + } +} diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Controllers/ClientValidationDisabledController.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Controllers/ClientValidationDisabledController.cs new file mode 100644 index 0000000000..4f6b721c56 --- /dev/null +++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Controllers/ClientValidationDisabledController.cs @@ -0,0 +1,13 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Mvc; + +namespace RazorPagesWebSite +{ + public class ClientValidationDisabledController : Controller + { + [HttpGet("/Controller/ClientValidationDisabled")] + public IActionResult ValidationDisabled() => View(); + } +} diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ClientValidationDisabled.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ClientValidationDisabled.cshtml new file mode 100644 index 0000000000..5261d1c054 --- /dev/null +++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ClientValidationDisabled.cshtml @@ -0,0 +1,2 @@ +@page +@(ViewContext.ClientValidationEnabled ? "ClientValidationEnabled" : "ClientValidationDisabled") \ No newline at end of file diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/StartupWithClientValidationDisabled.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/StartupWithClientValidationDisabled.cs new file mode 100644 index 0000000000..68cb0f6e30 --- /dev/null +++ b/src/Mvc/test/WebSites/RazorPagesWebSite/StartupWithClientValidationDisabled.cs @@ -0,0 +1,41 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.DependencyInjection; + +namespace RazorPagesWebSite +{ + public class StartupWithClientValidationDisabled + { + public void ConfigureServices(IServiceCollection services) + { + services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme) + .AddCookie(options => options.LoginPath = "/Login"); + + services.AddRazorPages(options => + { + options.Conventions.AuthorizeFolder("/Admin"); + }) + .SetCompatibilityVersion(CompatibilityVersion.Latest); + + services.Configure(o => o.HtmlHelperOptions.ClientValidationEnabled = false); + } + + public void Configure(IApplicationBuilder app) + { + app.UseRouting(); + + app.UseAuthentication(); + app.UseAuthorization(); + + app.UseEndpoints(endpoints => + { + endpoints.MapControllers(); + endpoints.MapRazorPages(); + }); + } + } +} diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Views/ClientValidationDisabled/ValidationDisabled.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Views/ClientValidationDisabled/ValidationDisabled.cshtml new file mode 100644 index 0000000000..a388893b34 --- /dev/null +++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Views/ClientValidationDisabled/ValidationDisabled.cshtml @@ -0,0 +1 @@ +@(ViewContext.ClientValidationEnabled ? "ClientValidationEnabled" : "ClientValidationDisabled") \ No newline at end of file diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/css/site.css b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/css/site.css index c486131d5a..19dc5bf077 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/css/site.css +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/css/site.css @@ -50,7 +50,5 @@ body { bottom: 0; width: 100%; white-space: nowrap; - /* Set the fixed height of the footer here */ - height: 60px; line-height: 60px; /* Vertically center the text there */ } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/css/site.css b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/css/site.css index c486131d5a..19dc5bf077 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/css/site.css +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/css/site.css @@ -50,7 +50,5 @@ body { bottom: 0; width: 100%; white-space: nowrap; - /* Set the fixed height of the footer here */ - height: 60px; line-height: 60px; /* Vertically center the text there */ } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/css/site.css b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/css/site.css index c486131d5a..19dc5bf077 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/css/site.css +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/css/site.css @@ -50,7 +50,5 @@ body { bottom: 0; width: 100%; white-space: nowrap; - /* Set the fixed height of the footer here */ - height: 60px; line-height: 60px; /* Vertically center the text there */ } diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/ClientApp/src/App.test.tsx b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/ClientApp/src/App.test.tsx index 8ad9b2d9f3..6875830410 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/ClientApp/src/App.test.tsx +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/ClientApp/src/App.test.tsx @@ -11,7 +11,7 @@ it('renders without crashing', () => { dispatch: () => {}, getState: () => ({ ...state }) }); - const store = storeFake({}); + const store = storeFake({}) as any; ReactDOM.render( diff --git a/src/Security/Authentication/MicrosoftAccount/src/MicrosoftAccountOptions.cs b/src/Security/Authentication/MicrosoftAccount/src/MicrosoftAccountOptions.cs index 8462913a3d..36abae5be7 100644 --- a/src/Security/Authentication/MicrosoftAccount/src/MicrosoftAccountOptions.cs +++ b/src/Security/Authentication/MicrosoftAccount/src/MicrosoftAccountOptions.cs @@ -27,7 +27,15 @@ namespace Microsoft.AspNetCore.Authentication.MicrosoftAccount ClaimActions.MapJsonKey(ClaimTypes.Name, "displayName"); ClaimActions.MapJsonKey(ClaimTypes.GivenName, "givenName"); ClaimActions.MapJsonKey(ClaimTypes.Surname, "surname"); - ClaimActions.MapCustomJson(ClaimTypes.Email, user => user.GetString("mail") ?? user.GetString("userPrincipalName")); + ClaimActions.MapCustomJson(ClaimTypes.Email, user => + { + var mail = user.GetString("mail"); + if (string.IsNullOrEmpty(mail)) + { + mail = user.GetString("userPrincipalName"); + } + return mail; + }); } } } diff --git a/src/Security/Authentication/test/MicrosoftAccountTests.cs b/src/Security/Authentication/test/MicrosoftAccountTests.cs index c13f4bf51b..5e6021ebab 100644 --- a/src/Security/Authentication/test/MicrosoftAccountTests.cs +++ b/src/Security/Authentication/test/MicrosoftAccountTests.cs @@ -203,7 +203,8 @@ namespace Microsoft.AspNetCore.Authentication.Tests.MicrosoftAccount displayName = "Test Name", givenName = "Test Given Name", surname = "Test Family Name", - mail = "Test email" + mail = "", + userPrincipalName = "Test email" }); } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index eff3e6d1b9..5a75024208 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -28,6 +28,9 @@ 10.0.17134.0 + + + DynamicLibrary true diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index b73d0978ad..9fd8d24671 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -26,6 +26,9 @@ 10.0.17134.0 + + + StaticLibrary true diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj index 1c4e1520f0..3c76ed6b05 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj @@ -26,6 +26,9 @@ Unicode + + + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj index 04b9d13c0d..2afc56dacb 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj @@ -26,6 +26,9 @@ 10.0.17134.0 + + + StaticLibrary true diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index 91a0290afc..cf2b5d1f02 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -28,6 +28,9 @@ InProcessRequestHandler + + + DynamicLibrary true diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index f303165e9e..29428de6a2 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -28,6 +28,9 @@ OutOfProcessRequestHandler + + + DynamicLibrary true diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj index d74177acc3..56088b84ad 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj @@ -26,6 +26,9 @@ 10.0.17134.0 + + + StaticLibrary true diff --git a/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj index f184f229f1..20bc6451a1 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj @@ -29,6 +29,9 @@ 10.0.17134.0 + + + StaticLibrary true diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs index 9ea84650d7..68ff8d44ac 100644 --- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs +++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/LogFileTests.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IIS.FunctionalTests.Utilities; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting.IIS; +using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing.xunit; using Xunit; @@ -170,6 +171,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } [ConditionalTheory] + [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2200", FlakyOn.All)] [MemberData(nameof(TestVariants))] public async Task CheckUTF8File(TestVariant variant) { diff --git a/src/Servers/IIS/build/Build.Settings b/src/Servers/IIS/build/Build.Settings index ce1d870e75..0097cb4352 100644 --- a/src/Servers/IIS/build/Build.Settings +++ b/src/Servers/IIS/build/Build.Settings @@ -4,7 +4,7 @@ $(MSBuildThisFileDirectory)..\ Debug Win32 - v141 + v142 $(MSBuildProjectDirectory)\bin\$(Configuration)\$(Platform)\ $(OutputPath) aspnetcore diff --git a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp3.0.cs b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp3.0.cs index 494c58056d..62687bc800 100644 --- a/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp3.0.cs +++ b/src/Servers/Kestrel/Core/ref/Microsoft.AspNetCore.Server.Kestrel.Core.netcoreapp3.0.cs @@ -121,6 +121,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core public Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal.SchedulingMode ApplicationSchedulingMode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public System.IServiceProvider ApplicationServices { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader ConfigurationLoader { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } + public bool DisableStringReuse { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } } public Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerLimits Limits { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } } public Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader Configure() { throw null; } public Microsoft.AspNetCore.Server.Kestrel.KestrelConfigurationLoader Configure(Microsoft.Extensions.Configuration.IConfiguration config) { throw null; } @@ -251,6 +252,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http public partial interface IHttpHeadersHandler { void OnHeader(System.Span name, System.Span value); + void OnHeadersComplete(); } public partial interface IHttpParser where TRequestHandler : Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpHeadersHandler, Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.IHttpRequestLineHandler { diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/Http1Connection.cs b/src/Servers/Kestrel/Core/src/Internal/Http/Http1Connection.cs index d2cdb57382..7b23196794 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/Http1Connection.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/Http1Connection.cs @@ -19,6 +19,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http private const byte ByteAsterisk = (byte)'*'; private const byte ByteForwardSlash = (byte)'/'; private const string Asterisk = "*"; + private const string ForwardSlash = "/"; private readonly HttpConnectionContext _context; private readonly IHttpParser _parser; @@ -268,16 +269,68 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http _requestTargetForm = HttpRequestTarget.OriginForm; + if (target.Length == 1) + { + // If target.Length == 1 it can only be a forward slash (e.g. home page) + // and we know RawTarget and Path are the same and QueryString is Empty + RawTarget = ForwardSlash; + Path = ForwardSlash; + QueryString = string.Empty; + // Clear parsedData as we won't check it if we come via this path again, + // an setting to null is fast as it doesn't need to use a GC write barrier. + _parsedRawTarget = _parsedPath = _parsedQueryString = null; + return; + } + // URIs are always encoded/escaped to ASCII https://tools.ietf.org/html/rfc3986#page-11 // Multibyte Internationalized Resource Identifiers (IRIs) are first converted to utf8; // then encoded/escaped to ASCII https://www.ietf.org/rfc/rfc3987.txt "Mapping of IRIs to URIs" try { + var disableStringReuse = ServerOptions.DisableStringReuse; // Read raw target before mutating memory. - RawTarget = target.GetAsciiStringNonNullCharacters(); - QueryString = query.GetAsciiStringNonNullCharacters(); - Path = PathNormalizer.DecodePath(path, pathEncoded, RawTarget, query.Length); + var previousValue = _parsedRawTarget; + if (disableStringReuse || + previousValue == null || previousValue.Length != target.Length || + !StringUtilities.BytesOrdinalEqualsStringAndAscii(previousValue, target)) + { + // The previous string does not match what the bytes would convert to, + // so we will need to generate a new string. + RawTarget = _parsedRawTarget = target.GetAsciiStringNonNullCharacters(); + + previousValue = _parsedQueryString; + if (disableStringReuse || + previousValue == null || previousValue.Length != query.Length || + !StringUtilities.BytesOrdinalEqualsStringAndAscii(previousValue, query)) + { + // The previous string does not match what the bytes would convert to, + // so we will need to generate a new string. + QueryString = _parsedQueryString = query.GetAsciiStringNonNullCharacters(); + } + else + { + // Same as previous + QueryString = _parsedQueryString; + } + + if (path.Length == 1) + { + // If path.Length == 1 it can only be a forward slash (e.g. home page) + Path = _parsedPath = ForwardSlash; + } + else + { + Path = _parsedPath = PathNormalizer.DecodePath(path, pathEncoded, RawTarget, query.Length); + } + } + else + { + // As RawTarget is the same we can reuse the previous parsed values. + RawTarget = _parsedRawTarget; + Path = _parsedPath; + QueryString = _parsedQueryString; + } } catch (InvalidOperationException) { @@ -312,9 +365,27 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http // // Allowed characters in the 'host + port' section of authority. // See https://tools.ietf.org/html/rfc3986#section-3.2 - RawTarget = target.GetAsciiStringNonNullCharacters(); + + var previousValue = _parsedRawTarget; + if (ServerOptions.DisableStringReuse || + previousValue == null || previousValue.Length != target.Length || + !StringUtilities.BytesOrdinalEqualsStringAndAscii(previousValue, target)) + { + // The previous string does not match what the bytes would convert to, + // so we will need to generate a new string. + RawTarget = _parsedRawTarget = target.GetAsciiStringNonNullCharacters(); + } + else + { + // Reuse previous value + RawTarget = _parsedRawTarget; + } + Path = string.Empty; QueryString = string.Empty; + // Clear parsedData for path and queryString as we won't check it if we come via this path again, + // an setting to null is fast as it doesn't need to use a GC write barrier. + _parsedPath = _parsedQueryString = null; } private void OnAsteriskFormTarget(HttpMethod method) @@ -331,6 +402,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http RawTarget = Asterisk; Path = string.Empty; QueryString = string.Empty; + // Clear parsedData as we won't check it if we come via this path again, + // an setting to null is fast as it doesn't need to use a GC write barrier. + _parsedRawTarget = _parsedPath = _parsedQueryString = null; } private void OnAbsoluteFormTarget(Span target, Span query) @@ -346,21 +420,49 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http // a server MUST accept the absolute-form in requests, even though // HTTP/1.1 clients will only send them in requests to proxies. - RawTarget = target.GetAsciiStringNonNullCharacters(); - - // Validation of absolute URIs is slow, but clients - // should not be sending this form anyways, so perf optimization - // not high priority - - if (!Uri.TryCreate(RawTarget, UriKind.Absolute, out var uri)) + var disableStringReuse = ServerOptions.DisableStringReuse; + var previousValue = _parsedRawTarget; + if (disableStringReuse || + previousValue == null || previousValue.Length != target.Length || + !StringUtilities.BytesOrdinalEqualsStringAndAscii(previousValue, target)) { - ThrowRequestTargetRejected(target); - } + // The previous string does not match what the bytes would convert to, + // so we will need to generate a new string. + RawTarget = _parsedRawTarget = target.GetAsciiStringNonNullCharacters(); - _absoluteRequestTarget = uri; - Path = uri.LocalPath; - // don't use uri.Query because we need the unescaped version - QueryString = query.GetAsciiStringNonNullCharacters(); + // Validation of absolute URIs is slow, but clients + // should not be sending this form anyways, so perf optimization + // not high priority + + if (!Uri.TryCreate(RawTarget, UriKind.Absolute, out var uri)) + { + ThrowRequestTargetRejected(target); + } + + _absoluteRequestTarget = uri; + Path = _parsedPath = uri.LocalPath; + // don't use uri.Query because we need the unescaped version + previousValue = _parsedQueryString; + if (disableStringReuse || + previousValue == null || previousValue.Length != query.Length || + !StringUtilities.BytesOrdinalEqualsStringAndAscii(previousValue, query)) + { + // The previous string does not match what the bytes would convert to, + // so we will need to generate a new string. + QueryString = _parsedQueryString = query.GetAsciiStringNonNullCharacters(); + } + else + { + QueryString = _parsedQueryString; + } + } + else + { + // As RawTarget is the same we can reuse the previous values. + RawTarget = _parsedRawTarget; + Path = _parsedPath; + QueryString = _parsedQueryString; + } } internal void EnsureHostHeaderExists() diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/Http1ParsingHandler.cs b/src/Servers/Kestrel/Core/src/Internal/Http/Http1ParsingHandler.cs index a7d6fdddc7..bcc905cab9 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/Http1ParsingHandler.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/Http1ParsingHandler.cs @@ -17,6 +17,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http public void OnHeader(Span name, Span value) => Connection.OnHeader(name, value); + public void OnHeadersComplete() + => Connection.OnHeadersComplete(); + public void OnStartLine(HttpMethod method, HttpVersion version, Span target, Span path, Span query, Span customMethod, bool pathEncoded) => Connection.OnStartLine(method, version, target, path, query, customMethod, pathEncoded); } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.Generated.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.Generated.cs index a69e738048..55882f905d 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.Generated.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.Generated.cs @@ -6,16 +6,16 @@ using System.Collections.Generic; using System.Buffers; using System.IO.Pipelines; using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; using Microsoft.Extensions.Primitives; using Microsoft.Net.Http.Headers; +using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { internal partial class HttpRequestHeaders { - - private long _bits = 0; private HeaderReferences _headers; public bool HasConnection => (_bits & 0x2L) != 0; @@ -703,12 +703,46 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http _headers._UserAgent = value; } } - public StringValues HeaderOrigin + public StringValues HeaderDNT { get { StringValues value = default; if ((_bits & 0x10000000000L) != 0) + { + value = _headers._DNT; + } + return value; + } + set + { + _bits |= 0x10000000000L; + _headers._DNT = value; + } + } + public StringValues HeaderUpgradeInsecureRequests + { + get + { + StringValues value = default; + if ((_bits & 0x20000000000L) != 0) + { + value = _headers._UpgradeInsecureRequests; + } + return value; + } + set + { + _bits |= 0x20000000000L; + _headers._UpgradeInsecureRequests = value; + } + } + public StringValues HeaderOrigin + { + get + { + StringValues value = default; + if ((_bits & 0x40000000000L) != 0) { value = _headers._Origin; } @@ -716,7 +750,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } set { - _bits |= 0x10000000000L; + _bits |= 0x40000000000L; _headers._Origin = value; } } @@ -725,7 +759,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http get { StringValues value = default; - if ((_bits & 0x20000000000L) != 0) + if ((_bits & 0x80000000000L) != 0) { value = _headers._AccessControlRequestMethod; } @@ -733,7 +767,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } set { - _bits |= 0x20000000000L; + _bits |= 0x80000000000L; _headers._AccessControlRequestMethod = value; } } @@ -742,7 +776,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http get { StringValues value = default; - if ((_bits & 0x40000000000L) != 0) + if ((_bits & 0x100000000000L) != 0) { value = _headers._AccessControlRequestHeaders; } @@ -750,7 +784,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } set { - _bits |= 0x40000000000L; + _bits |= 0x100000000000L; _headers._AccessControlRequestHeaders = value; } } @@ -932,7 +966,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } if ("Origin".Equals(key, StringComparison.OrdinalIgnoreCase)) { - if ((_bits & 0x10000000000L) != 0) + if ((_bits & 0x40000000000L) != 0) { value = _headers._Origin; return true; @@ -1023,6 +1057,15 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } return false; } + if ("DNT".Equals(key, StringComparison.OrdinalIgnoreCase)) + { + if ((_bits & 0x10000000000L) != 0) + { + value = _headers._DNT; + return true; + } + return false; + } } break; case 5: @@ -1227,11 +1270,24 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } } break; + case 25: + { + if ("Upgrade-Insecure-Requests".Equals(key, StringComparison.OrdinalIgnoreCase)) + { + if ((_bits & 0x20000000000L) != 0) + { + value = _headers._UpgradeInsecureRequests; + return true; + } + return false; + } + } + break; case 29: { if ("Access-Control-Request-Method".Equals(key, StringComparison.OrdinalIgnoreCase)) { - if ((_bits & 0x20000000000L) != 0) + if ((_bits & 0x80000000000L) != 0) { value = _headers._AccessControlRequestMethod; return true; @@ -1244,7 +1300,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { if ("Access-Control-Request-Headers".Equals(key, StringComparison.OrdinalIgnoreCase)) { - if ((_bits & 0x40000000000L) != 0) + if ((_bits & 0x100000000000L) != 0) { value = _headers._AccessControlRequestHeaders; return true; @@ -1368,7 +1424,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } if ("Origin".Equals(key, StringComparison.OrdinalIgnoreCase)) { - _bits |= 0x10000000000L; + _bits |= 0x40000000000L; _headers._Origin = value; return; } @@ -1432,6 +1488,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http _headers._Via = value; return; } + if ("DNT".Equals(key, StringComparison.OrdinalIgnoreCase)) + { + _bits |= 0x10000000000L; + _headers._DNT = value; + return; + } } break; case 5: @@ -1581,11 +1643,21 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } } break; + case 25: + { + if ("Upgrade-Insecure-Requests".Equals(key, StringComparison.OrdinalIgnoreCase)) + { + _bits |= 0x20000000000L; + _headers._UpgradeInsecureRequests = value; + return; + } + } + break; case 29: { if ("Access-Control-Request-Method".Equals(key, StringComparison.OrdinalIgnoreCase)) { - _bits |= 0x20000000000L; + _bits |= 0x80000000000L; _headers._AccessControlRequestMethod = value; return; } @@ -1595,7 +1667,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { if ("Access-Control-Request-Headers".Equals(key, StringComparison.OrdinalIgnoreCase)) { - _bits |= 0x40000000000L; + _bits |= 0x100000000000L; _headers._AccessControlRequestHeaders = value; return; } @@ -1776,9 +1848,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } if ("Origin".Equals(key, StringComparison.OrdinalIgnoreCase)) { - if ((_bits & 0x10000000000L) == 0) + if ((_bits & 0x40000000000L) == 0) { - _bits |= 0x10000000000L; + _bits |= 0x40000000000L; _headers._Origin = value; return true; } @@ -1876,6 +1948,16 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } return false; } + if ("DNT".Equals(key, StringComparison.OrdinalIgnoreCase)) + { + if ((_bits & 0x10000000000L) == 0) + { + _bits |= 0x10000000000L; + _headers._DNT = value; + return true; + } + return false; + } } break; case 5: @@ -2097,13 +2179,27 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } } break; - case 29: + case 25: { - if ("Access-Control-Request-Method".Equals(key, StringComparison.OrdinalIgnoreCase)) + if ("Upgrade-Insecure-Requests".Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x20000000000L) == 0) { _bits |= 0x20000000000L; + _headers._UpgradeInsecureRequests = value; + return true; + } + return false; + } + } + break; + case 29: + { + if ("Access-Control-Request-Method".Equals(key, StringComparison.OrdinalIgnoreCase)) + { + if ((_bits & 0x80000000000L) == 0) + { + _bits |= 0x80000000000L; _headers._AccessControlRequestMethod = value; return true; } @@ -2115,9 +2211,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { if ("Access-Control-Request-Headers".Equals(key, StringComparison.OrdinalIgnoreCase)) { - if ((_bits & 0x40000000000L) == 0) + if ((_bits & 0x100000000000L) == 0) { - _bits |= 0x40000000000L; + _bits |= 0x100000000000L; _headers._AccessControlRequestHeaders = value; return true; } @@ -2302,9 +2398,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } if ("Origin".Equals(key, StringComparison.OrdinalIgnoreCase)) { - if ((_bits & 0x10000000000L) != 0) + if ((_bits & 0x40000000000L) != 0) { - _bits &= ~0x10000000000L; + _bits &= ~0x40000000000L; _headers._Origin = default(StringValues); return true; } @@ -2402,6 +2498,16 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } return false; } + if ("DNT".Equals(key, StringComparison.OrdinalIgnoreCase)) + { + if ((_bits & 0x10000000000L) != 0) + { + _bits &= ~0x10000000000L; + _headers._DNT = default(StringValues); + return true; + } + return false; + } } break; case 5: @@ -2623,13 +2729,27 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } } break; - case 29: + case 25: { - if ("Access-Control-Request-Method".Equals(key, StringComparison.OrdinalIgnoreCase)) + if ("Upgrade-Insecure-Requests".Equals(key, StringComparison.OrdinalIgnoreCase)) { if ((_bits & 0x20000000000L) != 0) { _bits &= ~0x20000000000L; + _headers._UpgradeInsecureRequests = default(StringValues); + return true; + } + return false; + } + } + break; + case 29: + { + if ("Access-Control-Request-Method".Equals(key, StringComparison.OrdinalIgnoreCase)) + { + if ((_bits & 0x80000000000L) != 0) + { + _bits &= ~0x80000000000L; _headers._AccessControlRequestMethod = default(StringValues); return true; } @@ -2641,9 +2761,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { if ("Access-Control-Request-Headers".Equals(key, StringComparison.OrdinalIgnoreCase)) { - if ((_bits & 0x40000000000L) != 0) + if ((_bits & 0x100000000000L) != 0) { - _bits &= ~0x40000000000L; + _bits &= ~0x100000000000L; _headers._AccessControlRequestHeaders = default(StringValues); return true; } @@ -2655,18 +2775,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return MaybeUnknown?.Remove(key) ?? false; } - - protected override void ClearFast() + private void Clear(long bitsToClear) { - MaybeUnknown?.Clear(); - _contentLength = null; - var tempBits = _bits; - _bits = 0; - if(HttpHeaders.BitCount(tempBits) > 12) - { - _headers = default(HeaderReferences); - return; - } + var tempBits = bitsToClear; if ((tempBits & 0x2L) != 0) { @@ -3070,7 +3181,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http if ((tempBits & 0x10000000000L) != 0) { - _headers._Origin = default(StringValues); + _headers._DNT = default(StringValues); if((tempBits & ~0x10000000000L) == 0) { return; @@ -3080,7 +3191,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http if ((tempBits & 0x20000000000L) != 0) { - _headers._AccessControlRequestMethod = default(StringValues); + _headers._UpgradeInsecureRequests = default(StringValues); if((tempBits & ~0x20000000000L) == 0) { return; @@ -3090,7 +3201,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http if ((tempBits & 0x40000000000L) != 0) { - _headers._AccessControlRequestHeaders = default(StringValues); + _headers._Origin = default(StringValues); if((tempBits & ~0x40000000000L) == 0) { return; @@ -3098,6 +3209,26 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http tempBits &= ~0x40000000000L; } + if ((tempBits & 0x80000000000L) != 0) + { + _headers._AccessControlRequestMethod = default(StringValues); + if((tempBits & ~0x80000000000L) == 0) + { + return; + } + tempBits &= ~0x80000000000L; + } + + if ((tempBits & 0x100000000000L) != 0) + { + _headers._AccessControlRequestHeaders = default(StringValues); + if((tempBits & ~0x100000000000L) == 0) + { + return; + } + tempBits &= ~0x100000000000L; + } + } protected override bool CopyToFast(KeyValuePair[] array, int arrayIndex) @@ -3473,7 +3604,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { return false; } - array[arrayIndex] = new KeyValuePair("Origin", _headers._Origin); + array[arrayIndex] = new KeyValuePair("DNT", _headers._DNT); ++arrayIndex; } if ((_bits & 0x20000000000L) != 0) @@ -3482,10 +3613,28 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { return false; } - array[arrayIndex] = new KeyValuePair("Access-Control-Request-Method", _headers._AccessControlRequestMethod); + array[arrayIndex] = new KeyValuePair("Upgrade-Insecure-Requests", _headers._UpgradeInsecureRequests); ++arrayIndex; } if ((_bits & 0x40000000000L) != 0) + { + if (arrayIndex == array.Length) + { + return false; + } + array[arrayIndex] = new KeyValuePair("Origin", _headers._Origin); + ++arrayIndex; + } + if ((_bits & 0x80000000000L) != 0) + { + if (arrayIndex == array.Length) + { + return false; + } + array[arrayIndex] = new KeyValuePair("Access-Control-Request-Method", _headers._AccessControlRequestMethod); + ++arrayIndex; + } + if ((_bits & 0x100000000000L) != 0) { if (arrayIndex == array.Length) { @@ -3508,734 +3657,345 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return true; } - - public unsafe void Append(byte* pKeyBytes, int keyLength, string value) + [MethodImpl(MethodImplOptions.AggressiveOptimization)] + public unsafe void Append(Span name, Span value) { - var pUB = pKeyBytes; - var pUL = (ulong*)pUB; - var pUI = (uint*)pUB; - var pUS = (ushort*)pUB; - var stringValue = new StringValues(value); - switch (keyLength) + ref byte nameStart = ref MemoryMarshal.GetReference(name); + ref StringValues values = ref Unsafe.AsRef(null); + var flag = 0L; + + // Does the name matched any "known" headers + switch (name.Length) + { + case 2: + if (((Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfu) == 0x4554u)) + { + flag = 0x2000000000L; + values = ref _headers._TE; + } + break; + case 3: + var firstTerm3 = (Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfu); + if ((firstTerm3 == 0x4e44u) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)2) & 0xdfu) == 0x54u)) + { + flag = 0x10000000000L; + values = ref _headers._DNT; + } + else if ((firstTerm3 == 0x4956u) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)2) & 0xdfu) == 0x41u)) + { + flag = 0x100L; + values = ref _headers._Via; + } + break; + case 4: + var firstTerm4 = (Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfdfdfu); + if ((firstTerm4 == 0x54534f48u)) + { + flag = 0x8000000L; + values = ref _headers._Host; + } + else if ((firstTerm4 == 0x45544144u)) + { + flag = 0x4L; + values = ref _headers._Date; + } + else if ((firstTerm4 == 0x4d4f5246u)) + { + flag = 0x4000000L; + values = ref _headers._From; + } + break; + case 5: + var firstTerm5 = (Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfdfdfu); + if ((firstTerm5 == 0x4f4c4c41u) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)4) & 0xdfu) == 0x57u)) + { + flag = 0x400L; + values = ref _headers._Allow; + } + else if ((firstTerm5 == 0x474e4152u) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)4) & 0xdfu) == 0x45u)) + { + flag = 0x1000000000L; + values = ref _headers._Range; + } + break; + case 6: + var firstTerm6 = (Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfdfdfu); + if ((firstTerm6 == 0x45434341u) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(ushort)))) & 0xdfdfu) == 0x5450u)) + { + flag = 0x80000L; + values = ref _headers._Accept; + } + else if ((firstTerm6 == 0x4b4f4f43u) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(ushort)))) & 0xdfdfu) == 0x4549u)) + { + flag = 0x1000000L; + values = ref _headers._Cookie; + } + else if ((firstTerm6 == 0x45505845u) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(ushort)))) & 0xdfdfu) == 0x5443u)) + { + flag = 0x2000000L; + values = ref _headers._Expect; + } + else if ((firstTerm6 == 0x4749524fu) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(ushort)))) & 0xdfdfu) == 0x4e49u)) + { + flag = 0x40000000000L; + values = ref _headers._Origin; + } + else if ((firstTerm6 == 0x47415250u) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(ushort)))) & 0xdfdfu) == 0x414du)) + { + flag = 0x10L; + values = ref _headers._Pragma; + } + break; + case 7: + var firstTerm7 = (Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfdfdfu); + if ((firstTerm7 == 0x49505845u) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(ushort)))) & 0xdfdfu) == 0x4552u) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)6) & 0xdfu) == 0x53u)) + { + flag = 0x20000L; + values = ref _headers._Expires; + } + else if ((firstTerm7 == 0x45464552u) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(ushort)))) & 0xdfdfu) == 0x4552u) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)6) & 0xdfu) == 0x52u)) + { + flag = 0x800000000L; + values = ref _headers._Referer; + } + else if ((firstTerm7 == 0x49415254u) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(ushort)))) & 0xdfdfu) == 0x454cu) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)6) & 0xdfu) == 0x52u)) + { + flag = 0x20L; + values = ref _headers._Trailer; + } + else if ((firstTerm7 == 0x52475055u) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(ushort)))) & 0xdfdfu) == 0x4441u) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)6) & 0xdfu) == 0x45u)) + { + flag = 0x80L; + values = ref _headers._Upgrade; + } + else if ((firstTerm7 == 0x4e524157u) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(ushort)))) & 0xdfdfu) == 0x4e49u) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)6) & 0xdfu) == 0x47u)) + { + flag = 0x200L; + values = ref _headers._Warning; + } + break; + case 8: + var firstTerm8 = (Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfdfdfdfffdfdfuL); + if ((firstTerm8 == 0x484354414d2d4649uL)) + { + flag = 0x10000000L; + values = ref _headers._IfMatch; + } + else if ((firstTerm8 == 0x45474e41522d4649uL)) + { + flag = 0x80000000L; + values = ref _headers._IfRange; + } + break; + case 9: + if (((Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfdfdfdfdfdfdfuL) == 0x54414c534e415254uL) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)8) & 0xdfu) == 0x45u)) + { + flag = 0x4000000000L; + values = ref _headers._Translate; + } + break; + case 10: + if (((Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfdfdfdfdfdfdfuL) == 0x495443454e4e4f43uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(4 * sizeof(ushort)))) & 0xdfdfu) == 0x4e4fu)) + { + flag = 0x2L; + values = ref _headers._Connection; + } + else if (((Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfdfffdfdfdfdfuL) == 0x4547412d52455355uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(4 * sizeof(ushort)))) & 0xdfdfu) == 0x544eu)) + { + flag = 0x8000000000L; + values = ref _headers._UserAgent; + } + else if (((Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfdfffdfdfdfdfuL) == 0x494c412d5045454buL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(4 * sizeof(ushort)))) & 0xdfdfu) == 0x4556u)) + { + flag = 0x8L; + values = ref _headers._KeepAlive; + } + break; + case 11: + if (((Unsafe.ReadUnaligned(ref nameStart) & 0xffdfdfdfdfdfdfdfuL) == 0x2d544e45544e4f43uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(4 * sizeof(ushort)))) & 0xdfdfu) == 0x444du) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)10) & 0xffu) == 0x35u)) + { + flag = 0x8000L; + values = ref _headers._ContentMD5; + } + break; + case 12: + if (((Unsafe.ReadUnaligned(ref nameStart) & 0xffdfdfdfdfdfdfdfuL) == 0x2d544e45544e4f43uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(uint)))) & 0xdfdfdfdfu) == 0x45505954u)) + { + flag = 0x800L; + values = ref _headers._ContentType; + } + else if (((Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfdfdfffdfdfdfuL) == 0x57524f462d58414duL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(uint)))) & 0xdfdfdfdfu) == 0x53445241u)) + { + flag = 0x200000000L; + values = ref _headers._MaxForwards; + } + break; + case 13: + if (((Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfdfdfdfdfdfdfuL) == 0x5a49524f48545541uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(uint)))) & 0xdfdfdfdfu) == 0x4f495441u) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)12) & 0xdfu) == 0x4eu)) + { + flag = 0x800000L; + values = ref _headers._Authorization; + } + else if (((Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfffdfdfdfdfdfuL) == 0x4f432d4548434143uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(uint)))) & 0xdfdfdfdfu) == 0x4f52544eu) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)12) & 0xdfu) == 0x4cu)) + { + flag = 0x1L; + values = ref _headers._CacheControl; + } + else if (((Unsafe.ReadUnaligned(ref nameStart) & 0xffdfdfdfdfdfdfdfuL) == 0x2d544e45544e4f43uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(uint)))) & 0xdfdfdfdfu) == 0x474e4152u) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)12) & 0xdfu) == 0x45u)) + { + flag = 0x10000L; + values = ref _headers._ContentRange; + } + else if (((Unsafe.ReadUnaligned(ref nameStart) & 0xffdfdfdfdfffdfdfuL) == 0x2d454e4f4e2d4649uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(uint)))) & 0xdfdfdfdfu) == 0x4354414du) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)12) & 0xdfu) == 0x48u)) + { + flag = 0x40000000L; + values = ref _headers._IfNoneMatch; + } + else if (((Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfdfffdfdfdfdfuL) == 0x444f4d2d5453414cuL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(uint)))) & 0xdfdfdfdfu) == 0x45494649u) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)12) & 0xdfu) == 0x44u)) + { + flag = 0x40000L; + values = ref _headers._LastModified; + } + break; + case 14: + if (((Unsafe.ReadUnaligned(ref nameStart) & 0xdfffdfdfdfdfdfdfuL) == 0x432d545045434341uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(uint)))) & 0xdfdfdfdfu) == 0x53524148u) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(6 * sizeof(ushort)))) & 0xdfdfu) == 0x5445u)) + { + flag = 0x100000L; + values = ref _headers._AcceptCharset; + } + else if (((Unsafe.ReadUnaligned(ref nameStart) & 0xffdfdfdfdfdfdfdfuL) == 0x2d544e45544e4f43uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(uint)))) & 0xdfdfdfdfu) == 0x474e454cu) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(6 * sizeof(ushort)))) & 0xdfdfu) == 0x4854u)) + { + AppendContentLength(value); + return; + } + break; + case 15: + var firstTerm15 = (Unsafe.ReadUnaligned(ref nameStart) & 0xdfffdfdfdfdfdfdfuL); + if ((firstTerm15 == 0x452d545045434341uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(uint)))) & 0xdfdfdfdfu) == 0x444f434eu) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(6 * sizeof(ushort)))) & 0xdfdfu) == 0x4e49u) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)14) & 0xdfu) == 0x47u)) + { + flag = 0x200000L; + values = ref _headers._AcceptEncoding; + } + else if ((firstTerm15 == 0x4c2d545045434341uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(uint)))) & 0xdfdfdfdfu) == 0x55474e41u) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(6 * sizeof(ushort)))) & 0xdfdfu) == 0x4741u) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)14) & 0xdfu) == 0x45u)) + { + flag = 0x400000L; + values = ref _headers._AcceptLanguage; + } + break; + case 16: + var firstTerm16 = (Unsafe.ReadUnaligned(ref nameStart) & 0xffdfdfdfdfdfdfdfuL); + if ((firstTerm16 == 0x2d544e45544e4f43uL)) + { + if (((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)sizeof(ulong))) & 0xdfdfdfdfdfdfdfdfuL) == 0x474e49444f434e45uL)) + { + flag = 0x1000L; + values = ref _headers._ContentEncoding; + } + else if (((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)sizeof(ulong))) & 0xdfdfdfdfdfdfdfdfuL) == 0x45474155474e414cuL)) + { + flag = 0x2000L; + values = ref _headers._ContentLanguage; + } + else if (((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)sizeof(ulong))) & 0xdfdfdfdfdfdfdfdfuL) == 0x4e4f495441434f4cuL)) + { + flag = 0x4000L; + values = ref _headers._ContentLocation; + } + } + break; + case 17: + if (((Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfdfdfdfffdfdfuL) == 0x4649444f4d2d4649uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)sizeof(ulong))) & 0xdfdfdfdfffdfdfdfuL) == 0x434e49532d444549uL) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)16) & 0xdfu) == 0x45u)) + { + flag = 0x20000000L; + values = ref _headers._IfModifiedSince; + } + else if (((Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfdfdfdfdfdfdfuL) == 0x524546534e415254uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)sizeof(ulong))) & 0xdfdfdfdfdfdfdfffuL) == 0x4e49444f434e452duL) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)16) & 0xdfu) == 0x47u)) + { + flag = 0x40L; + values = ref _headers._TransferEncoding; + } + break; + case 19: + if (((Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfdfdfdfffdfdfuL) == 0x444f4d4e552d4649uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)sizeof(ulong))) & 0xdfdfffdfdfdfdfdfuL) == 0x49532d4445494649uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(8 * sizeof(ushort)))) & 0xdfdfu) == 0x434eu) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)18) & 0xdfu) == 0x45u)) + { + flag = 0x100000000L; + values = ref _headers._IfUnmodifiedSince; + } + else if (((Unsafe.ReadUnaligned(ref nameStart) & 0xdfdfffdfdfdfdfdfuL) == 0x55412d59584f5250uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)sizeof(ulong))) & 0xdfdfdfdfdfdfdfdfuL) == 0x54415a49524f4854uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(8 * sizeof(ushort)))) & 0xdfdfu) == 0x4f49u) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)18) & 0xdfu) == 0x4eu)) + { + flag = 0x400000000L; + values = ref _headers._ProxyAuthorization; + } + break; + case 25: + if (((Unsafe.ReadUnaligned(ref nameStart) & 0xffdfdfdfdfdfdfdfuL) == 0x2d45444152475055uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)sizeof(ulong))) & 0xdfdfdfdfdfdfdfdfuL) == 0x4552554345534e49uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(ulong)))) & 0xdfdfdfdfdfdfdfffuL) == 0x545345555145522duL) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)24) & 0xdfu) == 0x53u)) + { + flag = 0x20000000000L; + values = ref _headers._UpgradeInsecureRequests; + } + break; + case 29: + if (((Unsafe.ReadUnaligned(ref nameStart) & 0xdfffdfdfdfdfdfdfuL) == 0x432d535345434341uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)sizeof(ulong))) & 0xdfffdfdfdfdfdfdfuL) == 0x522d4c4f52544e4fuL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(ulong)))) & 0xdfffdfdfdfdfdfdfuL) == 0x4d2d545345555145uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(6 * sizeof(uint)))) & 0xdfdfdfdfu) == 0x4f485445u) && ((Unsafe.AddByteOffset(ref nameStart, (IntPtr)28) & 0xdfu) == 0x44u)) + { + flag = 0x80000000000L; + values = ref _headers._AccessControlRequestMethod; + } + break; + case 30: + if (((Unsafe.ReadUnaligned(ref nameStart) & 0xdfffdfdfdfdfdfdfuL) == 0x432d535345434341uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)sizeof(ulong))) & 0xdfffdfdfdfdfdfdfuL) == 0x522d4c4f52544e4fuL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(2 * sizeof(ulong)))) & 0xdfffdfdfdfdfdfdfuL) == 0x482d545345555145uL) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(6 * sizeof(uint)))) & 0xdfdfdfdfu) == 0x45444145u) && ((Unsafe.ReadUnaligned(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)(14 * sizeof(ushort)))) & 0xdfdfu) == 0x5352u)) + { + flag = 0x100000000000L; + values = ref _headers._AccessControlRequestHeaders; + } + break; + } + + if (flag != 0) + { + // Matched a known header + if ((_previousBits & flag) != 0) { - case 10: + // Had a previous string for this header, mark it as used so we don't clear it OnHeadersComplete or consider it if we get a second header + _previousBits ^= flag; + + // We will only reuse this header if there was only one previous header + if (values.Count == 1) + { + var previousValue = values.ToString(); + // Check lengths are the same, then if the bytes were converted to an ascii string if they would be the same. + // We do not consider Utf8 headers for reuse. + if (previousValue.Length == value.Length && + StringUtilities.BytesOrdinalEqualsStringAndAscii(previousValue, value)) { - if ((((pUL[0] & 16131858542891098079uL) == 5283922227757993795uL) && ((pUS[4] & 57311u) == 20047u))) - { - if ((_bits & 0x2L) != 0) - { - _headers._Connection = AppendValue(_headers._Connection, value); - } - else - { - _bits |= 0x2L; - _headers._Connection = stringValue; - } - return; - } - - if ((((pUL[0] & 16131858680330051551uL) == 4992030374873092949uL) && ((pUS[4] & 57311u) == 21582u))) - { - if ((_bits & 0x8000000000L) != 0) - { - _headers._UserAgent = AppendValue(_headers._UserAgent, value); - } - else - { - _bits |= 0x8000000000L; - _headers._UserAgent = stringValue; - } - return; - } + // The previous string matches what the bytes would convert to, so we will just use that one. + _bits |= flag; + return; } - break; - - case 6: - { - if ((((pUI[0] & 3755991007u) == 1162036033u) && ((pUS[2] & 57311u) == 21584u))) - { - if ((_bits & 0x80000L) != 0) - { - _headers._Accept = AppendValue(_headers._Accept, value); - } - else - { - _bits |= 0x80000L; - _headers._Accept = stringValue; - } - return; - } - } - break; - - case 4: - { - if ((((pUI[0] & 3755991007u) == 1414745928u))) - { - if ((_bits & 0x8000000L) != 0) - { - _headers._Host = AppendValue(_headers._Host, value); - } - else - { - _bits |= 0x8000000L; - _headers._Host = stringValue; - } - return; - } - } - break; + } } - AppendNonPrimaryHeaders(pKeyBytes, keyLength, value); - } - - private unsafe void AppendNonPrimaryHeaders(byte* pKeyBytes, int keyLength, string value) - { - var pUB = pKeyBytes; - var pUL = (ulong*)pUB; - var pUI = (uint*)pUB; - var pUS = (ushort*)pUB; - var stringValue = new StringValues(value); - switch (keyLength) + // We didn't have a previous matching header value, or have already added a header, so get the string for this value. + var valueStr = value.GetAsciiOrUTF8StringNonNullCharacters(); + if ((_bits & flag) == 0) { - case 13: - { - if ((((pUL[0] & 16131893727263186911uL) == 5711458528024281411uL) && ((pUI[2] & 3755991007u) == 1330795598u) && ((pUB[12] & 223u) == 76u))) - { - if ((_bits & 0x1L) != 0) - { - _headers._CacheControl = AppendValue(_headers._CacheControl, value); - } - else - { - _bits |= 0x1L; - _headers._CacheControl = stringValue; - } - return; - } - - if ((((pUL[0] & 18437701552104792031uL) == 3266321689424580419uL) && ((pUI[2] & 3755991007u) == 1196310866u) && ((pUB[12] & 223u) == 69u))) - { - if ((_bits & 0x10000L) != 0) - { - _headers._ContentRange = AppendValue(_headers._ContentRange, value); - } - else - { - _bits |= 0x10000L; - _headers._ContentRange = stringValue; - } - return; - } - - if ((((pUL[0] & 16131858680330051551uL) == 4922237774822850892uL) && ((pUI[2] & 3755991007u) == 1162430025u) && ((pUB[12] & 223u) == 68u))) - { - if ((_bits & 0x40000L) != 0) - { - _headers._LastModified = AppendValue(_headers._LastModified, value); - } - else - { - _bits |= 0x40000L; - _headers._LastModified = stringValue; - } - return; - } - - if ((((pUL[0] & 16131858542891098079uL) == 6505821637182772545uL) && ((pUI[2] & 3755991007u) == 1330205761u) && ((pUB[12] & 223u) == 78u))) - { - if ((_bits & 0x800000L) != 0) - { - _headers._Authorization = AppendValue(_headers._Authorization, value); - } - else - { - _bits |= 0x800000L; - _headers._Authorization = stringValue; - } - return; - } - - if ((((pUL[0] & 18437701552106889183uL) == 3262099607620765257uL) && ((pUI[2] & 3755991007u) == 1129595213u) && ((pUB[12] & 223u) == 72u))) - { - if ((_bits & 0x40000000L) != 0) - { - _headers._IfNoneMatch = AppendValue(_headers._IfNoneMatch, value); - } - else - { - _bits |= 0x40000000L; - _headers._IfNoneMatch = stringValue; - } - return; - } - } - break; - - case 4: - { - if ((((pUI[0] & 3755991007u) == 1163149636u))) - { - if ((_bits & 0x4L) != 0) - { - _headers._Date = AppendValue(_headers._Date, value); - } - else - { - _bits |= 0x4L; - _headers._Date = stringValue; - } - return; - } - - if ((((pUI[0] & 3755991007u) == 1297044038u))) - { - if ((_bits & 0x4000000L) != 0) - { - _headers._From = AppendValue(_headers._From, value); - } - else - { - _bits |= 0x4000000L; - _headers._From = stringValue; - } - return; - } - } - break; - - case 10: - { - if ((((pUL[0] & 16131858680330051551uL) == 5281668125874799947uL) && ((pUS[4] & 57311u) == 17750u))) - { - if ((_bits & 0x8L) != 0) - { - _headers._KeepAlive = AppendValue(_headers._KeepAlive, value); - } - else - { - _bits |= 0x8L; - _headers._KeepAlive = stringValue; - } - return; - } - } - break; - - case 6: - { - if ((((pUI[0] & 3755991007u) == 1195463248u) && ((pUS[2] & 57311u) == 16717u))) - { - if ((_bits & 0x10L) != 0) - { - _headers._Pragma = AppendValue(_headers._Pragma, value); - } - else - { - _bits |= 0x10L; - _headers._Pragma = stringValue; - } - return; - } - - if ((((pUI[0] & 3755991007u) == 1263488835u) && ((pUS[2] & 57311u) == 17737u))) - { - if ((_bits & 0x1000000L) != 0) - { - _headers._Cookie = AppendValue(_headers._Cookie, value); - } - else - { - _bits |= 0x1000000L; - _headers._Cookie = stringValue; - } - return; - } - - if ((((pUI[0] & 3755991007u) == 1162893381u) && ((pUS[2] & 57311u) == 21571u))) - { - if ((_bits & 0x2000000L) != 0) - { - _headers._Expect = AppendValue(_headers._Expect, value); - } - else - { - _bits |= 0x2000000L; - _headers._Expect = stringValue; - } - return; - } - - if ((((pUI[0] & 3755991007u) == 1195987535u) && ((pUS[2] & 57311u) == 20041u))) - { - if ((_bits & 0x10000000000L) != 0) - { - _headers._Origin = AppendValue(_headers._Origin, value); - } - else - { - _bits |= 0x10000000000L; - _headers._Origin = stringValue; - } - return; - } - } - break; - - case 7: - { - if ((((pUI[0] & 3755991007u) == 1229017684u) && ((pUS[2] & 57311u) == 17740u) && ((pUB[6] & 223u) == 82u))) - { - if ((_bits & 0x20L) != 0) - { - _headers._Trailer = AppendValue(_headers._Trailer, value); - } - else - { - _bits |= 0x20L; - _headers._Trailer = stringValue; - } - return; - } - - if ((((pUI[0] & 3755991007u) == 1380405333u) && ((pUS[2] & 57311u) == 17473u) && ((pUB[6] & 223u) == 69u))) - { - if ((_bits & 0x80L) != 0) - { - _headers._Upgrade = AppendValue(_headers._Upgrade, value); - } - else - { - _bits |= 0x80L; - _headers._Upgrade = stringValue; - } - return; - } - - if ((((pUI[0] & 3755991007u) == 1314013527u) && ((pUS[2] & 57311u) == 20041u) && ((pUB[6] & 223u) == 71u))) - { - if ((_bits & 0x200L) != 0) - { - _headers._Warning = AppendValue(_headers._Warning, value); - } - else - { - _bits |= 0x200L; - _headers._Warning = stringValue; - } - return; - } - - if ((((pUI[0] & 3755991007u) == 1230002245u) && ((pUS[2] & 57311u) == 17746u) && ((pUB[6] & 223u) == 83u))) - { - if ((_bits & 0x20000L) != 0) - { - _headers._Expires = AppendValue(_headers._Expires, value); - } - else - { - _bits |= 0x20000L; - _headers._Expires = stringValue; - } - return; - } - - if ((((pUI[0] & 3755991007u) == 1162233170u) && ((pUS[2] & 57311u) == 17746u) && ((pUB[6] & 223u) == 82u))) - { - if ((_bits & 0x800000000L) != 0) - { - _headers._Referer = AppendValue(_headers._Referer, value); - } - else - { - _bits |= 0x800000000L; - _headers._Referer = stringValue; - } - return; - } - } - break; - - case 17: - { - if ((((pUL[0] & 16131858542891098079uL) == 5928221808112259668uL) && ((pUL[1] & 16131858542891098111uL) == 5641115115480565037uL) && ((pUB[16] & 223u) == 71u))) - { - if ((_bits & 0x40L) != 0) - { - _headers._TransferEncoding = AppendValue(_headers._TransferEncoding, value); - } - else - { - _bits |= 0x40L; - _headers._TransferEncoding = stringValue; - } - return; - } - - if ((((pUL[0] & 16131858542893195231uL) == 5064654363342751305uL) && ((pUL[1] & 16131858543427968991uL) == 4849894470315165001uL) && ((pUB[16] & 223u) == 69u))) - { - if ((_bits & 0x20000000L) != 0) - { - _headers._IfModifiedSince = AppendValue(_headers._IfModifiedSince, value); - } - else - { - _bits |= 0x20000000L; - _headers._IfModifiedSince = stringValue; - } - return; - } - } - break; - - case 3: - { - if ((((pUS[0] & 57311u) == 18774u) && ((pUB[2] & 223u) == 65u))) - { - if ((_bits & 0x100L) != 0) - { - _headers._Via = AppendValue(_headers._Via, value); - } - else - { - _bits |= 0x100L; - _headers._Via = stringValue; - } - return; - } - } - break; - - case 5: - { - if ((((pUI[0] & 3755991007u) == 1330400321u) && ((pUB[4] & 223u) == 87u))) - { - if ((_bits & 0x400L) != 0) - { - _headers._Allow = AppendValue(_headers._Allow, value); - } - else - { - _bits |= 0x400L; - _headers._Allow = stringValue; - } - return; - } - - if ((((pUI[0] & 3755991007u) == 1196310866u) && ((pUB[4] & 223u) == 69u))) - { - if ((_bits & 0x1000000000L) != 0) - { - _headers._Range = AppendValue(_headers._Range, value); - } - else - { - _bits |= 0x1000000000L; - _headers._Range = stringValue; - } - return; - } - } - break; - - case 12: - { - if ((((pUL[0] & 18437701552104792031uL) == 3266321689424580419uL) && ((pUI[2] & 3755991007u) == 1162893652u))) - { - if ((_bits & 0x800L) != 0) - { - _headers._ContentType = AppendValue(_headers._ContentType, value); - } - else - { - _bits |= 0x800L; - _headers._ContentType = stringValue; - } - return; - } - - if ((((pUL[0] & 16131858543427968991uL) == 6292178792217067853uL) && ((pUI[2] & 3755991007u) == 1396986433u))) - { - if ((_bits & 0x200000000L) != 0) - { - _headers._MaxForwards = AppendValue(_headers._MaxForwards, value); - } - else - { - _bits |= 0x200000000L; - _headers._MaxForwards = stringValue; - } - return; - } - } - break; - - case 16: - { - if ((((pUL[0] & 18437701552104792031uL) == 3266321689424580419uL) && ((pUL[1] & 16131858542891098079uL) == 5138124782612729413uL))) - { - if ((_bits & 0x1000L) != 0) - { - _headers._ContentEncoding = AppendValue(_headers._ContentEncoding, value); - } - else - { - _bits |= 0x1000L; - _headers._ContentEncoding = stringValue; - } - return; - } - - if ((((pUL[0] & 18437701552104792031uL) == 3266321689424580419uL) && ((pUL[1] & 16131858542891098079uL) == 4992030546487820620uL))) - { - if ((_bits & 0x2000L) != 0) - { - _headers._ContentLanguage = AppendValue(_headers._ContentLanguage, value); - } - else - { - _bits |= 0x2000L; - _headers._ContentLanguage = stringValue; - } - return; - } - - if ((((pUL[0] & 18437701552104792031uL) == 3266321689424580419uL) && ((pUL[1] & 16131858542891098079uL) == 5642809484339531596uL))) - { - if ((_bits & 0x4000L) != 0) - { - _headers._ContentLocation = AppendValue(_headers._ContentLocation, value); - } - else - { - _bits |= 0x4000L; - _headers._ContentLocation = stringValue; - } - return; - } - } - break; - - case 11: - { - if ((((pUL[0] & 18437701552104792031uL) == 3266321689424580419uL) && ((pUS[4] & 57311u) == 17485u) && ((pUB[10] & 255u) == 53u))) - { - if ((_bits & 0x8000L) != 0) - { - _headers._ContentMD5 = AppendValue(_headers._ContentMD5, value); - } - else - { - _bits |= 0x8000L; - _headers._ContentMD5 = stringValue; - } - return; - } - } - break; - - case 14: - { - if ((((pUL[0] & 16140865742145839071uL) == 4840617878229304129uL) && ((pUI[2] & 3755991007u) == 1397899592u) && ((pUS[6] & 57311u) == 21573u))) - { - if ((_bits & 0x100000L) != 0) - { - _headers._AcceptCharset = AppendValue(_headers._AcceptCharset, value); - } - else - { - _bits |= 0x100000L; - _headers._AcceptCharset = stringValue; - } - return; - } - - if ((((pUL[0] & 18437701552104792031uL) == 3266321689424580419uL) && ((pUI[2] & 3755991007u) == 1196311884u) && ((pUS[6] & 57311u) == 18516u))) - { - if (_contentLength.HasValue) - { - BadHttpRequestException.Throw(RequestRejectionReason.MultipleContentLengths); - } - else - { - _contentLength = ParseContentLength(value); - } - return; - } - } - break; - - case 15: - { - if ((((pUL[0] & 16140865742145839071uL) == 4984733066305160001uL) && ((pUI[2] & 3755991007u) == 1146045262u) && ((pUS[6] & 57311u) == 20041u) && ((pUB[14] & 223u) == 71u))) - { - if ((_bits & 0x200000L) != 0) - { - _headers._AcceptEncoding = AppendValue(_headers._AcceptEncoding, value); - } - else - { - _bits |= 0x200000L; - _headers._AcceptEncoding = stringValue; - } - return; - } - - if ((((pUL[0] & 16140865742145839071uL) == 5489136224570655553uL) && ((pUI[2] & 3755991007u) == 1430736449u) && ((pUS[6] & 57311u) == 18241u) && ((pUB[14] & 223u) == 69u))) - { - if ((_bits & 0x400000L) != 0) - { - _headers._AcceptLanguage = AppendValue(_headers._AcceptLanguage, value); - } - else - { - _bits |= 0x400000L; - _headers._AcceptLanguage = stringValue; - } - return; - } - } - break; - - case 8: - { - if ((((pUL[0] & 16131858542893195231uL) == 5207098233614845513uL))) - { - if ((_bits & 0x10000000L) != 0) - { - _headers._IfMatch = AppendValue(_headers._IfMatch, value); - } - else - { - _bits |= 0x10000000L; - _headers._IfMatch = stringValue; - } - return; - } - - if ((((pUL[0] & 16131858542893195231uL) == 4992044754422023753uL))) - { - if ((_bits & 0x80000000L) != 0) - { - _headers._IfRange = AppendValue(_headers._IfRange, value); - } - else - { - _bits |= 0x80000000L; - _headers._IfRange = stringValue; - } - return; - } - } - break; - - case 19: - { - if ((((pUL[0] & 16131858542893195231uL) == 4922237916571059785uL) && ((pUL[1] & 16131893727263186911uL) == 5283616559079179849uL) && ((pUS[8] & 57311u) == 17230u) && ((pUB[18] & 223u) == 69u))) - { - if ((_bits & 0x100000000L) != 0) - { - _headers._IfUnmodifiedSince = AppendValue(_headers._IfUnmodifiedSince, value); - } - else - { - _bits |= 0x100000000L; - _headers._IfUnmodifiedSince = stringValue; - } - return; - } - - if ((((pUL[0] & 16131893727263186911uL) == 6143241228466999888uL) && ((pUL[1] & 16131858542891098079uL) == 6071233043632179284uL) && ((pUS[8] & 57311u) == 20297u) && ((pUB[18] & 223u) == 78u))) - { - if ((_bits & 0x400000000L) != 0) - { - _headers._ProxyAuthorization = AppendValue(_headers._ProxyAuthorization, value); - } - else - { - _bits |= 0x400000000L; - _headers._ProxyAuthorization = stringValue; - } - return; - } - } - break; - - case 2: - { - if ((((pUS[0] & 57311u) == 17748u))) - { - if ((_bits & 0x2000000000L) != 0) - { - _headers._TE = AppendValue(_headers._TE, value); - } - else - { - _bits |= 0x2000000000L; - _headers._TE = stringValue; - } - return; - } - } - break; - - case 9: - { - if ((((pUL[0] & 16131858542891098079uL) == 6071217693351039572uL) && ((pUB[8] & 223u) == 69u))) - { - if ((_bits & 0x4000000000L) != 0) - { - _headers._Translate = AppendValue(_headers._Translate, value); - } - else - { - _bits |= 0x4000000000L; - _headers._Translate = stringValue; - } - return; - } - } - break; - - case 29: - { - if ((((pUL[0] & 16140865742145839071uL) == 4840616791602578241uL) && ((pUL[1] & 16140865742145839071uL) == 5921472988629454415uL) && ((pUL[2] & 16140865742145839071uL) == 5561193831494668613uL) && ((pUI[6] & 3755991007u) == 1330140229u) && ((pUB[28] & 223u) == 68u))) - { - if ((_bits & 0x20000000000L) != 0) - { - _headers._AccessControlRequestMethod = AppendValue(_headers._AccessControlRequestMethod, value); - } - else - { - _bits |= 0x20000000000L; - _headers._AccessControlRequestMethod = stringValue; - } - return; - } - } - break; - - case 30: - { - if ((((pUL[0] & 16140865742145839071uL) == 4840616791602578241uL) && ((pUL[1] & 16140865742145839071uL) == 5921472988629454415uL) && ((pUL[2] & 16140865742145839071uL) == 5200905861305028933uL) && ((pUI[6] & 3755991007u) == 1162101061u) && ((pUS[14] & 57311u) == 21330u))) - { - if ((_bits & 0x40000000000L) != 0) - { - _headers._AccessControlRequestHeaders = AppendValue(_headers._AccessControlRequestHeaders, value); - } - else - { - _bits |= 0x40000000000L; - _headers._AccessControlRequestHeaders = stringValue; - } - return; - } - } - break; + // We didn't already have a header set, so add a new one. + _bits |= flag; + values = new StringValues(valueStr); } - - AppendUnknownHeaders(pKeyBytes, keyLength, value); + else + { + // We already had a header set, so concatenate the new one. + values = AppendValue(values, valueStr); + } + } + else + { + // The header was not one of the "known" headers. + // Convert value to string first, because passing two spans causes 8 bytes stack zeroing in + // this method with rep stosd, which is slower than necessary. + var valueStr = value.GetAsciiOrUTF8StringNonNullCharacters(); + AppendUnknownHeaders(name, valueStr); + } } private struct HeaderReferences @@ -4280,6 +4040,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http public StringValues _TE; public StringValues _Translate; public StringValues _UserAgent; + public StringValues _DNT; + public StringValues _UpgradeInsecureRequests; public StringValues _Origin; public StringValues _AccessControlRequestMethod; public StringValues _AccessControlRequestHeaders; @@ -4374,12 +4136,16 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http case 39: goto HeaderUserAgent; case 40: - goto HeaderOrigin; + goto HeaderDNT; case 41: - goto HeaderAccessControlRequestMethod; + goto HeaderUpgradeInsecureRequests; case 42: - goto HeaderAccessControlRequestHeaders; + goto HeaderOrigin; case 43: + goto HeaderAccessControlRequestMethod; + case 44: + goto HeaderAccessControlRequestHeaders; + case 45: goto HeaderContentLength; default: goto ExtraHeaders; @@ -4665,32 +4431,46 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http _next = 40; return true; } - HeaderOrigin: // case 40 + HeaderDNT: // case 40 if ((_bits & 0x10000000000L) != 0) { - _current = new KeyValuePair("Origin", _collection._headers._Origin); + _current = new KeyValuePair("DNT", _collection._headers._DNT); _next = 41; return true; } - HeaderAccessControlRequestMethod: // case 41 + HeaderUpgradeInsecureRequests: // case 41 if ((_bits & 0x20000000000L) != 0) { - _current = new KeyValuePair("Access-Control-Request-Method", _collection._headers._AccessControlRequestMethod); + _current = new KeyValuePair("Upgrade-Insecure-Requests", _collection._headers._UpgradeInsecureRequests); _next = 42; return true; } - HeaderAccessControlRequestHeaders: // case 42 + HeaderOrigin: // case 42 if ((_bits & 0x40000000000L) != 0) { - _current = new KeyValuePair("Access-Control-Request-Headers", _collection._headers._AccessControlRequestHeaders); + _current = new KeyValuePair("Origin", _collection._headers._Origin); _next = 43; return true; } - HeaderContentLength: // case 43 + HeaderAccessControlRequestMethod: // case 43 + if ((_bits & 0x80000000000L) != 0) + { + _current = new KeyValuePair("Access-Control-Request-Method", _collection._headers._AccessControlRequestMethod); + _next = 44; + return true; + } + HeaderAccessControlRequestHeaders: // case 44 + if ((_bits & 0x100000000000L) != 0) + { + _current = new KeyValuePair("Access-Control-Request-Headers", _collection._headers._AccessControlRequestHeaders); + _next = 45; + return true; + } + HeaderContentLength: // case 45 if (_collection._contentLength.HasValue) { _current = new KeyValuePair("Content-Length", HeaderUtilities.FormatNonNegativeInt64(_collection._contentLength.Value)); - _next = 44; + _next = 46; return true; } ExtraHeaders: @@ -4711,8 +4491,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { 13,10,67,97,99,104,101,45,67,111,110,116,114,111,108,58,32,13,10,67,111,110,110,101,99,116,105,111,110,58,32,13,10,68,97,116,101,58,32,13,10,75,101,101,112,45,65,108,105,118,101,58,32,13,10,80,114,97,103,109,97,58,32,13,10,84,114,97,105,108,101,114,58,32,13,10,84,114,97,110,115,102,101,114,45,69,110,99,111,100,105,110,103,58,32,13,10,85,112,103,114,97,100,101,58,32,13,10,86,105,97,58,32,13,10,87,97,114,110,105,110,103,58,32,13,10,65,108,108,111,119,58,32,13,10,67,111,110,116,101,110,116,45,84,121,112,101,58,32,13,10,67,111,110,116,101,110,116,45,69,110,99,111,100,105,110,103,58,32,13,10,67,111,110,116,101,110,116,45,76,97,110,103,117,97,103,101,58,32,13,10,67,111,110,116,101,110,116,45,76,111,99,97,116,105,111,110,58,32,13,10,67,111,110,116,101,110,116,45,77,68,53,58,32,13,10,67,111,110,116,101,110,116,45,82,97,110,103,101,58,32,13,10,69,120,112,105,114,101,115,58,32,13,10,76,97,115,116,45,77,111,100,105,102,105,101,100,58,32,13,10,65,99,99,101,112,116,45,82,97,110,103,101,115,58,32,13,10,65,103,101,58,32,13,10,69,84,97,103,58,32,13,10,76,111,99,97,116,105,111,110,58,32,13,10,80,114,111,120,121,45,65,117,116,104,101,110,116,105,99,97,116,101,58,32,13,10,82,101,116,114,121,45,65,102,116,101,114,58,32,13,10,83,101,114,118,101,114,58,32,13,10,83,101,116,45,67,111,111,107,105,101,58,32,13,10,86,97,114,121,58,32,13,10,87,87,87,45,65,117,116,104,101,110,116,105,99,97,116,101,58,32,13,10,65,99,99,101,115,115,45,67,111,110,116,114,111,108,45,65,108,108,111,119,45,67,114,101,100,101,110,116,105,97,108,115,58,32,13,10,65,99,99,101,115,115,45,67,111,110,116,114,111,108,45,65,108,108,111,119,45,72,101,97,100,101,114,115,58,32,13,10,65,99,99,101,115,115,45,67,111,110,116,114,111,108,45,65,108,108,111,119,45,77,101,116,104,111,100,115,58,32,13,10,65,99,99,101,115,115,45,67,111,110,116,114,111,108,45,65,108,108,111,119,45,79,114,105,103,105,110,58,32,13,10,65,99,99,101,115,115,45,67,111,110,116,114,111,108,45,69,120,112,111,115,101,45,72,101,97,100,101,114,115,58,32,13,10,65,99,99,101,115,115,45,67,111,110,116,114,111,108,45,77,97,120,45,65,103,101,58,32,13,10,67,111,110,116,101,110,116,45,76,101,110,103,116,104,58,32, }; - - private long _bits = 0; private HeaderReferences _headers; public bool HasConnection => (_bits & 0x2L) != 0; @@ -6980,7 +6758,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return MaybeUnknown?.Remove(key) ?? false; } - protected override void ClearFast() { MaybeUnknown?.Clear(); @@ -8138,7 +7915,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } } while (tempBits != 0); } - private struct HeaderReferences { @@ -8537,8 +8313,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { 13,10,69,84,97,103,58,32, }; - - private long _bits = 0; private HeaderReferences _headers; @@ -8657,7 +8431,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return MaybeUnknown?.Remove(key) ?? false; } - protected override void ClearFast() { MaybeUnknown?.Clear(); @@ -8712,7 +8485,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return true; } - private struct HeaderReferences { diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.cs index f907c81d88..b6944d8021 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.cs @@ -16,6 +16,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { internal abstract class HttpHeaders : IHeaderDictionary { + protected long _bits = 0; protected long? _contentLength; protected bool _isReadOnly; protected Dictionary MaybeUnknown; diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs index 3010aecc61..d55706d827 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpParser.cs @@ -241,6 +241,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http } done = true; + handler.OnHeadersComplete(); return true; } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs index 8fec2adc03..8131508a82 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs @@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http private Stack, object>> _onCompleted; private object _abortLock = new object(); - private volatile bool _requestAborted; + private volatile bool _connectionAborted; private bool _preventRequestAbortedCancellation; private CancellationTokenSource _abortedCts; private CancellationToken? _manuallySetRequestAbortToken; @@ -74,6 +74,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http _context = context; ServerOptions = ServiceContext.ServerOptions; + HttpRequestHeaders = new HttpRequestHeaders(reuseHeaderValues: !ServerOptions.DisableStringReuse); HttpResponseControl = this; } @@ -124,8 +125,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http public string Scheme { get; set; } public HttpMethod Method { get; set; } public string PathBase { get; set; } + + protected string _parsedPath = null; public string Path { get; set; } + + protected string _parsedQueryString = null; public string QueryString { get; set; } + + protected string _parsedRawTarget = null; public string RawTarget { get; set; } public string HttpVersion @@ -250,7 +257,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return new CancellationToken(false); } - if (_requestAborted) + if (_connectionAborted) { return new CancellationToken(true); } @@ -275,7 +282,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http public bool HasFlushedHeaders => _requestProcessingStatus == RequestProcessingStatus.HeadersFlushed; - protected HttpRequestHeaders HttpRequestHeaders { get; } = new HttpRequestHeaders(); + protected HttpRequestHeaders HttpRequestHeaders { get; } protected HttpResponseHeaders HttpResponseHeaders { get; } = new HttpResponseHeaders(); @@ -368,18 +375,19 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http Scheme = _scheme; _manuallySetRequestAbortToken = null; - _preventRequestAbortedCancellation = false; - // Lock to prevent CancelRequestAbortedToken from attempting to cancel an disposed CTS. + // Lock to prevent CancelRequestAbortedToken from attempting to cancel a disposed CTS. + CancellationTokenSource localAbortCts = null; + lock (_abortLock) { - if (!_requestAborted) - { - _abortedCts?.Dispose(); - _abortedCts = null; - } + _preventRequestAbortedCancellation = false; + localAbortCts = _abortedCts; + _abortedCts = null; } + localAbortCts?.Dispose(); + if (_wrapperObjectsToDispose != null) { foreach (var disposable in _wrapperObjectsToDispose) @@ -435,9 +443,20 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { try { - _abortedCts.Cancel(); - _abortedCts.Dispose(); - _abortedCts = null; + CancellationTokenSource localAbortCts = null; + + lock (_abortLock) + { + if (_abortedCts != null && !_preventRequestAbortedCancellation) + { + localAbortCts = _abortedCts; + _abortedCts = null; + } + } + + // If we cancel the cts, we don't dispose as people may still be using + // the cts. It also isn't necessary to dispose a canceled cts. + localAbortCts?.Cancel(); } catch (Exception ex) { @@ -447,17 +466,20 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http protected void AbortRequest() { + var shouldScheduleCancellation = false; + lock (_abortLock) { - if (_requestAborted) + if (_connectionAborted) { return; } - _requestAborted = true; + shouldScheduleCancellation = _abortedCts != null && !_preventRequestAbortedCancellation; + _connectionAborted = true; } - if (_abortedCts != null) + if (shouldScheduleCancellation) { // Potentially calling user code. CancelRequestAbortedToken logs any exceptions. ServiceContext.Scheduler.Schedule(state => ((HttpProtocol)state).CancelRequestAbortedToken(), this); @@ -474,14 +496,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { lock (_abortLock) { - if (_requestAborted) + if (_connectionAborted) { return; } _preventRequestAbortedCancellation = true; - _abortedCts?.Dispose(); - _abortedCts = null; } } @@ -492,9 +512,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { BadHttpRequestException.Throw(RequestRejectionReason.TooManyHeaders); } - var valueString = value.GetAsciiOrUTF8StringNonNullCharacters(); - HttpRequestHeaders.Append(name, valueString); + HttpRequestHeaders.Append(name, value); + } + + public void OnHeadersComplete() + { + HttpRequestHeaders.OnHeadersComplete(); } public async Task ProcessRequestsAsync(IHttpApplication application) @@ -583,7 +607,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http // Run the application code for this request await application.ProcessRequestAsync(context); - if (!_requestAborted) + if (!_connectionAborted) { VerifyResponseContentLength(); } @@ -619,7 +643,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http // 4XX responses are written by TryProduceInvalidRequestResponse during connection tear down. if (_requestRejectedException == null) { - if (!_requestAborted) + if (!_connectionAborted) { // Call ProduceEnd() before consuming the rest of the request body to prevent // delaying clients waiting for the chunk terminator: @@ -651,7 +675,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http application.DisposeContext(context, _applicationException); // Even for non-keep-alive requests, try to consume the entire body to avoid RSTs. - if (!_requestAborted && _requestRejectedException == null && !messageBody.IsEmpty) + if (!_connectionAborted && _requestRejectedException == null && !messageBody.IsEmpty) { await messageBody.ConsumeAsync(); } @@ -953,7 +977,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http protected Task TryProduceInvalidRequestResponse() { // If _requestAborted is set, the connection has already been closed. - if (_requestRejectedException != null && !_requestAborted) + if (_requestRejectedException != null && !_connectionAborted) { return ProduceEnd(); } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpRequestHeaders.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpRequestHeaders.cs index 823cf6d126..586987ebdf 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpRequestHeaders.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpRequestHeaders.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Buffers.Text; using System.Collections; using System.Collections.Generic; using System.Runtime.CompilerServices; @@ -13,6 +14,50 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { internal sealed partial class HttpRequestHeaders : HttpHeaders { + private readonly bool _reuseHeaderValues; + private long _previousBits = 0; + + public HttpRequestHeaders(bool reuseHeaderValues = true) + { + _reuseHeaderValues = reuseHeaderValues; + } + + public void OnHeadersComplete() + { + var bitsToClear = _previousBits & ~_bits; + _previousBits = 0; + + if (bitsToClear != 0) + { + // Some previous headers were not reused or overwritten. + + // While they cannot be accessed by the current request (as they were not supplied by it) + // there is no point in holding on to them, so clear them now, + // to allow them to get collected by the GC. + Clear(bitsToClear); + } + } + + protected override void ClearFast() + { + if (!_reuseHeaderValues) + { + // If we aren't reusing headers clear them all + Clear(_bits); + } + else + { + // If we are reusing headers, store the currently set headers for comparison later + _previousBits = _bits; + } + + // Mark no headers as currently in use + _bits = 0; + // Clear ContentLength and any unknown headers as we will never reuse them + _contentLength = null; + MaybeUnknown?.Clear(); + } + private static long ParseContentLength(string value) { if (!HeaderUtilities.TryParseNonNegativeInt64(value, out var parsed)) @@ -23,34 +68,45 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return parsed; } + [MethodImpl(MethodImplOptions.NoInlining)] + private void AppendContentLength(Span value) + { + if (_contentLength.HasValue) + { + BadHttpRequestException.Throw(RequestRejectionReason.MultipleContentLengths); + } + + if (!Utf8Parser.TryParse(value, out long parsed, out var consumed) || + parsed < 0 || + consumed != value.Length) + { + BadHttpRequestException.Throw(RequestRejectionReason.InvalidContentLength, value.GetAsciiOrUTF8StringNonNullCharacters()); + } + + _contentLength = parsed; + } + [MethodImpl(MethodImplOptions.NoInlining)] private void SetValueUnknown(string key, StringValues value) { Unknown[key] = value; } - public unsafe void Append(Span name, string value) - { - fixed (byte* namePtr = name) - { - Append(namePtr, name.Length, value); - } - } - [MethodImpl(MethodImplOptions.NoInlining)] - private unsafe void AppendUnknownHeaders(byte* pKeyBytes, int keyLength, string value) + private unsafe void AppendUnknownHeaders(Span name, string valueString) { - string key = new string('\0', keyLength); + string key = new string('\0', name.Length); + fixed (byte* pKeyBytes = name) fixed (char* keyBuffer = key) { - if (!StringUtilities.TryGetAsciiString(pKeyBytes, keyBuffer, keyLength)) + if (!StringUtilities.TryGetAsciiString(pKeyBytes, keyBuffer, name.Length)) { BadHttpRequestException.Throw(RequestRejectionReason.InvalidCharactersInHeaderName); } } Unknown.TryGetValue(key, out var existing); - Unknown[key] = AppendValue(existing, value); + Unknown[key] = AppendValue(existing, valueString); } public Enumerator GetEnumerator() diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/IHttpHeadersHandler.cs b/src/Servers/Kestrel/Core/src/Internal/Http/IHttpHeadersHandler.cs index 9a322f0da9..0ed16148b8 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/IHttpHeadersHandler.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/IHttpHeadersHandler.cs @@ -8,5 +8,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http public interface IHttpHeadersHandler { void OnHeader(Span name, Span value); + void OnHeadersComplete(); } } \ No newline at end of file diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs index 9f42f5545f..fed15bdf83 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs @@ -1092,6 +1092,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 } } + public void OnHeadersComplete() + => _currentHeadersStream.OnHeadersComplete(); + private void ValidateHeader(Span name, Span value) { // http://httpwg.org/specs/rfc7540.html#rfc.section.8.1.2.1 diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/StringUtilities.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/StringUtilities.cs index edc3a8eeed..aea8290b66 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/StringUtilities.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/StringUtilities.cs @@ -2,13 +2,19 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Buffers.Binary; +using System.Diagnostics; using System.Numerics; using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Runtime.Intrinsics.X86; +using System.Text; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure { internal class StringUtilities { + [MethodImpl(MethodImplOptions.AggressiveOptimization)] public static unsafe bool TryGetAsciiString(byte* input, char* output, int count) { // Calculate end position @@ -109,6 +115,261 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure return isValid; } + [MethodImpl(MethodImplOptions.AggressiveOptimization)] + public unsafe static bool BytesOrdinalEqualsStringAndAscii(string previousValue, Span newValue) + { + // previousValue is a previously materialized string which *must* have already passed validation. + Debug.Assert(IsValidHeaderString(previousValue)); + + // Ascii bytes => Utf-16 chars will be the same length. + // The caller should have already compared lengths before calling this method. + // However; let's double check, and early exit if they are not the same length. + if (previousValue.Length != newValue.Length) + { + // Lengths don't match, so there cannot be an exact ascii conversion between the two. + goto NotEqual; + } + + // Use IntPtr values rather than int, to avoid unnecessary 32 -> 64 movs on 64-bit. + // Unfortunately this means we also need to cast to byte* for comparisons as IntPtr doesn't + // support operator comparisons (e.g. <=, >, etc). + // + // Note: Pointer comparison is unsigned, so we use the compare pattern (offset + length <= count) + // rather than (offset <= count - length) which we'd do with signed comparison to avoid overflow. + // This isn't problematic as we know the maximum length is max string length (from test above) + // which is a signed value so half the size of the unsigned pointer value so we can safely add + // a Vector.Count to it without overflowing. + var count = (IntPtr)newValue.Length; + var offset = (IntPtr)0; + + // Get references to the first byte in the span, and the first char in the string. + ref var bytes = ref MemoryMarshal.GetReference(newValue); + ref var str = ref MemoryMarshal.GetReference(previousValue.AsSpan()); + + do + { + // If Vector not-accelerated or remaining less than vector size + if (!Vector.IsHardwareAccelerated || (byte*)(offset + Vector.Count) > (byte*)count) + { + if (IntPtr.Size == 8) // Use Intrinsic switch for branch elimination + { + // 64-bit: Loop longs by default + while ((byte*)(offset + sizeof(long)) <= (byte*)count) + { + if (!WidenFourAsciiBytesToUtf16AndCompareToChars( + ref Unsafe.Add(ref str, offset), + Unsafe.ReadUnaligned(ref Unsafe.Add(ref bytes, offset))) || + !WidenFourAsciiBytesToUtf16AndCompareToChars( + ref Unsafe.Add(ref str, offset + 4), + Unsafe.ReadUnaligned(ref Unsafe.Add(ref bytes, offset + 4)))) + { + goto NotEqual; + } + + offset += sizeof(long); + } + if ((byte*)(offset + sizeof(int)) <= (byte*)count) + { + if (!WidenFourAsciiBytesToUtf16AndCompareToChars( + ref Unsafe.Add(ref str, offset), + Unsafe.ReadUnaligned(ref Unsafe.Add(ref bytes, offset)))) + { + goto NotEqual; + } + + offset += sizeof(int); + } + } + else + { + // 32-bit: Loop ints by default + while ((byte*)(offset + sizeof(int)) <= (byte*)count) + { + if (!WidenFourAsciiBytesToUtf16AndCompareToChars( + ref Unsafe.Add(ref str, offset), + Unsafe.ReadUnaligned(ref Unsafe.Add(ref bytes, offset)))) + { + goto NotEqual; + } + + offset += sizeof(int); + } + } + if ((byte*)(offset + sizeof(short)) <= (byte*)count) + { + if (!WidenTwoAsciiBytesToUtf16AndCompareToChars( + ref Unsafe.Add(ref str, offset), + Unsafe.ReadUnaligned(ref Unsafe.Add(ref bytes, offset)))) + { + goto NotEqual; + } + + offset += sizeof(short); + } + if ((byte*)offset < (byte*)count) + { + var ch = (char)Unsafe.Add(ref bytes, offset); + if (((ch & 0x80) != 0) || Unsafe.Add(ref str, offset) != ch) + { + goto NotEqual; + } + } + + // End of input reached, there are no inequalities via widening; so the input bytes are both ascii + // and a match to the string if it was converted via Encoding.ASCII.GetString(...) + return true; + } + + // Create a comparision vector for all bits being equal + var AllTrue = new Vector(-1); + // do/while as entry condition already checked, remaining length must be Vector.Count or larger. + do + { + // Read a Vector length from the input as bytes + var vector = Unsafe.ReadUnaligned>(ref Unsafe.Add(ref bytes, offset)); + if (!CheckBytesInAsciiRange(vector)) + { + goto NotEqual; + } + // Widen the bytes directly to chars (ushort) as if they were ascii. + // As widening doubles the size we get two vectors back. + Vector.Widen(vector, out var vector0, out var vector1); + // Read two char vectors from the string to perform the match. + var compare0 = Unsafe.ReadUnaligned>(ref Unsafe.As(ref Unsafe.Add(ref str, offset))); + var compare1 = Unsafe.ReadUnaligned>(ref Unsafe.As(ref Unsafe.Add(ref str, offset + Vector.Count))); + + // If the string is not ascii, then the widened bytes cannot match + // as each widened byte element as chars will be in the range 0-255 + // so cannot match any higher unicode values. + + // Compare to our all bits true comparision vector + if (!AllTrue.Equals( + // BitwiseAnd the two equals together + Vector.BitwiseAnd( + // Check equality for the two widened vectors + Vector.Equals(compare0, vector0), + Vector.Equals(compare1, vector1)))) + { + goto NotEqual; + } + + offset += Vector.Count; + } while ((byte*)(offset + Vector.Count) <= (byte*)count); + + // Vector path done, loop back to do non-Vector + // If is a exact multiple of vector size, bail now + } while ((byte*)offset < (byte*)count); + + // If we get here (input is exactly a multiple of Vector length) then there are no inequalities via widening; + // so the input bytes are both ascii and a match to the string if it was converted via Encoding.ASCII.GetString(...) + return true; + NotEqual: + return false; + } + + /// + /// Given a DWORD which represents a buffer of 4 bytes, widens the buffer into 4 WORDs and + /// compares them to the WORD buffer with machine endianness. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + private static bool WidenFourAsciiBytesToUtf16AndCompareToChars(ref char charStart, uint value) + { + if (!AllBytesInUInt32AreAscii(value)) + { + return false; + } + + if (Bmi2.X64.IsSupported) + { + // BMI2 will work regardless of the processor's endianness. + return Unsafe.ReadUnaligned(ref Unsafe.As(ref charStart)) == + Bmi2.X64.ParallelBitDeposit(value, 0x00FF00FF_00FF00FFul); + } + else + { + if (BitConverter.IsLittleEndian) + { + return charStart == (char)(byte)value && + Unsafe.Add(ref charStart, 1) == (char)(byte)(value >> 8) && + Unsafe.Add(ref charStart, 2) == (char)(byte)(value >> 16) && + Unsafe.Add(ref charStart, 3) == (char)(value >> 24); + } + else + { + return Unsafe.Add(ref charStart, 3) == (char)(byte)value && + Unsafe.Add(ref charStart, 2) == (char)(byte)(value >> 8) && + Unsafe.Add(ref charStart, 1) == (char)(byte)(value >> 16) && + charStart == (char)(value >> 24); + } + } + } + + /// + /// Given a WORD which represents a buffer of 2 bytes, widens the buffer into 2 WORDs and + /// compares them to the WORD buffer with machine endianness. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)] + private static bool WidenTwoAsciiBytesToUtf16AndCompareToChars(ref char charStart, ushort value) + { + if (!AllBytesInUInt16AreAscii(value)) + { + return false; + } + + if (Bmi2.IsSupported) + { + // BMI2 will work regardless of the processor's endianness. + return Unsafe.ReadUnaligned(ref Unsafe.As(ref charStart)) == + Bmi2.ParallelBitDeposit(value, 0x00FF00FFu); + } + else + { + if (BitConverter.IsLittleEndian) + { + return charStart == (char)(byte)value && + Unsafe.Add(ref charStart, 1) == (char)(byte)(value >> 8); + } + else + { + return Unsafe.Add(ref charStart, 1) == (char)(byte)value && + charStart == (char)(byte)(value >> 8); + } + } + } + + /// + /// Returns iff all bytes in are ASCII. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static bool AllBytesInUInt32AreAscii(uint value) + { + return ((value & 0x80808080u) == 0); + } + + /// + /// Returns iff all bytes in are ASCII. + /// + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static bool AllBytesInUInt16AreAscii(ushort value) + { + return ((value & 0x8080u) == 0); + } + + private unsafe static bool IsValidHeaderString(string value) + { + // Method for Debug.Assert to ensure BytesOrdinalEqualsStringAndAscii + // is not called with an unvalidated string comparitor. + try + { + if (value is null) return false; + new UTF8Encoding(encoderShouldEmitUTF8Identifier: false, throwOnInvalidBytes: true).GetByteCount(value); + return !value.Contains('\0'); + } + catch (DecoderFallbackException) { + return false; + } + } + private static readonly char[] s_encode16Chars = "0123456789ABCDEF".ToCharArray(); /// diff --git a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs index 3b29d1ee1a..bbe5d30b9a 100644 --- a/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs +++ b/src/Servers/Kestrel/Core/src/KestrelServerOptions.cs @@ -54,6 +54,15 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core /// public bool AllowSynchronousIO { get; set; } = false; + /// + /// Gets or sets a value that controls whether the string values materialized + /// will be reused across requests; if they match, or if the strings will always be reallocated. + /// + /// + /// Defaults to false. + /// + public bool DisableStringReuse { get; set; } = false; + /// /// Enables the Listen options callback to resolve and use services registered by the application during startup. /// Typically initialized by UseKestrel()"/>. diff --git a/src/Servers/Kestrel/Core/test/AsciiDecoding.cs b/src/Servers/Kestrel/Core/test/AsciiDecoding.cs index 7fa45513d2..128b79fdd0 100644 --- a/src/Servers/Kestrel/Core/test/AsciiDecoding.cs +++ b/src/Servers/Kestrel/Core/test/AsciiDecoding.cs @@ -24,16 +24,28 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests .Concat(byteRange) .ToArray(); - var s = new Span(byteArray).GetAsciiStringNonNullCharacters(); + var span = new Span(byteArray); - Assert.Equal(s.Length, byteArray.Length); - - for (var i = 1; i < byteArray.Length; i++) + for (var i = 0; i <= byteArray.Length; i++) { - var sb = (byte)s[i]; - var b = byteArray[i]; + // Test all the lengths to hit all the different length paths e.g. Vector, long, short, char + Test(span.Slice(i)); + } - Assert.Equal(sb, b); + static void Test(Span asciiBytes) + { + var s = asciiBytes.GetAsciiStringNonNullCharacters(); + + Assert.True(StringUtilities.BytesOrdinalEqualsStringAndAscii(s, asciiBytes)); + Assert.Equal(s.Length, asciiBytes.Length); + + for (var i = 0; i < asciiBytes.Length; i++) + { + var sb = (byte)s[i]; + var b = asciiBytes[i]; + + Assert.Equal(sb, b); + } } } @@ -59,8 +71,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests { var byteRange = Enumerable.Range(0, 16384 + 64).Select(x => (byte)((x & 0x7f) | 0x01)).ToArray(); var expectedByteRange = byteRange.Concat(byteRange).ToArray(); - - var s = new Span(expectedByteRange).GetAsciiStringNonNullCharacters(); + + var span = new Span(expectedByteRange); + var s = span.GetAsciiStringNonNullCharacters(); Assert.Equal(expectedByteRange.Length, s.Length); @@ -68,8 +81,74 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests { var sb = (byte)((s[i] & 0x7f) | 0x01); var b = expectedByteRange[i]; + } - Assert.Equal(sb, b); + Assert.True(StringUtilities.BytesOrdinalEqualsStringAndAscii(s, span)); + } + + [Fact] + private void DifferentLengthsAreNotEqual() + { + var byteRange = Enumerable.Range(0, 4096).Select(x => (byte)((x & 0x7f) | 0x01)).ToArray(); + var expectedByteRange = byteRange.Concat(byteRange).ToArray(); + + for (var i = 1; i < byteRange.Length; i++) + { + var span = new Span(expectedByteRange); + var s = span.GetAsciiStringNonNullCharacters(); + + Assert.True(StringUtilities.BytesOrdinalEqualsStringAndAscii(s, span)); + + // One off end + Assert.False(StringUtilities.BytesOrdinalEqualsStringAndAscii(s, span.Slice(0, span.Length - 1))); + Assert.False(StringUtilities.BytesOrdinalEqualsStringAndAscii(s.Substring(0, s.Length - 1), span)); + + // One off start + Assert.False(StringUtilities.BytesOrdinalEqualsStringAndAscii(s, span.Slice(1, span.Length - 1))); + Assert.False(StringUtilities.BytesOrdinalEqualsStringAndAscii(s.Substring(1, s.Length - 1), span)); + } + } + + [Fact] + private void AsciiBytesEqualAsciiStrings() + { + var byteRange = Enumerable.Range(1, 127).Select(x => (byte)x); + + var byteArray = byteRange + .Concat(byteRange) + .Concat(byteRange) + .Concat(byteRange) + .Concat(byteRange) + .Concat(byteRange) + .ToArray(); + + var span = new Span(byteArray); + + for (var i = 0; i <= byteArray.Length; i++) + { + // Test all the lengths to hit all the different length paths e.g. Vector, long, short, char + Test(span.Slice(i)); + } + + static void Test(Span asciiBytes) + { + var s = asciiBytes.GetAsciiStringNonNullCharacters(); + + // Should start as equal + Assert.True(StringUtilities.BytesOrdinalEqualsStringAndAscii(s, asciiBytes)); + + for (var i = 0; i < asciiBytes.Length; i++) + { + var b = asciiBytes[i]; + + // Change one byte, ensure is not equal + asciiBytes[i] = (byte)(b + 1); + Assert.False(StringUtilities.BytesOrdinalEqualsStringAndAscii(s, asciiBytes)); + + // Change byte back for next iteration, ensure is equal again + asciiBytes[i] = b; + Assert.True(StringUtilities.BytesOrdinalEqualsStringAndAscii(s, asciiBytes)); + } } } } diff --git a/src/Servers/Kestrel/Core/test/HPackDecoderTests.cs b/src/Servers/Kestrel/Core/test/HPackDecoderTests.cs index 598a7a6ed5..d9318e01e9 100644 --- a/src/Servers/Kestrel/Core/test/HPackDecoderTests.cs +++ b/src/Servers/Kestrel/Core/test/HPackDecoderTests.cs @@ -103,6 +103,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests _decodedHeaders[name.GetAsciiStringNonNullCharacters()] = value.GetAsciiStringNonNullCharacters(); } + void IHttpHeadersHandler.OnHeadersComplete() { } + [Fact] public void DecodesIndexedHeaderField_StaticTable() { diff --git a/src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs b/src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs index ce1f86e7a6..6ac94c384a 100644 --- a/src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs +++ b/src/Servers/Kestrel/Core/test/Http1ConnectionTests.cs @@ -729,6 +729,20 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests Assert.False(_http1Connection.RequestAborted.IsCancellationRequested); } + [Fact] + public void RequestAbortedTokenIsFullyUsableAfterCancellation() + { + var originalToken = _http1Connection.RequestAborted; + var originalRegistration = originalToken.Register(() => { }); + + _http1Connection.Abort(new ConnectionAbortedException()); + + Assert.True(originalToken.WaitHandle.WaitOne(TestConstants.DefaultTimeout)); + Assert.True(_http1Connection.RequestAborted.WaitHandle.WaitOne(TestConstants.DefaultTimeout)); + + Assert.Equal(originalToken, originalRegistration.Token); + } + [Fact] public void RequestAbortedTokenIsUsableAfterCancellation() { diff --git a/src/Servers/Kestrel/Core/test/HttpParserTests.cs b/src/Servers/Kestrel/Core/test/HttpParserTests.cs index 825ee085de..0c7abe1b60 100644 --- a/src/Servers/Kestrel/Core/test/HttpParserTests.cs +++ b/src/Servers/Kestrel/Core/test/HttpParserTests.cs @@ -483,6 +483,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests Headers[name.GetAsciiStringNonNullCharacters()] = value.GetAsciiStringNonNullCharacters(); } + void IHttpHeadersHandler.OnHeadersComplete() { } + public void OnStartLine(HttpMethod method, HttpVersion version, Span target, Span path, Span query, Span customMethod, bool pathEncoded) { Method = method != HttpMethod.Custom ? HttpUtilities.MethodToString(method) : customMethod.GetAsciiStringNonNullCharacters(); diff --git a/src/Servers/Kestrel/Core/test/HttpRequestHeadersTests.cs b/src/Servers/Kestrel/Core/test/HttpRequestHeadersTests.cs index 1eef7c792c..a7603b9190 100644 --- a/src/Servers/Kestrel/Core/test/HttpRequestHeadersTests.cs +++ b/src/Servers/Kestrel/Core/test/HttpRequestHeadersTests.cs @@ -3,11 +3,13 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Text; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.Extensions.Primitives; using Xunit; +using static CodeGenerator.KnownHeaders; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests { @@ -307,8 +309,347 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests var encoding = Encoding.GetEncoding("iso-8859-1"); var exception = Assert.Throws( - () => headers.Append(encoding.GetBytes(key), "value")); + () => headers.Append(encoding.GetBytes(key), Encoding.ASCII.GetBytes("value"))); Assert.Equal(StatusCodes.Status400BadRequest, exception.StatusCode); } + + [Theory] + [MemberData(nameof(KnownRequestHeaders))] + public void ValueReuseOnlyWhenAllowed(bool reuseValue, KnownHeader header) + { + const string HeaderValue = "Hello"; + var headers = new HttpRequestHeaders(reuseHeaderValues: reuseValue); + + for (var i = 0; i < 6; i++) + { + var prevName = ChangeNameCase(header.Name, variant: i); + var nextName = ChangeNameCase(header.Name, variant: i + 1); + + var values = GetHeaderValues(headers, prevName, nextName, HeaderValue, HeaderValue); + + Assert.Equal(HeaderValue, values.PrevHeaderValue); + Assert.NotSame(HeaderValue, values.PrevHeaderValue); + + Assert.Equal(HeaderValue, values.NextHeaderValue); + Assert.NotSame(HeaderValue, values.NextHeaderValue); + + Assert.Equal(values.PrevHeaderValue, values.NextHeaderValue); + if (reuseValue) + { + // When materalized string is reused previous and new should be the same object + Assert.Same(values.PrevHeaderValue, values.NextHeaderValue); + } + else + { + // When materalized string is not reused previous and new should be the different objects + Assert.NotSame(values.PrevHeaderValue, values.NextHeaderValue); + } + } + } + + [Theory] + [MemberData(nameof(KnownRequestHeaders))] + public void ValueReuseChangedValuesOverwrite(bool reuseValue, KnownHeader header) + { + const string HeaderValue1 = "Hello1"; + const string HeaderValue2 = "Hello2"; + var headers = new HttpRequestHeaders(reuseHeaderValues: reuseValue); + + for (var i = 0; i < 6; i++) + { + var prevName = ChangeNameCase(header.Name, variant: i); + var nextName = ChangeNameCase(header.Name, variant: i + 1); + + var values = GetHeaderValues(headers, prevName, nextName, HeaderValue1, HeaderValue2); + + Assert.Equal(HeaderValue1, values.PrevHeaderValue); + Assert.NotSame(HeaderValue1, values.PrevHeaderValue); + + Assert.Equal(HeaderValue2, values.NextHeaderValue); + Assert.NotSame(HeaderValue2, values.NextHeaderValue); + + Assert.NotEqual(values.PrevHeaderValue, values.NextHeaderValue); + } + } + + [Theory] + [MemberData(nameof(KnownRequestHeaders))] + public void ValueReuseMissingValuesClear(bool reuseValue, KnownHeader header) + { + const string HeaderValue1 = "Hello1"; + var headers = new HttpRequestHeaders(reuseHeaderValues: reuseValue); + + for (var i = 0; i < 6; i++) + { + var prevName = ChangeNameCase(header.Name, variant: i); + var nextName = ChangeNameCase(header.Name, variant: i + 1); + + var values = GetHeaderValues(headers, prevName, nextName, HeaderValue1, nextValue: null); + + Assert.Equal(HeaderValue1, values.PrevHeaderValue); + Assert.NotSame(HeaderValue1, values.PrevHeaderValue); + + Assert.Equal(string.Empty, values.NextHeaderValue); + + Assert.NotEqual(values.PrevHeaderValue, values.NextHeaderValue); + } + } + + [Theory] + [MemberData(nameof(KnownRequestHeaders))] + public void ValueReuseNeverWhenNotAscii(bool reuseValue, KnownHeader header) + { + const string HeaderValue = "Hello \u03a0"; + + var headers = new HttpRequestHeaders(reuseHeaderValues: reuseValue); + + for (var i = 0; i < 6; i++) + { + var prevName = ChangeNameCase(header.Name, variant: i); + var nextName = ChangeNameCase(header.Name, variant: i + 1); + + var values = GetHeaderValues(headers, prevName, nextName, HeaderValue, HeaderValue); + + Assert.Equal(HeaderValue, values.PrevHeaderValue); + Assert.NotSame(HeaderValue, values.PrevHeaderValue); + + Assert.Equal(HeaderValue, values.NextHeaderValue); + Assert.NotSame(HeaderValue, values.NextHeaderValue); + + Assert.Equal(values.PrevHeaderValue, values.NextHeaderValue); + + Assert.NotSame(values.PrevHeaderValue, values.NextHeaderValue); + } + } + + [Theory] + [MemberData(nameof(KnownRequestHeaders))] + public void ValueReuseLatin1NotConfusedForUtf16AndStillRejected(bool reuseValue, KnownHeader header) + { + var headers = new HttpRequestHeaders(reuseHeaderValues: reuseValue); + + var headerValue = new char[127]; // 64 + 32 + 16 + 8 + 4 + 2 + 1 + for (var i = 0; i < headerValue.Length; i++) + { + headerValue[i] = 'a'; + } + + for (var i = 0; i < headerValue.Length; i++) + { + // Set non-ascii Latin char that is valid Utf16 when widened; but not a valid utf8 -> utf16 conversion. + headerValue[i] = '\u00a3'; + + for (var mode = 0; mode <= 1; mode++) + { + string headerValueUtf16Latin1CrossOver; + if (mode == 0) + { + // Full length + headerValueUtf16Latin1CrossOver = new string(headerValue); + } + else + { + // Truncated length (to ensure different paths from changing lengths in matching) + headerValueUtf16Latin1CrossOver = new string(headerValue.AsSpan().Slice(0, i + 1)); + } + + headers.Reset(); + + var headerName = Encoding.ASCII.GetBytes(header.Name).AsSpan(); + var prevSpan = Encoding.UTF8.GetBytes(headerValueUtf16Latin1CrossOver).AsSpan(); + + headers.Append(headerName, prevSpan); + headers.OnHeadersComplete(); + var prevHeaderValue = ((IHeaderDictionary)headers)[header.Name].ToString(); + + Assert.Equal(headerValueUtf16Latin1CrossOver, prevHeaderValue); + Assert.NotSame(headerValueUtf16Latin1CrossOver, prevHeaderValue); + + headers.Reset(); + + Assert.Throws(() => + { + var headerName = Encoding.ASCII.GetBytes(header.Name).AsSpan(); + var nextSpan = Encoding.GetEncoding("iso-8859-1").GetBytes(headerValueUtf16Latin1CrossOver).AsSpan(); + + Assert.False(nextSpan.SequenceEqual(Encoding.ASCII.GetBytes(headerValueUtf16Latin1CrossOver))); + + headers.Append(headerName, nextSpan); + }); + } + + // Reset back to Ascii + headerValue[i] = 'a'; + } + } + + [Fact] + public void ValueReuseNeverWhenUnknownHeader() + { + const string HeaderName = "An-Unknown-Header"; + const string HeaderValue = "Hello"; + + var headers = new HttpRequestHeaders(reuseHeaderValues: true); + + for (var i = 0; i < 6; i++) + { + var prevName = ChangeNameCase(HeaderName, variant: i); + var nextName = ChangeNameCase(HeaderName, variant: i + 1); + + var values = GetHeaderValues(headers, prevName, nextName, HeaderValue, HeaderValue); + + Assert.Equal(HeaderValue, values.PrevHeaderValue); + Assert.NotSame(HeaderValue, values.PrevHeaderValue); + + Assert.Equal(HeaderValue, values.NextHeaderValue); + Assert.NotSame(HeaderValue, values.NextHeaderValue); + + Assert.Equal(values.PrevHeaderValue, values.NextHeaderValue); + + Assert.NotSame(values.PrevHeaderValue, values.NextHeaderValue); + } + } + + [Theory] + [MemberData(nameof(KnownRequestHeaders))] + public void ValueReuseEmptyAfterReset(bool reuseValue, KnownHeader header) + { + const string HeaderValue = "Hello"; + + var headers = new HttpRequestHeaders(reuseHeaderValues: reuseValue); + var headerName = Encoding.ASCII.GetBytes(header.Name).AsSpan(); + var prevSpan = Encoding.UTF8.GetBytes(HeaderValue).AsSpan(); + + headers.Append(headerName, prevSpan); + headers.OnHeadersComplete(); + var prevHeaderValue = ((IHeaderDictionary)headers)[header.Name].ToString(); + + Assert.NotNull(prevHeaderValue); + Assert.NotEqual(string.Empty, prevHeaderValue); + Assert.Equal(HeaderValue, prevHeaderValue); + Assert.NotSame(HeaderValue, prevHeaderValue); + Assert.Single(headers); + var count = headers.Count; + Assert.Equal(1, count); + + headers.Reset(); + + // Empty after reset + var nextHeaderValue = ((IHeaderDictionary)headers)[header.Name].ToString(); + + Assert.NotNull(nextHeaderValue); + Assert.Equal(string.Empty, nextHeaderValue); + Assert.NotEqual(HeaderValue, nextHeaderValue); + Assert.Empty(headers); + count = headers.Count; + Assert.Equal(0, count); + + headers.OnHeadersComplete(); + + // Still empty after complete + nextHeaderValue = ((IHeaderDictionary)headers)[header.Name].ToString(); + + Assert.NotNull(nextHeaderValue); + Assert.Equal(string.Empty, nextHeaderValue); + Assert.NotEqual(HeaderValue, nextHeaderValue); + Assert.Empty(headers); + count = headers.Count; + Assert.Equal(0, count); + } + + [Theory] + [MemberData(nameof(KnownRequestHeaders))] + public void MultiValueReuseEmptyAfterReset(bool reuseValue, KnownHeader header) + { + const string HeaderValue1 = "Hello1"; + const string HeaderValue2 = "Hello2"; + + var headers = new HttpRequestHeaders(reuseHeaderValues: reuseValue); + var headerName = Encoding.ASCII.GetBytes(header.Name).AsSpan(); + var prevSpan1 = Encoding.UTF8.GetBytes(HeaderValue1).AsSpan(); + var prevSpan2 = Encoding.UTF8.GetBytes(HeaderValue2).AsSpan(); + + headers.Append(headerName, prevSpan1); + headers.Append(headerName, prevSpan2); + headers.OnHeadersComplete(); + var prevHeaderValue = ((IHeaderDictionary)headers)[header.Name]; + + Assert.Equal(2, prevHeaderValue.Count); + + Assert.NotEqual(string.Empty, prevHeaderValue.ToString()); + Assert.Single(headers); + var count = headers.Count; + Assert.Equal(1, count); + + headers.Reset(); + + // Empty after reset + var nextHeaderValue = ((IHeaderDictionary)headers)[header.Name].ToString(); + + Assert.NotNull(nextHeaderValue); + Assert.Equal(string.Empty, nextHeaderValue); + Assert.Empty(headers); + count = headers.Count; + Assert.Equal(0, count); + + headers.OnHeadersComplete(); + + // Still empty after complete + nextHeaderValue = ((IHeaderDictionary)headers)[header.Name].ToString(); + + Assert.NotNull(nextHeaderValue); + Assert.Equal(string.Empty, nextHeaderValue); + Assert.Empty(headers); + count = headers.Count; + Assert.Equal(0, count); + } + + private static (string PrevHeaderValue, string NextHeaderValue) GetHeaderValues(HttpRequestHeaders headers, string prevName, string nextName, string prevValue, string nextValue) + { + headers.Reset(); + var headerName = Encoding.ASCII.GetBytes(prevName).AsSpan(); + var prevSpan = Encoding.UTF8.GetBytes(prevValue).AsSpan(); + + headers.Append(headerName, prevSpan); + headers.OnHeadersComplete(); + var prevHeaderValue = ((IHeaderDictionary)headers)[prevName].ToString(); + + headers.Reset(); + + if (nextValue != null) + { + headerName = Encoding.ASCII.GetBytes(prevName).AsSpan(); + var nextSpan = Encoding.UTF8.GetBytes(nextValue).AsSpan(); + headers.Append(headerName, nextSpan); + } + + headers.OnHeadersComplete(); + + var newHeaderValue = ((IHeaderDictionary)headers)[nextName].ToString(); + + return (prevHeaderValue, newHeaderValue); + } + + private static string ChangeNameCase(string name, int variant) + { + switch ((variant / 2) % 3) + { + case 0: + return name; + case 1: + return name.ToLowerInvariant(); + case 2: + return name.ToUpperInvariant(); + } + + // Never reached + Assert.False(true); + return name; + } + + // Content-Length is numeric not a string, so we exclude it from the string reuse tests + public static IEnumerable KnownRequestHeaders => + RequestHeaders.Where(h => h.Name != "Content-Length").Select(h => new object[] { true, h }).Concat( + RequestHeaders.Where(h => h.Name != "Content-Length").Select(h => new object[] { false, h })); } } diff --git a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj index 797278050b..b334a87ed9 100644 --- a/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj +++ b/src/Servers/Kestrel/Core/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests.csproj @@ -10,6 +10,7 @@ + diff --git a/src/Servers/Kestrel/Core/test/StartLineTests.cs b/src/Servers/Kestrel/Core/test/StartLineTests.cs new file mode 100644 index 0000000000..9b9656fbba --- /dev/null +++ b/src/Servers/Kestrel/Core/test/StartLineTests.cs @@ -0,0 +1,536 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Buffers; +using System.IO.Pipelines; +using System.Text; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Server.Kestrel.Core; +using Microsoft.AspNetCore.Server.Kestrel.Core.Internal; +using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; +using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; +using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal; +using Moq; +using Xunit; + +namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests +{ + public class StartLineTests : IDisposable + { + private readonly static IKestrelTrace _trace = Mock.Of(); + + private IDuplexPipe Transport { get; } + private MemoryPool MemoryPool { get; } + private Http1Connection Http1Connection { get; } + private Http1ParsingHandler ParsingHandler {get;} + private IHttpParser Parser { get; } + + [Fact] + public void InOriginForm() + { + var rawTarget = "/path%20with%20spaces?q=123&w=xyzw1"; + var path = "/path with spaces"; + var query = "?q=123&w=xyzw1"; + Http1Connection.Reset(); + // RawTarget, Path, QueryString are null after reset + Assert.Null(Http1Connection.RawTarget); + Assert.Null(Http1Connection.Path); + Assert.Null(Http1Connection.QueryString); + + var ros = new ReadOnlySequence(Encoding.ASCII.GetBytes($"POST {rawTarget} HTTP/1.1\r\n")); + Assert.True(Parser.ParseRequestLine(ParsingHandler, ros, out _, out _)); + + // Equal the inputs. + Assert.Equal(rawTarget, Http1Connection.RawTarget); + Assert.Equal(path, Http1Connection.Path); + Assert.Equal(query, Http1Connection.QueryString); + + // But not the same as the inputs. + Assert.NotSame(rawTarget, Http1Connection.RawTarget); + Assert.NotSame(path, Http1Connection.Path); + Assert.NotSame(query, Http1Connection.QueryString); + } + + [Fact] + public void InAuthorityForm() + { + var rawTarget = "example.com:1234"; + var path = string.Empty; + var query = string.Empty; + Http1Connection.Reset(); + // RawTarget, Path, QueryString are null after reset + Assert.Null(Http1Connection.RawTarget); + Assert.Null(Http1Connection.Path); + Assert.Null(Http1Connection.QueryString); + + var ros = new ReadOnlySequence(Encoding.ASCII.GetBytes($"CONNECT {rawTarget} HTTP/1.1\r\n")); + Assert.True(Parser.ParseRequestLine(ParsingHandler, ros, out _, out _)); + + // Equal the inputs. + Assert.Equal(rawTarget, Http1Connection.RawTarget); + Assert.Equal(path, Http1Connection.Path); + Assert.Equal(query, Http1Connection.QueryString); + + // But not the same as the inputs. + Assert.NotSame(rawTarget, Http1Connection.RawTarget); + // Empty strings, so interned and the same. + Assert.Same(path, Http1Connection.Path); + Assert.Same(query, Http1Connection.QueryString); + } + + [Fact] + public void InAbsoluteForm() + { + var rawTarget = "http://localhost/path1?q=123&w=xyzw"; + var path = "/path1"; + var query = "?q=123&w=xyzw"; + Http1Connection.Reset(); + // RawTarget, Path, QueryString are null after reset + Assert.Null(Http1Connection.RawTarget); + Assert.Null(Http1Connection.Path); + Assert.Null(Http1Connection.QueryString); + + var ros = new ReadOnlySequence(Encoding.ASCII.GetBytes($"CONNECT {rawTarget} HTTP/1.1\r\n")); + Assert.True(Parser.ParseRequestLine(ParsingHandler, ros, out _, out _)); + + // Equal the inputs. + Assert.Equal(rawTarget, Http1Connection.RawTarget); + Assert.Equal(path, Http1Connection.Path); + Assert.Equal(query, Http1Connection.QueryString); + + // But not the same as the inputs. + Assert.NotSame(rawTarget, Http1Connection.RawTarget); + Assert.NotSame(path, Http1Connection.Path); + Assert.NotSame(query, Http1Connection.QueryString); + } + + [Fact] + public void InAsteriskForm() + { + var rawTarget = "*"; + var path = string.Empty; + var query = string.Empty; + Http1Connection.Reset(); + // RawTarget, Path, QueryString are null after reset + Assert.Null(Http1Connection.RawTarget); + Assert.Null(Http1Connection.Path); + Assert.Null(Http1Connection.QueryString); + + var ros = new ReadOnlySequence(Encoding.ASCII.GetBytes($"OPTIONS {rawTarget} HTTP/1.1\r\n")); + Assert.True(Parser.ParseRequestLine(ParsingHandler, ros, out _, out _)); + + // Equal the inputs. + Assert.Equal(rawTarget, Http1Connection.RawTarget); + Assert.Equal(path, Http1Connection.Path); + Assert.Equal(query, Http1Connection.QueryString); + + // Asterisk is interned string, so the same. + Assert.Same(rawTarget, Http1Connection.RawTarget); + // Empty strings, so interned and the same. + Assert.Same(path, Http1Connection.Path); + Assert.Same(query, Http1Connection.QueryString); + } + + [Fact] + public void DifferentFormsWorkTogether() + { + // InOriginForm + var rawTarget = "/a%20path%20with%20spaces?q=123&w=xyzw12"; + var path = "/a path with spaces"; + var query = "?q=123&w=xyzw12"; + Http1Connection.Reset(); + var ros = new ReadOnlySequence(Encoding.ASCII.GetBytes($"POST {rawTarget} HTTP/1.1\r\n")); + Assert.True(Parser.ParseRequestLine(ParsingHandler, ros, out _, out _)); + + // Equal the inputs. + Assert.Equal(rawTarget, Http1Connection.RawTarget); + Assert.Equal(path, Http1Connection.Path); + Assert.Equal(query, Http1Connection.QueryString); + + // But not the same as the inputs. + Assert.NotSame(rawTarget, Http1Connection.RawTarget); + Assert.NotSame(path, Http1Connection.Path); + Assert.NotSame(query, Http1Connection.QueryString); + + InAuthorityForm(); + + InOriginForm(); + InAbsoluteForm(); + + InOriginForm(); + InAsteriskForm(); + + InAuthorityForm(); + InAsteriskForm(); + + InAbsoluteForm(); + InAuthorityForm(); + + InAbsoluteForm(); + InAsteriskForm(); + + InAbsoluteForm(); + InAuthorityForm(); + } + + [Theory] + [InlineData("/abs/path", "/abs/path", "")] + [InlineData("/", "/", "")] + [InlineData("/path", "/path", "")] + [InlineData("/?q=123&w=xyz", "/", "?q=123&w=xyz")] + [InlineData("/path?q=123&w=xyz", "/path", "?q=123&w=xyz")] + [InlineData("/path%20with%20space?q=abc%20123", "/path with space", "?q=abc%20123")] + public void OriginForms(string rawTarget, string path, string query) + { + Http1Connection.Reset(); + var ros = new ReadOnlySequence(Encoding.ASCII.GetBytes($"GET {rawTarget} HTTP/1.1\r\n")); + Assert.True(Parser.ParseRequestLine(ParsingHandler, ros, out _, out _)); + + var prevRequestUrl = Http1Connection.RawTarget; + var prevPath = Http1Connection.Path; + var prevQuery = Http1Connection.QueryString; + + // Identical requests keep same materialized string values + for (var i = 0; i < 5; i++) + { + Http1Connection.Reset(); + // RawTarget, Path, QueryString are null after reset + Assert.Null(Http1Connection.RawTarget); + Assert.Null(Http1Connection.Path); + Assert.Null(Http1Connection.QueryString); + + // Parser decodes % encoding in place, so we need to recreate the ROS + ros = new ReadOnlySequence(Encoding.ASCII.GetBytes($"GET {rawTarget} HTTP/1.1\r\n")); + Assert.True(Parser.ParseRequestLine(ParsingHandler, ros, out _, out _)); + + // Equal the inputs. + Assert.Equal(rawTarget, Http1Connection.RawTarget); + Assert.Equal(path, Http1Connection.Path); + Assert.Equal(query, Http1Connection.QueryString); + + // But not the same as the inputs. + + Assert.NotSame(rawTarget, Http1Connection.RawTarget); + Assert.NotSame(path, Http1Connection.Path); + // string.Empty is used for empty strings, so should be the same. + Assert.True(query.Length == 0 || !ReferenceEquals(query, Http1Connection.QueryString)); + + // However, materalized strings are reused if generated for previous requests. + + Assert.Same(prevRequestUrl, Http1Connection.RawTarget); + Assert.Same(prevPath, Http1Connection.Path); + Assert.Same(prevQuery, Http1Connection.QueryString); + + prevRequestUrl = Http1Connection.RawTarget; + prevPath = Http1Connection.Path; + prevQuery = Http1Connection.QueryString; + } + + // Different OriginForm request changes values + + rawTarget = "/path1?q=123&w=xyzw"; + path = "/path1"; + query = "?q=123&w=xyzw"; + + Http1Connection.Reset(); + ros = new ReadOnlySequence(Encoding.ASCII.GetBytes($"GET {rawTarget} HTTP/1.1\r\n")); + Parser.ParseRequestLine(ParsingHandler, ros, out _, out _); + + // Equal the inputs. + Assert.Equal(rawTarget, Http1Connection.RawTarget); + Assert.Equal(path, Http1Connection.Path); + Assert.Equal(query, Http1Connection.QueryString); + + // But not the same as the inputs. + Assert.NotSame(rawTarget, Http1Connection.RawTarget); + Assert.NotSame(path, Http1Connection.Path); + Assert.NotSame(query, Http1Connection.QueryString); + + // Not equal previous request. + Assert.NotEqual(prevRequestUrl, Http1Connection.RawTarget); + Assert.NotEqual(prevPath, Http1Connection.Path); + Assert.NotEqual(prevQuery, Http1Connection.QueryString); + + DifferentFormsWorkTogether(); + } + + [Theory] + [InlineData("http://localhost/abs/path", "/abs/path", "")] + [InlineData("https://localhost/abs/path", "/abs/path", "")] // handles mismatch scheme + [InlineData("https://localhost:22/abs/path", "/abs/path", "")] // handles mismatched ports + [InlineData("https://differenthost/abs/path", "/abs/path", "")] // handles mismatched hostname + [InlineData("http://localhost/", "/", "")] + [InlineData("http://root@contoso.com/path", "/path", "")] + [InlineData("http://root:password@contoso.com/path", "/path", "")] + [InlineData("https://localhost/", "/", "")] + [InlineData("http://localhost", "/", "")] + [InlineData("http://127.0.0.1/", "/", "")] + [InlineData("http://[::1]/", "/", "")] + [InlineData("http://[::1]:8080/", "/", "")] + [InlineData("http://localhost?q=123&w=xyz", "/", "?q=123&w=xyz")] + [InlineData("http://localhost/?q=123&w=xyz", "/", "?q=123&w=xyz")] + [InlineData("http://localhost/path?q=123&w=xyz", "/path", "?q=123&w=xyz")] + [InlineData("http://localhost/path%20with%20space?q=abc%20123", "/path with space", "?q=abc%20123")] + public void AbsoluteForms(string rawTarget, string path, string query) + { + Http1Connection.Reset(); + var ros = new ReadOnlySequence(Encoding.ASCII.GetBytes($"GET {rawTarget} HTTP/1.1\r\n")); + Assert.True(Parser.ParseRequestLine(ParsingHandler, ros, out _, out _)); + + var prevRequestUrl = Http1Connection.RawTarget; + var prevPath = Http1Connection.Path; + var prevQuery = Http1Connection.QueryString; + + // Identical requests keep same materialized string values + for (var i = 0; i < 5; i++) + { + Http1Connection.Reset(); + // RawTarget, Path, QueryString are null after reset + Assert.Null(Http1Connection.RawTarget); + Assert.Null(Http1Connection.Path); + Assert.Null(Http1Connection.QueryString); + + ros = new ReadOnlySequence(Encoding.ASCII.GetBytes($"GET {rawTarget} HTTP/1.1\r\n")); + Assert.True(Parser.ParseRequestLine(ParsingHandler, ros, out _, out _)); + + // Equal the inputs. + Assert.Equal(rawTarget, Http1Connection.RawTarget); + Assert.Equal(path, Http1Connection.Path); + Assert.Equal(query, Http1Connection.QueryString); + + // But not the same as the inputs. + + Assert.NotSame(rawTarget, Http1Connection.RawTarget); + Assert.NotSame(path, Http1Connection.Path); + // string.Empty is used for empty strings, so should be the same. + Assert.True(query.Length == 0 || !ReferenceEquals(query, Http1Connection.QueryString)); + + // However, materalized strings are reused if generated for previous requests. + + Assert.Same(prevRequestUrl, Http1Connection.RawTarget); + Assert.Same(prevPath, Http1Connection.Path); + Assert.Same(prevQuery, Http1Connection.QueryString); + + prevRequestUrl = Http1Connection.RawTarget; + prevPath = Http1Connection.Path; + prevQuery = Http1Connection.QueryString; + } + + // Different Absolute Form request changes values + + rawTarget = "http://localhost/path1?q=123&w=xyzw"; + path = "/path1"; + query = "?q=123&w=xyzw"; + + Http1Connection.Reset(); + ros = new ReadOnlySequence(Encoding.ASCII.GetBytes($"GET {rawTarget} HTTP/1.1\r\n")); + Parser.ParseRequestLine(ParsingHandler, ros, out _, out _); + + // Equal the inputs. + Assert.Equal(rawTarget, Http1Connection.RawTarget); + Assert.Equal(path, Http1Connection.Path); + Assert.Equal(query, Http1Connection.QueryString); + + // But not the same as the inputs. + Assert.NotSame(rawTarget, Http1Connection.RawTarget); + Assert.NotSame(path, Http1Connection.Path); + Assert.NotSame(query, Http1Connection.QueryString); + + // Not equal previous request. + Assert.NotEqual(prevRequestUrl, Http1Connection.RawTarget); + Assert.NotEqual(prevPath, Http1Connection.Path); + Assert.NotEqual(prevQuery, Http1Connection.QueryString); + + DifferentFormsWorkTogether(); + } + + [Fact] + public void AsteriskForms() + { + var rawTarget = "*"; + var path = string.Empty; + var query = string.Empty; + + Http1Connection.Reset(); + var ros = new ReadOnlySequence(Encoding.ASCII.GetBytes($"OPTIONS {rawTarget} HTTP/1.1\r\n")); + Assert.True(Parser.ParseRequestLine(ParsingHandler, ros, out _, out _)); + + var prevRequestUrl = Http1Connection.RawTarget; + var prevPath = Http1Connection.Path; + var prevQuery = Http1Connection.QueryString; + + // Identical requests keep same materialized string values + for (var i = 0; i < 5; i++) + { + Http1Connection.Reset(); + // RawTarget, Path, QueryString are null after reset + Assert.Null(Http1Connection.RawTarget); + Assert.Null(Http1Connection.Path); + Assert.Null(Http1Connection.QueryString); + + ros = new ReadOnlySequence(Encoding.ASCII.GetBytes($"OPTIONS {rawTarget} HTTP/1.1\r\n")); + Assert.True(Parser.ParseRequestLine(ParsingHandler, ros, out _, out _)); + + // Equal the inputs. + Assert.Equal(rawTarget, Http1Connection.RawTarget); + Assert.Equal(path, Http1Connection.Path); + Assert.Equal(query, Http1Connection.QueryString); + + // Also same as the inputs (interned strings). + + Assert.Same(rawTarget, Http1Connection.RawTarget); + Assert.Same(path, Http1Connection.Path); + Assert.Same(query, Http1Connection.QueryString); + + // Materalized strings are reused if generated for previous requests. + + Assert.Same(prevRequestUrl, Http1Connection.RawTarget); + Assert.Same(prevPath, Http1Connection.Path); + Assert.Same(prevQuery, Http1Connection.QueryString); + + prevRequestUrl = Http1Connection.RawTarget; + prevPath = Http1Connection.Path; + prevQuery = Http1Connection.QueryString; + } + + // Different request changes values (can't be Astrisk Form as all the same) + rawTarget = "http://localhost/path1?q=123&w=xyzw"; + path = "/path1"; + query = "?q=123&w=xyzw"; + + Http1Connection.Reset(); + ros = new ReadOnlySequence(Encoding.ASCII.GetBytes($"GET {rawTarget} HTTP/1.1\r\n")); + Parser.ParseRequestLine(ParsingHandler, ros, out _, out _); + + // Equal the inputs. + Assert.Equal(rawTarget, Http1Connection.RawTarget); + Assert.Equal(path, Http1Connection.Path); + Assert.Equal(query, Http1Connection.QueryString); + + // But not the same as the inputs. + Assert.NotSame(rawTarget, Http1Connection.RawTarget); + Assert.NotSame(path, Http1Connection.Path); + Assert.NotSame(query, Http1Connection.QueryString); + + // Not equal previous request. + Assert.NotEqual(prevRequestUrl, Http1Connection.RawTarget); + Assert.NotEqual(prevPath, Http1Connection.Path); + Assert.NotEqual(prevQuery, Http1Connection.QueryString); + + DifferentFormsWorkTogether(); + } + + [Theory] + [InlineData("localhost", "", "")] + [InlineData("localhost:22", "", "")] // handles mismatched ports + [InlineData("differenthost", "", "")] // handles mismatched hostname + [InlineData("127.0.0.1", "", "")] + [InlineData("[::1]", "", "")] + [InlineData("[::1]:8080", "", "")] + public void AuthorityForms(string rawTarget, string path, string query) + { + Http1Connection.Reset(); + var ros = new ReadOnlySequence(Encoding.ASCII.GetBytes($"CONNECT {rawTarget} HTTP/1.1\r\n")); + Assert.True(Parser.ParseRequestLine(ParsingHandler, ros, out _, out _)); + + var prevRequestUrl = Http1Connection.RawTarget; + var prevPath = Http1Connection.Path; + var prevQuery = Http1Connection.QueryString; + + // Identical requests keep same materialized string values + for (var i = 0; i < 5; i++) + { + Http1Connection.Reset(); + // RawTarget, Path, QueryString are null after reset + Assert.Null(Http1Connection.RawTarget); + Assert.Null(Http1Connection.Path); + Assert.Null(Http1Connection.QueryString); + + ros = new ReadOnlySequence(Encoding.ASCII.GetBytes($"CONNECT {rawTarget} HTTP/1.1\r\n")); + Assert.True(Parser.ParseRequestLine(ParsingHandler, ros, out _, out _)); + + // Equal the inputs. + Assert.Equal(rawTarget, Http1Connection.RawTarget); + Assert.Equal(path, Http1Connection.Path); + Assert.Equal(query, Http1Connection.QueryString); + + // RawTarget not the same as the input. + Assert.NotSame(rawTarget, Http1Connection.RawTarget); + // Others same as the inputs, empty strings. + Assert.Same(path, Http1Connection.Path); + Assert.Same(query, Http1Connection.QueryString); + + // However, materalized strings are reused if generated for previous requests. + + Assert.Same(prevRequestUrl, Http1Connection.RawTarget); + Assert.Same(prevPath, Http1Connection.Path); + Assert.Same(prevQuery, Http1Connection.QueryString); + + prevRequestUrl = Http1Connection.RawTarget; + prevPath = Http1Connection.Path; + prevQuery = Http1Connection.QueryString; + } + + // Different Authority Form request changes values + rawTarget = "example.org:2345"; + path = ""; + query = ""; + + Http1Connection.Reset(); + ros = new ReadOnlySequence(Encoding.ASCII.GetBytes($"CONNECT {rawTarget} HTTP/1.1\r\n")); + Parser.ParseRequestLine(ParsingHandler, ros, out _, out _); + + // Equal the inputs. + Assert.Equal(rawTarget, Http1Connection.RawTarget); + Assert.Equal(path, Http1Connection.Path); + Assert.Equal(query, Http1Connection.QueryString); + + // But not the same as the inputs. + Assert.NotSame(rawTarget, Http1Connection.RawTarget); + // Empty interned strings + Assert.Same(path, Http1Connection.Path); + Assert.Same(query, Http1Connection.QueryString); + + // Not equal previous request. + Assert.NotEqual(prevRequestUrl, Http1Connection.RawTarget); + + DifferentFormsWorkTogether(); + } + + public StartLineTests() + { + MemoryPool = KestrelMemoryPool.Create(); + var options = new PipeOptions(MemoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false); + var pair = DuplexPipe.CreateConnectionPair(options, options); + Transport = pair.Transport; + + var serviceContext = new ServiceContext + { + ServerOptions = new KestrelServerOptions(), + Log = _trace, + HttpParser = new HttpParser() + }; + + Http1Connection = new Http1Connection(context: new HttpConnectionContext + { + ServiceContext = serviceContext, + ConnectionFeatures = new FeatureCollection(), + MemoryPool = MemoryPool, + Transport = Transport, + TimeoutControl = new TimeoutControl(timeoutHandler: null) + }); + + Parser = new HttpParser(showErrorDetails: true); + ParsingHandler = new Http1ParsingHandler(Http1Connection); + } + + public void Dispose() + { + Transport.Input.Complete(); + Transport.Output.Complete(); + + MemoryPool.Dispose(); + } + } +} diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ConnectionBenchmark.cs b/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ConnectionBenchmark.cs index 27023e0af5..c404a16c27 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ConnectionBenchmark.cs +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ConnectionBenchmark.cs @@ -107,6 +107,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance public void OnHeader(Span name, Span value) => RequestHandler.Connection.OnHeader(name, value); + public void OnHeadersComplete() + => RequestHandler.Connection.OnHeadersComplete(); + public void OnStartLine(HttpMethod method, HttpVersion version, Span target, Span path, Span query, Span customMethod, bool pathEncoded) => RequestHandler.Connection.OnStartLine(method, version, target, path, query, customMethod, pathEncoded); } diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/HttpParserBenchmark.cs b/src/Servers/Kestrel/perf/Kestrel.Performance/HttpParserBenchmark.cs index 1fab96121b..a542f905b5 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/HttpParserBenchmark.cs +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/HttpParserBenchmark.cs @@ -72,6 +72,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance { } + public void OnHeadersComplete() + { + } + private struct Adapter : IHttpRequestLineHandler, IHttpHeadersHandler { public HttpParserBenchmark RequestHandler; @@ -84,6 +88,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance public void OnHeader(Span name, Span value) => RequestHandler.OnHeader(name, value); + public void OnHeadersComplete() + => RequestHandler.OnHeadersComplete(); + public void OnStartLine(HttpMethod method, HttpVersion version, Span target, Span path, Span query, Span customMethod, bool pathEncoded) => RequestHandler.OnStartLine(method, version, target, path, query, customMethod, pathEncoded); } diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/NullParser.cs b/src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/NullParser.cs index fc190bbafb..2a3069823a 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/NullParser.cs +++ b/src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/NullParser.cs @@ -26,6 +26,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance handler.OnHeader(new Span(_hostHeaderName), new Span(_hostHeaderValue)); handler.OnHeader(new Span(_acceptHeaderName), new Span(_acceptHeaderValue)); handler.OnHeader(new Span(_connectionHeaderName), new Span(_connectionHeaderValue)); + handler.OnHeadersComplete(); consumedBytes = 0; consumed = buffer.Start; diff --git a/src/Servers/Kestrel/perf/PlatformBenchmarks/BenchmarkApplication.HttpConnection.cs b/src/Servers/Kestrel/perf/PlatformBenchmarks/BenchmarkApplication.HttpConnection.cs index 0714143289..1d5cc6f55d 100644 --- a/src/Servers/Kestrel/perf/PlatformBenchmarks/BenchmarkApplication.HttpConnection.cs +++ b/src/Servers/Kestrel/perf/PlatformBenchmarks/BenchmarkApplication.HttpConnection.cs @@ -125,6 +125,12 @@ namespace PlatformBenchmarks { } +#if NETCOREAPP3_0 + public void OnHeadersComplete() + { + } +#endif + public async ValueTask OnReadCompletedAsync() { await Writer.FlushAsync(); @@ -175,6 +181,11 @@ namespace PlatformBenchmarks public void OnStartLine(HttpMethod method, HttpVersion version, Span target, Span path, Span query, Span customMethod, bool pathEncoded) => RequestHandler.OnStartLine(method, version, target, path, query, customMethod, pathEncoded); + +#if NETCOREAPP3_0 + public void OnHeadersComplete() + => RequestHandler.OnHeadersComplete(); +#endif } } diff --git a/src/Servers/Kestrel/tools/CodeGenerator/KnownHeaders.cs b/src/Servers/Kestrel/shared/KnownHeaders.cs similarity index 63% rename from src/Servers/Kestrel/tools/CodeGenerator/KnownHeaders.cs rename to src/Servers/Kestrel/shared/KnownHeaders.cs index 7dd1500cca..0899143bc5 100644 --- a/src/Servers/Kestrel/tools/CodeGenerator/KnownHeaders.cs +++ b/src/Servers/Kestrel/shared/KnownHeaders.cs @@ -11,114 +11,11 @@ namespace CodeGenerator { public class KnownHeaders { - static string Each(IEnumerable values, Func formatter) - { - return values.Any() ? values.Select(formatter).Aggregate((a, b) => a + b) : ""; - } + public readonly static KnownHeader[] RequestHeaders; + public readonly static KnownHeader[] ResponseHeaders; + public readonly static KnownHeader[] ResponseTrailers; - static string AppendSwitch(IEnumerable> values, string className) => - $@"var pUL = (ulong*)pUB; - var pUI = (uint*)pUB; - var pUS = (ushort*)pUB; - var stringValue = new StringValues(value); - switch (keyLength) - {{{Each(values, byLength => $@" - case {byLength.Key}: - {{{Each(byLength, header => $@" - if ({header.EqualIgnoreCaseBytes()}) - {{{(header.Identifier == "ContentLength" ? $@" - if (_contentLength.HasValue) - {{ - BadHttpRequestException.Throw(RequestRejectionReason.MultipleContentLengths); - }} - else - {{ - _contentLength = ParseContentLength(value); - }} - return;" : $@" - if ({header.TestBit()}) - {{ - _headers._{header.Identifier} = AppendValue(_headers._{header.Identifier}, value); - }} - else - {{ - {header.SetBit()}; - _headers._{header.Identifier} = stringValue;{(header.EnhancedSetter == false ? "" : $@" - _headers._raw{header.Identifier} = null;")} - }} - return;")} - }} - ")}}} - break; - ")}}}"; - - class KnownHeader - { - public string Name { get; set; } - public int Index { get; set; } - public string Identifier => Name.Replace("-", ""); - - public byte[] Bytes => Encoding.ASCII.GetBytes($"\r\n{Name}: "); - public int BytesOffset { get; set; } - public int BytesCount { get; set; } - public bool ExistenceCheck { get; set; } - public bool FastCount { get; set; } - public bool EnhancedSetter { get; set; } - public bool PrimaryHeader { get; set; } - public string TestBit() => $"(_bits & {"0x" + (1L << Index).ToString("x")}L) != 0"; - public string TestTempBit() => $"(tempBits & {"0x" + (1L << Index).ToString("x")}L) != 0"; - public string TestNotTempBit() => $"(tempBits & ~{"0x" + (1L << Index).ToString("x")}L) == 0"; - public string TestNotBit() => $"(_bits & {"0x" + (1L << Index).ToString("x")}L) == 0"; - public string SetBit() => $"_bits |= {"0x" + (1L << Index).ToString("x")}L"; - public string ClearBit() => $"_bits &= ~{"0x" + (1L << Index).ToString("x")}L"; - - public string EqualIgnoreCaseBytes() - { - var result = ""; - var delim = ""; - var index = 0; - while (index != Name.Length) - { - if (Name.Length - index >= 8) - { - result += delim + Term(Name, index, 8, "pUL", "uL"); - index += 8; - } - else if (Name.Length - index >= 4) - { - result += delim + Term(Name, index, 4, "pUI", "u"); - index += 4; - } - else if (Name.Length - index >= 2) - { - result += delim + Term(Name, index, 2, "pUS", "u"); - index += 2; - } - else - { - result += delim + Term(Name, index, 1, "pUB", "u"); - index += 1; - } - delim = " && "; - } - return $"({result})"; - } - protected string Term(string name, int offset, int count, string array, string suffix) - { - ulong mask = 0; - ulong comp = 0; - for (var scan = 0; scan < count; scan++) - { - var ch = (byte)name[offset + count - scan - 1]; - var isAlpha = (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z'); - comp = (comp << 8) + (ch & (isAlpha ? 0xdfu : 0xffu)); - mask = (mask << 8) + (isAlpha ? 0xdfu : 0xffu); - } - return $"(({array}[{offset / count}] & {mask}{suffix}) == {comp}{suffix})"; - } - } - - public static string GeneratedFile() + static KnownHeaders() { var requestPrimaryHeaders = new[] { @@ -173,7 +70,7 @@ namespace CodeGenerator { "Host" }; - var requestHeaders = commonHeaders.Concat(new[] + RequestHeaders = commonHeaders.Concat(new[] { "Accept", "Accept-Charset", @@ -196,6 +93,8 @@ namespace CodeGenerator "TE", "Translate", "User-Agent", + "DNT", + "Upgrade-Insecure-Requests" }) .Concat(corsRequestHeaders) .Select((header, index) => new KnownHeader @@ -213,8 +112,6 @@ namespace CodeGenerator PrimaryHeader = requestPrimaryHeaders.Contains("Content-Length") }}) .ToArray(); - Debug.Assert(requestHeaders.Length <= 64); - Debug.Assert(requestHeaders.Max(x => x.Index) <= 62); var responseHeadersExistence = new[] { @@ -240,7 +137,7 @@ namespace CodeGenerator "Access-Control-Expose-Headers", "Access-Control-Max-Age", }; - var responseHeaders = commonHeaders.Concat(new[] + ResponseHeaders = commonHeaders.Concat(new[] { "Accept-Ranges", "Age", @@ -271,7 +168,7 @@ namespace CodeGenerator }}) .ToArray(); - var responseTrailers = new[] + ResponseTrailers = new[] { "ETag", } @@ -284,11 +181,359 @@ namespace CodeGenerator PrimaryHeader = responsePrimaryHeaders.Contains(header) }) .ToArray(); + } + + static string Each(IEnumerable values, Func formatter) + { + return values.Any() ? values.Select(formatter).Aggregate((a, b) => a + b) : ""; + } + + static string Each(IEnumerable values, Func formatter) + { + return values.Any() ? values.Select(formatter).Aggregate((a, b) => a + b) : ""; + } + + static string AppendSwitch(IEnumerable> values) => + $@"switch (name.Length) + {{{Each(values, byLength => $@" + case {byLength.Key}:{AppendSwitchSection(byLength.Key, byLength.OrderBy(h => (h.PrimaryHeader ? "_" : "") + h.Name))} + break;")} + }}"; + + static string AppendSwitchSection(int length, IOrderedEnumerable values) + { + var useVarForFirstTerm = values.Count() > 1 && values.Select(h => h.FirstNameIgnoreCaseSegment()).Distinct().Count() == 1; + var firstTermVarExpression = values.Select(h => h.FirstNameIgnoreCaseSegment()).FirstOrDefault(); + var firstTermVar = $"firstTerm{length}"; + + var start = ""; + if (useVarForFirstTerm) + { + start = $@" + var {firstTermVar} = {firstTermVarExpression};"; + } + else + { + firstTermVar = ""; + } + + var groups = values.GroupBy(header => header.EqualIgnoreCaseBytesFirstTerm()); + return start + $@"{Each(groups, (byFirstTerm, i) => $@"{(byFirstTerm.Count() == 1 ? $@"{Each(byFirstTerm, header => $@" + {(i > 0 ? "else " : "")}if ({header.EqualIgnoreCaseBytes(firstTermVar)}) + {{{(header.Identifier == "ContentLength" ? $@" + AppendContentLength(value); + return;" : $@" + flag = {header.FlagBit()}; + values = ref _headers._{header.Identifier};")} + }}")}" : $@" + if ({byFirstTerm.Key.Replace(firstTermVarExpression, firstTermVar)}) + {{{Each(byFirstTerm, (header, i) => $@" + {(i > 0 ? "else " : "")}if ({header.EqualIgnoreCaseBytesSecondTermOnwards()}) + {{{(header.Identifier == "ContentLength" ? $@" + AppendContentLength(value); + return;" : $@" + flag = {header.FlagBit()}; + values = ref _headers._{header.Identifier};")} + }}")} + }}")}")}"; + } + + public class KnownHeader + { + public string Name { get; set; } + public int Index { get; set; } + public string Identifier => Name.Replace("-", ""); + + public byte[] Bytes => Encoding.ASCII.GetBytes($"\r\n{Name}: "); + public int BytesOffset { get; set; } + public int BytesCount { get; set; } + public bool ExistenceCheck { get; set; } + public bool FastCount { get; set; } + public bool EnhancedSetter { get; set; } + public bool PrimaryHeader { get; set; } + public string FlagBit() => $"{"0x" + (1L << Index).ToString("x")}L"; + public string TestBit() => $"(_bits & {"0x" + (1L << Index).ToString("x")}L) != 0"; + public string TestTempBit() => $"(tempBits & {"0x" + (1L << Index).ToString("x")}L) != 0"; + public string TestNotTempBit() => $"(tempBits & ~{"0x" + (1L << Index).ToString("x")}L) == 0"; + public string TestNotBit() => $"(_bits & {"0x" + (1L << Index).ToString("x")}L) == 0"; + public string SetBit() => $"_bits |= {"0x" + (1L << Index).ToString("x")}L"; + public string ClearBit() => $"_bits &= ~{"0x" + (1L << Index).ToString("x")}L"; + + private void GetMaskAndComp(string name, int offset, int count, out ulong mask, out ulong comp) + { + mask = 0; + comp = 0; + for (var scan = 0; scan < count; scan++) + { + var ch = (byte)name[offset + count - scan - 1]; + var isAlpha = (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z'); + comp = (comp << 8) + (ch & (isAlpha ? 0xdfu : 0xffu)); + mask = (mask << 8) + (isAlpha ? 0xdfu : 0xffu); + } + } + + private string NameTerm(string name, int offset, int count, string type, string suffix) + { + GetMaskAndComp(name, offset, count, out var mask, out var comp); + + if (offset == 0) + { + if (type == "byte") + { + return $"(nameStart & 0x{mask:x}{suffix})"; + } + else + { + return $"(Unsafe.ReadUnaligned<{type}>(ref nameStart) & 0x{mask:x}{suffix})"; + } + } + else + { + if (type == "byte") + { + return $"(Unsafe.AddByteOffset(ref nameStart, (IntPtr){offset / count}) & 0x{mask:x}{suffix})"; + } + else if ((offset / count) == 1) + { + return $"(Unsafe.ReadUnaligned<{type}>(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)sizeof({type}))) & 0x{mask:x}{suffix})"; + } + else + { + return $"(Unsafe.ReadUnaligned<{type}>(ref Unsafe.AddByteOffset(ref nameStart, (IntPtr)({offset / count} * sizeof({type})))) & 0x{mask:x}{suffix})"; + } + } + + } + + private string EqualityTerm(string name, int offset, int count, string type, string suffix) + { + GetMaskAndComp(name, offset, count, out var mask, out var comp); + + return $"0x{comp:x}{suffix}"; + } + + private string Term(string name, int offset, int count, string type, string suffix) + { + GetMaskAndComp(name, offset, count, out var mask, out var comp); + + return $"({NameTerm(name, offset, count, type, suffix)} == {EqualityTerm(name, offset, count, type, suffix)})"; + } + + public string FirstNameIgnoreCaseSegment() + { + var result = ""; + if (Name.Length >= 8) + { + result = NameTerm(Name, 0, 8, "ulong", "uL"); + } + else if (Name.Length >= 4) + { + result = NameTerm(Name, 0, 4, "uint", "u"); + } + else if (Name.Length >= 2) + { + result = NameTerm(Name, 0, 2, "ushort", "u"); + } + else + { + result = NameTerm(Name, 0, 1, "byte", "u"); + } + + return result; + } + + public string EqualIgnoreCaseBytes(string firstTermVar = "") + { + if (!string.IsNullOrEmpty(firstTermVar)) + { + return EqualIgnoreCaseBytesWithVar(firstTermVar); + } + + var result = ""; + var delim = ""; + var index = 0; + while (index != Name.Length) + { + if (Name.Length - index >= 8) + { + result += delim + Term(Name, index, 8, "ulong", "uL"); + index += 8; + } + else if (Name.Length - index >= 4) + { + result += delim + Term(Name, index, 4, "uint", "u"); + index += 4; + } + else if (Name.Length - index >= 2) + { + result += delim + Term(Name, index, 2, "ushort", "u"); + index += 2; + } + else + { + result += delim + Term(Name, index, 1, "byte", "u"); + index += 1; + } + delim = " && "; + } + return result; + + string EqualIgnoreCaseBytesWithVar(string firstTermVar) + { + var result = ""; + var delim = " && "; + var index = 0; + var isFirst = true; + while (index != Name.Length) + { + if (Name.Length - index >= 8) + { + if (isFirst) + { + result = $"({firstTermVar} == {EqualityTerm(Name, index, 8, "ulong", "uL")})"; + } + else + { + result += delim + Term(Name, index, 8, "ulong", "uL"); + } + + index += 8; + } + else if (Name.Length - index >= 4) + { + if (isFirst) + { + result = $"({firstTermVar} == {EqualityTerm(Name, index, 4, "uint", "u")})"; + } + else + { + result += delim + Term(Name, index, 4, "uint", "u"); + } + index += 4; + } + else if (Name.Length - index >= 2) + { + if (isFirst) + { + result = $"({firstTermVar} == {EqualityTerm(Name, index, 2, "ushort", "u")})"; + } + else + { + result += delim + Term(Name, index, 2, "ushort", "u"); + } + index += 2; + } + else + { + if (isFirst) + { + result = $"({firstTermVar} == {EqualityTerm(Name, index, 1, "byte", "u")})"; + } + else + { + result += delim + Term(Name, index, 1, "byte", "u"); + } + index += 1; + } + + isFirst = false; + } + return result; + } + } + + public string EqualIgnoreCaseBytesFirstTerm() + { + var result = ""; + if (Name.Length >= 8) + { + result = Term(Name, 0, 8, "ulong", "uL"); + } + else if (Name.Length >= 4) + { + result = Term(Name, 0, 4, "uint", "u"); + } + else if (Name.Length >= 2) + { + result = Term(Name, 0, 2, "ushort", "u"); + } + else + { + result = Term(Name, 0, 1, "byte", "u"); + } + + return result; + } + + public string EqualIgnoreCaseBytesSecondTermOnwards() + { + var result = ""; + var delim = ""; + var index = 0; + var isFirst = true; + while (index != Name.Length) + { + if (Name.Length - index >= 8) + { + if (!isFirst) + { + result += delim + Term(Name, index, 8, "ulong", "uL"); + } + + index += 8; + } + else if (Name.Length - index >= 4) + { + if (!isFirst) + { + result += delim + Term(Name, index, 4, "uint", "u"); + } + index += 4; + } + else if (Name.Length - index >= 2) + { + if (!isFirst) + { + result += delim + Term(Name, index, 2, "ushort", "u"); + } + index += 2; + } + else + { + if (!isFirst) + { + result += delim + Term(Name, index, 1, "byte", "u"); + } + index += 1; + } + + if (isFirst) + { + isFirst = false; + } + else + { + delim = " && "; + } + } + return result; + } + } + + public static string GeneratedFile() + { + + var requestHeaders = RequestHeaders; + Debug.Assert(requestHeaders.Length <= 64); + Debug.Assert(requestHeaders.Max(x => x.Index) <= 62); // 63 for responseHeaders as it steals one bit for Content-Length in CopyTo(ref MemoryPoolIterator output) + var responseHeaders = ResponseHeaders; Debug.Assert(responseHeaders.Length <= 63); Debug.Assert(responseHeaders.Count(x => x.Index == 63) == 1); + var responseTrailers = ResponseTrailers; + var loops = new[] { new @@ -331,8 +576,10 @@ using System.Collections.Generic; using System.Buffers; using System.IO.Pipelines; using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; using Microsoft.Extensions.Primitives; using Microsoft.Net.Http.Headers; +using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http {{ @@ -345,8 +592,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http {Each(loop.Bytes, b => $"{b},")} }};" : "")} - - private long _bits = 0; private HeaderReferences _headers; {Each(loop.Headers.Where(header => header.ExistenceCheck), header => $@" public bool Has{header.Identifier} => {header.TestBit()};")} @@ -510,8 +755,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http return MaybeUnknown?.Remove(key) ?? false; }} - - protected override void ClearFast() +{(loop.ClassName != "HttpRequestHeaders" ? + $@" protected override void ClearFast() {{ MaybeUnknown?.Clear(); _contentLength = null; @@ -534,7 +779,23 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http }} ")} }} - +" : +$@" private void Clear(long bitsToClear) + {{ + var tempBits = bitsToClear; + {Each(loop.Headers.Where(header => header.Identifier != "ContentLength").OrderBy(h => !h.PrimaryHeader), header => $@" + if ({header.TestTempBit()}) + {{ + _headers._{header.Identifier} = default(StringValues); + if({header.TestNotTempBit()}) + {{ + return; + }} + tempBits &= ~{"0x" + (1L << header.Index).ToString("x")}L; + }} + ")} + }} +")} protected override bool CopyToFast(KeyValuePair[] array, int arrayIndex) {{ if (arrayIndex < 0) @@ -625,22 +886,63 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http }} }} }} while (tempBits != 0); - }}" : "")} - {(loop.ClassName == "HttpRequestHeaders" ? $@" - public unsafe void Append(byte* pKeyBytes, int keyLength, string value) + }}" : "")}{(loop.ClassName == "HttpRequestHeaders" ? $@" + [MethodImpl(MethodImplOptions.AggressiveOptimization)] + public unsafe void Append(Span name, Span value) {{ - var pUB = pKeyBytes; - {AppendSwitch(loop.Headers.Where(h => h.PrimaryHeader).GroupBy(x => x.Name.Length), loop.ClassName)} + ref byte nameStart = ref MemoryMarshal.GetReference(name); + ref StringValues values = ref Unsafe.AsRef(null); + var flag = 0L; - AppendNonPrimaryHeaders(pKeyBytes, keyLength, value); - }} + // Does the name matched any ""known"" headers + {AppendSwitch(loop.Headers.GroupBy(x => x.Name.Length).OrderBy(x => x.Key))} - private unsafe void AppendNonPrimaryHeaders(byte* pKeyBytes, int keyLength, string value) - {{ - var pUB = pKeyBytes; - {AppendSwitch(loop.Headers.Where(h => !h.PrimaryHeader).GroupBy(x => x.Name.Length), loop.ClassName)} + if (flag != 0) + {{ + // Matched a known header + if ((_previousBits & flag) != 0) + {{ + // Had a previous string for this header, mark it as used so we don't clear it OnHeadersComplete or consider it if we get a second header + _previousBits ^= flag; - AppendUnknownHeaders(pKeyBytes, keyLength, value); + // We will only reuse this header if there was only one previous header + if (values.Count == 1) + {{ + var previousValue = values.ToString(); + // Check lengths are the same, then if the bytes were converted to an ascii string if they would be the same. + // We do not consider Utf8 headers for reuse. + if (previousValue.Length == value.Length && + StringUtilities.BytesOrdinalEqualsStringAndAscii(previousValue, value)) + {{ + // The previous string matches what the bytes would convert to, so we will just use that one. + _bits |= flag; + return; + }} + }} + }} + + // We didn't have a previous matching header value, or have already added a header, so get the string for this value. + var valueStr = value.GetAsciiOrUTF8StringNonNullCharacters(); + if ((_bits & flag) == 0) + {{ + // We didn't already have a header set, so add a new one. + _bits |= flag; + values = new StringValues(valueStr); + }} + else + {{ + // We already had a header set, so concatenate the new one. + values = AppendValue(values, valueStr); + }} + }} + else + {{ + // The header was not one of the ""known"" headers. + // Convert value to string first, because passing two spans causes 8 bytes stack zeroing in + // this method with rep stosd, which is slower than necessary. + var valueStr = value.GetAsciiOrUTF8StringNonNullCharacters(); + AppendUnknownHeaders(name, valueStr); + }} }}" : "")} private struct HeaderReferences diff --git a/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs b/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs index 50fbbfb73d..654b7b6fea 100644 --- a/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs +++ b/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs @@ -154,6 +154,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } [ConditionalTheory] + [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2179", FlakyOn.Helix.All)] [MemberData(nameof(AddressRegistrationDataIPv6ScopeId))] [IPv6SupportedCondition] [IPv6ScopeIdPresentCondition] @@ -589,6 +590,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } [Fact] + [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2178", FlakyOn.All)] public async Task DoesNotOverrideDirectConfigurationWithIServerAddressesFeature_IfPreferHostingUrlsFalse() { var useUrlsAddress = $"http://127.0.0.1:0"; diff --git a/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs b/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs index 622531e104..540690317b 100644 --- a/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs +++ b/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs @@ -108,16 +108,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests }; } } - - private bool LargeUploadRetryPredicate(Exception e) - => e is IOException && e.Message.Contains("Unable to read data from the transport connection: The I/O operation has been aborted because of either a thread exit or an application request"); - [Theory] [Flaky("https://github.com/aspnet/AspNetCore/issues/8054", FlakyOn.AzP.Windows)] - [RetryTest(nameof(LargeUploadRetryPredicate), - "Active investigation into potential corefx sockets bug: https://github.com/dotnet/corefx/issues/30691", - OperatingSystems.Windows, - 5)] [MemberData(nameof(LargeUploadData))] public async Task LargeUpload(long? maxRequestBufferSize, bool connectionAdapter, bool expectPause) { diff --git a/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs b/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs index 7f1114a4c7..30bc96a50d 100644 --- a/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs +++ b/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs @@ -542,6 +542,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } [Theory] + [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2181", FlakyOn.Helix.All)] [MemberData(nameof(ConnectionAdapterData))] public async Task ConnectionClosedTokenFiresOnServerFIN(ListenOptions listenOptions) { diff --git a/src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs b/src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs index b1bfa5b494..f4abe60cc3 100644 --- a/src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs +++ b/src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs @@ -810,10 +810,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests => e is IOException && e.Message.Contains("Unable to read data from the transport connection: The I/O operation has been aborted because of either a thread exit or an application request"); [Fact] - [RetryTest(nameof(ConnectionNotClosedWhenClientSatisfiesMinimumDataRateGivenLargeResponseHeadersRetryPredicate), - "Active investigation into potential corefx sockets bug: https://github.com/dotnet/corefx/issues/30691", - OperatingSystems.Windows, - 5)] + [Flaky("https://github.com/dotnet/corefx/issues/30691", FlakyOn.AzP.Windows)] public async Task ConnectionNotClosedWhenClientSatisfiesMinimumDataRateGivenLargeResponseHeaders() { var headerSize = 1024 * 1024; // 1 MB for each header value diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionAdapterTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionAdapterTests.cs index c54c2a031b..07ea11262b 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionAdapterTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionAdapterTests.cs @@ -146,6 +146,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests var serviceContext = new TestServiceContext(LoggerFactory); + TestApplicationErrorLogger.ThrowOnUngracefulShutdown = false; + var stopTask = Task.CompletedTask; await using (var server = new TestServer(requestDelegate, serviceContext, listenOptions)) using (var shutdownCts = new CancellationTokenSource(TestConstants.DefaultTimeout)) diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs index f1a3b215a0..6752e74e3b 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs @@ -406,6 +406,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests _decodedHeaders[name.GetAsciiStringNonNullCharacters()] = value.GetAsciiOrUTF8StringNonNullCharacters(); } + void IHttpHeadersHandler.OnHeadersComplete() { } + protected void CreateConnection() { var limits = _serviceContext.ServerOptions.Limits; diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs index 92d175b17a..029e8b5e15 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TimeoutTests.cs @@ -492,7 +492,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests _mockConnectionContext.VerifyNoOtherCalls(); } - [Fact] + [Fact(Skip = "https://github.com/aspnet/AspNetCore-Internal/issues/2197")] public async Task DATA_Sent_TooSlowlyDueToOutputFlowControlOnMultipleStreams_AbortsConnectionAfterAdditiveRateTimeout() { var mockSystemClock = _serviceContext.MockSystemClock; diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionAdapterTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionAdapterTests.cs index fe46fba80f..1334d1809b 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionAdapterTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionAdapterTests.cs @@ -484,7 +484,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests } } - [Theory] + [ConditionalTheory] [SkipOnHelix] [InlineData(ClientCertificateMode.AllowCertificate)] [InlineData(ClientCertificateMode.RequireCertificate)] diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs index 6f834ebc8c..efd1d56722 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsTests.cs @@ -217,6 +217,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests } [Fact] + [Repeat(20)] public async Task DoesNotThrowObjectDisposedExceptionFromWriteAsyncAfterConnectionIsAborted() { var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionAdapterTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionAdapterTests.cs index bb70e492bf..cd0d470eec 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionAdapterTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionAdapterTests.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTransport; using Microsoft.AspNetCore.Testing; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging.Testing; using Xunit; @@ -14,6 +15,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests public class LoggingConnectionAdapterTests : LoggedTest { [Fact] + [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1753", FlakyOn.Helix.All)] public async Task LoggingConnectionAdapterCanBeAddedBeforeAndAfterHttpsAdapter() { await using (var server = new TestServer(context => diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs index 8ed69dc763..7aa6ccd275 100644 --- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs +++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/RequestTests.cs @@ -17,6 +17,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.TestTransport; using Microsoft.AspNetCore.Testing; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging.Testing; using Xunit; @@ -781,6 +782,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests } [Fact] + [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2176", FlakyOn.All)] public async Task ContentLengthReadAsyncSingleBytesAtATime() { var testContext = new TestServiceContext(LoggerFactory); @@ -811,10 +813,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests "Content-Length: 5", "", "fun"); - await tcs.Task; + await tcs.Task.DefaultTimeout(); await connection.Send( "n"); - await tcs2.Task; + await tcs2.Task.DefaultTimeout(); await connection.Send( "y"); await connection.ReceiveEnd( diff --git a/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj b/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj index e0bd7e6ee8..afb106a5cf 100644 --- a/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj +++ b/src/Servers/Kestrel/tools/CodeGenerator/CodeGenerator.csproj @@ -7,6 +7,10 @@ true + + + + diff --git a/src/Servers/Kestrel/xunit.runner.json b/src/Servers/Kestrel/xunit.runner.json index e3984f4384..18711b4b2e 100644 --- a/src/Servers/Kestrel/xunit.runner.json +++ b/src/Servers/Kestrel/xunit.runner.json @@ -3,5 +3,6 @@ "appDomain": "denied", "methodDisplay": "method", "longRunningTestSeconds": 60, - "maxParallelThreads": -1 + "maxParallelThreads": -1, + "diagnosticMessages": true } diff --git a/src/Shared/CertificateGeneration/CertificateManager.cs b/src/Shared/CertificateGeneration/CertificateManager.cs index 17e0d52e4d..78ea93398c 100644 --- a/src/Shared/CertificateGeneration/CertificateManager.cs +++ b/src/Shared/CertificateGeneration/CertificateManager.cs @@ -156,7 +156,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation var sanBuilder = new SubjectAlternativeNameBuilder(); sanBuilder.AddDnsName(LocalhostHttpsDnsName); - var keyUsage = new X509KeyUsageExtension(X509KeyUsageFlags.KeyEncipherment, critical: true); + var keyUsage = new X509KeyUsageExtension(X509KeyUsageFlags.KeyEncipherment | X509KeyUsageFlags.DigitalSignature, critical: true); var enhancedKeyUsage = new X509EnhancedKeyUsageExtension( new OidCollection() { new Oid( diff --git a/src/Shared/E2ETesting/BrowserFixture.cs b/src/Shared/E2ETesting/BrowserFixture.cs index b1f954ce12..c93e618590 100644 --- a/src/Shared/E2ETesting/BrowserFixture.cs +++ b/src/Shared/E2ETesting/BrowserFixture.cs @@ -3,21 +3,20 @@ using System; using System.Collections.Concurrent; -using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Threading.Tasks; using OpenQA.Selenium; using OpenQA.Selenium.Chrome; using OpenQA.Selenium.Remote; +using Xunit; using Xunit.Abstractions; namespace Microsoft.AspNetCore.E2ETesting { - public class BrowserFixture : IDisposable + public class BrowserFixture : IAsyncLifetime { private ConcurrentDictionary> _browsers = new ConcurrentDictionary>(); - private List _browsersToDispose = new List(); public BrowserFixture(IMessageSink diagnosticsMessageSink) { @@ -52,9 +51,10 @@ namespace Microsoft.AspNetCore.E2ETesting } } - public void Dispose() + public async Task DisposeAsync() { - foreach (var browser in _browsersToDispose) + var browsers = await Task.WhenAll(_browsers.Values); + foreach (var (browser, log) in browsers) { browser.Dispose(); } @@ -71,6 +71,8 @@ namespace Microsoft.AspNetCore.E2ETesting return _browsers.GetOrAdd(isolationContext, CreateBrowserAsync, output); } + public Task InitializeAsync() => Task.CompletedTask; + private async Task<(IWebDriver browser, ILogs log)> CreateBrowserAsync(string context, ITestOutputHelper output) { var opts = new ChromeOptions(); @@ -115,7 +117,6 @@ namespace Microsoft.AspNetCore.E2ETesting driver.Manage().Timeouts().ImplicitWait = TimeSpan.FromSeconds(1); var logs = new RemoteLogs(driver); - _browsersToDispose.Add(driver); return (driver, logs); } catch diff --git a/src/Shared/E2ETesting/E2ETesting.targets b/src/Shared/E2ETesting/E2ETesting.targets index 96d1bb0a15..88d77ebf73 100644 --- a/src/Shared/E2ETesting/E2ETesting.targets +++ b/src/Shared/E2ETesting/E2ETesting.targets @@ -11,12 +11,15 @@ Importance="High" Text="Prerequisites were not enforced at build time. Running Yarn or the E2E tests might fail as a result. Check /src/Shared/E2ETesting/Readme.md for instructions." /> - - - - - - + + + + + + + EnsureNodeJSRestored + + - - - - $(MSBuildThisFileDirectory)..\ - Debug - Win32 - v120 - v140 - v140 - Desktop - $(SolutionDir)bin\$(SubSystem)\$(Platform)\$(Configuration)\ - signalrclient - en-US - - diff --git a/src/SignalR/clients/cpp/Build/Common.tasks b/src/SignalR/clients/cpp/Build/Common.tasks deleted file mode 100644 index 8c3db65aa9..0000000000 --- a/src/SignalR/clients/cpp/Build/Common.tasks +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/SignalR/clients/cpp/Build/Config.Definitions.Props b/src/SignalR/clients/cpp/Build/Config.Definitions.Props deleted file mode 100644 index 07e90f692c..0000000000 --- a/src/SignalR/clients/cpp/Build/Config.Definitions.Props +++ /dev/null @@ -1,21 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - diff --git a/src/SignalR/clients/cpp/Build/SignalRClient.Build.Settings b/src/SignalR/clients/cpp/Build/SignalRClient.Build.Settings deleted file mode 100644 index 33e61e1fa2..0000000000 --- a/src/SignalR/clients/cpp/Build/SignalRClient.Build.Settings +++ /dev/null @@ -1,91 +0,0 @@ - - - - - true - true - Unicode - false - - - true - false - - - false - true - - - 14.0 - true - Windows Store - 10.0.17134.0 - 10.0.10240.0 - 10.0 - False - - - - Use - Level4 - true - true - true - true - - - Windows - Console - true - $(OutDir)$(TargetName).pdb - $(OutDir)$(TargetName).pub.pdb - true - true - true - - - - - - Disabled - - - - - - MaxSpeed - true - true - - - - - - WIN32;_DEBUG;%(PreprocessorDefinitions) - - - - - - _WIN64;_DEBUG;%(PreprocessorDefinitions) - - - - - - WIN32;NDEBUG;%(PreprocessorDefinitions) - - - true - - - - - - _WIN64;NDEBUG;%(PreprocessorDefinitions) - - - true - - - diff --git a/src/SignalR/clients/cpp/Build/Version.props b/src/SignalR/clients/cpp/Build/Version.props deleted file mode 100644 index 07905402d8..0000000000 --- a/src/SignalR/clients/cpp/Build/Version.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - 1 - 0 - 0 - -alpha0 - - $(SignalRClientCppVersionSuffix)-$(build_number) - $(SignalRClientCppVersionMajor).$(SignalRClientCppVersionMinor).$(SignalRClientCppVersionPatch)$(SignalRClientCppVersionSuffix) - - diff --git a/src/SignalR/clients/cpp/Build/build.msbuild b/src/SignalR/clients/cpp/Build/build.msbuild deleted file mode 100644 index 0d28100087..0000000000 --- a/src/SignalR/clients/cpp/Build/build.msbuild +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - v140 - Desktop - $(SolutionDir)bin\Package\$(SubSystem)\$(PlatformToolset)\ - $(PackageSource)build\native\ - $(MSBuildThisFileDirectory)..\NuGet\ - $(NuGetArtifactsPath)signalrclientcpp.nuspec.template - $(SolutionDir)artifacts\build - $(SolutionDir)bin\Symbols\$(SubSystem)\$(PlatformToolset)\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(PUSH_NUGET_EXE) - $(MSBuildThisFileDirectory)..\.nuget\NuGet.exe - - - - - - - - diff --git a/src/SignalR/clients/cpp/CMakeLists.txt b/src/SignalR/clients/cpp/CMakeLists.txt deleted file mode 100644 index 0d78e1cf8a..0000000000 --- a/src/SignalR/clients/cpp/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -cmake_minimum_required (VERSION 2.8.11) -project (signalrclient) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -L -lcpprest") - -set(CPPREST_INCLUDE_DIR "" CACHE FILEPATH "Path to casablanca include dir") - -include_directories ( -include -"${CPPREST_INCLUDE_DIR}") - -find_library(CPPREST_SO NAMES "cpprest" PATHS ${CPPREST_LIB_DIR} REQUIRED) - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) - -add_subdirectory(src/signalrclient) -add_subdirectory(test) diff --git a/src/SignalR/clients/cpp/CONTRIBUTING.md b/src/SignalR/clients/cpp/CONTRIBUTING.md deleted file mode 100644 index 64ff041d5c..0000000000 --- a/src/SignalR/clients/cpp/CONTRIBUTING.md +++ /dev/null @@ -1,4 +0,0 @@ -Contributing -====== - -Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/dev/CONTRIBUTING.md) in the Home repo. diff --git a/src/SignalR/clients/cpp/NuGet.config b/src/SignalR/clients/cpp/NuGet.config deleted file mode 100644 index 0cbd4452e0..0000000000 --- a/src/SignalR/clients/cpp/NuGet.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/SignalR/clients/cpp/NuGet/Microsoft.AspNet.SignalR.Client.Cpp.UWP.targets.template b/src/SignalR/clients/cpp/NuGet/Microsoft.AspNet.SignalR.Client.Cpp.UWP.targets.template deleted file mode 100644 index 7086ee6059..0000000000 --- a/src/SignalR/clients/cpp/NuGet/Microsoft.AspNet.SignalR.Client.Cpp.UWP.targets.template +++ /dev/null @@ -1,69 +0,0 @@ - - - - - True - - - - - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories) - - - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories) - - - - - - $(MSBuildThisFileDirectory)lib\x64\#Toolset#\Release\signalrclient.lib;%(AdditionalDependencies) - - - - - $(MSBuildThisFileDirectory)lib\x64\#Toolset#\Debug\signalrclient.lib;%(AdditionalDependencies) - - - - - $(MSBuildThisFileDirectory)lib\Win32\#Toolset#\Release\signalrclient.lib;%(AdditionalDependencies) - - - - - $(MSBuildThisFileDirectory)lib\Win32\#Toolset#\Debug\signalrclient.lib;%(AdditionalDependencies) - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/SignalR/clients/cpp/NuGet/Microsoft.AspNet.SignalR.Client.Cpp.WinDesktop.targets.template b/src/SignalR/clients/cpp/NuGet/Microsoft.AspNet.SignalR.Client.Cpp.WinDesktop.targets.template deleted file mode 100644 index 659651b0c4..0000000000 --- a/src/SignalR/clients/cpp/NuGet/Microsoft.AspNet.SignalR.Client.Cpp.WinDesktop.targets.template +++ /dev/null @@ -1,82 +0,0 @@ - - - - - True - - - - - - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories) - - - $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories) - - - - - - $(MSBuildThisFileDirectory)lib\x64\#Toolset#\Release\signalrclient.lib;%(AdditionalDependencies) - - - - - $(MSBuildThisFileDirectory)lib\x64\#Toolset#\Debug\signalrclient.lib;%(AdditionalDependencies) - - - - - $(MSBuildThisFileDirectory)lib\Win32\#Toolset#\Release\signalrclient.lib;%(AdditionalDependencies) - - - - - $(MSBuildThisFileDirectory)lib\Win32\#Toolset#\Debug\signalrclient.lib;%(AdditionalDependencies) - - - - - - true - - - - - - - - - - - - - - - - true - - - - - - - true - - - - - - - true - - - - - - - true - - - - diff --git a/src/SignalR/clients/cpp/NuGet/signalrclientcpp.nuspec.template b/src/SignalR/clients/cpp/NuGet/signalrclientcpp.nuspec.template deleted file mode 100644 index 544a4f4f04..0000000000 --- a/src/SignalR/clients/cpp/NuGet/signalrclientcpp.nuspec.template +++ /dev/null @@ -1,21 +0,0 @@ - - - - Microsoft.AspNet.SignalR.Client.Cpp.#Toolset#.#SubSystem# - Microsoft ASP.NET SignalR C++ Client - 0.0.0 - Microsoft - Microsoft - http://www.microsoft.com/web/webpi/eula/net_library_eula_ENU.htm - © Microsoft Corporation. All rights reserved. - http://www.asp.net/signalr - true - C++ client for ASP.NET SignalR. - en-US - Microsoft AspNet SignalR AspNetSignalR Client C++ native - https://github.com/aspnet/SignalR-Client-Cpp/releases - - - - - diff --git a/src/SignalR/clients/cpp/README.md b/src/SignalR/clients/cpp/README.md deleted file mode 100644 index a9f17e5626..0000000000 --- a/src/SignalR/clients/cpp/README.md +++ /dev/null @@ -1,6 +0,0 @@ -ASP.NET Core SignalR C++ Client -======== - -This folder contains a C++ client for ASP.NET Core SignalR. - -**There are no plans to ship this client at this time.** \ No newline at end of file diff --git a/src/SignalR/clients/cpp/build.cmd b/src/SignalR/clients/cpp/build.cmd deleted file mode 100644 index 852b65ceb0..0000000000 --- a/src/SignalR/clients/cpp/build.cmd +++ /dev/null @@ -1 +0,0 @@ -msbuild "%~dp0\Build\build.msbuild" /v:minimal /maxcpucount /nodeReuse:false %* diff --git a/src/SignalR/clients/cpp/include/signalrclient/_exports.h b/src/SignalR/clients/cpp/include/signalrclient/_exports.h deleted file mode 100644 index c9e9fadbfa..0000000000 --- a/src/SignalR/clients/cpp/include/signalrclient/_exports.h +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#pragma once - -#ifdef NO_SIGNALRCLIENT_EXPORTS -#define SIGNALRCLIENT_API -#else -#ifdef SIGNALRCLIENT_EXPORTS -#define SIGNALRCLIENT_API __declspec(dllexport) -#else -#define SIGNALRCLIENT_API __declspec(dllimport) -#endif // SIGNALRCLIENT_EXPORTS -#endif // NO_SIGNALRCLIENT_EXPORTS \ No newline at end of file diff --git a/src/SignalR/clients/cpp/include/signalrclient/connection.h b/src/SignalR/clients/cpp/include/signalrclient/connection.h deleted file mode 100644 index b3af11d09f..0000000000 --- a/src/SignalR/clients/cpp/include/signalrclient/connection.h +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#pragma once - -#include "_exports.h" -#include -#include -#include "connection_state.h" -#include "trace_level.h" -#include "log_writer.h" -#include "signalr_client_config.h" - -namespace signalr -{ - class connection_impl; - - class connection - { - public: - typedef std::function message_received_handler; - - SIGNALRCLIENT_API explicit connection(const std::string& url, trace_level trace_level = trace_level::all, std::shared_ptr log_writer = nullptr); - - SIGNALRCLIENT_API ~connection(); - - connection(const connection&) = delete; - - connection& operator=(const connection&) = delete; - - SIGNALRCLIENT_API void __cdecl start(std::function callback) noexcept; - - SIGNALRCLIENT_API void __cdecl send(const std::string& data, std::function callback) noexcept; - - SIGNALRCLIENT_API void __cdecl set_message_received(const message_received_handler& message_received_callback); - SIGNALRCLIENT_API void __cdecl set_disconnected(const std::function& disconnected_callback); - - SIGNALRCLIENT_API void __cdecl set_client_config(const signalr_client_config& config); - - SIGNALRCLIENT_API void __cdecl stop(std::function callback) noexcept; - - SIGNALRCLIENT_API connection_state __cdecl get_connection_state() const noexcept; - SIGNALRCLIENT_API std::string __cdecl get_connection_id() const; - - private: - // The recommended smart pointer to use when doing pImpl is the `std::unique_ptr`. However - // we are capturing the m_pImpl instance in the lambdas used by tasks which can outlive - // the connection instance. Using `std::shared_ptr` guarantees that we won't be using - // a deleted object if the task is run after the `connection` instance goes away. - std::shared_ptr m_pImpl; - }; -} diff --git a/src/SignalR/clients/cpp/include/signalrclient/connection_state.h b/src/SignalR/clients/cpp/include/signalrclient/connection_state.h deleted file mode 100644 index ff01f5d399..0000000000 --- a/src/SignalR/clients/cpp/include/signalrclient/connection_state.h +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#pragma once - -namespace signalr -{ - enum class connection_state - { - connecting, - connected, - disconnecting, - disconnected - }; -} diff --git a/src/SignalR/clients/cpp/include/signalrclient/http_client.h b/src/SignalR/clients/cpp/include/signalrclient/http_client.h deleted file mode 100644 index 3b3b9b390a..0000000000 --- a/src/SignalR/clients/cpp/include/signalrclient/http_client.h +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#pragma once - -#include -#include -#include -#include - -namespace signalr -{ - enum class http_method - { - GET, - POST - }; - - class http_request - { - public: - http_method method; - std::map headers; - std::string content; - std::chrono::seconds timeout; - }; - - class http_response - { - public: - http_response() {} - http_response(http_response&& rhs) noexcept : status_code(rhs.status_code), content(std::move(rhs.content)) {} - http_response(int code, const std::string& content) : status_code(code), content(content) {} - - http_response& operator=(http_response&& rhs) - { - status_code = rhs.status_code; - content = std::move(rhs.content); - - return *this; - } - - int status_code = 0; - std::string content; - }; - - class http_client - { - public: - virtual void send(std::string url, http_request request, std::function callback) = 0; - - virtual ~http_client() {} - }; -} diff --git a/src/SignalR/clients/cpp/include/signalrclient/hub_connection.h b/src/SignalR/clients/cpp/include/signalrclient/hub_connection.h deleted file mode 100644 index 68597e5420..0000000000 --- a/src/SignalR/clients/cpp/include/signalrclient/hub_connection.h +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#pragma once - -#include "_exports.h" -#include -#include -#include "cpprest/json.h" -#include "connection_state.h" -#include "trace_level.h" -#include "log_writer.h" -#include "signalr_client_config.h" - -namespace signalr -{ - class hub_connection_impl; - - class hub_connection - { - public: - typedef std::function method_invoked_handler; - - SIGNALRCLIENT_API explicit hub_connection(const std::string& url, trace_level trace_level = trace_level::all, - std::shared_ptr log_writer = nullptr); - - SIGNALRCLIENT_API ~hub_connection(); - - hub_connection(const hub_connection&) = delete; - - hub_connection& operator=(const hub_connection&) = delete; - - SIGNALRCLIENT_API void __cdecl start(std::function callback) noexcept; - SIGNALRCLIENT_API void __cdecl stop(std::function callback) noexcept; - - SIGNALRCLIENT_API connection_state __cdecl get_connection_state() const; - SIGNALRCLIENT_API std::string __cdecl get_connection_id() const; - - SIGNALRCLIENT_API void __cdecl set_disconnected(const std::function& disconnected_callback); - - SIGNALRCLIENT_API void __cdecl set_client_config(const signalr_client_config& config); - - SIGNALRCLIENT_API void __cdecl on(const std::string& event_name, const method_invoked_handler& handler); - - SIGNALRCLIENT_API void invoke(const std::string& method_name, const web::json::value& arguments = web::json::value::array(), std::function callback = [](const web::json::value&, std::exception_ptr) {}) noexcept; - - SIGNALRCLIENT_API void send(const std::string& method_name, const web::json::value& arguments = web::json::value::array(), std::function callback = [](std::exception_ptr) {}) noexcept; - - private: - std::shared_ptr m_pImpl; - }; -} diff --git a/src/SignalR/clients/cpp/include/signalrclient/hub_exception.h b/src/SignalR/clients/cpp/include/signalrclient/hub_exception.h deleted file mode 100644 index 0c653acc2a..0000000000 --- a/src/SignalR/clients/cpp/include/signalrclient/hub_exception.h +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#pragma once - -#include -#include "signalr_exception.h" - -namespace signalr -{ - class hub_exception : public signalr_exception - { - public: - hub_exception(const std::string &what) - : signalr_exception(what) - {} - }; -} diff --git a/src/SignalR/clients/cpp/include/signalrclient/log_writer.h b/src/SignalR/clients/cpp/include/signalrclient/log_writer.h deleted file mode 100644 index 89dc3815c4..0000000000 --- a/src/SignalR/clients/cpp/include/signalrclient/log_writer.h +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#pragma once - -namespace signalr -{ - class log_writer - { - public: - // NOTE: the caller does not enforce thread safety of this call - virtual void __cdecl write(const std::string &entry) = 0; - }; -} diff --git a/src/SignalR/clients/cpp/include/signalrclient/signalr_client_config.h b/src/SignalR/clients/cpp/include/signalrclient/signalr_client_config.h deleted file mode 100644 index c8fe6d8122..0000000000 --- a/src/SignalR/clients/cpp/include/signalrclient/signalr_client_config.h +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#pragma once - -#include "cpprest/http_client.h" -#include "cpprest/ws_client.h" -#include "_exports.h" - -namespace signalr -{ - class signalr_client_config - { - public: - SIGNALRCLIENT_API void __cdecl set_proxy(const web::web_proxy &proxy); - // Please note that setting credentials does not work in all cases. - // For example, Basic Authentication fails under Win32. - // As a workaround, you can set the required authorization headers directly - // using signalr_client_config::set_http_headers - SIGNALRCLIENT_API void __cdecl set_credentials(const web::credentials &credentials); - - SIGNALRCLIENT_API web::http::client::http_client_config __cdecl get_http_client_config() const; - SIGNALRCLIENT_API void __cdecl set_http_client_config(const web::http::client::http_client_config& http_client_config); - - SIGNALRCLIENT_API web::websockets::client::websocket_client_config __cdecl get_websocket_client_config() const noexcept; - SIGNALRCLIENT_API void __cdecl set_websocket_client_config(const web::websockets::client::websocket_client_config& websocket_client_config); - - SIGNALRCLIENT_API web::http::http_headers __cdecl get_http_headers() const noexcept; - SIGNALRCLIENT_API void __cdecl set_http_headers(const web::http::http_headers& http_headers); - - private: - web::http::client::http_client_config m_http_client_config; - web::websockets::client::websocket_client_config m_websocket_client_config; - web::http::http_headers m_http_headers; - }; -} diff --git a/src/SignalR/clients/cpp/include/signalrclient/signalr_exception.h b/src/SignalR/clients/cpp/include/signalrclient/signalr_exception.h deleted file mode 100644 index e475ff4ee9..0000000000 --- a/src/SignalR/clients/cpp/include/signalrclient/signalr_exception.h +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#pragma once - -#include - -namespace signalr -{ - class signalr_exception : public std::runtime_error - { - public: - explicit signalr_exception(const std::string &what) - : runtime_error(what) - {} - }; -} diff --git a/src/SignalR/clients/cpp/include/signalrclient/trace_level.h b/src/SignalR/clients/cpp/include/signalrclient/trace_level.h deleted file mode 100644 index 928d0a28bc..0000000000 --- a/src/SignalR/clients/cpp/include/signalrclient/trace_level.h +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#pragma once - -namespace signalr -{ - enum class trace_level : int - { - none = 0, - messages = 1, - events = 2, - state_changes = 4, - errors = 8, - info = 16, - all = messages | events | state_changes | errors | info - }; - - inline trace_level operator|(trace_level lhs, trace_level rhs) noexcept - { - return static_cast(static_cast(lhs) | static_cast(rhs)); - } - - inline trace_level operator&(trace_level lhs, trace_level rhs) noexcept - { - return static_cast(static_cast(lhs) & static_cast(rhs)); - } -} diff --git a/src/SignalR/clients/cpp/include/signalrclient/transfer_format.h b/src/SignalR/clients/cpp/include/signalrclient/transfer_format.h deleted file mode 100644 index 8355d25309..0000000000 --- a/src/SignalR/clients/cpp/include/signalrclient/transfer_format.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#pragma once - -namespace signalr -{ - enum class transfer_format - { - text, - binary - }; -} diff --git a/src/SignalR/clients/cpp/include/signalrclient/transport_type.h b/src/SignalR/clients/cpp/include/signalrclient/transport_type.h deleted file mode 100644 index bc30ee4646..0000000000 --- a/src/SignalR/clients/cpp/include/signalrclient/transport_type.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#pragma once - -namespace signalr -{ - enum class transport_type - { - long_polling, - websockets - }; -} diff --git a/src/SignalR/clients/cpp/include/signalrclient/web_exception.h b/src/SignalR/clients/cpp/include/signalrclient/web_exception.h deleted file mode 100644 index f8d4c9a520..0000000000 --- a/src/SignalR/clients/cpp/include/signalrclient/web_exception.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#pragma once - -#include - -namespace signalr -{ - class web_exception : public std::runtime_error - { - public: - web_exception(const std::string &what, unsigned short status_code) - : runtime_error(what), m_status_code(status_code) - {} - - unsigned short status_code() const noexcept - { - return m_status_code; - } - - private: - unsigned short m_status_code; - }; -} diff --git a/src/SignalR/clients/cpp/include/signalrclient/websocket_client.h b/src/SignalR/clients/cpp/include/signalrclient/websocket_client.h deleted file mode 100644 index b45e73995f..0000000000 --- a/src/SignalR/clients/cpp/include/signalrclient/websocket_client.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#pragma once - -#include "transfer_format.h" - -namespace signalr -{ - class websocket_client - { - public: - virtual ~websocket_client() {}; - - virtual void start(std::string url, transfer_format format, std::function callback) = 0; - - virtual void stop(std::function callback) = 0; - - virtual void send(std::string payload, std::function callback) = 0; - - virtual void receive(std::function callback) = 0; - }; -} diff --git a/src/SignalR/clients/cpp/samples.sln b/src/SignalR/clients/cpp/samples.sln deleted file mode 100644 index b152ac18a8..0000000000 --- a/src/SignalR/clients/cpp/samples.sln +++ /dev/null @@ -1,63 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PersistentConnectionSample", "samples\PersistentConnectionSample\PersistentConnectionSample.vcxproj", "{BD075706-11E9-403B-A2E3-A5E1397E53EF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HubConnectionSample", "samples\HubConnectionSample\HubConnectionSample.vcxproj", "{3C9BD092-18E6-4C6E-A887-CDFC80ACB206}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SignalRServer", "samples\SignalRServer\SignalRServer.csproj", "{A6782DC4-7435-4DB2-9E34-3F0390BC3FDE}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{4AA7C02A-A2E9-4E22-A026-B43D623C272F}" - ProjectSection(SolutionItems) = preProject - .nuget\NuGet.Config = .nuget\NuGet.Config - .nuget\NuGet.exe = .nuget\NuGet.exe - .nuget\NuGet.targets = .nuget\NuGet.targets - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|Win32 = Debug|Win32 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BD075706-11E9-403B-A2E3-A5E1397E53EF}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {BD075706-11E9-403B-A2E3-A5E1397E53EF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {BD075706-11E9-403B-A2E3-A5E1397E53EF}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {BD075706-11E9-403B-A2E3-A5E1397E53EF}.Debug|Win32.ActiveCfg = Debug|Win32 - {BD075706-11E9-403B-A2E3-A5E1397E53EF}.Debug|Win32.Build.0 = Debug|Win32 - {BD075706-11E9-403B-A2E3-A5E1397E53EF}.Release|Any CPU.ActiveCfg = Release|Win32 - {BD075706-11E9-403B-A2E3-A5E1397E53EF}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {BD075706-11E9-403B-A2E3-A5E1397E53EF}.Release|Mixed Platforms.Build.0 = Release|Win32 - {BD075706-11E9-403B-A2E3-A5E1397E53EF}.Release|Win32.ActiveCfg = Release|Win32 - {BD075706-11E9-403B-A2E3-A5E1397E53EF}.Release|Win32.Build.0 = Release|Win32 - {3C9BD092-18E6-4C6E-A887-CDFC80ACB206}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {3C9BD092-18E6-4C6E-A887-CDFC80ACB206}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {3C9BD092-18E6-4C6E-A887-CDFC80ACB206}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {3C9BD092-18E6-4C6E-A887-CDFC80ACB206}.Debug|Win32.ActiveCfg = Debug|Win32 - {3C9BD092-18E6-4C6E-A887-CDFC80ACB206}.Debug|Win32.Build.0 = Debug|Win32 - {3C9BD092-18E6-4C6E-A887-CDFC80ACB206}.Release|Any CPU.ActiveCfg = Release|Win32 - {3C9BD092-18E6-4C6E-A887-CDFC80ACB206}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {3C9BD092-18E6-4C6E-A887-CDFC80ACB206}.Release|Mixed Platforms.Build.0 = Release|Win32 - {3C9BD092-18E6-4C6E-A887-CDFC80ACB206}.Release|Win32.ActiveCfg = Release|Win32 - {3C9BD092-18E6-4C6E-A887-CDFC80ACB206}.Release|Win32.Build.0 = Release|Win32 - {A6782DC4-7435-4DB2-9E34-3F0390BC3FDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6782DC4-7435-4DB2-9E34-3F0390BC3FDE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6782DC4-7435-4DB2-9E34-3F0390BC3FDE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A6782DC4-7435-4DB2-9E34-3F0390BC3FDE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A6782DC4-7435-4DB2-9E34-3F0390BC3FDE}.Debug|Win32.ActiveCfg = Debug|Any CPU - {A6782DC4-7435-4DB2-9E34-3F0390BC3FDE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6782DC4-7435-4DB2-9E34-3F0390BC3FDE}.Release|Any CPU.Build.0 = Release|Any CPU - {A6782DC4-7435-4DB2-9E34-3F0390BC3FDE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A6782DC4-7435-4DB2-9E34-3F0390BC3FDE}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A6782DC4-7435-4DB2-9E34-3F0390BC3FDE}.Release|Win32.ActiveCfg = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/SignalR/clients/cpp/samples/HubConnectionSample/HubConnectionSample.cpp b/src/SignalR/clients/cpp/samples/HubConnectionSample/HubConnectionSample.cpp deleted file mode 100644 index dba7bcc964..0000000000 --- a/src/SignalR/clients/cpp/samples/HubConnectionSample/HubConnectionSample.cpp +++ /dev/null @@ -1,112 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#include "stdafx.h" - -#include -#include -#include "hub_connection.h" -#include "log_writer.h" -#include - -class logger : public signalr::log_writer -{ - // Inherited via log_writer - virtual void __cdecl write(const std::string & entry) override - { - //std::cout << utility::conversions::to_utf8string(entry) << std::endl; - } -}; - -void send_message(signalr::hub_connection& connection, const std::string& message) -{ - web::json::value args{}; - args[0] = web::json::value(utility::conversions::to_string_t(message)); - - // if you get an internal compiler error uncomment the lambda below or install VS Update 4 - connection.invoke("Send", args, [](const web::json::value& value, std::exception_ptr exception) - { - try - { - if (exception) - { - std::rethrow_exception(exception); - } - - ucout << U("Received: ") << value.serialize() << std::endl; - } - catch (const std::exception &e) - { - ucout << U("Error while sending data: ") << e.what() << std::endl; - } - }); -} - -void chat() -{ - signalr::hub_connection connection("http://localhost:5000/default", signalr::trace_level::all, std::make_shared()); - connection.on("Send", [](const web::json::value & m) - { - ucout << std::endl << m.at(0).as_string() << /*U(" wrote:") << m.at(1).as_string() <<*/ std::endl << U("Enter your message: "); - }); - - std::promise task; - connection.start([&connection, &task](std::exception_ptr exception) - { - if (exception) - { - try - { - std::rethrow_exception(exception); - } - catch (const std::exception & ex) - { - ucout << U("exception when starting connection: ") << ex.what() << std::endl; - } - task.set_value(); - return; - } - - ucout << U("Enter your message:"); - for (;;) - { - std::string message; - std::getline(std::cin, message); - - if (message == ":q") - { - break; - } - - send_message(connection, message); - } - - connection.stop([&task](std::exception_ptr exception) - { - try - { - if (exception) - { - std::rethrow_exception(exception); - } - - ucout << U("connection stopped successfully") << std::endl; - } - catch (const std::exception & e) - { - ucout << U("exception when stopping connection: ") << e.what() << std::endl; - } - - task.set_value(); - }); - }); - - task.get_future().get(); -} - -int main() -{ - chat(); - - return 0; -} diff --git a/src/SignalR/clients/cpp/samples/HubConnectionSample/HubConnectionSample.vcxproj b/src/SignalR/clients/cpp/samples/HubConnectionSample/HubConnectionSample.vcxproj deleted file mode 100644 index ae70839bc8..0000000000 --- a/src/SignalR/clients/cpp/samples/HubConnectionSample/HubConnectionSample.vcxproj +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - - {3C9BD092-18E6-4C6E-A887-CDFC80ACB206} - Win32Proj - HubConnectionSample - ..\..\ - true - true - 10.0.17134.0 - - - - Application - true - v141 - Unicode - - - Application - false - v141 - true - Unicode - - - - - - - - - - - - - - true - - - false - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - ..\..\include\signalrclient;%(AdditionalIncludeDirectories) - - - Console - true - - - $(MSBuildThisFileDirectory)..\..\packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.2.9.1\lib\native\v140\windesktop\msvcstl\dyn\rt-dyn\x86\Debug\cpprest140d_2_9.lib;$(MSBuildThisFileDirectory)..\..\bin\Desktop\Win32\Debug\dll\signalrclient.lib;%(AdditionalDependencies) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - ..\..\include\signalrclient;$(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - - - - - - - - - Create - Create - - - - - - - - {87ed3ad4-d820-48cd-8382-a12564213a12} - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - diff --git a/src/SignalR/clients/cpp/samples/HubConnectionSample/HubConnectionSample.vcxproj.filters b/src/SignalR/clients/cpp/samples/HubConnectionSample/HubConnectionSample.vcxproj.filters deleted file mode 100644 index 2d23e3b461..0000000000 --- a/src/SignalR/clients/cpp/samples/HubConnectionSample/HubConnectionSample.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - Source Files - - - - - - \ No newline at end of file diff --git a/src/SignalR/clients/cpp/samples/HubConnectionSample/packages.config b/src/SignalR/clients/cpp/samples/HubConnectionSample/packages.config deleted file mode 100644 index 54b8976318..0000000000 --- a/src/SignalR/clients/cpp/samples/HubConnectionSample/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/SignalR/clients/cpp/samples/HubConnectionSample/stdafx.cpp b/src/SignalR/clients/cpp/samples/HubConnectionSample/stdafx.cpp deleted file mode 100644 index 4ddb0135bd..0000000000 --- a/src/SignalR/clients/cpp/samples/HubConnectionSample/stdafx.cpp +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#include "stdafx.h" \ No newline at end of file diff --git a/src/SignalR/clients/cpp/samples/HubConnectionSample/stdafx.h b/src/SignalR/clients/cpp/samples/HubConnectionSample/stdafx.h deleted file mode 100644 index b9c15ddfa2..0000000000 --- a/src/SignalR/clients/cpp/samples/HubConnectionSample/stdafx.h +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#pragma once diff --git a/src/SignalR/clients/cpp/samples/PersistentConnectionSample/PersistentConnectionSample.cpp b/src/SignalR/clients/cpp/samples/PersistentConnectionSample/PersistentConnectionSample.cpp deleted file mode 100644 index 323890a80d..0000000000 --- a/src/SignalR/clients/cpp/samples/PersistentConnectionSample/PersistentConnectionSample.cpp +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#include "stdafx.h" -#include "signalrclient\connection.h" -#include - -void send_message(signalr::connection &connection, const utility::string_t& message) -{ - connection.send(message) - .then([](pplx::task send_task) // fire and forget but we need to observe exceptions - { - try - { - send_task.get(); - } - catch (const std::exception &e) - { - ucout << U("Error while sending data: ") << e.what(); - } - }); -} - -int main() -{ - signalr::connection connection{ U("http://localhost:34281/echo") }; - connection.set_message_received([](const utility::string_t& m) - { - ucout << U("Message received:") << m << std::endl << U("Enter message: "); - }); - - connection.start() - .then([&connection]() // fine to capture by reference - we are blocking so it is guaranteed to be valid - { - for (;;) - { - utility::string_t message; - std::getline(ucin, message); - - if (message == U(":q")) - { - break; - } - - send_message(connection, message); - } - - return connection.stop(); - }) - .then([](pplx::task stop_task) - { - try - { - stop_task.get(); - ucout << U("connection stopped successfully") << std::endl; - } - catch (const std::exception &e) - { - ucout << U("exception when starting or closing connection: ") << e.what() << std::endl; - } - }).get(); - - return 0; -} diff --git a/src/SignalR/clients/cpp/samples/PersistentConnectionSample/PersistentConnectionSample.vcxproj b/src/SignalR/clients/cpp/samples/PersistentConnectionSample/PersistentConnectionSample.vcxproj deleted file mode 100644 index 06064783a4..0000000000 --- a/src/SignalR/clients/cpp/samples/PersistentConnectionSample/PersistentConnectionSample.vcxproj +++ /dev/null @@ -1,109 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {BD075706-11E9-403B-A2E3-A5E1397E53EF} - Win32Proj - PersistentConnectionSample - ..\..\ - true - true - 10.0.16299.0 - - - - Application - true - v141 - Unicode - - - Application - false - v141 - true - Unicode - - - - - - - - - - - - - true - - - false - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - - Create - Create - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - \ No newline at end of file diff --git a/src/SignalR/clients/cpp/samples/PersistentConnectionSample/PersistentConnectionSample.vcxproj.filters b/src/SignalR/clients/cpp/samples/PersistentConnectionSample/PersistentConnectionSample.vcxproj.filters deleted file mode 100644 index f04ee37ebf..0000000000 --- a/src/SignalR/clients/cpp/samples/PersistentConnectionSample/PersistentConnectionSample.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - Source Files - - - - - - \ No newline at end of file diff --git a/src/SignalR/clients/cpp/samples/PersistentConnectionSample/packages.config b/src/SignalR/clients/cpp/samples/PersistentConnectionSample/packages.config deleted file mode 100644 index b2d64c805a..0000000000 --- a/src/SignalR/clients/cpp/samples/PersistentConnectionSample/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/SignalR/clients/cpp/samples/PersistentConnectionSample/stdafx.cpp b/src/SignalR/clients/cpp/samples/PersistentConnectionSample/stdafx.cpp deleted file mode 100644 index bd7a85614c..0000000000 --- a/src/SignalR/clients/cpp/samples/PersistentConnectionSample/stdafx.cpp +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#include "stdafx.h" diff --git a/src/SignalR/clients/cpp/samples/PersistentConnectionSample/stdafx.h b/src/SignalR/clients/cpp/samples/PersistentConnectionSample/stdafx.h deleted file mode 100644 index b9c15ddfa2..0000000000 --- a/src/SignalR/clients/cpp/samples/PersistentConnectionSample/stdafx.h +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -#pragma once diff --git a/src/SignalR/clients/cpp/samples/SignalRServer/ChatHub.cs b/src/SignalR/clients/cpp/samples/SignalRServer/ChatHub.cs deleted file mode 100644 index 00f626c4a1..0000000000 --- a/src/SignalR/clients/cpp/samples/SignalRServer/ChatHub.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using Microsoft.AspNet.SignalR; - -namespace SignalRServer -{ - public class ChatHub : Hub - { - public void Send(string name, string message) - { - // Call the broadcastMessage method to update clients. - Clients.All.broadcastMessage(name, message); - } - } -} \ No newline at end of file diff --git a/src/SignalR/clients/cpp/samples/SignalRServer/EchoConnection.cs b/src/SignalR/clients/cpp/samples/SignalRServer/EchoConnection.cs deleted file mode 100644 index 98d50fc767..0000000000 --- a/src/SignalR/clients/cpp/samples/SignalRServer/EchoConnection.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Threading.Tasks; -using Microsoft.AspNet.SignalR; - -namespace SignalRServer -{ - public class EchoConnection : PersistentConnection - { - protected override Task OnConnected(IRequest request, string connectionId) - { - return Connection.Send(connectionId, "Welcome!"); - } - - protected override Task OnReceived(IRequest request, string connectionId, string data) - { - return Connection.Broadcast(data); - } - } -} \ No newline at end of file diff --git a/src/SignalR/clients/cpp/samples/SignalRServer/Properties/AssemblyInfo.cs b/src/SignalR/clients/cpp/samples/SignalRServer/Properties/AssemblyInfo.cs deleted file mode 100644 index a6bd8e468b..0000000000 --- a/src/SignalR/clients/cpp/samples/SignalRServer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 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: AssemblyTitle("SignalRServer")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("SignalRServer")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("64b40dbb-f6c1-45b4-8fc4-764526e9f16c")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/SignalR/clients/cpp/samples/SignalRServer/Scripts/jquery-1.10.2.intellisense.js b/src/SignalR/clients/cpp/samples/SignalRServer/Scripts/jquery-1.10.2.intellisense.js deleted file mode 100644 index f1d83254a6..0000000000 --- a/src/SignalR/clients/cpp/samples/SignalRServer/Scripts/jquery-1.10.2.intellisense.js +++ /dev/null @@ -1,2671 +0,0 @@ -/* NUGET: BEGIN LICENSE TEXT - * - * Microsoft grants you the right to use these script files for the sole - * purpose of either: (i) interacting through your browser with the Microsoft - * website or online service, subject to the applicable licensing or use - * terms; or (ii) using the files as included with a Microsoft product subject - * to that product's license terms. Microsoft reserves all other rights to the - * files not expressly granted by Microsoft, whether by implication, estoppel - * or otherwise. Insofar as a script file is dual licensed under GPL, - * Microsoft neither took the code under GPL nor distributes it thereunder but - * under the terms set out in this paragraph. All notices and licenses - * below are for informational purposes only. - * - * NUGET: END LICENSE TEXT */ -intellisense.annotate(jQuery, { - 'ajax': function() { - /// - /// Perform an asynchronous HTTP (Ajax) request. - /// A string containing the URL to which the request is sent. - /// A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup(). See jQuery.ajax( settings ) below for a complete list of all settings. - /// - /// - /// - /// Perform an asynchronous HTTP (Ajax) request. - /// A set of key/value pairs that configure the Ajax request. All settings are optional. A default can be set for any option with $.ajaxSetup(). - /// - /// - }, - 'ajaxPrefilter': function() { - /// - /// Handle custom Ajax options or modify existing options before each request is sent and before they are processed by $.ajax(). - /// An optional string containing one or more space-separated dataTypes - /// A handler to set default values for future Ajax requests. - /// - }, - 'ajaxSetup': function() { - /// - /// Set default values for future Ajax requests. - /// A set of key/value pairs that configure the default Ajax request. All options are optional. - /// - }, - 'ajaxTransport': function() { - /// - /// Creates an object that handles the actual transmission of Ajax data. - /// A string identifying the data type to use - /// A handler to return the new transport object to use with the data type provided in the first argument. - /// - }, - 'boxModel': function() { - /// Deprecated in jQuery 1.3 (see jQuery.support). States if the current page, in the user's browser, is being rendered using the W3C CSS Box Model. - /// - }, - 'browser': function() { - /// Contains flags for the useragent, read from navigator.userAgent. We recommend against using this property; please try to use feature detection instead (see jQuery.support). jQuery.browser may be moved to a plugin in a future release of jQuery. - /// - }, - 'browser.version': function() { - /// The version number of the rendering engine for the user's browser. - /// - }, - 'Callbacks': function() { - /// - /// A multi-purpose callbacks list object that provides a powerful way to manage callback lists. - /// An optional list of space-separated flags that change how the callback list behaves. - /// - /// - }, - 'contains': function() { - /// - /// Check to see if a DOM element is a descendant of another DOM element. - /// The DOM element that may contain the other element. - /// The DOM element that may be contained by (a descendant of) the other element. - /// - /// - }, - 'cssHooks': function() { - /// Hook directly into jQuery to override how particular CSS properties are retrieved or set, normalize CSS property naming, or create custom properties. - /// - }, - 'data': function() { - /// - /// Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element. - /// The DOM element to query for the data. - /// Name of the data stored. - /// - /// - /// - /// Returns value at named data store for the element, as set by jQuery.data(element, name, value), or the full data store for the element. - /// The DOM element to query for the data. - /// - /// - }, - 'Deferred': function() { - /// - /// A constructor function that returns a chainable utility object with methods to register multiple callbacks into callback queues, invoke callback queues, and relay the success or failure state of any synchronous or asynchronous function. - /// A function that is called just before the constructor returns. - /// - /// - }, - 'dequeue': function() { - /// - /// Execute the next function on the queue for the matched element. - /// A DOM element from which to remove and execute a queued function. - /// A string containing the name of the queue. Defaults to fx, the standard effects queue. - /// - }, - 'each': function() { - /// - /// A generic iterator function, which can be used to seamlessly iterate over both objects and arrays. Arrays and array-like objects with a length property (such as a function's arguments object) are iterated by numeric index, from 0 to length-1. Other objects are iterated via their named properties. - /// The object or array to iterate over. - /// The function that will be executed on every object. - /// - /// - }, - 'error': function() { - /// - /// Takes a string and throws an exception containing it. - /// The message to send out. - /// - }, - 'extend': function() { - /// - /// Merge the contents of two or more objects together into the first object. - /// An object that will receive the new properties if additional objects are passed in or that will extend the jQuery namespace if it is the sole argument. - /// An object containing additional properties to merge in. - /// Additional objects containing properties to merge in. - /// - /// - /// - /// Merge the contents of two or more objects together into the first object. - /// If true, the merge becomes recursive (aka. deep copy). - /// The object to extend. It will receive the new properties. - /// An object containing additional properties to merge in. - /// Additional objects containing properties to merge in. - /// - /// - }, - 'get': function() { - /// - /// Load data from the server using a HTTP GET request. - /// A string containing the URL to which the request is sent. - /// A plain object or string that is sent to the server with the request. - /// A callback function that is executed if the request succeeds. - /// The type of data expected from the server. Default: Intelligent Guess (xml, json, script, or html). - /// - /// - }, - 'getJSON': function() { - /// - /// Load JSON-encoded data from the server using a GET HTTP request. - /// A string containing the URL to which the request is sent. - /// A plain object or string that is sent to the server with the request. - /// A callback function that is executed if the request succeeds. - /// - /// - }, - 'getScript': function() { - /// - /// Load a JavaScript file from the server using a GET HTTP request, then execute it. - /// A string containing the URL to which the request is sent. - /// A callback function that is executed if the request succeeds. - /// - /// - }, - 'globalEval': function() { - /// - /// Execute some JavaScript code globally. - /// The JavaScript code to execute. - /// - }, - 'grep': function() { - /// - /// Finds the elements of an array which satisfy a filter function. The original array is not affected. - /// The array to search through. - /// The function to process each item against. The first argument to the function is the item, and the second argument is the index. The function should return a Boolean value. this will be the global window object. - /// If "invert" is false, or not provided, then the function returns an array consisting of all elements for which "callback" returns true. If "invert" is true, then the function returns an array consisting of all elements for which "callback" returns false. - /// - /// - }, - 'hasData': function() { - /// - /// Determine whether an element has any jQuery data associated with it. - /// A DOM element to be checked for data. - /// - /// - }, - 'holdReady': function() { - /// - /// Holds or releases the execution of jQuery's ready event. - /// Indicates whether the ready hold is being requested or released - /// - }, - 'inArray': function() { - /// - /// Search for a specified value within an array and return its index (or -1 if not found). - /// The value to search for. - /// An array through which to search. - /// The index of the array at which to begin the search. The default is 0, which will search the whole array. - /// - /// - }, - 'isArray': function() { - /// - /// Determine whether the argument is an array. - /// Object to test whether or not it is an array. - /// - /// - }, - 'isEmptyObject': function() { - /// - /// Check to see if an object is empty (contains no enumerable properties). - /// The object that will be checked to see if it's empty. - /// - /// - }, - 'isFunction': function() { - /// - /// Determine if the argument passed is a Javascript function object. - /// Object to test whether or not it is a function. - /// - /// - }, - 'isNumeric': function() { - /// - /// Determines whether its argument is a number. - /// The value to be tested. - /// - /// - }, - 'isPlainObject': function() { - /// - /// Check to see if an object is a plain object (created using "{}" or "new Object"). - /// The object that will be checked to see if it's a plain object. - /// - /// - }, - 'isWindow': function() { - /// - /// Determine whether the argument is a window. - /// Object to test whether or not it is a window. - /// - /// - }, - 'isXMLDoc': function() { - /// - /// Check to see if a DOM node is within an XML document (or is an XML document). - /// The DOM node that will be checked to see if it's in an XML document. - /// - /// - }, - 'makeArray': function() { - /// - /// Convert an array-like object into a true JavaScript array. - /// Any object to turn into a native Array. - /// - /// - }, - 'map': function() { - /// - /// Translate all items in an array or object to new array of items. - /// The Array to translate. - /// The function to process each item against. The first argument to the function is the array item, the second argument is the index in array The function can return any value. Within the function, this refers to the global (window) object. - /// - /// - /// - /// Translate all items in an array or object to new array of items. - /// The Array or Object to translate. - /// The function to process each item against. The first argument to the function is the value; the second argument is the index or key of the array or object property. The function can return any value to add to the array. A returned array will be flattened into the resulting array. Within the function, this refers to the global (window) object. - /// - /// - }, - 'merge': function() { - /// - /// Merge the contents of two arrays together into the first array. - /// The first array to merge, the elements of second added. - /// The second array to merge into the first, unaltered. - /// - /// - }, - 'noConflict': function() { - /// - /// Relinquish jQuery's control of the $ variable. - /// A Boolean indicating whether to remove all jQuery variables from the global scope (including jQuery itself). - /// - /// - }, - 'noop': function() { - /// An empty function. - }, - 'now': function() { - /// Return a number representing the current time. - /// - }, - 'param': function() { - /// - /// Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request. - /// An array or object to serialize. - /// - /// - /// - /// Create a serialized representation of an array or object, suitable for use in a URL query string or Ajax request. - /// An array or object to serialize. - /// A Boolean indicating whether to perform a traditional "shallow" serialization. - /// - /// - }, - 'parseHTML': function() { - /// - /// Parses a string into an array of DOM nodes. - /// HTML string to be parsed - /// DOM element to serve as the context in which the HTML fragment will be created - /// A Boolean indicating whether to include scripts passed in the HTML string - /// - /// - }, - 'parseJSON': function() { - /// - /// Takes a well-formed JSON string and returns the resulting JavaScript object. - /// The JSON string to parse. - /// - /// - }, - 'parseXML': function() { - /// - /// Parses a string into an XML document. - /// a well-formed XML string to be parsed - /// - /// - }, - 'post': function() { - /// - /// Load data from the server using a HTTP POST request. - /// A string containing the URL to which the request is sent. - /// A plain object or string that is sent to the server with the request. - /// A callback function that is executed if the request succeeds. - /// The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html). - /// - /// - }, - 'proxy': function() { - /// - /// Takes a function and returns a new one that will always have a particular context. - /// The function whose context will be changed. - /// The object to which the context (this) of the function should be set. - /// - /// - /// - /// Takes a function and returns a new one that will always have a particular context. - /// The object to which the context of the function should be set. - /// The name of the function whose context will be changed (should be a property of the context object). - /// - /// - /// - /// Takes a function and returns a new one that will always have a particular context. - /// The function whose context will be changed. - /// The object to which the context (this) of the function should be set. - /// Any number of arguments to be passed to the function referenced in the function argument. - /// - /// - /// - /// Takes a function and returns a new one that will always have a particular context. - /// The object to which the context of the function should be set. - /// The name of the function whose context will be changed (should be a property of the context object). - /// Any number of arguments to be passed to the function named in the name argument. - /// - /// - }, - 'queue': function() { - /// - /// Manipulate the queue of functions to be executed on the matched element. - /// A DOM element where the array of queued functions is attached. - /// A string containing the name of the queue. Defaults to fx, the standard effects queue. - /// An array of functions to replace the current queue contents. - /// - /// - /// - /// Manipulate the queue of functions to be executed on the matched element. - /// A DOM element on which to add a queued function. - /// A string containing the name of the queue. Defaults to fx, the standard effects queue. - /// The new function to add to the queue. - /// - /// - }, - 'removeData': function() { - /// - /// Remove a previously-stored piece of data. - /// A DOM element from which to remove data. - /// A string naming the piece of data to remove. - /// - /// - }, - 'sub': function() { - /// Creates a new copy of jQuery whose properties and methods can be modified without affecting the original jQuery object. - /// - }, - 'support': function() { - /// A collection of properties that represent the presence of different browser features or bugs. Primarily intended for jQuery's internal use; specific properties may be removed when they are no longer needed internally to improve page startup performance. - /// - }, - 'trim': function() { - /// - /// Remove the whitespace from the beginning and end of a string. - /// The string to trim. - /// - /// - }, - 'type': function() { - /// - /// Determine the internal JavaScript [[Class]] of an object. - /// Object to get the internal JavaScript [[Class]] of. - /// - /// - }, - 'unique': function() { - /// - /// Sorts an array of DOM elements, in place, with the duplicates removed. Note that this only works on arrays of DOM elements, not strings or numbers. - /// The Array of DOM elements. - /// - /// - }, - 'when': function() { - /// - /// Provides a way to execute callback functions based on one or more objects, usually Deferred objects that represent asynchronous events. - /// One or more Deferred objects, or plain JavaScript objects. - /// - /// - }, -}); - -var _1228819969 = jQuery.Callbacks; -jQuery.Callbacks = function(flags) { -var _object = _1228819969(flags); -intellisense.annotate(_object, { - 'add': function() { - /// - /// Add a callback or a collection of callbacks to a callback list. - /// A function, or array of functions, that are to be added to the callback list. - /// - /// - }, - 'disable': function() { - /// Disable a callback list from doing anything more. - /// - }, - 'disabled': function() { - /// Determine if the callbacks list has been disabled. - /// - }, - 'empty': function() { - /// Remove all of the callbacks from a list. - /// - }, - 'fire': function() { - /// - /// Call all of the callbacks with the given arguments - /// The argument or list of arguments to pass back to the callback list. - /// - /// - }, - 'fired': function() { - /// Determine if the callbacks have already been called at least once. - /// - }, - 'fireWith': function() { - /// - /// Call all callbacks in a list with the given context and arguments. - /// A reference to the context in which the callbacks in the list should be fired. - /// An argument, or array of arguments, to pass to the callbacks in the list. - /// - /// - }, - 'has': function() { - /// - /// Determine whether a supplied callback is in a list - /// The callback to search for. - /// - /// - }, - 'lock': function() { - /// Lock a callback list in its current state. - /// - }, - 'locked': function() { - /// Determine if the callbacks list has been locked. - /// - }, - 'remove': function() { - /// - /// Remove a callback or a collection of callbacks from a callback list. - /// A function, or array of functions, that are to be removed from the callback list. - /// - /// - }, -}); - -return _object; -}; -intellisense.redirectDefinition(jQuery.Callbacks, _1228819969); - -var _731531622 = jQuery.Deferred; -jQuery.Deferred = function(func) { -var _object = _731531622(func); -intellisense.annotate(_object, { - 'always': function() { - /// - /// Add handlers to be called when the Deferred object is either resolved or rejected. - /// A function, or array of functions, that is called when the Deferred is resolved or rejected. - /// Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected. - /// - /// - }, - 'done': function() { - /// - /// Add handlers to be called when the Deferred object is resolved. - /// A function, or array of functions, that are called when the Deferred is resolved. - /// Optional additional functions, or arrays of functions, that are called when the Deferred is resolved. - /// - /// - }, - 'fail': function() { - /// - /// Add handlers to be called when the Deferred object is rejected. - /// A function, or array of functions, that are called when the Deferred is rejected. - /// Optional additional functions, or arrays of functions, that are called when the Deferred is rejected. - /// - /// - }, - 'isRejected': function() { - /// Determine whether a Deferred object has been rejected. - /// - }, - 'isResolved': function() { - /// Determine whether a Deferred object has been resolved. - /// - }, - 'notify': function() { - /// - /// Call the progressCallbacks on a Deferred object with the given args. - /// Optional arguments that are passed to the progressCallbacks. - /// - /// - }, - 'notifyWith': function() { - /// - /// Call the progressCallbacks on a Deferred object with the given context and args. - /// Context passed to the progressCallbacks as the this object. - /// Optional arguments that are passed to the progressCallbacks. - /// - /// - }, - 'pipe': function() { - /// - /// Utility method to filter and/or chain Deferreds. - /// An optional function that is called when the Deferred is resolved. - /// An optional function that is called when the Deferred is rejected. - /// - /// - /// - /// Utility method to filter and/or chain Deferreds. - /// An optional function that is called when the Deferred is resolved. - /// An optional function that is called when the Deferred is rejected. - /// An optional function that is called when progress notifications are sent to the Deferred. - /// - /// - }, - 'progress': function() { - /// - /// Add handlers to be called when the Deferred object generates progress notifications. - /// A function, or array of functions, that is called when the Deferred generates progress notifications. - /// - /// - }, - 'promise': function() { - /// - /// Return a Deferred's Promise object. - /// Object onto which the promise methods have to be attached - /// - /// - }, - 'reject': function() { - /// - /// Reject a Deferred object and call any failCallbacks with the given args. - /// Optional arguments that are passed to the failCallbacks. - /// - /// - }, - 'rejectWith': function() { - /// - /// Reject a Deferred object and call any failCallbacks with the given context and args. - /// Context passed to the failCallbacks as the this object. - /// An optional array of arguments that are passed to the failCallbacks. - /// - /// - }, - 'resolve': function() { - /// - /// Resolve a Deferred object and call any doneCallbacks with the given args. - /// Optional arguments that are passed to the doneCallbacks. - /// - /// - }, - 'resolveWith': function() { - /// - /// Resolve a Deferred object and call any doneCallbacks with the given context and args. - /// Context passed to the doneCallbacks as the this object. - /// An optional array of arguments that are passed to the doneCallbacks. - /// - /// - }, - 'state': function() { - /// Determine the current state of a Deferred object. - /// - }, - 'then': function() { - /// - /// Add handlers to be called when the Deferred object is resolved, rejected, or still in progress. - /// A function that is called when the Deferred is resolved. - /// An optional function that is called when the Deferred is rejected. - /// An optional function that is called when progress notifications are sent to the Deferred. - /// - /// - /// - /// Add handlers to be called when the Deferred object is resolved, rejected, or still in progress. - /// A function, or array of functions, called when the Deferred is resolved. - /// A function, or array of functions, called when the Deferred is rejected. - /// - /// - /// - /// Add handlers to be called when the Deferred object is resolved, rejected, or still in progress. - /// A function, or array of functions, called when the Deferred is resolved. - /// A function, or array of functions, called when the Deferred is rejected. - /// A function, or array of functions, called when the Deferred notifies progress. - /// - /// - }, -}); - -return _object; -}; -intellisense.redirectDefinition(jQuery.Callbacks, _731531622); - -intellisense.annotate(jQuery.Event.prototype, { - 'currentTarget': function() { - /// The current DOM element within the event bubbling phase. - /// - }, - 'data': function() { - /// An optional object of data passed to an event method when the current executing handler is bound. - /// - }, - 'delegateTarget': function() { - /// The element where the currently-called jQuery event handler was attached. - /// - }, - 'isDefaultPrevented': function() { - /// Returns whether event.preventDefault() was ever called on this event object. - /// - }, - 'isImmediatePropagationStopped': function() { - /// Returns whether event.stopImmediatePropagation() was ever called on this event object. - /// - }, - 'isPropagationStopped': function() { - /// Returns whether event.stopPropagation() was ever called on this event object. - /// - }, - 'metaKey': function() { - /// Indicates whether the META key was pressed when the event fired. - /// - }, - 'namespace': function() { - /// The namespace specified when the event was triggered. - /// - }, - 'pageX': function() { - /// The mouse position relative to the left edge of the document. - /// - }, - 'pageY': function() { - /// The mouse position relative to the top edge of the document. - /// - }, - 'preventDefault': function() { - /// If this method is called, the default action of the event will not be triggered. - }, - 'relatedTarget': function() { - /// The other DOM element involved in the event, if any. - /// - }, - 'result': function() { - /// The last value returned by an event handler that was triggered by this event, unless the value was undefined. - /// - }, - 'stopImmediatePropagation': function() { - /// Keeps the rest of the handlers from being executed and prevents the event from bubbling up the DOM tree. - }, - 'stopPropagation': function() { - /// Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event. - }, - 'target': function() { - /// The DOM element that initiated the event. - /// - }, - 'timeStamp': function() { - /// The difference in milliseconds between the time the browser created the event and January 1, 1970. - /// - }, - 'type': function() { - /// Describes the nature of the event. - /// - }, - 'which': function() { - /// For key or mouse events, this property indicates the specific key or button that was pressed. - /// - }, -}); - -intellisense.annotate(jQuery.fn, { - 'add': function() { - /// - /// Add elements to the set of matched elements. - /// A string representing a selector expression to find additional elements to add to the set of matched elements. - /// - /// - /// - /// Add elements to the set of matched elements. - /// One or more elements to add to the set of matched elements. - /// - /// - /// - /// Add elements to the set of matched elements. - /// An HTML fragment to add to the set of matched elements. - /// - /// - /// - /// Add elements to the set of matched elements. - /// An existing jQuery object to add to the set of matched elements. - /// - /// - /// - /// Add elements to the set of matched elements. - /// A string representing a selector expression to find additional elements to add to the set of matched elements. - /// The point in the document at which the selector should begin matching; similar to the context argument of the $(selector, context) method. - /// - /// - }, - 'addBack': function() { - /// - /// Add the previous set of elements on the stack to the current set, optionally filtered by a selector. - /// A string containing a selector expression to match the current set of elements against. - /// - /// - }, - 'addClass': function() { - /// - /// Adds the specified class(es) to each of the set of matched elements. - /// One or more space-separated classes to be added to the class attribute of each matched element. - /// - /// - /// - /// Adds the specified class(es) to each of the set of matched elements. - /// A function returning one or more space-separated class names to be added to the existing class name(s). Receives the index position of the element in the set and the existing class name(s) as arguments. Within the function, this refers to the current element in the set. - /// - /// - }, - 'after': function() { - /// - /// Insert content, specified by the parameter, after each element in the set of matched elements. - /// HTML string, DOM element, or jQuery object to insert after each element in the set of matched elements. - /// One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert after each element in the set of matched elements. - /// - /// - /// - /// Insert content, specified by the parameter, after each element in the set of matched elements. - /// A function that returns an HTML string, DOM element(s), or jQuery object to insert after each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set. - /// - /// - }, - 'ajaxComplete': function() { - /// - /// Register a handler to be called when Ajax requests complete. This is an AjaxEvent. - /// The function to be invoked. - /// - /// - }, - 'ajaxError': function() { - /// - /// Register a handler to be called when Ajax requests complete with an error. This is an Ajax Event. - /// The function to be invoked. - /// - /// - }, - 'ajaxSend': function() { - /// - /// Attach a function to be executed before an Ajax request is sent. This is an Ajax Event. - /// The function to be invoked. - /// - /// - }, - 'ajaxStart': function() { - /// - /// Register a handler to be called when the first Ajax request begins. This is an Ajax Event. - /// The function to be invoked. - /// - /// - }, - 'ajaxStop': function() { - /// - /// Register a handler to be called when all Ajax requests have completed. This is an Ajax Event. - /// The function to be invoked. - /// - /// - }, - 'ajaxSuccess': function() { - /// - /// Attach a function to be executed whenever an Ajax request completes successfully. This is an Ajax Event. - /// The function to be invoked. - /// - /// - }, - 'all': function() { - /// Selects all elements. - }, - 'andSelf': function() { - /// Add the previous set of elements on the stack to the current set. - /// - }, - 'animate': function() { - /// - /// Perform a custom animation of a set of CSS properties. - /// An object of CSS properties and values that the animation will move toward. - /// A string or number determining how long the animation will run. - /// A string indicating which easing function to use for the transition. - /// A function to call once the animation is complete. - /// - /// - /// - /// Perform a custom animation of a set of CSS properties. - /// An object of CSS properties and values that the animation will move toward. - /// A map of additional options to pass to the method. - /// - /// - }, - 'animated': function() { - /// Select all elements that are in the progress of an animation at the time the selector is run. - }, - 'append': function() { - /// - /// Insert content, specified by the parameter, to the end of each element in the set of matched elements. - /// DOM element, HTML string, or jQuery object to insert at the end of each element in the set of matched elements. - /// One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the end of each element in the set of matched elements. - /// - /// - /// - /// Insert content, specified by the parameter, to the end of each element in the set of matched elements. - /// A function that returns an HTML string, DOM element(s), or jQuery object to insert at the end of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set. - /// - /// - }, - 'appendTo': function() { - /// - /// Insert every element in the set of matched elements to the end of the target. - /// A selector, element, HTML string, or jQuery object; the matched set of elements will be inserted at the end of the element(s) specified by this parameter. - /// - /// - }, - 'attr': function() { - /// - /// Set one or more attributes for the set of matched elements. - /// The name of the attribute to set. - /// A value to set for the attribute. - /// - /// - /// - /// Set one or more attributes for the set of matched elements. - /// An object of attribute-value pairs to set. - /// - /// - /// - /// Set one or more attributes for the set of matched elements. - /// The name of the attribute to set. - /// A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old attribute value as arguments. - /// - /// - }, - 'attributeContains': function() { - /// - /// Selects elements that have the specified attribute with a value containing the a given substring. - /// An attribute name. - /// An attribute value. Can be either an unquoted single word or a quoted string. - /// - }, - 'attributeContainsPrefix': function() { - /// - /// Selects elements that have the specified attribute with a value either equal to a given string or starting with that string followed by a hyphen (-). - /// An attribute name. - /// An attribute value. Can be either an unquoted single word or a quoted string. - /// - }, - 'attributeContainsWord': function() { - /// - /// Selects elements that have the specified attribute with a value containing a given word, delimited by spaces. - /// An attribute name. - /// An attribute value. Can be either an unquoted single word or a quoted string. - /// - }, - 'attributeEndsWith': function() { - /// - /// Selects elements that have the specified attribute with a value ending exactly with a given string. The comparison is case sensitive. - /// An attribute name. - /// An attribute value. Can be either an unquoted single word or a quoted string. - /// - }, - 'attributeEquals': function() { - /// - /// Selects elements that have the specified attribute with a value exactly equal to a certain value. - /// An attribute name. - /// An attribute value. Can be either an unquoted single word or a quoted string. - /// - }, - 'attributeHas': function() { - /// - /// Selects elements that have the specified attribute, with any value. - /// An attribute name. - /// - }, - 'attributeMultiple': function() { - /// - /// Matches elements that match all of the specified attribute filters. - /// An attribute filter. - /// Another attribute filter, reducing the selection even more - /// As many more attribute filters as necessary - /// - }, - 'attributeNotEqual': function() { - /// - /// Select elements that either don't have the specified attribute, or do have the specified attribute but not with a certain value. - /// An attribute name. - /// An attribute value. Can be either an unquoted single word or a quoted string. - /// - }, - 'attributeStartsWith': function() { - /// - /// Selects elements that have the specified attribute with a value beginning exactly with a given string. - /// An attribute name. - /// An attribute value. Can be either an unquoted single word or a quoted string. - /// - }, - 'before': function() { - /// - /// Insert content, specified by the parameter, before each element in the set of matched elements. - /// HTML string, DOM element, or jQuery object to insert before each element in the set of matched elements. - /// One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert before each element in the set of matched elements. - /// - /// - /// - /// Insert content, specified by the parameter, before each element in the set of matched elements. - /// A function that returns an HTML string, DOM element(s), or jQuery object to insert before each element in the set of matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set. - /// - /// - }, - 'bind': function() { - /// - /// Attach a handler to an event for the elements. - /// A string containing one or more DOM event types, such as "click" or "submit," or custom event names. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Attach a handler to an event for the elements. - /// A string containing one or more DOM event types, such as "click" or "submit," or custom event names. - /// An object containing data that will be passed to the event handler. - /// Setting the third argument to false will attach a function that prevents the default action from occurring and stops the event from bubbling. The default is true. - /// - /// - /// - /// Attach a handler to an event for the elements. - /// An object containing one or more DOM event types and functions to execute for them. - /// - /// - }, - 'blur': function() { - /// - /// Bind an event handler to the "blur" JavaScript event, or trigger that event on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "blur" JavaScript event, or trigger that event on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'button': function() { - /// Selects all button elements and elements of type button. - }, - 'change': function() { - /// - /// Bind an event handler to the "change" JavaScript event, or trigger that event on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "change" JavaScript event, or trigger that event on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'checkbox': function() { - /// Selects all elements of type checkbox. - }, - 'checked': function() { - /// Matches all elements that are checked. - }, - 'child': function() { - /// - /// Selects all direct child elements specified by "child" of elements specified by "parent". - /// Any valid selector. - /// A selector to filter the child elements. - /// - }, - 'children': function() { - /// - /// Get the children of each element in the set of matched elements, optionally filtered by a selector. - /// A string containing a selector expression to match elements against. - /// - /// - }, - 'class': function() { - /// - /// Selects all elements with the given class. - /// A class to search for. An element can have multiple classes; only one of them must match. - /// - }, - 'clearQueue': function() { - /// - /// Remove from the queue all items that have not yet been run. - /// A string containing the name of the queue. Defaults to fx, the standard effects queue. - /// - /// - }, - 'click': function() { - /// - /// Bind an event handler to the "click" JavaScript event, or trigger that event on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "click" JavaScript event, or trigger that event on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'clone': function() { - /// - /// Create a deep copy of the set of matched elements. - /// A Boolean indicating whether event handlers should be copied along with the elements. As of jQuery 1.4, element data will be copied as well. - /// - /// - /// - /// Create a deep copy of the set of matched elements. - /// A Boolean indicating whether event handlers and data should be copied along with the elements. The default value is false. *In jQuery 1.5.0 the default value was incorrectly true; it was changed back to false in 1.5.1 and up. - /// A Boolean indicating whether event handlers and data for all children of the cloned element should be copied. By default its value matches the first argument's value (which defaults to false). - /// - /// - }, - 'closest': function() { - /// - /// For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree. - /// A string containing a selector expression to match elements against. - /// - /// - /// - /// For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree. - /// A string containing a selector expression to match elements against. - /// A DOM element within which a matching element may be found. If no context is passed in then the context of the jQuery set will be used instead. - /// - /// - /// - /// For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree. - /// A jQuery object to match elements against. - /// - /// - /// - /// For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree. - /// An element to match elements against. - /// - /// - }, - 'contains': function() { - /// - /// Select all elements that contain the specified text. - /// A string of text to look for. It's case sensitive. - /// - }, - 'contents': function() { - /// Get the children of each element in the set of matched elements, including text and comment nodes. - /// - }, - 'context': function() { - /// The DOM node context originally passed to jQuery(); if none was passed then context will likely be the document. - /// - }, - 'css': function() { - /// - /// Set one or more CSS properties for the set of matched elements. - /// A CSS property name. - /// A value to set for the property. - /// - /// - /// - /// Set one or more CSS properties for the set of matched elements. - /// A CSS property name. - /// A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments. - /// - /// - /// - /// Set one or more CSS properties for the set of matched elements. - /// An object of property-value pairs to set. - /// - /// - }, - 'data': function() { - /// - /// Store arbitrary data associated with the matched elements. - /// A string naming the piece of data to set. - /// The new data value; it can be any Javascript type including Array or Object. - /// - /// - /// - /// Store arbitrary data associated with the matched elements. - /// An object of key-value pairs of data to update. - /// - /// - }, - 'dblclick': function() { - /// - /// Bind an event handler to the "dblclick" JavaScript event, or trigger that event on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "dblclick" JavaScript event, or trigger that event on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'delay': function() { - /// - /// Set a timer to delay execution of subsequent items in the queue. - /// An integer indicating the number of milliseconds to delay execution of the next item in the queue. - /// A string containing the name of the queue. Defaults to fx, the standard effects queue. - /// - /// - }, - 'delegate': function() { - /// - /// Attach a handler to one or more events for all elements that match the selector, now or in the future, based on a specific set of root elements. - /// A selector to filter the elements that trigger the event. - /// A string containing one or more space-separated JavaScript event types, such as "click" or "keydown," or custom event names. - /// A function to execute at the time the event is triggered. - /// - /// - /// - /// Attach a handler to one or more events for all elements that match the selector, now or in the future, based on a specific set of root elements. - /// A selector to filter the elements that trigger the event. - /// A string containing one or more space-separated JavaScript event types, such as "click" or "keydown," or custom event names. - /// An object containing data that will be passed to the event handler. - /// A function to execute at the time the event is triggered. - /// - /// - /// - /// Attach a handler to one or more events for all elements that match the selector, now or in the future, based on a specific set of root elements. - /// A selector to filter the elements that trigger the event. - /// A plain object of one or more event types and functions to execute for them. - /// - /// - }, - 'dequeue': function() { - /// - /// Execute the next function on the queue for the matched elements. - /// A string containing the name of the queue. Defaults to fx, the standard effects queue. - /// - /// - }, - 'descendant': function() { - /// - /// Selects all elements that are descendants of a given ancestor. - /// Any valid selector. - /// A selector to filter the descendant elements. - /// - }, - 'detach': function() { - /// - /// Remove the set of matched elements from the DOM. - /// A selector expression that filters the set of matched elements to be removed. - /// - /// - }, - 'die': function() { - /// - /// Remove event handlers previously attached using .live() from the elements. - /// A string containing a JavaScript event type, such as click or keydown. - /// The function that is no longer to be executed. - /// - /// - /// - /// Remove event handlers previously attached using .live() from the elements. - /// A plain object of one or more event types, such as click or keydown and their corresponding functions that are no longer to be executed. - /// - /// - }, - 'disabled': function() { - /// Selects all elements that are disabled. - }, - 'each': function() { - /// - /// Iterate over a jQuery object, executing a function for each matched element. - /// A function to execute for each matched element. - /// - /// - }, - 'element': function() { - /// - /// Selects all elements with the given tag name. - /// An element to search for. Refers to the tagName of DOM nodes. - /// - }, - 'empty': function() { - /// Select all elements that have no children (including text nodes). - }, - 'enabled': function() { - /// Selects all elements that are enabled. - }, - 'end': function() { - /// End the most recent filtering operation in the current chain and return the set of matched elements to its previous state. - /// - }, - 'eq': function() { - /// - /// Select the element at index n within the matched set. - /// Zero-based index of the element to match. - /// - /// - /// Select the element at index n within the matched set. - /// Zero-based index of the element to match, counting backwards from the last element. - /// - }, - 'error': function() { - /// - /// Bind an event handler to the "error" JavaScript event. - /// A function to execute when the event is triggered. - /// - /// - /// - /// Bind an event handler to the "error" JavaScript event. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'even': function() { - /// Selects even elements, zero-indexed. See also odd. - }, - 'fadeIn': function() { - /// - /// Display the matched elements by fading them to opaque. - /// A string or number determining how long the animation will run. - /// A function to call once the animation is complete. - /// - /// - /// - /// Display the matched elements by fading them to opaque. - /// A map of additional options to pass to the method. - /// - /// - /// - /// Display the matched elements by fading them to opaque. - /// A string or number determining how long the animation will run. - /// A string indicating which easing function to use for the transition. - /// A function to call once the animation is complete. - /// - /// - }, - 'fadeOut': function() { - /// - /// Hide the matched elements by fading them to transparent. - /// A string or number determining how long the animation will run. - /// A function to call once the animation is complete. - /// - /// - /// - /// Hide the matched elements by fading them to transparent. - /// A map of additional options to pass to the method. - /// - /// - /// - /// Hide the matched elements by fading them to transparent. - /// A string or number determining how long the animation will run. - /// A string indicating which easing function to use for the transition. - /// A function to call once the animation is complete. - /// - /// - }, - 'fadeTo': function() { - /// - /// Adjust the opacity of the matched elements. - /// A string or number determining how long the animation will run. - /// A number between 0 and 1 denoting the target opacity. - /// A function to call once the animation is complete. - /// - /// - /// - /// Adjust the opacity of the matched elements. - /// A string or number determining how long the animation will run. - /// A number between 0 and 1 denoting the target opacity. - /// A string indicating which easing function to use for the transition. - /// A function to call once the animation is complete. - /// - /// - }, - 'fadeToggle': function() { - /// - /// Display or hide the matched elements by animating their opacity. - /// A string or number determining how long the animation will run. - /// A string indicating which easing function to use for the transition. - /// A function to call once the animation is complete. - /// - /// - /// - /// Display or hide the matched elements by animating their opacity. - /// A map of additional options to pass to the method. - /// - /// - }, - 'file': function() { - /// Selects all elements of type file. - }, - 'filter': function() { - /// - /// Reduce the set of matched elements to those that match the selector or pass the function's test. - /// A string containing a selector expression to match the current set of elements against. - /// - /// - /// - /// Reduce the set of matched elements to those that match the selector or pass the function's test. - /// A function used as a test for each element in the set. this is the current DOM element. - /// - /// - /// - /// Reduce the set of matched elements to those that match the selector or pass the function's test. - /// An element to match the current set of elements against. - /// - /// - /// - /// Reduce the set of matched elements to those that match the selector or pass the function's test. - /// An existing jQuery object to match the current set of elements against. - /// - /// - }, - 'find': function() { - /// - /// Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element. - /// A string containing a selector expression to match elements against. - /// - /// - /// - /// Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element. - /// A jQuery object to match elements against. - /// - /// - /// - /// Get the descendants of each element in the current set of matched elements, filtered by a selector, jQuery object, or element. - /// An element to match elements against. - /// - /// - }, - 'finish': function() { - /// - /// Stop the currently-running animation, remove all queued animations, and complete all animations for the matched elements. - /// The name of the queue in which to stop animations. - /// - /// - }, - 'first': function() { - /// Selects the first matched element. - }, - 'first-child': function() { - /// Selects all elements that are the first child of their parent. - }, - 'first-of-type': function() { - /// Selects all elements that are the first among siblings of the same element name. - }, - 'focus': function() { - /// - /// Bind an event handler to the "focus" JavaScript event, or trigger that event on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "focus" JavaScript event, or trigger that event on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'focusin': function() { - /// - /// Bind an event handler to the "focusin" event. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "focusin" event. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'focusout': function() { - /// - /// Bind an event handler to the "focusout" JavaScript event. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "focusout" JavaScript event. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'get': function() { - /// - /// Retrieve the DOM elements matched by the jQuery object. - /// A zero-based integer indicating which element to retrieve. - /// - /// - }, - 'gt': function() { - /// - /// Select all elements at an index greater than index within the matched set. - /// Zero-based index. - /// - }, - 'has': function() { - /// - /// Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element. - /// A string containing a selector expression to match elements against. - /// - /// - /// - /// Reduce the set of matched elements to those that have a descendant that matches the selector or DOM element. - /// A DOM element to match elements against. - /// - /// - }, - 'hasClass': function() { - /// - /// Determine whether any of the matched elements are assigned the given class. - /// The class name to search for. - /// - /// - }, - 'header': function() { - /// Selects all elements that are headers, like h1, h2, h3 and so on. - }, - 'height': function() { - /// - /// Set the CSS height of every matched element. - /// An integer representing the number of pixels, or an integer with an optional unit of measure appended (as a string). - /// - /// - /// - /// Set the CSS height of every matched element. - /// A function returning the height to set. Receives the index position of the element in the set and the old height as arguments. Within the function, this refers to the current element in the set. - /// - /// - }, - 'hidden': function() { - /// Selects all elements that are hidden. - }, - 'hide': function() { - /// - /// Hide the matched elements. - /// A string or number determining how long the animation will run. - /// A function to call once the animation is complete. - /// - /// - /// - /// Hide the matched elements. - /// A map of additional options to pass to the method. - /// - /// - /// - /// Hide the matched elements. - /// A string or number determining how long the animation will run. - /// A string indicating which easing function to use for the transition. - /// A function to call once the animation is complete. - /// - /// - }, - 'hover': function() { - /// - /// Bind two handlers to the matched elements, to be executed when the mouse pointer enters and leaves the elements. - /// A function to execute when the mouse pointer enters the element. - /// A function to execute when the mouse pointer leaves the element. - /// - /// - }, - 'html': function() { - /// - /// Set the HTML contents of each element in the set of matched elements. - /// A string of HTML to set as the content of each matched element. - /// - /// - /// - /// Set the HTML contents of each element in the set of matched elements. - /// A function returning the HTML content to set. Receives the index position of the element in the set and the old HTML value as arguments. jQuery empties the element before calling the function; use the oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set. - /// - /// - }, - 'id': function() { - /// - /// Selects a single element with the given id attribute. - /// An ID to search for, specified via the id attribute of an element. - /// - }, - 'image': function() { - /// Selects all elements of type image. - }, - 'index': function() { - /// - /// Search for a given element from among the matched elements. - /// A selector representing a jQuery collection in which to look for an element. - /// - /// - /// - /// Search for a given element from among the matched elements. - /// The DOM element or first element within the jQuery object to look for. - /// - /// - }, - 'init': function() { - /// - /// Accepts a string containing a CSS selector which is then used to match a set of elements. - /// A string containing a selector expression - /// A DOM Element, Document, or jQuery to use as context - /// - /// - /// - /// Accepts a string containing a CSS selector which is then used to match a set of elements. - /// A DOM element to wrap in a jQuery object. - /// - /// - /// - /// Accepts a string containing a CSS selector which is then used to match a set of elements. - /// An array containing a set of DOM elements to wrap in a jQuery object. - /// - /// - /// - /// Accepts a string containing a CSS selector which is then used to match a set of elements. - /// A plain object to wrap in a jQuery object. - /// - /// - /// - /// Accepts a string containing a CSS selector which is then used to match a set of elements. - /// An existing jQuery object to clone. - /// - /// - }, - 'innerHeight': function() { - /// Get the current computed height for the first element in the set of matched elements, including padding but not border. - /// - }, - 'innerWidth': function() { - /// Get the current computed width for the first element in the set of matched elements, including padding but not border. - /// - }, - 'input': function() { - /// Selects all input, textarea, select and button elements. - }, - 'insertAfter': function() { - /// - /// Insert every element in the set of matched elements after the target. - /// A selector, element, HTML string, or jQuery object; the matched set of elements will be inserted after the element(s) specified by this parameter. - /// - /// - }, - 'insertBefore': function() { - /// - /// Insert every element in the set of matched elements before the target. - /// A selector, element, HTML string, or jQuery object; the matched set of elements will be inserted before the element(s) specified by this parameter. - /// - /// - }, - 'is': function() { - /// - /// Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments. - /// A string containing a selector expression to match elements against. - /// - /// - /// - /// Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments. - /// A function used as a test for the set of elements. It accepts one argument, index, which is the element's index in the jQuery collection.Within the function, this refers to the current DOM element. - /// - /// - /// - /// Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments. - /// An existing jQuery object to match the current set of elements against. - /// - /// - /// - /// Check the current matched set of elements against a selector, element, or jQuery object and return true if at least one of these elements matches the given arguments. - /// An element to match the current set of elements against. - /// - /// - }, - 'jquery': function() { - /// A string containing the jQuery version number. - /// - }, - 'keydown': function() { - /// - /// Bind an event handler to the "keydown" JavaScript event, or trigger that event on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "keydown" JavaScript event, or trigger that event on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'keypress': function() { - /// - /// Bind an event handler to the "keypress" JavaScript event, or trigger that event on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "keypress" JavaScript event, or trigger that event on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'keyup': function() { - /// - /// Bind an event handler to the "keyup" JavaScript event, or trigger that event on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "keyup" JavaScript event, or trigger that event on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'lang': function() { - /// - /// Selects all elements of the specified language. - /// A language code. - /// - }, - 'last': function() { - /// Selects the last matched element. - }, - 'last-child': function() { - /// Selects all elements that are the last child of their parent. - }, - 'last-of-type': function() { - /// Selects all elements that are the last among siblings of the same element name. - }, - 'length': function() { - /// The number of elements in the jQuery object. - /// - }, - 'live': function() { - /// - /// Attach an event handler for all elements which match the current selector, now and in the future. - /// A string containing a JavaScript event type, such as "click" or "keydown." As of jQuery 1.4 the string can contain multiple, space-separated event types or custom event names. - /// A function to execute at the time the event is triggered. - /// - /// - /// - /// Attach an event handler for all elements which match the current selector, now and in the future. - /// A string containing a JavaScript event type, such as "click" or "keydown." As of jQuery 1.4 the string can contain multiple, space-separated event types or custom event names. - /// An object containing data that will be passed to the event handler. - /// A function to execute at the time the event is triggered. - /// - /// - /// - /// Attach an event handler for all elements which match the current selector, now and in the future. - /// A plain object of one or more JavaScript event types and functions to execute for them. - /// - /// - }, - 'load': function() { - /// - /// Bind an event handler to the "load" JavaScript event. - /// A function to execute when the event is triggered. - /// - /// - /// - /// Bind an event handler to the "load" JavaScript event. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'lt': function() { - /// - /// Select all elements at an index less than index within the matched set. - /// Zero-based index. - /// - }, - 'map': function() { - /// - /// Pass each element in the current matched set through a function, producing a new jQuery object containing the return values. - /// A function object that will be invoked for each element in the current set. - /// - /// - }, - 'mousedown': function() { - /// - /// Bind an event handler to the "mousedown" JavaScript event, or trigger that event on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "mousedown" JavaScript event, or trigger that event on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'mouseenter': function() { - /// - /// Bind an event handler to be fired when the mouse enters an element, or trigger that handler on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to be fired when the mouse enters an element, or trigger that handler on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'mouseleave': function() { - /// - /// Bind an event handler to be fired when the mouse leaves an element, or trigger that handler on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to be fired when the mouse leaves an element, or trigger that handler on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'mousemove': function() { - /// - /// Bind an event handler to the "mousemove" JavaScript event, or trigger that event on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "mousemove" JavaScript event, or trigger that event on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'mouseout': function() { - /// - /// Bind an event handler to the "mouseout" JavaScript event, or trigger that event on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "mouseout" JavaScript event, or trigger that event on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'mouseover': function() { - /// - /// Bind an event handler to the "mouseover" JavaScript event, or trigger that event on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "mouseover" JavaScript event, or trigger that event on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'mouseup': function() { - /// - /// Bind an event handler to the "mouseup" JavaScript event, or trigger that event on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "mouseup" JavaScript event, or trigger that event on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'multiple': function() { - /// - /// Selects the combined results of all the specified selectors. - /// Any valid selector. - /// Another valid selector. - /// As many more valid selectors as you like. - /// - }, - 'next': function() { - /// - /// Get the immediately following sibling of each element in the set of matched elements. If a selector is provided, it retrieves the next sibling only if it matches that selector. - /// A string containing a selector expression to match elements against. - /// - /// - }, - 'next adjacent': function() { - /// - /// Selects all next elements matching "next" that are immediately preceded by a sibling "prev". - /// Any valid selector. - /// A selector to match the element that is next to the first selector. - /// - }, - 'next siblings': function() { - /// - /// Selects all sibling elements that follow after the "prev" element, have the same parent, and match the filtering "siblings" selector. - /// Any valid selector. - /// A selector to filter elements that are the following siblings of the first selector. - /// - }, - 'nextAll': function() { - /// - /// Get all following siblings of each element in the set of matched elements, optionally filtered by a selector. - /// A string containing a selector expression to match elements against. - /// - /// - }, - 'nextUntil': function() { - /// - /// Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed. - /// A string containing a selector expression to indicate where to stop matching following sibling elements. - /// A string containing a selector expression to match elements against. - /// - /// - /// - /// Get all following siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object passed. - /// A DOM node or jQuery object indicating where to stop matching following sibling elements. - /// A string containing a selector expression to match elements against. - /// - /// - }, - 'not': function() { - /// - /// Remove elements from the set of matched elements. - /// A string containing a selector expression to match elements against. - /// - /// - /// - /// Remove elements from the set of matched elements. - /// One or more DOM elements to remove from the matched set. - /// - /// - /// - /// Remove elements from the set of matched elements. - /// A function used as a test for each element in the set. this is the current DOM element. - /// - /// - /// - /// Remove elements from the set of matched elements. - /// An existing jQuery object to match the current set of elements against. - /// - /// - }, - 'nth-child': function() { - /// - /// Selects all elements that are the nth-child of their parent. - /// The index of each child to match, starting with 1, the string even or odd, or an equation ( eg. :nth-child(even), :nth-child(4n) ) - /// - }, - 'nth-last-child': function() { - /// - /// Selects all elements that are the nth-child of their parent, counting from the last element to the first. - /// The index of each child to match, starting with the last one (1), the string even or odd, or an equation ( eg. :nth-last-child(even), :nth-last-child(4n) ) - /// - }, - 'nth-last-of-type': function() { - /// - /// Selects all elements that are the nth-child of their parent, counting from the last element to the first. - /// The index of each child to match, starting with the last one (1), the string even or odd, or an equation ( eg. :nth-last-of-type(even), :nth-last-of-type(4n) ) - /// - }, - 'nth-of-type': function() { - /// - /// Selects all elements that are the nth child of their parent in relation to siblings with the same element name. - /// The index of each child to match, starting with 1, the string even or odd, or an equation ( eg. :nth-of-type(even), :nth-of-type(4n) ) - /// - }, - 'odd': function() { - /// Selects odd elements, zero-indexed. See also even. - }, - 'off': function() { - /// - /// Remove an event handler. - /// One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin". - /// A selector which should match the one originally passed to .on() when attaching event handlers. - /// A handler function previously attached for the event(s), or the special value false. - /// - /// - /// - /// Remove an event handler. - /// An object where the string keys represent one or more space-separated event types and optional namespaces, and the values represent handler functions previously attached for the event(s). - /// A selector which should match the one originally passed to .on() when attaching event handlers. - /// - /// - }, - 'offset': function() { - /// - /// Set the current coordinates of every element in the set of matched elements, relative to the document. - /// An object containing the properties top and left, which are integers indicating the new top and left coordinates for the elements. - /// - /// - /// - /// Set the current coordinates of every element in the set of matched elements, relative to the document. - /// A function to return the coordinates to set. Receives the index of the element in the collection as the first argument and the current coordinates as the second argument. The function should return an object with the new top and left properties. - /// - /// - }, - 'offsetParent': function() { - /// Get the closest ancestor element that is positioned. - /// - }, - 'on': function() { - /// - /// Attach an event handler function for one or more events to the selected elements. - /// One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin". - /// A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element. - /// Data to be passed to the handler in event.data when an event is triggered. - /// A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. - /// - /// - /// - /// Attach an event handler function for one or more events to the selected elements. - /// An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s). - /// A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element. - /// Data to be passed to the handler in event.data when an event occurs. - /// - /// - }, - 'one': function() { - /// - /// Attach a handler to an event for the elements. The handler is executed at most once per element. - /// A string containing one or more JavaScript event types, such as "click" or "submit," or custom event names. - /// An object containing data that will be passed to the event handler. - /// A function to execute at the time the event is triggered. - /// - /// - /// - /// Attach a handler to an event for the elements. The handler is executed at most once per element. - /// One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin". - /// A selector string to filter the descendants of the selected elements that trigger the event. If the selector is null or omitted, the event is always triggered when it reaches the selected element. - /// Data to be passed to the handler in event.data when an event is triggered. - /// A function to execute when the event is triggered. The value false is also allowed as a shorthand for a function that simply does return false. - /// - /// - /// - /// Attach a handler to an event for the elements. The handler is executed at most once per element. - /// An object in which the string keys represent one or more space-separated event types and optional namespaces, and the values represent a handler function to be called for the event(s). - /// A selector string to filter the descendants of the selected elements that will call the handler. If the selector is null or omitted, the handler is always called when it reaches the selected element. - /// Data to be passed to the handler in event.data when an event occurs. - /// - /// - }, - 'only-child': function() { - /// Selects all elements that are the only child of their parent. - }, - 'only-of-type': function() { - /// Selects all elements that have no siblings with the same element name. - }, - 'outerHeight': function() { - /// - /// Get the current computed height for the first element in the set of matched elements, including padding, border, and optionally margin. Returns an integer (without "px") representation of the value or null if called on an empty set of elements. - /// A Boolean indicating whether to include the element's margin in the calculation. - /// - /// - }, - 'outerWidth': function() { - /// - /// Get the current computed width for the first element in the set of matched elements, including padding and border. - /// A Boolean indicating whether to include the element's margin in the calculation. - /// - /// - }, - 'parent': function() { - /// - /// Get the parent of each element in the current set of matched elements, optionally filtered by a selector. - /// A string containing a selector expression to match elements against. - /// - /// - }, - 'parents': function() { - /// - /// Get the ancestors of each element in the current set of matched elements, optionally filtered by a selector. - /// A string containing a selector expression to match elements against. - /// - /// - }, - 'parentsUntil': function() { - /// - /// Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object. - /// A string containing a selector expression to indicate where to stop matching ancestor elements. - /// A string containing a selector expression to match elements against. - /// - /// - /// - /// Get the ancestors of each element in the current set of matched elements, up to but not including the element matched by the selector, DOM node, or jQuery object. - /// A DOM node or jQuery object indicating where to stop matching ancestor elements. - /// A string containing a selector expression to match elements against. - /// - /// - }, - 'password': function() { - /// Selects all elements of type password. - }, - 'position': function() { - /// Get the current coordinates of the first element in the set of matched elements, relative to the offset parent. - /// - }, - 'prepend': function() { - /// - /// Insert content, specified by the parameter, to the beginning of each element in the set of matched elements. - /// DOM element, array of elements, HTML string, or jQuery object to insert at the beginning of each element in the set of matched elements. - /// One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the beginning of each element in the set of matched elements. - /// - /// - /// - /// Insert content, specified by the parameter, to the beginning of each element in the set of matched elements. - /// A function that returns an HTML string, DOM element(s), or jQuery object to insert at the beginning of each element in the set of matched elements. Receives the index position of the element in the set and the old HTML value of the element as arguments. Within the function, this refers to the current element in the set. - /// - /// - }, - 'prependTo': function() { - /// - /// Insert every element in the set of matched elements to the beginning of the target. - /// A selector, element, HTML string, or jQuery object; the matched set of elements will be inserted at the beginning of the element(s) specified by this parameter. - /// - /// - }, - 'prev': function() { - /// - /// Get the immediately preceding sibling of each element in the set of matched elements, optionally filtered by a selector. - /// A string containing a selector expression to match elements against. - /// - /// - }, - 'prevAll': function() { - /// - /// Get all preceding siblings of each element in the set of matched elements, optionally filtered by a selector. - /// A string containing a selector expression to match elements against. - /// - /// - }, - 'prevUntil': function() { - /// - /// Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object. - /// A string containing a selector expression to indicate where to stop matching preceding sibling elements. - /// A string containing a selector expression to match elements against. - /// - /// - /// - /// Get all preceding siblings of each element up to but not including the element matched by the selector, DOM node, or jQuery object. - /// A DOM node or jQuery object indicating where to stop matching preceding sibling elements. - /// A string containing a selector expression to match elements against. - /// - /// - }, - 'promise': function() { - /// - /// Return a Promise object to observe when all actions of a certain type bound to the collection, queued or not, have finished. - /// The type of queue that needs to be observed. - /// Object onto which the promise methods have to be attached - /// - /// - }, - 'prop': function() { - /// - /// Set one or more properties for the set of matched elements. - /// The name of the property to set. - /// A value to set for the property. - /// - /// - /// - /// Set one or more properties for the set of matched elements. - /// An object of property-value pairs to set. - /// - /// - /// - /// Set one or more properties for the set of matched elements. - /// The name of the property to set. - /// A function returning the value to set. Receives the index position of the element in the set and the old property value as arguments. Within the function, the keyword this refers to the current element. - /// - /// - }, - 'pushStack': function() { - /// - /// Add a collection of DOM elements onto the jQuery stack. - /// An array of elements to push onto the stack and make into a new jQuery object. - /// - /// - /// - /// Add a collection of DOM elements onto the jQuery stack. - /// An array of elements to push onto the stack and make into a new jQuery object. - /// The name of a jQuery method that generated the array of elements. - /// The arguments that were passed in to the jQuery method (for serialization). - /// - /// - }, - 'queue': function() { - /// - /// Manipulate the queue of functions to be executed, once for each matched element. - /// A string containing the name of the queue. Defaults to fx, the standard effects queue. - /// An array of functions to replace the current queue contents. - /// - /// - /// - /// Manipulate the queue of functions to be executed, once for each matched element. - /// A string containing the name of the queue. Defaults to fx, the standard effects queue. - /// The new function to add to the queue, with a function to call that will dequeue the next item. - /// - /// - }, - 'radio': function() { - /// Selects all elements of type radio. - }, - 'ready': function() { - /// - /// Specify a function to execute when the DOM is fully loaded. - /// A function to execute after the DOM is ready. - /// - /// - }, - 'remove': function() { - /// - /// Remove the set of matched elements from the DOM. - /// A selector expression that filters the set of matched elements to be removed. - /// - /// - }, - 'removeAttr': function() { - /// - /// Remove an attribute from each element in the set of matched elements. - /// An attribute to remove; as of version 1.7, it can be a space-separated list of attributes. - /// - /// - }, - 'removeClass': function() { - /// - /// Remove a single class, multiple classes, or all classes from each element in the set of matched elements. - /// One or more space-separated classes to be removed from the class attribute of each matched element. - /// - /// - /// - /// Remove a single class, multiple classes, or all classes from each element in the set of matched elements. - /// A function returning one or more space-separated class names to be removed. Receives the index position of the element in the set and the old class value as arguments. - /// - /// - }, - 'removeData': function() { - /// - /// Remove a previously-stored piece of data. - /// A string naming the piece of data to delete. - /// - /// - /// - /// Remove a previously-stored piece of data. - /// An array or space-separated string naming the pieces of data to delete. - /// - /// - }, - 'removeProp': function() { - /// - /// Remove a property for the set of matched elements. - /// The name of the property to remove. - /// - /// - }, - 'replaceAll': function() { - /// - /// Replace each target element with the set of matched elements. - /// A selector expression indicating which element(s) to replace. - /// - /// - }, - 'replaceWith': function() { - /// - /// Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed. - /// The content to insert. May be an HTML string, DOM element, or jQuery object. - /// - /// - /// - /// Replace each element in the set of matched elements with the provided new content and return the set of elements that was removed. - /// A function that returns content with which to replace the set of matched elements. - /// - /// - }, - 'reset': function() { - /// Selects all elements of type reset. - }, - 'resize': function() { - /// - /// Bind an event handler to the "resize" JavaScript event, or trigger that event on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "resize" JavaScript event, or trigger that event on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'root': function() { - /// - /// Selects the element that is the root of the document. - /// The index of each child to match, starting with 1, the string even or odd, or an equation ( eg. :nth-last-child(even), :nth-last-child(4n) ) - /// - }, - 'scroll': function() { - /// - /// Bind an event handler to the "scroll" JavaScript event, or trigger that event on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "scroll" JavaScript event, or trigger that event on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'scrollLeft': function() { - /// - /// Set the current horizontal position of the scroll bar for each of the set of matched elements. - /// An integer indicating the new position to set the scroll bar to. - /// - /// - }, - 'scrollTop': function() { - /// - /// Set the current vertical position of the scroll bar for each of the set of matched elements. - /// An integer indicating the new position to set the scroll bar to. - /// - /// - }, - 'select': function() { - /// - /// Bind an event handler to the "select" JavaScript event, or trigger that event on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "select" JavaScript event, or trigger that event on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'selected': function() { - /// Selects all elements that are selected. - }, - 'selector': function() { - /// A selector representing selector originally passed to jQuery(). - /// - }, - 'serialize': function() { - /// Encode a set of form elements as a string for submission. - /// - }, - 'serializeArray': function() { - /// Encode a set of form elements as an array of names and values. - /// - }, - 'show': function() { - /// - /// Display the matched elements. - /// A string or number determining how long the animation will run. - /// A function to call once the animation is complete. - /// - /// - /// - /// Display the matched elements. - /// A map of additional options to pass to the method. - /// - /// - /// - /// Display the matched elements. - /// A string or number determining how long the animation will run. - /// A string indicating which easing function to use for the transition. - /// A function to call once the animation is complete. - /// - /// - }, - 'siblings': function() { - /// - /// Get the siblings of each element in the set of matched elements, optionally filtered by a selector. - /// A string containing a selector expression to match elements against. - /// - /// - }, - 'size': function() { - /// Return the number of elements in the jQuery object. - /// - }, - 'slice': function() { - /// - /// Reduce the set of matched elements to a subset specified by a range of indices. - /// An integer indicating the 0-based position at which the elements begin to be selected. If negative, it indicates an offset from the end of the set. - /// An integer indicating the 0-based position at which the elements stop being selected. If negative, it indicates an offset from the end of the set. If omitted, the range continues until the end of the set. - /// - /// - }, - 'slideDown': function() { - /// - /// Display the matched elements with a sliding motion. - /// A string or number determining how long the animation will run. - /// A function to call once the animation is complete. - /// - /// - /// - /// Display the matched elements with a sliding motion. - /// A map of additional options to pass to the method. - /// - /// - /// - /// Display the matched elements with a sliding motion. - /// A string or number determining how long the animation will run. - /// A string indicating which easing function to use for the transition. - /// A function to call once the animation is complete. - /// - /// - }, - 'slideToggle': function() { - /// - /// Display or hide the matched elements with a sliding motion. - /// A string or number determining how long the animation will run. - /// A function to call once the animation is complete. - /// - /// - /// - /// Display or hide the matched elements with a sliding motion. - /// A map of additional options to pass to the method. - /// - /// - /// - /// Display or hide the matched elements with a sliding motion. - /// A string or number determining how long the animation will run. - /// A string indicating which easing function to use for the transition. - /// A function to call once the animation is complete. - /// - /// - }, - 'slideUp': function() { - /// - /// Hide the matched elements with a sliding motion. - /// A string or number determining how long the animation will run. - /// A function to call once the animation is complete. - /// - /// - /// - /// Hide the matched elements with a sliding motion. - /// A map of additional options to pass to the method. - /// - /// - /// - /// Hide the matched elements with a sliding motion. - /// A string or number determining how long the animation will run. - /// A string indicating which easing function to use for the transition. - /// A function to call once the animation is complete. - /// - /// - }, - 'stop': function() { - /// - /// Stop the currently-running animation on the matched elements. - /// A Boolean indicating whether to remove queued animation as well. Defaults to false. - /// A Boolean indicating whether to complete the current animation immediately. Defaults to false. - /// - /// - /// - /// Stop the currently-running animation on the matched elements. - /// The name of the queue in which to stop animations. - /// A Boolean indicating whether to remove queued animation as well. Defaults to false. - /// A Boolean indicating whether to complete the current animation immediately. Defaults to false. - /// - /// - }, - 'submit': function() { - /// - /// Bind an event handler to the "submit" JavaScript event, or trigger that event on an element. - /// A function to execute each time the event is triggered. - /// - /// - /// - /// Bind an event handler to the "submit" JavaScript event, or trigger that event on an element. - /// An object containing data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'target': function() { - /// Selects the target element indicated by the fragment identifier of the document's URI. - }, - 'text': function() { - /// - /// Set the content of each element in the set of matched elements to the specified text. - /// A string of text to set as the content of each matched element. - /// - /// - /// - /// Set the content of each element in the set of matched elements to the specified text. - /// A function returning the text content to set. Receives the index position of the element in the set and the old text value as arguments. - /// - /// - }, - 'toArray': function() { - /// Retrieve all the DOM elements contained in the jQuery set, as an array. - /// - }, - 'toggle': function() { - /// - /// Display or hide the matched elements. - /// A string or number determining how long the animation will run. - /// A function to call once the animation is complete. - /// - /// - /// - /// Display or hide the matched elements. - /// A map of additional options to pass to the method. - /// - /// - /// - /// Display or hide the matched elements. - /// A string or number determining how long the animation will run. - /// A string indicating which easing function to use for the transition. - /// A function to call once the animation is complete. - /// - /// - /// - /// Display or hide the matched elements. - /// A Boolean indicating whether to show or hide the elements. - /// - /// - }, - 'toggleClass': function() { - /// - /// Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument. - /// One or more class names (separated by spaces) to be toggled for each element in the matched set. - /// - /// - /// - /// Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument. - /// One or more class names (separated by spaces) to be toggled for each element in the matched set. - /// A Boolean (not just truthy/falsy) value to determine whether the class should be added or removed. - /// - /// - /// - /// Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument. - /// A boolean value to determine whether the class should be added or removed. - /// - /// - /// - /// Add or remove one or more classes from each element in the set of matched elements, depending on either the class's presence or the value of the switch argument. - /// A function that returns class names to be toggled in the class attribute of each element in the matched set. Receives the index position of the element in the set, the old class value, and the switch as arguments. - /// A boolean value to determine whether the class should be added or removed. - /// - /// - }, - 'trigger': function() { - /// - /// Execute all handlers and behaviors attached to the matched elements for the given event type. - /// A string containing a JavaScript event type, such as click or submit. - /// Additional parameters to pass along to the event handler. - /// - /// - /// - /// Execute all handlers and behaviors attached to the matched elements for the given event type. - /// A jQuery.Event object. - /// - /// - }, - 'triggerHandler': function() { - /// - /// Execute all handlers attached to an element for an event. - /// A string containing a JavaScript event type, such as click or submit. - /// An array of additional parameters to pass along to the event handler. - /// - /// - }, - 'unbind': function() { - /// - /// Remove a previously-attached event handler from the elements. - /// A string containing a JavaScript event type, such as click or submit. - /// The function that is to be no longer executed. - /// - /// - /// - /// Remove a previously-attached event handler from the elements. - /// A string containing a JavaScript event type, such as click or submit. - /// Unbinds the corresponding 'return false' function that was bound using .bind( eventType, false ). - /// - /// - /// - /// Remove a previously-attached event handler from the elements. - /// A JavaScript event object as passed to an event handler. - /// - /// - }, - 'undelegate': function() { - /// - /// Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements. - /// A selector which will be used to filter the event results. - /// A string containing a JavaScript event type, such as "click" or "keydown" - /// - /// - /// - /// Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements. - /// A selector which will be used to filter the event results. - /// A string containing a JavaScript event type, such as "click" or "keydown" - /// A function to execute at the time the event is triggered. - /// - /// - /// - /// Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements. - /// A selector which will be used to filter the event results. - /// An object of one or more event types and previously bound functions to unbind from them. - /// - /// - /// - /// Remove a handler from the event for all elements which match the current selector, based upon a specific set of root elements. - /// A string containing a namespace to unbind all events from. - /// - /// - }, - 'unload': function() { - /// - /// Bind an event handler to the "unload" JavaScript event. - /// A function to execute when the event is triggered. - /// - /// - /// - /// Bind an event handler to the "unload" JavaScript event. - /// A plain object of data that will be passed to the event handler. - /// A function to execute each time the event is triggered. - /// - /// - }, - 'unwrap': function() { - /// Remove the parents of the set of matched elements from the DOM, leaving the matched elements in their place. - /// - }, - 'val': function() { - /// - /// Set the value of each element in the set of matched elements. - /// A string of text or an array of strings corresponding to the value of each matched element to set as selected/checked. - /// - /// - /// - /// Set the value of each element in the set of matched elements. - /// A function returning the value to set. this is the current element. Receives the index position of the element in the set and the old value as arguments. - /// - /// - }, - 'visible': function() { - /// Selects all elements that are visible. - }, - 'width': function() { - /// - /// Set the CSS width of each element in the set of matched elements. - /// An integer representing the number of pixels, or an integer along with an optional unit of measure appended (as a string). - /// - /// - /// - /// Set the CSS width of each element in the set of matched elements. - /// A function returning the width to set. Receives the index position of the element in the set and the old width as arguments. Within the function, this refers to the current element in the set. - /// - /// - }, - 'wrap': function() { - /// - /// Wrap an HTML structure around each element in the set of matched elements. - /// An HTML snippet, selector expression, jQuery object, or DOM element specifying the structure to wrap around the matched elements. - /// - /// - /// - /// Wrap an HTML structure around each element in the set of matched elements. - /// A callback function returning the HTML content or jQuery object to wrap around the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set. - /// - /// - }, - 'wrapAll': function() { - /// - /// Wrap an HTML structure around all elements in the set of matched elements. - /// An HTML snippet, selector expression, jQuery object, or DOM element specifying the structure to wrap around the matched elements. - /// - /// - }, - 'wrapInner': function() { - /// - /// Wrap an HTML structure around the content of each element in the set of matched elements. - /// An HTML snippet, selector expression, jQuery object, or DOM element specifying the structure to wrap around the content of the matched elements. - /// - /// - /// - /// Wrap an HTML structure around the content of each element in the set of matched elements. - /// A callback function which generates a structure to wrap around the content of the matched elements. Receives the index position of the element in the set as an argument. Within the function, this refers to the current element in the set. - /// - /// - }, -}); - -intellisense.annotate(window, { - '$': function() { - /// - /// Accepts a string containing a CSS selector which is then used to match a set of elements. - /// A string containing a selector expression - /// A DOM Element, Document, or jQuery to use as context - /// - /// - /// - /// Accepts a string containing a CSS selector which is then used to match a set of elements. - /// A DOM element to wrap in a jQuery object. - /// - /// - /// - /// Accepts a string containing a CSS selector which is then used to match a set of elements. - /// An array containing a set of DOM elements to wrap in a jQuery object. - /// - /// - /// - /// Accepts a string containing a CSS selector which is then used to match a set of elements. - /// A plain object to wrap in a jQuery object. - /// - /// - /// - /// Accepts a string containing a CSS selector which is then used to match a set of elements. - /// An existing jQuery object to clone. - /// - /// - }, -}); - diff --git a/src/SignalR/clients/cpp/samples/SignalRServer/Scripts/jquery-1.10.2.js b/src/SignalR/clients/cpp/samples/SignalRServer/Scripts/jquery-1.10.2.js deleted file mode 100644 index d3e121b860..0000000000 --- a/src/SignalR/clients/cpp/samples/SignalRServer/Scripts/jquery-1.10.2.js +++ /dev/null @@ -1,9803 +0,0 @@ -/* NUGET: BEGIN LICENSE TEXT - * - * Microsoft grants you the right to use these script files for the sole - * purpose of either: (i) interacting through your browser with the Microsoft - * website or online service, subject to the applicable licensing or use - * terms; or (ii) using the files as included with a Microsoft product subject - * to that product's license terms. Microsoft reserves all other rights to the - * files not expressly granted by Microsoft, whether by implication, estoppel - * or otherwise. Insofar as a script file is dual licensed under GPL, - * Microsoft neither took the code under GPL nor distributes it thereunder but - * under the terms set out in this paragraph. All notices and licenses - * below are for informational purposes only. - * - * NUGET: END LICENSE TEXT */ -/*! - * jQuery JavaScript Library v1.10.2 - * http://jquery.com/ - * - * Includes Sizzle.js - * http://sizzlejs.com/ - * - * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors - * Released under the MIT license - * http://jquery.org/license - * - * Date: 2013-07-03T13:48Z - */ -(function( window, undefined ) { - -// Can't do this because several apps including ASP.NET trace -// the stack via arguments.caller.callee and Firefox dies if -// you try to trace through "use strict" call chains. (#13335) -// Support: Firefox 18+ -//"use strict"; -var - // The deferred used on DOM ready - readyList, - - // A central reference to the root jQuery(document) - rootjQuery, - - // Support: IE<10 - // For `typeof xmlNode.method` instead of `xmlNode.method !== undefined` - core_strundefined = typeof undefined, - - // Use the correct document accordingly with window argument (sandbox) - location = window.location, - document = window.document, - docElem = document.documentElement, - - // Map over jQuery in case of overwrite - _jQuery = window.jQuery, - - // Map over the $ in case of overwrite - _$ = window.$, - - // [[Class]] -> type pairs - class2type = {}, - - // List of deleted data cache ids, so we can reuse them - core_deletedIds = [], - - core_version = "1.10.2", - - // Save a reference to some core methods - core_concat = core_deletedIds.concat, - core_push = core_deletedIds.push, - core_slice = core_deletedIds.slice, - core_indexOf = core_deletedIds.indexOf, - core_toString = class2type.toString, - core_hasOwn = class2type.hasOwnProperty, - core_trim = core_version.trim, - - // Define a local copy of jQuery - jQuery = function( selector, context ) { - // The jQuery object is actually just the init constructor 'enhanced' - return new jQuery.fn.init( selector, context, rootjQuery ); - }, - - // Used for matching numbers - core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source, - - // Used for splitting on whitespace - core_rnotwhite = /\S+/g, - - // Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE) - rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, - - // A simple way to check for HTML strings - // Prioritize #id over to avoid XSS via location.hash (#9521) - // Strict HTML recognition (#11290: must start with <) - rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, - - // Match a standalone tag - rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/, - - // JSON RegExp - rvalidchars = /^[\],:{}\s]*$/, - rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g, - rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g, - rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g, - - // Matches dashed string for camelizing - rmsPrefix = /^-ms-/, - rdashAlpha = /-([\da-z])/gi, - - // Used by jQuery.camelCase as callback to replace() - fcamelCase = function( all, letter ) { - return letter.toUpperCase(); - }, - - // The ready event handler - completed = function( event ) { - - // readyState === "complete" is good enough for us to call the dom ready in oldIE - if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) { - detach(); - jQuery.ready(); - } - }, - // Clean-up method for dom ready events - detach = function() { - if ( document.addEventListener ) { - document.removeEventListener( "DOMContentLoaded", completed, false ); - window.removeEventListener( "load", completed, false ); - - } else { - document.detachEvent( "onreadystatechange", completed ); - window.detachEvent( "onload", completed ); - } - }; - -jQuery.fn = jQuery.prototype = { - // The current version of jQuery being used - jquery: core_version, - - constructor: jQuery, - init: function( selector, context, rootjQuery ) { - var match, elem; - - // HANDLE: $(""), $(null), $(undefined), $(false) - if ( !selector ) { - return this; - } - - // Handle HTML strings - if ( typeof selector === "string" ) { - if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) { - // Assume that strings that start and end with <> are HTML and skip the regex check - match = [ null, selector, null ]; - - } else { - match = rquickExpr.exec( selector ); - } - - // Match html or make sure no context is specified for #id - if ( match && (match[1] || !context) ) { - - // HANDLE: $(html) -> $(array) - if ( match[1] ) { - context = context instanceof jQuery ? context[0] : context; - - // scripts is true for back-compat - jQuery.merge( this, jQuery.parseHTML( - match[1], - context && context.nodeType ? context.ownerDocument || context : document, - true - ) ); - - // HANDLE: $(html, props) - if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) { - for ( match in context ) { - // Properties of context are called as methods if possible - if ( jQuery.isFunction( this[ match ] ) ) { - this[ match ]( context[ match ] ); - - // ...and otherwise set as attributes - } else { - this.attr( match, context[ match ] ); - } - } - } - - return this; - - // HANDLE: $(#id) - } else { - elem = document.getElementById( match[2] ); - - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - if ( elem && elem.parentNode ) { - // Handle the case where IE and Opera return items - // by name instead of ID - if ( elem.id !== match[2] ) { - return rootjQuery.find( selector ); - } - - // Otherwise, we inject the element directly into the jQuery object - this.length = 1; - this[0] = elem; - } - - this.context = document; - this.selector = selector; - return this; - } - - // HANDLE: $(expr, $(...)) - } else if ( !context || context.jquery ) { - return ( context || rootjQuery ).find( selector ); - - // HANDLE: $(expr, context) - // (which is just equivalent to: $(context).find(expr) - } else { - return this.constructor( context ).find( selector ); - } - - // HANDLE: $(DOMElement) - } else if ( selector.nodeType ) { - this.context = this[0] = selector; - this.length = 1; - return this; - - // HANDLE: $(function) - // Shortcut for document ready - } else if ( jQuery.isFunction( selector ) ) { - return rootjQuery.ready( selector ); - } - - if ( selector.selector !== undefined ) { - this.selector = selector.selector; - this.context = selector.context; - } - - return jQuery.makeArray( selector, this ); - }, - - // Start with an empty selector - selector: "", - - // The default length of a jQuery object is 0 - length: 0, - - toArray: function() { - return core_slice.call( this ); - }, - - // Get the Nth element in the matched element set OR - // Get the whole matched element set as a clean array - get: function( num ) { - return num == null ? - - // Return a 'clean' array - this.toArray() : - - // Return just the object - ( num < 0 ? this[ this.length + num ] : this[ num ] ); - }, - - // Take an array of elements and push it onto the stack - // (returning the new matched element set) - pushStack: function( elems ) { - - // Build a new jQuery matched element set - var ret = jQuery.merge( this.constructor(), elems ); - - // Add the old object onto the stack (as a reference) - ret.prevObject = this; - ret.context = this.context; - - // Return the newly-formed element set - return ret; - }, - - // Execute a callback for every element in the matched set. - // (You can seed the arguments with an array of args, but this is - // only used internally.) - each: function( callback, args ) { - return jQuery.each( this, callback, args ); - }, - - ready: function( fn ) { - // Add the callback - jQuery.ready.promise().done( fn ); - - return this; - }, - - slice: function() { - return this.pushStack( core_slice.apply( this, arguments ) ); - }, - - first: function() { - return this.eq( 0 ); - }, - - last: function() { - return this.eq( -1 ); - }, - - eq: function( i ) { - var len = this.length, - j = +i + ( i < 0 ? len : 0 ); - return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] ); - }, - - map: function( callback ) { - return this.pushStack( jQuery.map(this, function( elem, i ) { - return callback.call( elem, i, elem ); - })); - }, - - end: function() { - return this.prevObject || this.constructor(null); - }, - - // For internal use only. - // Behaves like an Array's method, not like a jQuery method. - push: core_push, - sort: [].sort, - splice: [].splice -}; - -// Give the init function the jQuery prototype for later instantiation -jQuery.fn.init.prototype = jQuery.fn; - -jQuery.extend = jQuery.fn.extend = function() { - var src, copyIsArray, copy, name, options, clone, - target = arguments[0] || {}, - i = 1, - length = arguments.length, - deep = false; - - // Handle a deep copy situation - if ( typeof target === "boolean" ) { - deep = target; - target = arguments[1] || {}; - // skip the boolean and the target - i = 2; - } - - // Handle case when target is a string or something (possible in deep copy) - if ( typeof target !== "object" && !jQuery.isFunction(target) ) { - target = {}; - } - - // extend jQuery itself if only one argument is passed - if ( length === i ) { - target = this; - --i; - } - - for ( ; i < length; i++ ) { - // Only deal with non-null/undefined values - if ( (options = arguments[ i ]) != null ) { - // Extend the base object - for ( name in options ) { - src = target[ name ]; - copy = options[ name ]; - - // Prevent never-ending loop - if ( target === copy ) { - continue; - } - - // Recurse if we're merging plain objects or arrays - if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) { - if ( copyIsArray ) { - copyIsArray = false; - clone = src && jQuery.isArray(src) ? src : []; - - } else { - clone = src && jQuery.isPlainObject(src) ? src : {}; - } - - // Never move original objects, clone them - target[ name ] = jQuery.extend( deep, clone, copy ); - - // Don't bring in undefined values - } else if ( copy !== undefined ) { - target[ name ] = copy; - } - } - } - } - - // Return the modified object - return target; -}; - -jQuery.extend({ - // Unique for each copy of jQuery on the page - // Non-digits removed to match rinlinejQuery - expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ), - - noConflict: function( deep ) { - if ( window.$ === jQuery ) { - window.$ = _$; - } - - if ( deep && window.jQuery === jQuery ) { - window.jQuery = _jQuery; - } - - return jQuery; - }, - - // Is the DOM ready to be used? Set to true once it occurs. - isReady: false, - - // A counter to track how many items to wait for before - // the ready event fires. See #6781 - readyWait: 1, - - // Hold (or release) the ready event - holdReady: function( hold ) { - if ( hold ) { - jQuery.readyWait++; - } else { - jQuery.ready( true ); - } - }, - - // Handle when the DOM is ready - ready: function( wait ) { - - // Abort if there are pending holds or we're already ready - if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) { - return; - } - - // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). - if ( !document.body ) { - return setTimeout( jQuery.ready ); - } - - // Remember that the DOM is ready - jQuery.isReady = true; - - // If a normal DOM Ready event fired, decrement, and wait if need be - if ( wait !== true && --jQuery.readyWait > 0 ) { - return; - } - - // If there are functions bound, to execute - readyList.resolveWith( document, [ jQuery ] ); - - // Trigger any bound ready events - if ( jQuery.fn.trigger ) { - jQuery( document ).trigger("ready").off("ready"); - } - }, - - // See test/unit/core.js for details concerning isFunction. - // Since version 1.3, DOM methods and functions like alert - // aren't supported. They return false on IE (#2968). - isFunction: function( obj ) { - return jQuery.type(obj) === "function"; - }, - - isArray: Array.isArray || function( obj ) { - return jQuery.type(obj) === "array"; - }, - - isWindow: function( obj ) { - /* jshint eqeqeq: false */ - return obj != null && obj == obj.window; - }, - - isNumeric: function( obj ) { - return !isNaN( parseFloat(obj) ) && isFinite( obj ); - }, - - type: function( obj ) { - if ( obj == null ) { - return String( obj ); - } - return typeof obj === "object" || typeof obj === "function" ? - class2type[ core_toString.call(obj) ] || "object" : - typeof obj; - }, - - isPlainObject: function( obj ) { - var key; - - // Must be an Object. - // Because of IE, we also have to check the presence of the constructor property. - // Make sure that DOM nodes and window objects don't pass through, as well - if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { - return false; - } - - try { - // Not own constructor property must be Object - if ( obj.constructor && - !core_hasOwn.call(obj, "constructor") && - !core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) { - return false; - } - } catch ( e ) { - // IE8,9 Will throw exceptions on certain host objects #9897 - return false; - } - - // Support: IE<9 - // Handle iteration over inherited properties before own properties. - if ( jQuery.support.ownLast ) { - for ( key in obj ) { - return core_hasOwn.call( obj, key ); - } - } - - // Own properties are enumerated firstly, so to speed up, - // if last one is own, then all properties are own. - for ( key in obj ) {} - - return key === undefined || core_hasOwn.call( obj, key ); - }, - - isEmptyObject: function( obj ) { - var name; - for ( name in obj ) { - return false; - } - return true; - }, - - error: function( msg ) { - throw new Error( msg ); - }, - - // data: string of html - // context (optional): If specified, the fragment will be created in this context, defaults to document - // keepScripts (optional): If true, will include scripts passed in the html string - parseHTML: function( data, context, keepScripts ) { - if ( !data || typeof data !== "string" ) { - return null; - } - if ( typeof context === "boolean" ) { - keepScripts = context; - context = false; - } - context = context || document; - - var parsed = rsingleTag.exec( data ), - scripts = !keepScripts && []; - - // Single tag - if ( parsed ) { - return [ context.createElement( parsed[1] ) ]; - } - - parsed = jQuery.buildFragment( [ data ], context, scripts ); - if ( scripts ) { - jQuery( scripts ).remove(); - } - return jQuery.merge( [], parsed.childNodes ); - }, - - parseJSON: function( data ) { - // Attempt to parse using the native JSON parser first - if ( window.JSON && window.JSON.parse ) { - return window.JSON.parse( data ); - } - - if ( data === null ) { - return data; - } - - if ( typeof data === "string" ) { - - // Make sure leading/trailing whitespace is removed (IE can't handle it) - data = jQuery.trim( data ); - - if ( data ) { - // Make sure the incoming data is actual JSON - // Logic borrowed from http://json.org/json2.js - if ( rvalidchars.test( data.replace( rvalidescape, "@" ) - .replace( rvalidtokens, "]" ) - .replace( rvalidbraces, "")) ) { - - return ( new Function( "return " + data ) )(); - } - } - } - - jQuery.error( "Invalid JSON: " + data ); - }, - - // Cross-browser xml parsing - parseXML: function( data ) { - var xml, tmp; - if ( !data || typeof data !== "string" ) { - return null; - } - try { - if ( window.DOMParser ) { // Standard - tmp = new DOMParser(); - xml = tmp.parseFromString( data , "text/xml" ); - } else { // IE - xml = new ActiveXObject( "Microsoft.XMLDOM" ); - xml.async = "false"; - xml.loadXML( data ); - } - } catch( e ) { - xml = undefined; - } - if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) { - jQuery.error( "Invalid XML: " + data ); - } - return xml; - }, - - noop: function() {}, - - // Evaluates a script in a global context - // Workarounds based on findings by Jim Driscoll - // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context - globalEval: function( data ) { - if ( data && jQuery.trim( data ) ) { - // We use execScript on Internet Explorer - // We use an anonymous function so that context is window - // rather than jQuery in Firefox - ( window.execScript || function( data ) { - window[ "eval" ].call( window, data ); - } )( data ); - } - }, - - // Convert dashed to camelCase; used by the css and data modules - // Microsoft forgot to hump their vendor prefix (#9572) - camelCase: function( string ) { - return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); - }, - - nodeName: function( elem, name ) { - return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase(); - }, - - // args is for internal usage only - each: function( obj, callback, args ) { - var value, - i = 0, - length = obj.length, - isArray = isArraylike( obj ); - - if ( args ) { - if ( isArray ) { - for ( ; i < length; i++ ) { - value = callback.apply( obj[ i ], args ); - - if ( value === false ) { - break; - } - } - } else { - for ( i in obj ) { - value = callback.apply( obj[ i ], args ); - - if ( value === false ) { - break; - } - } - } - - // A special, fast, case for the most common use of each - } else { - if ( isArray ) { - for ( ; i < length; i++ ) { - value = callback.call( obj[ i ], i, obj[ i ] ); - - if ( value === false ) { - break; - } - } - } else { - for ( i in obj ) { - value = callback.call( obj[ i ], i, obj[ i ] ); - - if ( value === false ) { - break; - } - } - } - } - - return obj; - }, - - // Use native String.trim function wherever possible - trim: core_trim && !core_trim.call("\uFEFF\xA0") ? - function( text ) { - return text == null ? - "" : - core_trim.call( text ); - } : - - // Otherwise use our own trimming functionality - function( text ) { - return text == null ? - "" : - ( text + "" ).replace( rtrim, "" ); - }, - - // results is for internal usage only - makeArray: function( arr, results ) { - var ret = results || []; - - if ( arr != null ) { - if ( isArraylike( Object(arr) ) ) { - jQuery.merge( ret, - typeof arr === "string" ? - [ arr ] : arr - ); - } else { - core_push.call( ret, arr ); - } - } - - return ret; - }, - - inArray: function( elem, arr, i ) { - var len; - - if ( arr ) { - if ( core_indexOf ) { - return core_indexOf.call( arr, elem, i ); - } - - len = arr.length; - i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0; - - for ( ; i < len; i++ ) { - // Skip accessing in sparse arrays - if ( i in arr && arr[ i ] === elem ) { - return i; - } - } - } - - return -1; - }, - - merge: function( first, second ) { - var l = second.length, - i = first.length, - j = 0; - - if ( typeof l === "number" ) { - for ( ; j < l; j++ ) { - first[ i++ ] = second[ j ]; - } - } else { - while ( second[j] !== undefined ) { - first[ i++ ] = second[ j++ ]; - } - } - - first.length = i; - - return first; - }, - - grep: function( elems, callback, inv ) { - var retVal, - ret = [], - i = 0, - length = elems.length; - inv = !!inv; - - // Go through the array, only saving the items - // that pass the validator function - for ( ; i < length; i++ ) { - retVal = !!callback( elems[ i ], i ); - if ( inv !== retVal ) { - ret.push( elems[ i ] ); - } - } - - return ret; - }, - - // arg is for internal usage only - map: function( elems, callback, arg ) { - var value, - i = 0, - length = elems.length, - isArray = isArraylike( elems ), - ret = []; - - // Go through the array, translating each of the items to their - if ( isArray ) { - for ( ; i < length; i++ ) { - value = callback( elems[ i ], i, arg ); - - if ( value != null ) { - ret[ ret.length ] = value; - } - } - - // Go through every key on the object, - } else { - for ( i in elems ) { - value = callback( elems[ i ], i, arg ); - - if ( value != null ) { - ret[ ret.length ] = value; - } - } - } - - // Flatten any nested arrays - return core_concat.apply( [], ret ); - }, - - // A global GUID counter for objects - guid: 1, - - // Bind a function to a context, optionally partially applying any - // arguments. - proxy: function( fn, context ) { - var args, proxy, tmp; - - if ( typeof context === "string" ) { - tmp = fn[ context ]; - context = fn; - fn = tmp; - } - - // Quick check to determine if target is callable, in the spec - // this throws a TypeError, but we will just return undefined. - if ( !jQuery.isFunction( fn ) ) { - return undefined; - } - - // Simulated bind - args = core_slice.call( arguments, 2 ); - proxy = function() { - return fn.apply( context || this, args.concat( core_slice.call( arguments ) ) ); - }; - - // Set the guid of unique handler to the same of original handler, so it can be removed - proxy.guid = fn.guid = fn.guid || jQuery.guid++; - - return proxy; - }, - - // Multifunctional method to get and set values of a collection - // The value/s can optionally be executed if it's a function - access: function( elems, fn, key, value, chainable, emptyGet, raw ) { - var i = 0, - length = elems.length, - bulk = key == null; - - // Sets many values - if ( jQuery.type( key ) === "object" ) { - chainable = true; - for ( i in key ) { - jQuery.access( elems, fn, i, key[i], true, emptyGet, raw ); - } - - // Sets one value - } else if ( value !== undefined ) { - chainable = true; - - if ( !jQuery.isFunction( value ) ) { - raw = true; - } - - if ( bulk ) { - // Bulk operations run against the entire set - if ( raw ) { - fn.call( elems, value ); - fn = null; - - // ...except when executing function values - } else { - bulk = fn; - fn = function( elem, key, value ) { - return bulk.call( jQuery( elem ), value ); - }; - } - } - - if ( fn ) { - for ( ; i < length; i++ ) { - fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) ); - } - } - } - - return chainable ? - elems : - - // Gets - bulk ? - fn.call( elems ) : - length ? fn( elems[0], key ) : emptyGet; - }, - - now: function() { - return ( new Date() ).getTime(); - }, - - // A method for quickly swapping in/out CSS properties to get correct calculations. - // Note: this method belongs to the css module but it's needed here for the support module. - // If support gets modularized, this method should be moved back to the css module. - swap: function( elem, options, callback, args ) { - var ret, name, - old = {}; - - // Remember the old values, and insert the new ones - for ( name in options ) { - old[ name ] = elem.style[ name ]; - elem.style[ name ] = options[ name ]; - } - - ret = callback.apply( elem, args || [] ); - - // Revert the old values - for ( name in options ) { - elem.style[ name ] = old[ name ]; - } - - return ret; - } -}); - -jQuery.ready.promise = function( obj ) { - if ( !readyList ) { - - readyList = jQuery.Deferred(); - - // Catch cases where $(document).ready() is called after the browser event has already occurred. - // we once tried to use readyState "interactive" here, but it caused issues like the one - // discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15 - if ( document.readyState === "complete" ) { - // Handle it asynchronously to allow scripts the opportunity to delay ready - setTimeout( jQuery.ready ); - - // Standards-based browsers support DOMContentLoaded - } else if ( document.addEventListener ) { - // Use the handy event callback - document.addEventListener( "DOMContentLoaded", completed, false ); - - // A fallback to window.onload, that will always work - window.addEventListener( "load", completed, false ); - - // If IE event model is used - } else { - // Ensure firing before onload, maybe late but safe also for iframes - document.attachEvent( "onreadystatechange", completed ); - - // A fallback to window.onload, that will always work - window.attachEvent( "onload", completed ); - - // If IE and not a frame - // continually check to see if the document is ready - var top = false; - - try { - top = window.frameElement == null && document.documentElement; - } catch(e) {} - - if ( top && top.doScroll ) { - (function doScrollCheck() { - if ( !jQuery.isReady ) { - - try { - // Use the trick by Diego Perini - // http://javascript.nwbox.com/IEContentLoaded/ - top.doScroll("left"); - } catch(e) { - return setTimeout( doScrollCheck, 50 ); - } - - // detach all dom ready events - detach(); - - // and execute any waiting functions - jQuery.ready(); - } - })(); - } - } - } - return readyList.promise( obj ); -}; - -// Populate the class2type map -jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) { - class2type[ "[object " + name + "]" ] = name.toLowerCase(); -}); - -function isArraylike( obj ) { - var length = obj.length, - type = jQuery.type( obj ); - - if ( jQuery.isWindow( obj ) ) { - return false; - } - - if ( obj.nodeType === 1 && length ) { - return true; - } - - return type === "array" || type !== "function" && - ( length === 0 || - typeof length === "number" && length > 0 && ( length - 1 ) in obj ); -} - -// All jQuery objects should point back to these -rootjQuery = jQuery(document); -/*! - * Sizzle CSS Selector Engine v1.10.2 - * http://sizzlejs.com/ - * - * Copyright 2013 jQuery Foundation, Inc. and other contributors - * Released under the MIT license - * http://jquery.org/license - * - * Date: 2013-07-03 - */ -(function( window, undefined ) { - -var i, - support, - cachedruns, - Expr, - getText, - isXML, - compile, - outermostContext, - sortInput, - - // Local document vars - setDocument, - document, - docElem, - documentIsHTML, - rbuggyQSA, - rbuggyMatches, - matches, - contains, - - // Instance-specific data - expando = "sizzle" + -(new Date()), - preferredDoc = window.document, - dirruns = 0, - done = 0, - classCache = createCache(), - tokenCache = createCache(), - compilerCache = createCache(), - hasDuplicate = false, - sortOrder = function( a, b ) { - if ( a === b ) { - hasDuplicate = true; - return 0; - } - return 0; - }, - - // General-purpose constants - strundefined = typeof undefined, - MAX_NEGATIVE = 1 << 31, - - // Instance methods - hasOwn = ({}).hasOwnProperty, - arr = [], - pop = arr.pop, - push_native = arr.push, - push = arr.push, - slice = arr.slice, - // Use a stripped-down indexOf if we can't use a native one - indexOf = arr.indexOf || function( elem ) { - var i = 0, - len = this.length; - for ( ; i < len; i++ ) { - if ( this[i] === elem ) { - return i; - } - } - return -1; - }, - - booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped", - - // Regular expressions - - // Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace - whitespace = "[\\x20\\t\\r\\n\\f]", - // http://www.w3.org/TR/css3-syntax/#characters - characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", - - // Loosely modeled on CSS identifier characters - // An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors - // Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier - identifier = characterEncoding.replace( "w", "w#" ), - - // Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors - attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace + - "*(?:([*^$|!~]?=)" + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]", - - // Prefer arguments quoted, - // then not containing pseudos/brackets, - // then attribute selectors/non-parenthetical expressions, - // then anything else - // These preferences are here to reduce the number of selectors - // needing tokenize in the PSEUDO preFilter - pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)", - - // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter - rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ), - - rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), - rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ), - - rsibling = new RegExp( whitespace + "*[+~]" ), - rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*)" + whitespace + "*\\]", "g" ), - - rpseudo = new RegExp( pseudos ), - ridentifier = new RegExp( "^" + identifier + "$" ), - - matchExpr = { - "ID": new RegExp( "^#(" + characterEncoding + ")" ), - "CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ), - "TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ), - "ATTR": new RegExp( "^" + attributes ), - "PSEUDO": new RegExp( "^" + pseudos ), - "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace + - "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace + - "*(\\d+)|))" + whitespace + "*\\)|)", "i" ), - "bool": new RegExp( "^(?:" + booleans + ")$", "i" ), - // For use in libraries implementing .is() - // We use this for POS matching in `select` - "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + - whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" ) - }, - - rnative = /^[^{]+\{\s*\[native \w/, - - // Easily-parseable/retrievable ID or TAG or CLASS selectors - rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, - - rinputs = /^(?:input|select|textarea|button)$/i, - rheader = /^h\d$/i, - - rescape = /'|\\/g, - - // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters - runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ), - funescape = function( _, escaped, escapedWhitespace ) { - var high = "0x" + escaped - 0x10000; - // NaN means non-codepoint - // Support: Firefox - // Workaround erroneous numeric interpretation of +"0x" - return high !== high || escapedWhitespace ? - escaped : - // BMP codepoint - high < 0 ? - String.fromCharCode( high + 0x10000 ) : - // Supplemental Plane codepoint (surrogate pair) - String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); - }; - -// Optimize for push.apply( _, NodeList ) -try { - push.apply( - (arr = slice.call( preferredDoc.childNodes )), - preferredDoc.childNodes - ); - // Support: Android<4.0 - // Detect silently failing push.apply - arr[ preferredDoc.childNodes.length ].nodeType; -} catch ( e ) { - push = { apply: arr.length ? - - // Leverage slice if possible - function( target, els ) { - push_native.apply( target, slice.call(els) ); - } : - - // Support: IE<9 - // Otherwise append directly - function( target, els ) { - var j = target.length, - i = 0; - // Can't trust NodeList.length - while ( (target[j++] = els[i++]) ) {} - target.length = j - 1; - } - }; -} - -function Sizzle( selector, context, results, seed ) { - var match, elem, m, nodeType, - // QSA vars - i, groups, old, nid, newContext, newSelector; - - if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) { - setDocument( context ); - } - - context = context || document; - results = results || []; - - if ( !selector || typeof selector !== "string" ) { - return results; - } - - if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) { - return []; - } - - if ( documentIsHTML && !seed ) { - - // Shortcuts - if ( (match = rquickExpr.exec( selector )) ) { - // Speed-up: Sizzle("#ID") - if ( (m = match[1]) ) { - if ( nodeType === 9 ) { - elem = context.getElementById( m ); - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - if ( elem && elem.parentNode ) { - // Handle the case where IE, Opera, and Webkit return items - // by name instead of ID - if ( elem.id === m ) { - results.push( elem ); - return results; - } - } else { - return results; - } - } else { - // Context is not a document - if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) && - contains( context, elem ) && elem.id === m ) { - results.push( elem ); - return results; - } - } - - // Speed-up: Sizzle("TAG") - } else if ( match[2] ) { - push.apply( results, context.getElementsByTagName( selector ) ); - return results; - - // Speed-up: Sizzle(".CLASS") - } else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) { - push.apply( results, context.getElementsByClassName( m ) ); - return results; - } - } - - // QSA path - if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) { - nid = old = expando; - newContext = context; - newSelector = nodeType === 9 && selector; - - // qSA works strangely on Element-rooted queries - // We can work around this by specifying an extra ID on the root - // and working up from there (Thanks to Andrew Dupont for the technique) - // IE 8 doesn't work on object elements - if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { - groups = tokenize( selector ); - - if ( (old = context.getAttribute("id")) ) { - nid = old.replace( rescape, "\\$&" ); - } else { - context.setAttribute( "id", nid ); - } - nid = "[id='" + nid + "'] "; - - i = groups.length; - while ( i-- ) { - groups[i] = nid + toSelector( groups[i] ); - } - newContext = rsibling.test( selector ) && context.parentNode || context; - newSelector = groups.join(","); - } - - if ( newSelector ) { - try { - push.apply( results, - newContext.querySelectorAll( newSelector ) - ); - return results; - } catch(qsaError) { - } finally { - if ( !old ) { - context.removeAttribute("id"); - } - } - } - } - } - - // All others - return select( selector.replace( rtrim, "$1" ), context, results, seed ); -} - -/** - * Create key-value caches of limited size - * @returns {Function(string, Object)} Returns the Object data after storing it on itself with - * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) - * deleting the oldest entry - */ -function createCache() { - var keys = []; - - function cache( key, value ) { - // Use (key + " ") to avoid collision with native prototype properties (see Issue #157) - if ( keys.push( key += " " ) > Expr.cacheLength ) { - // Only keep the most recent entries - delete cache[ keys.shift() ]; - } - return (cache[ key ] = value); - } - return cache; -} - -/** - * Mark a function for special use by Sizzle - * @param {Function} fn The function to mark - */ -function markFunction( fn ) { - fn[ expando ] = true; - return fn; -} - -/** - * Support testing using an element - * @param {Function} fn Passed the created div and expects a boolean result - */ -function assert( fn ) { - var div = document.createElement("div"); - - try { - return !!fn( div ); - } catch (e) { - return false; - } finally { - // Remove from its parent by default - if ( div.parentNode ) { - div.parentNode.removeChild( div ); - } - // release memory in IE - div = null; - } -} - -/** - * Adds the same handler for all of the specified attrs - * @param {String} attrs Pipe-separated list of attributes - * @param {Function} handler The method that will be applied - */ -function addHandle( attrs, handler ) { - var arr = attrs.split("|"), - i = attrs.length; - - while ( i-- ) { - Expr.attrHandle[ arr[i] ] = handler; - } -} - -/** - * Checks document order of two siblings - * @param {Element} a - * @param {Element} b - * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b - */ -function siblingCheck( a, b ) { - var cur = b && a, - diff = cur && a.nodeType === 1 && b.nodeType === 1 && - ( ~b.sourceIndex || MAX_NEGATIVE ) - - ( ~a.sourceIndex || MAX_NEGATIVE ); - - // Use IE sourceIndex if available on both nodes - if ( diff ) { - return diff; - } - - // Check if b follows a - if ( cur ) { - while ( (cur = cur.nextSibling) ) { - if ( cur === b ) { - return -1; - } - } - } - - return a ? 1 : -1; -} - -/** - * Returns a function to use in pseudos for input types - * @param {String} type - */ -function createInputPseudo( type ) { - return function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && elem.type === type; - }; -} - -/** - * Returns a function to use in pseudos for buttons - * @param {String} type - */ -function createButtonPseudo( type ) { - return function( elem ) { - var name = elem.nodeName.toLowerCase(); - return (name === "input" || name === "button") && elem.type === type; - }; -} - -/** - * Returns a function to use in pseudos for positionals - * @param {Function} fn - */ -function createPositionalPseudo( fn ) { - return markFunction(function( argument ) { - argument = +argument; - return markFunction(function( seed, matches ) { - var j, - matchIndexes = fn( [], seed.length, argument ), - i = matchIndexes.length; - - // Match elements found at the specified indexes - while ( i-- ) { - if ( seed[ (j = matchIndexes[i]) ] ) { - seed[j] = !(matches[j] = seed[j]); - } - } - }); - }); -} - -/** - * Detect xml - * @param {Element|Object} elem An element or a document - */ -isXML = Sizzle.isXML = function( elem ) { - // documentElement is verified for cases where it doesn't yet exist - // (such as loading iframes in IE - #4833) - var documentElement = elem && (elem.ownerDocument || elem).documentElement; - return documentElement ? documentElement.nodeName !== "HTML" : false; -}; - -// Expose support vars for convenience -support = Sizzle.support = {}; - -/** - * Sets document-related variables once based on the current document - * @param {Element|Object} [doc] An element or document object to use to set the document - * @returns {Object} Returns the current document - */ -setDocument = Sizzle.setDocument = function( node ) { - var doc = node ? node.ownerDocument || node : preferredDoc, - parent = doc.defaultView; - - // If no document and documentElement is available, return - if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) { - return document; - } - - // Set our document - document = doc; - docElem = doc.documentElement; - - // Support tests - documentIsHTML = !isXML( doc ); - - // Support: IE>8 - // If iframe document is assigned to "document" variable and if iframe has been reloaded, - // IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936 - // IE6-8 do not support the defaultView property so parent will be undefined - if ( parent && parent.attachEvent && parent !== parent.top ) { - parent.attachEvent( "onbeforeunload", function() { - setDocument(); - }); - } - - /* Attributes - ---------------------------------------------------------------------- */ - - // Support: IE<8 - // Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans) - support.attributes = assert(function( div ) { - div.className = "i"; - return !div.getAttribute("className"); - }); - - /* getElement(s)By* - ---------------------------------------------------------------------- */ - - // Check if getElementsByTagName("*") returns only elements - support.getElementsByTagName = assert(function( div ) { - div.appendChild( doc.createComment("") ); - return !div.getElementsByTagName("*").length; - }); - - // Check if getElementsByClassName can be trusted - support.getElementsByClassName = assert(function( div ) { - div.innerHTML = "
"; - - // Support: Safari<4 - // Catch class over-caching - div.firstChild.className = "i"; - // Support: Opera<10 - // Catch gEBCN failure to find non-leading classes - return div.getElementsByClassName("i").length === 2; - }); - - // Support: IE<10 - // Check if getElementById returns elements by name - // The broken getElementById methods don't pick up programatically-set names, - // so use a roundabout getElementsByName test - support.getById = assert(function( div ) { - docElem.appendChild( div ).id = expando; - return !doc.getElementsByName || !doc.getElementsByName( expando ).length; - }); - - // ID find and filter - if ( support.getById ) { - Expr.find["ID"] = function( id, context ) { - if ( typeof context.getElementById !== strundefined && documentIsHTML ) { - var m = context.getElementById( id ); - // Check parentNode to catch when Blackberry 4.6 returns - // nodes that are no longer in the document #6963 - return m && m.parentNode ? [m] : []; - } - }; - Expr.filter["ID"] = function( id ) { - var attrId = id.replace( runescape, funescape ); - return function( elem ) { - return elem.getAttribute("id") === attrId; - }; - }; - } else { - // Support: IE6/7 - // getElementById is not reliable as a find shortcut - delete Expr.find["ID"]; - - Expr.filter["ID"] = function( id ) { - var attrId = id.replace( runescape, funescape ); - return function( elem ) { - var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id"); - return node && node.value === attrId; - }; - }; - } - - // Tag - Expr.find["TAG"] = support.getElementsByTagName ? - function( tag, context ) { - if ( typeof context.getElementsByTagName !== strundefined ) { - return context.getElementsByTagName( tag ); - } - } : - function( tag, context ) { - var elem, - tmp = [], - i = 0, - results = context.getElementsByTagName( tag ); - - // Filter out possible comments - if ( tag === "*" ) { - while ( (elem = results[i++]) ) { - if ( elem.nodeType === 1 ) { - tmp.push( elem ); - } - } - - return tmp; - } - return results; - }; - - // Class - Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) { - if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) { - return context.getElementsByClassName( className ); - } - }; - - /* QSA/matchesSelector - ---------------------------------------------------------------------- */ - - // QSA and matchesSelector support - - // matchesSelector(:active) reports false when true (IE9/Opera 11.5) - rbuggyMatches = []; - - // qSa(:focus) reports false when true (Chrome 21) - // We allow this because of a bug in IE8/9 that throws an error - // whenever `document.activeElement` is accessed on an iframe - // So, we allow :focus to pass through QSA all the time to avoid the IE error - // See http://bugs.jquery.com/ticket/13378 - rbuggyQSA = []; - - if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) { - // Build QSA regex - // Regex strategy adopted from Diego Perini - assert(function( div ) { - // Select is set to empty string on purpose - // This is to test IE's treatment of not explicitly - // setting a boolean content attribute, - // since its presence should be enough - // http://bugs.jquery.com/ticket/12359 - div.innerHTML = ""; - - // Support: IE8 - // Boolean attributes and "value" are not treated correctly - if ( !div.querySelectorAll("[selected]").length ) { - rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); - } - - // Webkit/Opera - :checked should return selected option elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - // IE8 throws error here and will not see later tests - if ( !div.querySelectorAll(":checked").length ) { - rbuggyQSA.push(":checked"); - } - }); - - assert(function( div ) { - - // Support: Opera 10-12/IE8 - // ^= $= *= and empty values - // Should not select anything - // Support: Windows 8 Native Apps - // The type attribute is restricted during .innerHTML assignment - var input = doc.createElement("input"); - input.setAttribute( "type", "hidden" ); - div.appendChild( input ).setAttribute( "t", "" ); - - if ( div.querySelectorAll("[t^='']").length ) { - rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); - } - - // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) - // IE8 throws error here and will not see later tests - if ( !div.querySelectorAll(":enabled").length ) { - rbuggyQSA.push( ":enabled", ":disabled" ); - } - - // Opera 10-11 does not throw on post-comma invalid pseudos - div.querySelectorAll("*,:x"); - rbuggyQSA.push(",.*:"); - }); - } - - if ( (support.matchesSelector = rnative.test( (matches = docElem.webkitMatchesSelector || - docElem.mozMatchesSelector || - docElem.oMatchesSelector || - docElem.msMatchesSelector) )) ) { - - assert(function( div ) { - // Check to see if it's possible to do matchesSelector - // on a disconnected node (IE 9) - support.disconnectedMatch = matches.call( div, "div" ); - - // This should fail with an exception - // Gecko does not error, returns false instead - matches.call( div, "[s!='']:x" ); - rbuggyMatches.push( "!=", pseudos ); - }); - } - - rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") ); - rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") ); - - /* Contains - ---------------------------------------------------------------------- */ - - // Element contains another - // Purposefully does not implement inclusive descendent - // As in, an element does not contain itself - contains = rnative.test( docElem.contains ) || docElem.compareDocumentPosition ? - function( a, b ) { - var adown = a.nodeType === 9 ? a.documentElement : a, - bup = b && b.parentNode; - return a === bup || !!( bup && bup.nodeType === 1 && ( - adown.contains ? - adown.contains( bup ) : - a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16 - )); - } : - function( a, b ) { - if ( b ) { - while ( (b = b.parentNode) ) { - if ( b === a ) { - return true; - } - } - } - return false; - }; - - /* Sorting - ---------------------------------------------------------------------- */ - - // Document order sorting - sortOrder = docElem.compareDocumentPosition ? - function( a, b ) { - - // Flag for duplicate removal - if ( a === b ) { - hasDuplicate = true; - return 0; - } - - var compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b ); - - if ( compare ) { - // Disconnected nodes - if ( compare & 1 || - (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) { - - // Choose the first element that is related to our preferred document - if ( a === doc || contains(preferredDoc, a) ) { - return -1; - } - if ( b === doc || contains(preferredDoc, b) ) { - return 1; - } - - // Maintain original order - return sortInput ? - ( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) : - 0; - } - - return compare & 4 ? -1 : 1; - } - - // Not directly comparable, sort on existence of method - return a.compareDocumentPosition ? -1 : 1; - } : - function( a, b ) { - var cur, - i = 0, - aup = a.parentNode, - bup = b.parentNode, - ap = [ a ], - bp = [ b ]; - - // Exit early if the nodes are identical - if ( a === b ) { - hasDuplicate = true; - return 0; - - // Parentless nodes are either documents or disconnected - } else if ( !aup || !bup ) { - return a === doc ? -1 : - b === doc ? 1 : - aup ? -1 : - bup ? 1 : - sortInput ? - ( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) : - 0; - - // If the nodes are siblings, we can do a quick check - } else if ( aup === bup ) { - return siblingCheck( a, b ); - } - - // Otherwise we need full lists of their ancestors for comparison - cur = a; - while ( (cur = cur.parentNode) ) { - ap.unshift( cur ); - } - cur = b; - while ( (cur = cur.parentNode) ) { - bp.unshift( cur ); - } - - // Walk down the tree looking for a discrepancy - while ( ap[i] === bp[i] ) { - i++; - } - - return i ? - // Do a sibling check if the nodes have a common ancestor - siblingCheck( ap[i], bp[i] ) : - - // Otherwise nodes in our document sort first - ap[i] === preferredDoc ? -1 : - bp[i] === preferredDoc ? 1 : - 0; - }; - - return doc; -}; - -Sizzle.matches = function( expr, elements ) { - return Sizzle( expr, null, null, elements ); -}; - -Sizzle.matchesSelector = function( elem, expr ) { - // Set document vars if needed - if ( ( elem.ownerDocument || elem ) !== document ) { - setDocument( elem ); - } - - // Make sure that attribute selectors are quoted - expr = expr.replace( rattributeQuotes, "='$1']" ); - - if ( support.matchesSelector && documentIsHTML && - ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) && - ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) { - - try { - var ret = matches.call( elem, expr ); - - // IE 9's matchesSelector returns false on disconnected nodes - if ( ret || support.disconnectedMatch || - // As well, disconnected nodes are said to be in a document - // fragment in IE 9 - elem.document && elem.document.nodeType !== 11 ) { - return ret; - } - } catch(e) {} - } - - return Sizzle( expr, document, null, [elem] ).length > 0; -}; - -Sizzle.contains = function( context, elem ) { - // Set document vars if needed - if ( ( context.ownerDocument || context ) !== document ) { - setDocument( context ); - } - return contains( context, elem ); -}; - -Sizzle.attr = function( elem, name ) { - // Set document vars if needed - if ( ( elem.ownerDocument || elem ) !== document ) { - setDocument( elem ); - } - - var fn = Expr.attrHandle[ name.toLowerCase() ], - // Don't get fooled by Object.prototype properties (jQuery #13807) - val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? - fn( elem, name, !documentIsHTML ) : - undefined; - - return val === undefined ? - support.attributes || !documentIsHTML ? - elem.getAttribute( name ) : - (val = elem.getAttributeNode(name)) && val.specified ? - val.value : - null : - val; -}; - -Sizzle.error = function( msg ) { - throw new Error( "Syntax error, unrecognized expression: " + msg ); -}; - -/** - * Document sorting and removing duplicates - * @param {ArrayLike} results - */ -Sizzle.uniqueSort = function( results ) { - var elem, - duplicates = [], - j = 0, - i = 0; - - // Unless we *know* we can detect duplicates, assume their presence - hasDuplicate = !support.detectDuplicates; - sortInput = !support.sortStable && results.slice( 0 ); - results.sort( sortOrder ); - - if ( hasDuplicate ) { - while ( (elem = results[i++]) ) { - if ( elem === results[ i ] ) { - j = duplicates.push( i ); - } - } - while ( j-- ) { - results.splice( duplicates[ j ], 1 ); - } - } - - return results; -}; - -/** - * Utility function for retrieving the text value of an array of DOM nodes - * @param {Array|Element} elem - */ -getText = Sizzle.getText = function( elem ) { - var node, - ret = "", - i = 0, - nodeType = elem.nodeType; - - if ( !nodeType ) { - // If no nodeType, this is expected to be an array - for ( ; (node = elem[i]); i++ ) { - // Do not traverse comment nodes - ret += getText( node ); - } - } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { - // Use textContent for elements - // innerText usage removed for consistency of new lines (see #11153) - if ( typeof elem.textContent === "string" ) { - return elem.textContent; - } else { - // Traverse its children - for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { - ret += getText( elem ); - } - } - } else if ( nodeType === 3 || nodeType === 4 ) { - return elem.nodeValue; - } - // Do not include comment or processing instruction nodes - - return ret; -}; - -Expr = Sizzle.selectors = { - - // Can be adjusted by the user - cacheLength: 50, - - createPseudo: markFunction, - - match: matchExpr, - - attrHandle: {}, - - find: {}, - - relative: { - ">": { dir: "parentNode", first: true }, - " ": { dir: "parentNode" }, - "+": { dir: "previousSibling", first: true }, - "~": { dir: "previousSibling" } - }, - - preFilter: { - "ATTR": function( match ) { - match[1] = match[1].replace( runescape, funescape ); - - // Move the given value to match[3] whether quoted or unquoted - match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape ); - - if ( match[2] === "~=" ) { - match[3] = " " + match[3] + " "; - } - - return match.slice( 0, 4 ); - }, - - "CHILD": function( match ) { - /* matches from matchExpr["CHILD"] - 1 type (only|nth|...) - 2 what (child|of-type) - 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...) - 4 xn-component of xn+y argument ([+-]?\d*n|) - 5 sign of xn-component - 6 x of xn-component - 7 sign of y-component - 8 y of y-component - */ - match[1] = match[1].toLowerCase(); - - if ( match[1].slice( 0, 3 ) === "nth" ) { - // nth-* requires argument - if ( !match[3] ) { - Sizzle.error( match[0] ); - } - - // numeric x and y parameters for Expr.filter.CHILD - // remember that false/true cast respectively to 0/1 - match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) ); - match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" ); - - // other types prohibit arguments - } else if ( match[3] ) { - Sizzle.error( match[0] ); - } - - return match; - }, - - "PSEUDO": function( match ) { - var excess, - unquoted = !match[5] && match[2]; - - if ( matchExpr["CHILD"].test( match[0] ) ) { - return null; - } - - // Accept quoted arguments as-is - if ( match[3] && match[4] !== undefined ) { - match[2] = match[4]; - - // Strip excess characters from unquoted arguments - } else if ( unquoted && rpseudo.test( unquoted ) && - // Get excess from tokenize (recursively) - (excess = tokenize( unquoted, true )) && - // advance to the next closing parenthesis - (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) { - - // excess is a negative index - match[0] = match[0].slice( 0, excess ); - match[2] = unquoted.slice( 0, excess ); - } - - // Return only captures needed by the pseudo filter method (type and argument) - return match.slice( 0, 3 ); - } - }, - - filter: { - - "TAG": function( nodeNameSelector ) { - var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase(); - return nodeNameSelector === "*" ? - function() { return true; } : - function( elem ) { - return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; - }; - }, - - "CLASS": function( className ) { - var pattern = classCache[ className + " " ]; - - return pattern || - (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) && - classCache( className, function( elem ) { - return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" ); - }); - }, - - "ATTR": function( name, operator, check ) { - return function( elem ) { - var result = Sizzle.attr( elem, name ); - - if ( result == null ) { - return operator === "!="; - } - if ( !operator ) { - return true; - } - - result += ""; - - return operator === "=" ? result === check : - operator === "!=" ? result !== check : - operator === "^=" ? check && result.indexOf( check ) === 0 : - operator === "*=" ? check && result.indexOf( check ) > -1 : - operator === "$=" ? check && result.slice( -check.length ) === check : - operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 : - operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" : - false; - }; - }, - - "CHILD": function( type, what, argument, first, last ) { - var simple = type.slice( 0, 3 ) !== "nth", - forward = type.slice( -4 ) !== "last", - ofType = what === "of-type"; - - return first === 1 && last === 0 ? - - // Shortcut for :nth-*(n) - function( elem ) { - return !!elem.parentNode; - } : - - function( elem, context, xml ) { - var cache, outerCache, node, diff, nodeIndex, start, - dir = simple !== forward ? "nextSibling" : "previousSibling", - parent = elem.parentNode, - name = ofType && elem.nodeName.toLowerCase(), - useCache = !xml && !ofType; - - if ( parent ) { - - // :(first|last|only)-(child|of-type) - if ( simple ) { - while ( dir ) { - node = elem; - while ( (node = node[ dir ]) ) { - if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) { - return false; - } - } - // Reverse direction for :only-* (if we haven't yet done so) - start = dir = type === "only" && !start && "nextSibling"; - } - return true; - } - - start = [ forward ? parent.firstChild : parent.lastChild ]; - - // non-xml :nth-child(...) stores cache data on `parent` - if ( forward && useCache ) { - // Seek `elem` from a previously-cached index - outerCache = parent[ expando ] || (parent[ expando ] = {}); - cache = outerCache[ type ] || []; - nodeIndex = cache[0] === dirruns && cache[1]; - diff = cache[0] === dirruns && cache[2]; - node = nodeIndex && parent.childNodes[ nodeIndex ]; - - while ( (node = ++nodeIndex && node && node[ dir ] || - - // Fallback to seeking `elem` from the start - (diff = nodeIndex = 0) || start.pop()) ) { - - // When found, cache indexes on `parent` and break - if ( node.nodeType === 1 && ++diff && node === elem ) { - outerCache[ type ] = [ dirruns, nodeIndex, diff ]; - break; - } - } - - // Use previously-cached element index if available - } else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) { - diff = cache[1]; - - // xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...) - } else { - // Use the same loop as above to seek `elem` from the start - while ( (node = ++nodeIndex && node && node[ dir ] || - (diff = nodeIndex = 0) || start.pop()) ) { - - if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) { - // Cache the index of each encountered element - if ( useCache ) { - (node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ]; - } - - if ( node === elem ) { - break; - } - } - } - } - - // Incorporate the offset, then check against cycle size - diff -= last; - return diff === first || ( diff % first === 0 && diff / first >= 0 ); - } - }; - }, - - "PSEUDO": function( pseudo, argument ) { - // pseudo-class names are case-insensitive - // http://www.w3.org/TR/selectors/#pseudo-classes - // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters - // Remember that setFilters inherits from pseudos - var args, - fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] || - Sizzle.error( "unsupported pseudo: " + pseudo ); - - // The user may use createPseudo to indicate that - // arguments are needed to create the filter function - // just as Sizzle does - if ( fn[ expando ] ) { - return fn( argument ); - } - - // But maintain support for old signatures - if ( fn.length > 1 ) { - args = [ pseudo, pseudo, "", argument ]; - return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ? - markFunction(function( seed, matches ) { - var idx, - matched = fn( seed, argument ), - i = matched.length; - while ( i-- ) { - idx = indexOf.call( seed, matched[i] ); - seed[ idx ] = !( matches[ idx ] = matched[i] ); - } - }) : - function( elem ) { - return fn( elem, 0, args ); - }; - } - - return fn; - } - }, - - pseudos: { - // Potentially complex pseudos - "not": markFunction(function( selector ) { - // Trim the selector passed to compile - // to avoid treating leading and trailing - // spaces as combinators - var input = [], - results = [], - matcher = compile( selector.replace( rtrim, "$1" ) ); - - return matcher[ expando ] ? - markFunction(function( seed, matches, context, xml ) { - var elem, - unmatched = matcher( seed, null, xml, [] ), - i = seed.length; - - // Match elements unmatched by `matcher` - while ( i-- ) { - if ( (elem = unmatched[i]) ) { - seed[i] = !(matches[i] = elem); - } - } - }) : - function( elem, context, xml ) { - input[0] = elem; - matcher( input, null, xml, results ); - return !results.pop(); - }; - }), - - "has": markFunction(function( selector ) { - return function( elem ) { - return Sizzle( selector, elem ).length > 0; - }; - }), - - "contains": markFunction(function( text ) { - return function( elem ) { - return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1; - }; - }), - - // "Whether an element is represented by a :lang() selector - // is based solely on the element's language value - // being equal to the identifier C, - // or beginning with the identifier C immediately followed by "-". - // The matching of C against the element's language value is performed case-insensitively. - // The identifier C does not have to be a valid language name." - // http://www.w3.org/TR/selectors/#lang-pseudo - "lang": markFunction( function( lang ) { - // lang value must be a valid identifier - if ( !ridentifier.test(lang || "") ) { - Sizzle.error( "unsupported lang: " + lang ); - } - lang = lang.replace( runescape, funescape ).toLowerCase(); - return function( elem ) { - var elemLang; - do { - if ( (elemLang = documentIsHTML ? - elem.lang : - elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) { - - elemLang = elemLang.toLowerCase(); - return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0; - } - } while ( (elem = elem.parentNode) && elem.nodeType === 1 ); - return false; - }; - }), - - // Miscellaneous - "target": function( elem ) { - var hash = window.location && window.location.hash; - return hash && hash.slice( 1 ) === elem.id; - }, - - "root": function( elem ) { - return elem === docElem; - }, - - "focus": function( elem ) { - return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex); - }, - - // Boolean properties - "enabled": function( elem ) { - return elem.disabled === false; - }, - - "disabled": function( elem ) { - return elem.disabled === true; - }, - - "checked": function( elem ) { - // In CSS3, :checked should return both checked and selected elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - var nodeName = elem.nodeName.toLowerCase(); - return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected); - }, - - "selected": function( elem ) { - // Accessing this property makes selected-by-default - // options in Safari work properly - if ( elem.parentNode ) { - elem.parentNode.selectedIndex; - } - - return elem.selected === true; - }, - - // Contents - "empty": function( elem ) { - // http://www.w3.org/TR/selectors/#empty-pseudo - // :empty is only affected by element nodes and content nodes(including text(3), cdata(4)), - // not comment, processing instructions, or others - // Thanks to Diego Perini for the nodeName shortcut - // Greater than "@" means alpha characters (specifically not starting with "#" or "?") - for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { - if ( elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4 ) { - return false; - } - } - return true; - }, - - "parent": function( elem ) { - return !Expr.pseudos["empty"]( elem ); - }, - - // Element/input types - "header": function( elem ) { - return rheader.test( elem.nodeName ); - }, - - "input": function( elem ) { - return rinputs.test( elem.nodeName ); - }, - - "button": function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && elem.type === "button" || name === "button"; - }, - - "text": function( elem ) { - var attr; - // IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) - // use getAttribute instead to test this case - return elem.nodeName.toLowerCase() === "input" && - elem.type === "text" && - ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type ); - }, - - // Position-in-collection - "first": createPositionalPseudo(function() { - return [ 0 ]; - }), - - "last": createPositionalPseudo(function( matchIndexes, length ) { - return [ length - 1 ]; - }), - - "eq": createPositionalPseudo(function( matchIndexes, length, argument ) { - return [ argument < 0 ? argument + length : argument ]; - }), - - "even": createPositionalPseudo(function( matchIndexes, length ) { - var i = 0; - for ( ; i < length; i += 2 ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "odd": createPositionalPseudo(function( matchIndexes, length ) { - var i = 1; - for ( ; i < length; i += 2 ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "lt": createPositionalPseudo(function( matchIndexes, length, argument ) { - var i = argument < 0 ? argument + length : argument; - for ( ; --i >= 0; ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "gt": createPositionalPseudo(function( matchIndexes, length, argument ) { - var i = argument < 0 ? argument + length : argument; - for ( ; ++i < length; ) { - matchIndexes.push( i ); - } - return matchIndexes; - }) - } -}; - -Expr.pseudos["nth"] = Expr.pseudos["eq"]; - -// Add button/input type pseudos -for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) { - Expr.pseudos[ i ] = createInputPseudo( i ); -} -for ( i in { submit: true, reset: true } ) { - Expr.pseudos[ i ] = createButtonPseudo( i ); -} - -// Easy API for creating new setFilters -function setFilters() {} -setFilters.prototype = Expr.filters = Expr.pseudos; -Expr.setFilters = new setFilters(); - -function tokenize( selector, parseOnly ) { - var matched, match, tokens, type, - soFar, groups, preFilters, - cached = tokenCache[ selector + " " ]; - - if ( cached ) { - return parseOnly ? 0 : cached.slice( 0 ); - } - - soFar = selector; - groups = []; - preFilters = Expr.preFilter; - - while ( soFar ) { - - // Comma and first run - if ( !matched || (match = rcomma.exec( soFar )) ) { - if ( match ) { - // Don't consume trailing commas as valid - soFar = soFar.slice( match[0].length ) || soFar; - } - groups.push( tokens = [] ); - } - - matched = false; - - // Combinators - if ( (match = rcombinators.exec( soFar )) ) { - matched = match.shift(); - tokens.push({ - value: matched, - // Cast descendant combinators to space - type: match[0].replace( rtrim, " " ) - }); - soFar = soFar.slice( matched.length ); - } - - // Filters - for ( type in Expr.filter ) { - if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] || - (match = preFilters[ type ]( match ))) ) { - matched = match.shift(); - tokens.push({ - value: matched, - type: type, - matches: match - }); - soFar = soFar.slice( matched.length ); - } - } - - if ( !matched ) { - break; - } - } - - // Return the length of the invalid excess - // if we're just parsing - // Otherwise, throw an error or return tokens - return parseOnly ? - soFar.length : - soFar ? - Sizzle.error( selector ) : - // Cache the tokens - tokenCache( selector, groups ).slice( 0 ); -} - -function toSelector( tokens ) { - var i = 0, - len = tokens.length, - selector = ""; - for ( ; i < len; i++ ) { - selector += tokens[i].value; - } - return selector; -} - -function addCombinator( matcher, combinator, base ) { - var dir = combinator.dir, - checkNonElements = base && dir === "parentNode", - doneName = done++; - - return combinator.first ? - // Check against closest ancestor/preceding element - function( elem, context, xml ) { - while ( (elem = elem[ dir ]) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - return matcher( elem, context, xml ); - } - } - } : - - // Check against all ancestor/preceding elements - function( elem, context, xml ) { - var data, cache, outerCache, - dirkey = dirruns + " " + doneName; - - // We can't set arbitrary data on XML nodes, so they don't benefit from dir caching - if ( xml ) { - while ( (elem = elem[ dir ]) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - if ( matcher( elem, context, xml ) ) { - return true; - } - } - } - } else { - while ( (elem = elem[ dir ]) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - outerCache = elem[ expando ] || (elem[ expando ] = {}); - if ( (cache = outerCache[ dir ]) && cache[0] === dirkey ) { - if ( (data = cache[1]) === true || data === cachedruns ) { - return data === true; - } - } else { - cache = outerCache[ dir ] = [ dirkey ]; - cache[1] = matcher( elem, context, xml ) || cachedruns; - if ( cache[1] === true ) { - return true; - } - } - } - } - } - }; -} - -function elementMatcher( matchers ) { - return matchers.length > 1 ? - function( elem, context, xml ) { - var i = matchers.length; - while ( i-- ) { - if ( !matchers[i]( elem, context, xml ) ) { - return false; - } - } - return true; - } : - matchers[0]; -} - -function condense( unmatched, map, filter, context, xml ) { - var elem, - newUnmatched = [], - i = 0, - len = unmatched.length, - mapped = map != null; - - for ( ; i < len; i++ ) { - if ( (elem = unmatched[i]) ) { - if ( !filter || filter( elem, context, xml ) ) { - newUnmatched.push( elem ); - if ( mapped ) { - map.push( i ); - } - } - } - } - - return newUnmatched; -} - -function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) { - if ( postFilter && !postFilter[ expando ] ) { - postFilter = setMatcher( postFilter ); - } - if ( postFinder && !postFinder[ expando ] ) { - postFinder = setMatcher( postFinder, postSelector ); - } - return markFunction(function( seed, results, context, xml ) { - var temp, i, elem, - preMap = [], - postMap = [], - preexisting = results.length, - - // Get initial elements from seed or context - elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ), - - // Prefilter to get matcher input, preserving a map for seed-results synchronization - matcherIn = preFilter && ( seed || !selector ) ? - condense( elems, preMap, preFilter, context, xml ) : - elems, - - matcherOut = matcher ? - // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, - postFinder || ( seed ? preFilter : preexisting || postFilter ) ? - - // ...intermediate processing is necessary - [] : - - // ...otherwise use results directly - results : - matcherIn; - - // Find primary matches - if ( matcher ) { - matcher( matcherIn, matcherOut, context, xml ); - } - - // Apply postFilter - if ( postFilter ) { - temp = condense( matcherOut, postMap ); - postFilter( temp, [], context, xml ); - - // Un-match failing elements by moving them back to matcherIn - i = temp.length; - while ( i-- ) { - if ( (elem = temp[i]) ) { - matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem); - } - } - } - - if ( seed ) { - if ( postFinder || preFilter ) { - if ( postFinder ) { - // Get the final matcherOut by condensing this intermediate into postFinder contexts - temp = []; - i = matcherOut.length; - while ( i-- ) { - if ( (elem = matcherOut[i]) ) { - // Restore matcherIn since elem is not yet a final match - temp.push( (matcherIn[i] = elem) ); - } - } - postFinder( null, (matcherOut = []), temp, xml ); - } - - // Move matched elements from seed to results to keep them synchronized - i = matcherOut.length; - while ( i-- ) { - if ( (elem = matcherOut[i]) && - (temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) { - - seed[temp] = !(results[temp] = elem); - } - } - } - - // Add elements to results, through postFinder if defined - } else { - matcherOut = condense( - matcherOut === results ? - matcherOut.splice( preexisting, matcherOut.length ) : - matcherOut - ); - if ( postFinder ) { - postFinder( null, results, matcherOut, xml ); - } else { - push.apply( results, matcherOut ); - } - } - }); -} - -function matcherFromTokens( tokens ) { - var checkContext, matcher, j, - len = tokens.length, - leadingRelative = Expr.relative[ tokens[0].type ], - implicitRelative = leadingRelative || Expr.relative[" "], - i = leadingRelative ? 1 : 0, - - // The foundational matcher ensures that elements are reachable from top-level context(s) - matchContext = addCombinator( function( elem ) { - return elem === checkContext; - }, implicitRelative, true ), - matchAnyContext = addCombinator( function( elem ) { - return indexOf.call( checkContext, elem ) > -1; - }, implicitRelative, true ), - matchers = [ function( elem, context, xml ) { - return ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( - (checkContext = context).nodeType ? - matchContext( elem, context, xml ) : - matchAnyContext( elem, context, xml ) ); - } ]; - - for ( ; i < len; i++ ) { - if ( (matcher = Expr.relative[ tokens[i].type ]) ) { - matchers = [ addCombinator(elementMatcher( matchers ), matcher) ]; - } else { - matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches ); - - // Return special upon seeing a positional matcher - if ( matcher[ expando ] ) { - // Find the next relative operator (if any) for proper handling - j = ++i; - for ( ; j < len; j++ ) { - if ( Expr.relative[ tokens[j].type ] ) { - break; - } - } - return setMatcher( - i > 1 && elementMatcher( matchers ), - i > 1 && toSelector( - // If the preceding token was a descendant combinator, insert an implicit any-element `*` - tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" }) - ).replace( rtrim, "$1" ), - matcher, - i < j && matcherFromTokens( tokens.slice( i, j ) ), - j < len && matcherFromTokens( (tokens = tokens.slice( j )) ), - j < len && toSelector( tokens ) - ); - } - matchers.push( matcher ); - } - } - - return elementMatcher( matchers ); -} - -function matcherFromGroupMatchers( elementMatchers, setMatchers ) { - // A counter to specify which element is currently being matched - var matcherCachedRuns = 0, - bySet = setMatchers.length > 0, - byElement = elementMatchers.length > 0, - superMatcher = function( seed, context, xml, results, expandContext ) { - var elem, j, matcher, - setMatched = [], - matchedCount = 0, - i = "0", - unmatched = seed && [], - outermost = expandContext != null, - contextBackup = outermostContext, - // We must always have either seed elements or context - elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ), - // Use integer dirruns iff this is the outermost matcher - dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1); - - if ( outermost ) { - outermostContext = context !== document && context; - cachedruns = matcherCachedRuns; - } - - // Add elements passing elementMatchers directly to results - // Keep `i` a string if there are no elements so `matchedCount` will be "00" below - for ( ; (elem = elems[i]) != null; i++ ) { - if ( byElement && elem ) { - j = 0; - while ( (matcher = elementMatchers[j++]) ) { - if ( matcher( elem, context, xml ) ) { - results.push( elem ); - break; - } - } - if ( outermost ) { - dirruns = dirrunsUnique; - cachedruns = ++matcherCachedRuns; - } - } - - // Track unmatched elements for set filters - if ( bySet ) { - // They will have gone through all possible matchers - if ( (elem = !matcher && elem) ) { - matchedCount--; - } - - // Lengthen the array for every element, matched or not - if ( seed ) { - unmatched.push( elem ); - } - } - } - - // Apply set filters to unmatched elements - matchedCount += i; - if ( bySet && i !== matchedCount ) { - j = 0; - while ( (matcher = setMatchers[j++]) ) { - matcher( unmatched, setMatched, context, xml ); - } - - if ( seed ) { - // Reintegrate element matches to eliminate the need for sorting - if ( matchedCount > 0 ) { - while ( i-- ) { - if ( !(unmatched[i] || setMatched[i]) ) { - setMatched[i] = pop.call( results ); - } - } - } - - // Discard index placeholder values to get only actual matches - setMatched = condense( setMatched ); - } - - // Add matches to results - push.apply( results, setMatched ); - - // Seedless set matches succeeding multiple successful matchers stipulate sorting - if ( outermost && !seed && setMatched.length > 0 && - ( matchedCount + setMatchers.length ) > 1 ) { - - Sizzle.uniqueSort( results ); - } - } - - // Override manipulation of globals by nested matchers - if ( outermost ) { - dirruns = dirrunsUnique; - outermostContext = contextBackup; - } - - return unmatched; - }; - - return bySet ? - markFunction( superMatcher ) : - superMatcher; -} - -compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) { - var i, - setMatchers = [], - elementMatchers = [], - cached = compilerCache[ selector + " " ]; - - if ( !cached ) { - // Generate a function of recursive functions that can be used to check each element - if ( !group ) { - group = tokenize( selector ); - } - i = group.length; - while ( i-- ) { - cached = matcherFromTokens( group[i] ); - if ( cached[ expando ] ) { - setMatchers.push( cached ); - } else { - elementMatchers.push( cached ); - } - } - - // Cache the compiled function - cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) ); - } - return cached; -}; - -function multipleContexts( selector, contexts, results ) { - var i = 0, - len = contexts.length; - for ( ; i < len; i++ ) { - Sizzle( selector, contexts[i], results ); - } - return results; -} - -function select( selector, context, results, seed ) { - var i, tokens, token, type, find, - match = tokenize( selector ); - - if ( !seed ) { - // Try to minimize operations if there is only one group - if ( match.length === 1 ) { - - // Take a shortcut and set the context if the root selector is an ID - tokens = match[0] = match[0].slice( 0 ); - if ( tokens.length > 2 && (token = tokens[0]).type === "ID" && - support.getById && context.nodeType === 9 && documentIsHTML && - Expr.relative[ tokens[1].type ] ) { - - context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0]; - if ( !context ) { - return results; - } - selector = selector.slice( tokens.shift().value.length ); - } - - // Fetch a seed set for right-to-left matching - i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length; - while ( i-- ) { - token = tokens[i]; - - // Abort if we hit a combinator - if ( Expr.relative[ (type = token.type) ] ) { - break; - } - if ( (find = Expr.find[ type ]) ) { - // Search, expanding context for leading sibling combinators - if ( (seed = find( - token.matches[0].replace( runescape, funescape ), - rsibling.test( tokens[0].type ) && context.parentNode || context - )) ) { - - // If seed is empty or no tokens remain, we can return early - tokens.splice( i, 1 ); - selector = seed.length && toSelector( tokens ); - if ( !selector ) { - push.apply( results, seed ); - return results; - } - - break; - } - } - } - } - } - - // Compile and execute a filtering function - // Provide `match` to avoid retokenization if we modified the selector above - compile( selector, match )( - seed, - context, - !documentIsHTML, - results, - rsibling.test( selector ) - ); - return results; -} - -// One-time assignments - -// Sort stability -support.sortStable = expando.split("").sort( sortOrder ).join("") === expando; - -// Support: Chrome<14 -// Always assume duplicates if they aren't passed to the comparison function -support.detectDuplicates = hasDuplicate; - -// Initialize against the default document -setDocument(); - -// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) -// Detached nodes confoundingly follow *each other* -support.sortDetached = assert(function( div1 ) { - // Should return 1, but returns 4 (following) - return div1.compareDocumentPosition( document.createElement("div") ) & 1; -}); - -// Support: IE<8 -// Prevent attribute/property "interpolation" -// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx -if ( !assert(function( div ) { - div.innerHTML = ""; - return div.firstChild.getAttribute("href") === "#" ; -}) ) { - addHandle( "type|href|height|width", function( elem, name, isXML ) { - if ( !isXML ) { - return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 ); - } - }); -} - -// Support: IE<9 -// Use defaultValue in place of getAttribute("value") -if ( !support.attributes || !assert(function( div ) { - div.innerHTML = ""; - div.firstChild.setAttribute( "value", "" ); - return div.firstChild.getAttribute( "value" ) === ""; -}) ) { - addHandle( "value", function( elem, name, isXML ) { - if ( !isXML && elem.nodeName.toLowerCase() === "input" ) { - return elem.defaultValue; - } - }); -} - -// Support: IE<9 -// Use getAttributeNode to fetch booleans when getAttribute lies -if ( !assert(function( div ) { - return div.getAttribute("disabled") == null; -}) ) { - addHandle( booleans, function( elem, name, isXML ) { - var val; - if ( !isXML ) { - return (val = elem.getAttributeNode( name )) && val.specified ? - val.value : - elem[ name ] === true ? name.toLowerCase() : null; - } - }); -} - -jQuery.find = Sizzle; -jQuery.expr = Sizzle.selectors; -jQuery.expr[":"] = jQuery.expr.pseudos; -jQuery.unique = Sizzle.uniqueSort; -jQuery.text = Sizzle.getText; -jQuery.isXMLDoc = Sizzle.isXML; -jQuery.contains = Sizzle.contains; - - -})( window ); -// String to Object options format cache -var optionsCache = {}; - -// Convert String-formatted options into Object-formatted ones and store in cache -function createOptions( options ) { - var object = optionsCache[ options ] = {}; - jQuery.each( options.match( core_rnotwhite ) || [], function( _, flag ) { - object[ flag ] = true; - }); - return object; -} - -/* - * Create a callback list using the following parameters: - * - * options: an optional list of space-separated options that will change how - * the callback list behaves or a more traditional option object - * - * By default a callback list will act like an event callback list and can be - * "fired" multiple times. - * - * Possible options: - * - * once: will ensure the callback list can only be fired once (like a Deferred) - * - * memory: will keep track of previous values and will call any callback added - * after the list has been fired right away with the latest "memorized" - * values (like a Deferred) - * - * unique: will ensure a callback can only be added once (no duplicate in the list) - * - * stopOnFalse: interrupt callings when a callback returns false - * - */ -jQuery.Callbacks = function( options ) { - - // Convert options from String-formatted to Object-formatted if needed - // (we check in cache first) - options = typeof options === "string" ? - ( optionsCache[ options ] || createOptions( options ) ) : - jQuery.extend( {}, options ); - - var // Flag to know if list is currently firing - firing, - // Last fire value (for non-forgettable lists) - memory, - // Flag to know if list was already fired - fired, - // End of the loop when firing - firingLength, - // Index of currently firing callback (modified by remove if needed) - firingIndex, - // First callback to fire (used internally by add and fireWith) - firingStart, - // Actual callback list - list = [], - // Stack of fire calls for repeatable lists - stack = !options.once && [], - // Fire callbacks - fire = function( data ) { - memory = options.memory && data; - fired = true; - firingIndex = firingStart || 0; - firingStart = 0; - firingLength = list.length; - firing = true; - for ( ; list && firingIndex < firingLength; firingIndex++ ) { - if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) { - memory = false; // To prevent further calls using add - break; - } - } - firing = false; - if ( list ) { - if ( stack ) { - if ( stack.length ) { - fire( stack.shift() ); - } - } else if ( memory ) { - list = []; - } else { - self.disable(); - } - } - }, - // Actual Callbacks object - self = { - // Add a callback or a collection of callbacks to the list - add: function() { - if ( list ) { - // First, we save the current length - var start = list.length; - (function add( args ) { - jQuery.each( args, function( _, arg ) { - var type = jQuery.type( arg ); - if ( type === "function" ) { - if ( !options.unique || !self.has( arg ) ) { - list.push( arg ); - } - } else if ( arg && arg.length && type !== "string" ) { - // Inspect recursively - add( arg ); - } - }); - })( arguments ); - // Do we need to add the callbacks to the - // current firing batch? - if ( firing ) { - firingLength = list.length; - // With memory, if we're not firing then - // we should call right away - } else if ( memory ) { - firingStart = start; - fire( memory ); - } - } - return this; - }, - // Remove a callback from the list - remove: function() { - if ( list ) { - jQuery.each( arguments, function( _, arg ) { - var index; - while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { - list.splice( index, 1 ); - // Handle firing indexes - if ( firing ) { - if ( index <= firingLength ) { - firingLength--; - } - if ( index <= firingIndex ) { - firingIndex--; - } - } - } - }); - } - return this; - }, - // Check if a given callback is in the list. - // If no argument is given, return whether or not list has callbacks attached. - has: function( fn ) { - return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length ); - }, - // Remove all callbacks from the list - empty: function() { - list = []; - firingLength = 0; - return this; - }, - // Have the list do nothing anymore - disable: function() { - list = stack = memory = undefined; - return this; - }, - // Is it disabled? - disabled: function() { - return !list; - }, - // Lock the list in its current state - lock: function() { - stack = undefined; - if ( !memory ) { - self.disable(); - } - return this; - }, - // Is it locked? - locked: function() { - return !stack; - }, - // Call all callbacks with the given context and arguments - fireWith: function( context, args ) { - if ( list && ( !fired || stack ) ) { - args = args || []; - args = [ context, args.slice ? args.slice() : args ]; - if ( firing ) { - stack.push( args ); - } else { - fire( args ); - } - } - return this; - }, - // Call all the callbacks with the given arguments - fire: function() { - self.fireWith( this, arguments ); - return this; - }, - // To know if the callbacks have already been called at least once - fired: function() { - return !!fired; - } - }; - - return self; -}; -jQuery.extend({ - - Deferred: function( func ) { - var tuples = [ - // action, add listener, listener list, final state - [ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ], - [ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ], - [ "notify", "progress", jQuery.Callbacks("memory") ] - ], - state = "pending", - promise = { - state: function() { - return state; - }, - always: function() { - deferred.done( arguments ).fail( arguments ); - return this; - }, - then: function( /* fnDone, fnFail, fnProgress */ ) { - var fns = arguments; - return jQuery.Deferred(function( newDefer ) { - jQuery.each( tuples, function( i, tuple ) { - var action = tuple[ 0 ], - fn = jQuery.isFunction( fns[ i ] ) && fns[ i ]; - // deferred[ done | fail | progress ] for forwarding actions to newDefer - deferred[ tuple[1] ](function() { - var returned = fn && fn.apply( this, arguments ); - if ( returned && jQuery.isFunction( returned.promise ) ) { - returned.promise() - .done( newDefer.resolve ) - .fail( newDefer.reject ) - .progress( newDefer.notify ); - } else { - newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments ); - } - }); - }); - fns = null; - }).promise(); - }, - // Get a promise for this deferred - // If obj is provided, the promise aspect is added to the object - promise: function( obj ) { - return obj != null ? jQuery.extend( obj, promise ) : promise; - } - }, - deferred = {}; - - // Keep pipe for back-compat - promise.pipe = promise.then; - - // Add list-specific methods - jQuery.each( tuples, function( i, tuple ) { - var list = tuple[ 2 ], - stateString = tuple[ 3 ]; - - // promise[ done | fail | progress ] = list.add - promise[ tuple[1] ] = list.add; - - // Handle state - if ( stateString ) { - list.add(function() { - // state = [ resolved | rejected ] - state = stateString; - - // [ reject_list | resolve_list ].disable; progress_list.lock - }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock ); - } - - // deferred[ resolve | reject | notify ] - deferred[ tuple[0] ] = function() { - deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments ); - return this; - }; - deferred[ tuple[0] + "With" ] = list.fireWith; - }); - - // Make the deferred a promise - promise.promise( deferred ); - - // Call given func if any - if ( func ) { - func.call( deferred, deferred ); - } - - // All done! - return deferred; - }, - - // Deferred helper - when: function( subordinate /* , ..., subordinateN */ ) { - var i = 0, - resolveValues = core_slice.call( arguments ), - length = resolveValues.length, - - // the count of uncompleted subordinates - remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0, - - // the master Deferred. If resolveValues consist of only a single Deferred, just use that. - deferred = remaining === 1 ? subordinate : jQuery.Deferred(), - - // Update function for both resolve and progress values - updateFunc = function( i, contexts, values ) { - return function( value ) { - contexts[ i ] = this; - values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value; - if( values === progressValues ) { - deferred.notifyWith( contexts, values ); - } else if ( !( --remaining ) ) { - deferred.resolveWith( contexts, values ); - } - }; - }, - - progressValues, progressContexts, resolveContexts; - - // add listeners to Deferred subordinates; treat others as resolved - if ( length > 1 ) { - progressValues = new Array( length ); - progressContexts = new Array( length ); - resolveContexts = new Array( length ); - for ( ; i < length; i++ ) { - if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) { - resolveValues[ i ].promise() - .done( updateFunc( i, resolveContexts, resolveValues ) ) - .fail( deferred.reject ) - .progress( updateFunc( i, progressContexts, progressValues ) ); - } else { - --remaining; - } - } - } - - // if we're not waiting on anything, resolve the master - if ( !remaining ) { - deferred.resolveWith( resolveContexts, resolveValues ); - } - - return deferred.promise(); - } -}); -jQuery.support = (function( support ) { - - var all, a, input, select, fragment, opt, eventName, isSupported, i, - div = document.createElement("div"); - - // Setup - div.setAttribute( "className", "t" ); - div.innerHTML = "
a"; - - // Finish early in limited (non-browser) environments - all = div.getElementsByTagName("*") || []; - a = div.getElementsByTagName("a")[ 0 ]; - if ( !a || !a.style || !all.length ) { - return support; - } - - // First batch of tests - select = document.createElement("select"); - opt = select.appendChild( document.createElement("option") ); - input = div.getElementsByTagName("input")[ 0 ]; - - a.style.cssText = "top:1px;float:left;opacity:.5"; - - // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7) - support.getSetAttribute = div.className !== "t"; - - // IE strips leading whitespace when .innerHTML is used - support.leadingWhitespace = div.firstChild.nodeType === 3; - - // Make sure that tbody elements aren't automatically inserted - // IE will insert them into empty tables - support.tbody = !div.getElementsByTagName("tbody").length; - - // Make sure that link elements get serialized correctly by innerHTML - // This requires a wrapper element in IE - support.htmlSerialize = !!div.getElementsByTagName("link").length; - - // Get the style information from getAttribute - // (IE uses .cssText instead) - support.style = /top/.test( a.getAttribute("style") ); - - // Make sure that URLs aren't manipulated - // (IE normalizes it by default) - support.hrefNormalized = a.getAttribute("href") === "/a"; - - // Make sure that element opacity exists - // (IE uses filter instead) - // Use a regex to work around a WebKit issue. See #5145 - support.opacity = /^0.5/.test( a.style.opacity ); - - // Verify style float existence - // (IE uses styleFloat instead of cssFloat) - support.cssFloat = !!a.style.cssFloat; - - // Check the default checkbox/radio value ("" on WebKit; "on" elsewhere) - support.checkOn = !!input.value; - - // Make sure that a selected-by-default option has a working selected property. - // (WebKit defaults to false instead of true, IE too, if it's in an optgroup) - support.optSelected = opt.selected; - - // Tests for enctype support on a form (#6743) - support.enctype = !!document.createElement("form").enctype; - - // Makes sure cloning an html5 element does not cause problems - // Where outerHTML is undefined, this still works - support.html5Clone = document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav>"; - - // Will be defined later - support.inlineBlockNeedsLayout = false; - support.shrinkWrapBlocks = false; - support.pixelPosition = false; - support.deleteExpando = true; - support.noCloneEvent = true; - support.reliableMarginRight = true; - support.boxSizingReliable = true; - - // Make sure checked status is properly cloned - input.checked = true; - support.noCloneChecked = input.cloneNode( true ).checked; - - // Make sure that the options inside disabled selects aren't marked as disabled - // (WebKit marks them as disabled) - select.disabled = true; - support.optDisabled = !opt.disabled; - - // Support: IE<9 - try { - delete div.test; - } catch( e ) { - support.deleteExpando = false; - } - - // Check if we can trust getAttribute("value") - input = document.createElement("input"); - input.setAttribute( "value", "" ); - support.input = input.getAttribute( "value" ) === ""; - - // Check if an input maintains its value after becoming a radio - input.value = "t"; - input.setAttribute( "type", "radio" ); - support.radioValue = input.value === "t"; - - // #11217 - WebKit loses check when the name is after the checked attribute - input.setAttribute( "checked", "t" ); - input.setAttribute( "name", "t" ); - - fragment = document.createDocumentFragment(); - fragment.appendChild( input ); - - // Check if a disconnected checkbox will retain its checked - // value of true after appended to the DOM (IE6/7) - support.appendChecked = input.checked; - - // WebKit doesn't clone checked state correctly in fragments - support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked; - - // Support: IE<9 - // Opera does not clone events (and typeof div.attachEvent === undefined). - // IE9-10 clones events bound via attachEvent, but they don't trigger with .click() - if ( div.attachEvent ) { - div.attachEvent( "onclick", function() { - support.noCloneEvent = false; - }); - - div.cloneNode( true ).click(); - } - - // Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event) - // Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP) - for ( i in { submit: true, change: true, focusin: true }) { - div.setAttribute( eventName = "on" + i, "t" ); - - support[ i + "Bubbles" ] = eventName in window || div.attributes[ eventName ].expando === false; - } - - div.style.backgroundClip = "content-box"; - div.cloneNode( true ).style.backgroundClip = ""; - support.clearCloneStyle = div.style.backgroundClip === "content-box"; - - // Support: IE<9 - // Iteration over object's inherited properties before its own. - for ( i in jQuery( support ) ) { - break; - } - support.ownLast = i !== "0"; - - // Run tests that need a body at doc ready - jQuery(function() { - var container, marginDiv, tds, - divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;", - body = document.getElementsByTagName("body")[0]; - - if ( !body ) { - // Return for frameset docs that don't have a body - return; - } - - container = document.createElement("div"); - container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px"; - - body.appendChild( container ).appendChild( div ); - - // Support: IE8 - // Check if table cells still have offsetWidth/Height when they are set - // to display:none and there are still other visible table cells in a - // table row; if so, offsetWidth/Height are not reliable for use when - // determining if an element has been hidden directly using - // display:none (it is still safe to use offsets if a parent element is - // hidden; don safety goggles and see bug #4512 for more information). - div.innerHTML = "
t
"; - tds = div.getElementsByTagName("td"); - tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none"; - isSupported = ( tds[ 0 ].offsetHeight === 0 ); - - tds[ 0 ].style.display = ""; - tds[ 1 ].style.display = "none"; - - // Support: IE8 - // Check if empty table cells still have offsetWidth/Height - support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 ); - - // Check box-sizing and margin behavior. - div.innerHTML = ""; - div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;"; - - // Workaround failing boxSizing test due to offsetWidth returning wrong value - // with some non-1 values of body zoom, ticket #13543 - jQuery.swap( body, body.style.zoom != null ? { zoom: 1 } : {}, function() { - support.boxSizing = div.offsetWidth === 4; - }); - - // Use window.getComputedStyle because jsdom on node.js will break without it. - if ( window.getComputedStyle ) { - support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%"; - support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px"; - - // Check if div with explicit width and no margin-right incorrectly - // gets computed margin-right based on width of container. (#3333) - // Fails in WebKit before Feb 2011 nightlies - // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right - marginDiv = div.appendChild( document.createElement("div") ); - marginDiv.style.cssText = div.style.cssText = divReset; - marginDiv.style.marginRight = marginDiv.style.width = "0"; - div.style.width = "1px"; - - support.reliableMarginRight = - !parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight ); - } - - if ( typeof div.style.zoom !== core_strundefined ) { - // Support: IE<8 - // Check if natively block-level elements act like inline-block - // elements when setting their display to 'inline' and giving - // them layout - div.innerHTML = ""; - div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1"; - support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 ); - - // Support: IE6 - // Check if elements with layout shrink-wrap their children - div.style.display = "block"; - div.innerHTML = "
"; - div.firstChild.style.width = "5px"; - support.shrinkWrapBlocks = ( div.offsetWidth !== 3 ); - - if ( support.inlineBlockNeedsLayout ) { - // Prevent IE 6 from affecting layout for positioned elements #11048 - // Prevent IE from shrinking the body in IE 7 mode #12869 - // Support: IE<8 - body.style.zoom = 1; - } - } - - body.removeChild( container ); - - // Null elements to avoid leaks in IE - container = div = tds = marginDiv = null; - }); - - // Null elements to avoid leaks in IE - all = select = fragment = opt = a = input = null; - - return support; -})({}); - -var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/, - rmultiDash = /([A-Z])/g; - -function internalData( elem, name, data, pvt /* Internal Use Only */ ){ - if ( !jQuery.acceptData( elem ) ) { - return; - } - - var ret, thisCache, - internalKey = jQuery.expando, - - // We have to handle DOM nodes and JS objects differently because IE6-7 - // can't GC object references properly across the DOM-JS boundary - isNode = elem.nodeType, - - // Only DOM nodes need the global jQuery cache; JS object data is - // attached directly to the object so GC can occur automatically - cache = isNode ? jQuery.cache : elem, - - // Only defining an ID for JS objects if its cache already exists allows - // the code to shortcut on the same path as a DOM node with no cache - id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey; - - // Avoid doing any more work than we need to when trying to get data on an - // object that has no data at all - if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && data === undefined && typeof name === "string" ) { - return; - } - - if ( !id ) { - // Only DOM nodes need a new unique ID for each element since their data - // ends up in the global cache - if ( isNode ) { - id = elem[ internalKey ] = core_deletedIds.pop() || jQuery.guid++; - } else { - id = internalKey; - } - } - - if ( !cache[ id ] ) { - // Avoid exposing jQuery metadata on plain JS objects when the object - // is serialized using JSON.stringify - cache[ id ] = isNode ? {} : { toJSON: jQuery.noop }; - } - - // An object can be passed to jQuery.data instead of a key/value pair; this gets - // shallow copied over onto the existing cache - if ( typeof name === "object" || typeof name === "function" ) { - if ( pvt ) { - cache[ id ] = jQuery.extend( cache[ id ], name ); - } else { - cache[ id ].data = jQuery.extend( cache[ id ].data, name ); - } - } - - thisCache = cache[ id ]; - - // jQuery data() is stored in a separate object inside the object's internal data - // cache in order to avoid key collisions between internal data and user-defined - // data. - if ( !pvt ) { - if ( !thisCache.data ) { - thisCache.data = {}; - } - - thisCache = thisCache.data; - } - - if ( data !== undefined ) { - thisCache[ jQuery.camelCase( name ) ] = data; - } - - // Check for both converted-to-camel and non-converted data property names - // If a data property was specified - if ( typeof name === "string" ) { - - // First Try to find as-is property data - ret = thisCache[ name ]; - - // Test for null|undefined property data - if ( ret == null ) { - - // Try to find the camelCased property - ret = thisCache[ jQuery.camelCase( name ) ]; - } - } else { - ret = thisCache; - } - - return ret; -} - -function internalRemoveData( elem, name, pvt ) { - if ( !jQuery.acceptData( elem ) ) { - return; - } - - var thisCache, i, - isNode = elem.nodeType, - - // See jQuery.data for more information - cache = isNode ? jQuery.cache : elem, - id = isNode ? elem[ jQuery.expando ] : jQuery.expando; - - // If there is already no cache entry for this object, there is no - // purpose in continuing - if ( !cache[ id ] ) { - return; - } - - if ( name ) { - - thisCache = pvt ? cache[ id ] : cache[ id ].data; - - if ( thisCache ) { - - // Support array or space separated string names for data keys - if ( !jQuery.isArray( name ) ) { - - // try the string as a key before any manipulation - if ( name in thisCache ) { - name = [ name ]; - } else { - - // split the camel cased version by spaces unless a key with the spaces exists - name = jQuery.camelCase( name ); - if ( name in thisCache ) { - name = [ name ]; - } else { - name = name.split(" "); - } - } - } else { - // If "name" is an array of keys... - // When data is initially created, via ("key", "val") signature, - // keys will be converted to camelCase. - // Since there is no way to tell _how_ a key was added, remove - // both plain key and camelCase key. #12786 - // This will only penalize the array argument path. - name = name.concat( jQuery.map( name, jQuery.camelCase ) ); - } - - i = name.length; - while ( i-- ) { - delete thisCache[ name[i] ]; - } - - // If there is no data left in the cache, we want to continue - // and let the cache object itself get destroyed - if ( pvt ? !isEmptyDataObject(thisCache) : !jQuery.isEmptyObject(thisCache) ) { - return; - } - } - } - - // See jQuery.data for more information - if ( !pvt ) { - delete cache[ id ].data; - - // Don't destroy the parent cache unless the internal data object - // had been the only thing left in it - if ( !isEmptyDataObject( cache[ id ] ) ) { - return; - } - } - - // Destroy the cache - if ( isNode ) { - jQuery.cleanData( [ elem ], true ); - - // Use delete when supported for expandos or `cache` is not a window per isWindow (#10080) - /* jshint eqeqeq: false */ - } else if ( jQuery.support.deleteExpando || cache != cache.window ) { - /* jshint eqeqeq: true */ - delete cache[ id ]; - - // When all else fails, null - } else { - cache[ id ] = null; - } -} - -jQuery.extend({ - cache: {}, - - // The following elements throw uncatchable exceptions if you - // attempt to add expando properties to them. - noData: { - "applet": true, - "embed": true, - // Ban all objects except for Flash (which handle expandos) - "object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" - }, - - hasData: function( elem ) { - elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ]; - return !!elem && !isEmptyDataObject( elem ); - }, - - data: function( elem, name, data ) { - return internalData( elem, name, data ); - }, - - removeData: function( elem, name ) { - return internalRemoveData( elem, name ); - }, - - // For internal use only. - _data: function( elem, name, data ) { - return internalData( elem, name, data, true ); - }, - - _removeData: function( elem, name ) { - return internalRemoveData( elem, name, true ); - }, - - // A method for determining if a DOM node can handle the data expando - acceptData: function( elem ) { - // Do not set data on non-element because it will not be cleared (#8335). - if ( elem.nodeType && elem.nodeType !== 1 && elem.nodeType !== 9 ) { - return false; - } - - var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ]; - - // nodes accept data unless otherwise specified; rejection can be conditional - return !noData || noData !== true && elem.getAttribute("classid") === noData; - } -}); - -jQuery.fn.extend({ - data: function( key, value ) { - var attrs, name, - data = null, - i = 0, - elem = this[0]; - - // Special expections of .data basically thwart jQuery.access, - // so implement the relevant behavior ourselves - - // Gets all values - if ( key === undefined ) { - if ( this.length ) { - data = jQuery.data( elem ); - - if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) { - attrs = elem.attributes; - for ( ; i < attrs.length; i++ ) { - name = attrs[i].name; - - if ( name.indexOf("data-") === 0 ) { - name = jQuery.camelCase( name.slice(5) ); - - dataAttr( elem, name, data[ name ] ); - } - } - jQuery._data( elem, "parsedAttrs", true ); - } - } - - return data; - } - - // Sets multiple values - if ( typeof key === "object" ) { - return this.each(function() { - jQuery.data( this, key ); - }); - } - - return arguments.length > 1 ? - - // Sets one value - this.each(function() { - jQuery.data( this, key, value ); - }) : - - // Gets one value - // Try to fetch any internally stored data first - elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null; - }, - - removeData: function( key ) { - return this.each(function() { - jQuery.removeData( this, key ); - }); - } -}); - -function dataAttr( elem, key, data ) { - // If nothing was found internally, try to fetch any - // data from the HTML5 data-* attribute - if ( data === undefined && elem.nodeType === 1 ) { - - var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); - - data = elem.getAttribute( name ); - - if ( typeof data === "string" ) { - try { - data = data === "true" ? true : - data === "false" ? false : - data === "null" ? null : - // Only convert to a number if it doesn't change the string - +data + "" === data ? +data : - rbrace.test( data ) ? jQuery.parseJSON( data ) : - data; - } catch( e ) {} - - // Make sure we set the data so it isn't changed later - jQuery.data( elem, key, data ); - - } else { - data = undefined; - } - } - - return data; -} - -// checks a cache object for emptiness -function isEmptyDataObject( obj ) { - var name; - for ( name in obj ) { - - // if the public data object is empty, the private is still empty - if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) { - continue; - } - if ( name !== "toJSON" ) { - return false; - } - } - - return true; -} -jQuery.extend({ - queue: function( elem, type, data ) { - var queue; - - if ( elem ) { - type = ( type || "fx" ) + "queue"; - queue = jQuery._data( elem, type ); - - // Speed up dequeue by getting out quickly if this is just a lookup - if ( data ) { - if ( !queue || jQuery.isArray(data) ) { - queue = jQuery._data( elem, type, jQuery.makeArray(data) ); - } else { - queue.push( data ); - } - } - return queue || []; - } - }, - - dequeue: function( elem, type ) { - type = type || "fx"; - - var queue = jQuery.queue( elem, type ), - startLength = queue.length, - fn = queue.shift(), - hooks = jQuery._queueHooks( elem, type ), - next = function() { - jQuery.dequeue( elem, type ); - }; - - // If the fx queue is dequeued, always remove the progress sentinel - if ( fn === "inprogress" ) { - fn = queue.shift(); - startLength--; - } - - if ( fn ) { - - // Add a progress sentinel to prevent the fx queue from being - // automatically dequeued - if ( type === "fx" ) { - queue.unshift( "inprogress" ); - } - - // clear up the last queue stop function - delete hooks.stop; - fn.call( elem, next, hooks ); - } - - if ( !startLength && hooks ) { - hooks.empty.fire(); - } - }, - - // not intended for public consumption - generates a queueHooks object, or returns the current one - _queueHooks: function( elem, type ) { - var key = type + "queueHooks"; - return jQuery._data( elem, key ) || jQuery._data( elem, key, { - empty: jQuery.Callbacks("once memory").add(function() { - jQuery._removeData( elem, type + "queue" ); - jQuery._removeData( elem, key ); - }) - }); - } -}); - -jQuery.fn.extend({ - queue: function( type, data ) { - var setter = 2; - - if ( typeof type !== "string" ) { - data = type; - type = "fx"; - setter--; - } - - if ( arguments.length < setter ) { - return jQuery.queue( this[0], type ); - } - - return data === undefined ? - this : - this.each(function() { - var queue = jQuery.queue( this, type, data ); - - // ensure a hooks for this queue - jQuery._queueHooks( this, type ); - - if ( type === "fx" && queue[0] !== "inprogress" ) { - jQuery.dequeue( this, type ); - } - }); - }, - dequeue: function( type ) { - return this.each(function() { - jQuery.dequeue( this, type ); - }); - }, - // Based off of the plugin by Clint Helfers, with permission. - // http://blindsignals.com/index.php/2009/07/jquery-delay/ - delay: function( time, type ) { - time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time; - type = type || "fx"; - - return this.queue( type, function( next, hooks ) { - var timeout = setTimeout( next, time ); - hooks.stop = function() { - clearTimeout( timeout ); - }; - }); - }, - clearQueue: function( type ) { - return this.queue( type || "fx", [] ); - }, - // Get a promise resolved when queues of a certain type - // are emptied (fx is the type by default) - promise: function( type, obj ) { - var tmp, - count = 1, - defer = jQuery.Deferred(), - elements = this, - i = this.length, - resolve = function() { - if ( !( --count ) ) { - defer.resolveWith( elements, [ elements ] ); - } - }; - - if ( typeof type !== "string" ) { - obj = type; - type = undefined; - } - type = type || "fx"; - - while( i-- ) { - tmp = jQuery._data( elements[ i ], type + "queueHooks" ); - if ( tmp && tmp.empty ) { - count++; - tmp.empty.add( resolve ); - } - } - resolve(); - return defer.promise( obj ); - } -}); -var nodeHook, boolHook, - rclass = /[\t\r\n\f]/g, - rreturn = /\r/g, - rfocusable = /^(?:input|select|textarea|button|object)$/i, - rclickable = /^(?:a|area)$/i, - ruseDefault = /^(?:checked|selected)$/i, - getSetAttribute = jQuery.support.getSetAttribute, - getSetInput = jQuery.support.input; - -jQuery.fn.extend({ - attr: function( name, value ) { - return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 ); - }, - - removeAttr: function( name ) { - return this.each(function() { - jQuery.removeAttr( this, name ); - }); - }, - - prop: function( name, value ) { - return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 ); - }, - - removeProp: function( name ) { - name = jQuery.propFix[ name ] || name; - return this.each(function() { - // try/catch handles cases where IE balks (such as removing a property on window) - try { - this[ name ] = undefined; - delete this[ name ]; - } catch( e ) {} - }); - }, - - addClass: function( value ) { - var classes, elem, cur, clazz, j, - i = 0, - len = this.length, - proceed = typeof value === "string" && value; - - if ( jQuery.isFunction( value ) ) { - return this.each(function( j ) { - jQuery( this ).addClass( value.call( this, j, this.className ) ); - }); - } - - if ( proceed ) { - // The disjunction here is for better compressibility (see removeClass) - classes = ( value || "" ).match( core_rnotwhite ) || []; - - for ( ; i < len; i++ ) { - elem = this[ i ]; - cur = elem.nodeType === 1 && ( elem.className ? - ( " " + elem.className + " " ).replace( rclass, " " ) : - " " - ); - - if ( cur ) { - j = 0; - while ( (clazz = classes[j++]) ) { - if ( cur.indexOf( " " + clazz + " " ) < 0 ) { - cur += clazz + " "; - } - } - elem.className = jQuery.trim( cur ); - - } - } - } - - return this; - }, - - removeClass: function( value ) { - var classes, elem, cur, clazz, j, - i = 0, - len = this.length, - proceed = arguments.length === 0 || typeof value === "string" && value; - - if ( jQuery.isFunction( value ) ) { - return this.each(function( j ) { - jQuery( this ).removeClass( value.call( this, j, this.className ) ); - }); - } - if ( proceed ) { - classes = ( value || "" ).match( core_rnotwhite ) || []; - - for ( ; i < len; i++ ) { - elem = this[ i ]; - // This expression is here for better compressibility (see addClass) - cur = elem.nodeType === 1 && ( elem.className ? - ( " " + elem.className + " " ).replace( rclass, " " ) : - "" - ); - - if ( cur ) { - j = 0; - while ( (clazz = classes[j++]) ) { - // Remove *all* instances - while ( cur.indexOf( " " + clazz + " " ) >= 0 ) { - cur = cur.replace( " " + clazz + " ", " " ); - } - } - elem.className = value ? jQuery.trim( cur ) : ""; - } - } - } - - return this; - }, - - toggleClass: function( value, stateVal ) { - var type = typeof value; - - if ( typeof stateVal === "boolean" && type === "string" ) { - return stateVal ? this.addClass( value ) : this.removeClass( value ); - } - - if ( jQuery.isFunction( value ) ) { - return this.each(function( i ) { - jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal ); - }); - } - - return this.each(function() { - if ( type === "string" ) { - // toggle individual class names - var className, - i = 0, - self = jQuery( this ), - classNames = value.match( core_rnotwhite ) || []; - - while ( (className = classNames[ i++ ]) ) { - // check each className given, space separated list - if ( self.hasClass( className ) ) { - self.removeClass( className ); - } else { - self.addClass( className ); - } - } - - // Toggle whole class name - } else if ( type === core_strundefined || type === "boolean" ) { - if ( this.className ) { - // store className if set - jQuery._data( this, "__className__", this.className ); - } - - // If the element has a class name or if we're passed "false", - // then remove the whole classname (if there was one, the above saved it). - // Otherwise bring back whatever was previously saved (if anything), - // falling back to the empty string if nothing was stored. - this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || ""; - } - }); - }, - - hasClass: function( selector ) { - var className = " " + selector + " ", - i = 0, - l = this.length; - for ( ; i < l; i++ ) { - if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) { - return true; - } - } - - return false; - }, - - val: function( value ) { - var ret, hooks, isFunction, - elem = this[0]; - - if ( !arguments.length ) { - if ( elem ) { - hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ]; - - if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) { - return ret; - } - - ret = elem.value; - - return typeof ret === "string" ? - // handle most common string cases - ret.replace(rreturn, "") : - // handle cases where value is null/undef or number - ret == null ? "" : ret; - } - - return; - } - - isFunction = jQuery.isFunction( value ); - - return this.each(function( i ) { - var val; - - if ( this.nodeType !== 1 ) { - return; - } - - if ( isFunction ) { - val = value.call( this, i, jQuery( this ).val() ); - } else { - val = value; - } - - // Treat null/undefined as ""; convert numbers to string - if ( val == null ) { - val = ""; - } else if ( typeof val === "number" ) { - val += ""; - } else if ( jQuery.isArray( val ) ) { - val = jQuery.map(val, function ( value ) { - return value == null ? "" : value + ""; - }); - } - - hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ]; - - // If set returns undefined, fall back to normal setting - if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) { - this.value = val; - } - }); - } -}); - -jQuery.extend({ - valHooks: { - option: { - get: function( elem ) { - // Use proper attribute retrieval(#6932, #12072) - var val = jQuery.find.attr( elem, "value" ); - return val != null ? - val : - elem.text; - } - }, - select: { - get: function( elem ) { - var value, option, - options = elem.options, - index = elem.selectedIndex, - one = elem.type === "select-one" || index < 0, - values = one ? null : [], - max = one ? index + 1 : options.length, - i = index < 0 ? - max : - one ? index : 0; - - // Loop through all the selected options - for ( ; i < max; i++ ) { - option = options[ i ]; - - // oldIE doesn't update selected after form reset (#2551) - if ( ( option.selected || i === index ) && - // Don't return options that are disabled or in a disabled optgroup - ( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) && - ( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) { - - // Get the specific value for the option - value = jQuery( option ).val(); - - // We don't need an array for one selects - if ( one ) { - return value; - } - - // Multi-Selects return an array - values.push( value ); - } - } - - return values; - }, - - set: function( elem, value ) { - var optionSet, option, - options = elem.options, - values = jQuery.makeArray( value ), - i = options.length; - - while ( i-- ) { - option = options[ i ]; - if ( (option.selected = jQuery.inArray( jQuery(option).val(), values ) >= 0) ) { - optionSet = true; - } - } - - // force browsers to behave consistently when non-matching value is set - if ( !optionSet ) { - elem.selectedIndex = -1; - } - return values; - } - } - }, - - attr: function( elem, name, value ) { - var hooks, ret, - nType = elem.nodeType; - - // don't get/set attributes on text, comment and attribute nodes - if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { - return; - } - - // Fallback to prop when attributes are not supported - if ( typeof elem.getAttribute === core_strundefined ) { - return jQuery.prop( elem, name, value ); - } - - // All attributes are lowercase - // Grab necessary hook if one is defined - if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) { - name = name.toLowerCase(); - hooks = jQuery.attrHooks[ name ] || - ( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook ); - } - - if ( value !== undefined ) { - - if ( value === null ) { - jQuery.removeAttr( elem, name ); - - } else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) { - return ret; - - } else { - elem.setAttribute( name, value + "" ); - return value; - } - - } else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) { - return ret; - - } else { - ret = jQuery.find.attr( elem, name ); - - // Non-existent attributes return null, we normalize to undefined - return ret == null ? - undefined : - ret; - } - }, - - removeAttr: function( elem, value ) { - var name, propName, - i = 0, - attrNames = value && value.match( core_rnotwhite ); - - if ( attrNames && elem.nodeType === 1 ) { - while ( (name = attrNames[i++]) ) { - propName = jQuery.propFix[ name ] || name; - - // Boolean attributes get special treatment (#10870) - if ( jQuery.expr.match.bool.test( name ) ) { - // Set corresponding property to false - if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) { - elem[ propName ] = false; - // Support: IE<9 - // Also clear defaultChecked/defaultSelected (if appropriate) - } else { - elem[ jQuery.camelCase( "default-" + name ) ] = - elem[ propName ] = false; - } - - // See #9699 for explanation of this approach (setting first, then removal) - } else { - jQuery.attr( elem, name, "" ); - } - - elem.removeAttribute( getSetAttribute ? name : propName ); - } - } - }, - - attrHooks: { - type: { - set: function( elem, value ) { - if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) { - // Setting the type on a radio button after the value resets the value in IE6-9 - // Reset value to default in case type is set after value during creation - var val = elem.value; - elem.setAttribute( "type", value ); - if ( val ) { - elem.value = val; - } - return value; - } - } - } - }, - - propFix: { - "for": "htmlFor", - "class": "className" - }, - - prop: function( elem, name, value ) { - var ret, hooks, notxml, - nType = elem.nodeType; - - // don't get/set properties on text, comment and attribute nodes - if ( !elem || nType === 3 || nType === 8 || nType === 2 ) { - return; - } - - notxml = nType !== 1 || !jQuery.isXMLDoc( elem ); - - if ( notxml ) { - // Fix name and attach hooks - name = jQuery.propFix[ name ] || name; - hooks = jQuery.propHooks[ name ]; - } - - if ( value !== undefined ) { - return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ? - ret : - ( elem[ name ] = value ); - - } else { - return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ? - ret : - elem[ name ]; - } - }, - - propHooks: { - tabIndex: { - get: function( elem ) { - // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set - // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ - // Use proper attribute retrieval(#12072) - var tabindex = jQuery.find.attr( elem, "tabindex" ); - - return tabindex ? - parseInt( tabindex, 10 ) : - rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? - 0 : - -1; - } - } - } -}); - -// Hooks for boolean attributes -boolHook = { - set: function( elem, value, name ) { - if ( value === false ) { - // Remove boolean attributes when set to false - jQuery.removeAttr( elem, name ); - } else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) { - // IE<8 needs the *property* name - elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name ); - - // Use defaultChecked and defaultSelected for oldIE - } else { - elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true; - } - - return name; - } -}; -jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) { - var getter = jQuery.expr.attrHandle[ name ] || jQuery.find.attr; - - jQuery.expr.attrHandle[ name ] = getSetInput && getSetAttribute || !ruseDefault.test( name ) ? - function( elem, name, isXML ) { - var fn = jQuery.expr.attrHandle[ name ], - ret = isXML ? - undefined : - /* jshint eqeqeq: false */ - (jQuery.expr.attrHandle[ name ] = undefined) != - getter( elem, name, isXML ) ? - - name.toLowerCase() : - null; - jQuery.expr.attrHandle[ name ] = fn; - return ret; - } : - function( elem, name, isXML ) { - return isXML ? - undefined : - elem[ jQuery.camelCase( "default-" + name ) ] ? - name.toLowerCase() : - null; - }; -}); - -// fix oldIE attroperties -if ( !getSetInput || !getSetAttribute ) { - jQuery.attrHooks.value = { - set: function( elem, value, name ) { - if ( jQuery.nodeName( elem, "input" ) ) { - // Does not return so that setAttribute is also used - elem.defaultValue = value; - } else { - // Use nodeHook if defined (#1954); otherwise setAttribute is fine - return nodeHook && nodeHook.set( elem, value, name ); - } - } - }; -} - -// IE6/7 do not support getting/setting some attributes with get/setAttribute -if ( !getSetAttribute ) { - - // Use this for any attribute in IE6/7 - // This fixes almost every IE6/7 issue - nodeHook = { - set: function( elem, value, name ) { - // Set the existing or create a new attribute node - var ret = elem.getAttributeNode( name ); - if ( !ret ) { - elem.setAttributeNode( - (ret = elem.ownerDocument.createAttribute( name )) - ); - } - - ret.value = value += ""; - - // Break association with cloned elements by also using setAttribute (#9646) - return name === "value" || value === elem.getAttribute( name ) ? - value : - undefined; - } - }; - jQuery.expr.attrHandle.id = jQuery.expr.attrHandle.name = jQuery.expr.attrHandle.coords = - // Some attributes are constructed with empty-string values when not defined - function( elem, name, isXML ) { - var ret; - return isXML ? - undefined : - (ret = elem.getAttributeNode( name )) && ret.value !== "" ? - ret.value : - null; - }; - jQuery.valHooks.button = { - get: function( elem, name ) { - var ret = elem.getAttributeNode( name ); - return ret && ret.specified ? - ret.value : - undefined; - }, - set: nodeHook.set - }; - - // Set contenteditable to false on removals(#10429) - // Setting to empty string throws an error as an invalid value - jQuery.attrHooks.contenteditable = { - set: function( elem, value, name ) { - nodeHook.set( elem, value === "" ? false : value, name ); - } - }; - - // Set width and height to auto instead of 0 on empty string( Bug #8150 ) - // This is for removals - jQuery.each([ "width", "height" ], function( i, name ) { - jQuery.attrHooks[ name ] = { - set: function( elem, value ) { - if ( value === "" ) { - elem.setAttribute( name, "auto" ); - return value; - } - } - }; - }); -} - - -// Some attributes require a special call on IE -// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx -if ( !jQuery.support.hrefNormalized ) { - // href/src property should get the full normalized URL (#10299/#12915) - jQuery.each([ "href", "src" ], function( i, name ) { - jQuery.propHooks[ name ] = { - get: function( elem ) { - return elem.getAttribute( name, 4 ); - } - }; - }); -} - -if ( !jQuery.support.style ) { - jQuery.attrHooks.style = { - get: function( elem ) { - // Return undefined in the case of empty string - // Note: IE uppercases css property names, but if we were to .toLowerCase() - // .cssText, that would destroy case senstitivity in URL's, like in "background" - return elem.style.cssText || undefined; - }, - set: function( elem, value ) { - return ( elem.style.cssText = value + "" ); - } - }; -} - -// Safari mis-reports the default selected property of an option -// Accessing the parent's selectedIndex property fixes it -if ( !jQuery.support.optSelected ) { - jQuery.propHooks.selected = { - get: function( elem ) { - var parent = elem.parentNode; - - if ( parent ) { - parent.selectedIndex; - - // Make sure that it also works with optgroups, see #5701 - if ( parent.parentNode ) { - parent.parentNode.selectedIndex; - } - } - return null; - } - }; -} - -jQuery.each([ - "tabIndex", - "readOnly", - "maxLength", - "cellSpacing", - "cellPadding", - "rowSpan", - "colSpan", - "useMap", - "frameBorder", - "contentEditable" -], function() { - jQuery.propFix[ this.toLowerCase() ] = this; -}); - -// IE6/7 call enctype encoding -if ( !jQuery.support.enctype ) { - jQuery.propFix.enctype = "encoding"; -} - -// Radios and checkboxes getter/setter -jQuery.each([ "radio", "checkbox" ], function() { - jQuery.valHooks[ this ] = { - set: function( elem, value ) { - if ( jQuery.isArray( value ) ) { - return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 ); - } - } - }; - if ( !jQuery.support.checkOn ) { - jQuery.valHooks[ this ].get = function( elem ) { - // Support: Webkit - // "" is returned instead of "on" if a value isn't specified - return elem.getAttribute("value") === null ? "on" : elem.value; - }; - } -}); -var rformElems = /^(?:input|select|textarea)$/i, - rkeyEvent = /^key/, - rmouseEvent = /^(?:mouse|contextmenu)|click/, - rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, - rtypenamespace = /^([^.]*)(?:\.(.+)|)$/; - -function returnTrue() { - return true; -} - -function returnFalse() { - return false; -} - -function safeActiveElement() { - try { - return document.activeElement; - } catch ( err ) { } -} - -/* - * Helper functions for managing events -- not part of the public interface. - * Props to Dean Edwards' addEvent library for many of the ideas. - */ -jQuery.event = { - - global: {}, - - add: function( elem, types, handler, data, selector ) { - var tmp, events, t, handleObjIn, - special, eventHandle, handleObj, - handlers, type, namespaces, origType, - elemData = jQuery._data( elem ); - - // Don't attach events to noData or text/comment nodes (but allow plain objects) - if ( !elemData ) { - return; - } - - // Caller can pass in an object of custom data in lieu of the handler - if ( handler.handler ) { - handleObjIn = handler; - handler = handleObjIn.handler; - selector = handleObjIn.selector; - } - - // Make sure that the handler has a unique ID, used to find/remove it later - if ( !handler.guid ) { - handler.guid = jQuery.guid++; - } - - // Init the element's event structure and main handler, if this is the first - if ( !(events = elemData.events) ) { - events = elemData.events = {}; - } - if ( !(eventHandle = elemData.handle) ) { - eventHandle = elemData.handle = function( e ) { - // Discard the second event of a jQuery.event.trigger() and - // when an event is called after a page has unloaded - return typeof jQuery !== core_strundefined && (!e || jQuery.event.triggered !== e.type) ? - jQuery.event.dispatch.apply( eventHandle.elem, arguments ) : - undefined; - }; - // Add elem as a property of the handle fn to prevent a memory leak with IE non-native events - eventHandle.elem = elem; - } - - // Handle multiple events separated by a space - types = ( types || "" ).match( core_rnotwhite ) || [""]; - t = types.length; - while ( t-- ) { - tmp = rtypenamespace.exec( types[t] ) || []; - type = origType = tmp[1]; - namespaces = ( tmp[2] || "" ).split( "." ).sort(); - - // There *must* be a type, no attaching namespace-only handlers - if ( !type ) { - continue; - } - - // If event changes its type, use the special event handlers for the changed type - special = jQuery.event.special[ type ] || {}; - - // If selector defined, determine special event api type, otherwise given type - type = ( selector ? special.delegateType : special.bindType ) || type; - - // Update special based on newly reset type - special = jQuery.event.special[ type ] || {}; - - // handleObj is passed to all event handlers - handleObj = jQuery.extend({ - type: type, - origType: origType, - data: data, - handler: handler, - guid: handler.guid, - selector: selector, - needsContext: selector && jQuery.expr.match.needsContext.test( selector ), - namespace: namespaces.join(".") - }, handleObjIn ); - - // Init the event handler queue if we're the first - if ( !(handlers = events[ type ]) ) { - handlers = events[ type ] = []; - handlers.delegateCount = 0; - - // Only use addEventListener/attachEvent if the special events handler returns false - if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { - // Bind the global event handler to the element - if ( elem.addEventListener ) { - elem.addEventListener( type, eventHandle, false ); - - } else if ( elem.attachEvent ) { - elem.attachEvent( "on" + type, eventHandle ); - } - } - } - - if ( special.add ) { - special.add.call( elem, handleObj ); - - if ( !handleObj.handler.guid ) { - handleObj.handler.guid = handler.guid; - } - } - - // Add to the element's handler list, delegates in front - if ( selector ) { - handlers.splice( handlers.delegateCount++, 0, handleObj ); - } else { - handlers.push( handleObj ); - } - - // Keep track of which events have ever been used, for event optimization - jQuery.event.global[ type ] = true; - } - - // Nullify elem to prevent memory leaks in IE - elem = null; - }, - - // Detach an event or set of events from an element - remove: function( elem, types, handler, selector, mappedTypes ) { - var j, handleObj, tmp, - origCount, t, events, - special, handlers, type, - namespaces, origType, - elemData = jQuery.hasData( elem ) && jQuery._data( elem ); - - if ( !elemData || !(events = elemData.events) ) { - return; - } - - // Once for each type.namespace in types; type may be omitted - types = ( types || "" ).match( core_rnotwhite ) || [""]; - t = types.length; - while ( t-- ) { - tmp = rtypenamespace.exec( types[t] ) || []; - type = origType = tmp[1]; - namespaces = ( tmp[2] || "" ).split( "." ).sort(); - - // Unbind all events (on this namespace, if provided) for the element - if ( !type ) { - for ( type in events ) { - jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); - } - continue; - } - - special = jQuery.event.special[ type ] || {}; - type = ( selector ? special.delegateType : special.bindType ) || type; - handlers = events[ type ] || []; - tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ); - - // Remove matching events - origCount = j = handlers.length; - while ( j-- ) { - handleObj = handlers[ j ]; - - if ( ( mappedTypes || origType === handleObj.origType ) && - ( !handler || handler.guid === handleObj.guid ) && - ( !tmp || tmp.test( handleObj.namespace ) ) && - ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { - handlers.splice( j, 1 ); - - if ( handleObj.selector ) { - handlers.delegateCount--; - } - if ( special.remove ) { - special.remove.call( elem, handleObj ); - } - } - } - - // Remove generic event handler if we removed something and no more handlers exist - // (avoids potential for endless recursion during removal of special event handlers) - if ( origCount && !handlers.length ) { - if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) { - jQuery.removeEvent( elem, type, elemData.handle ); - } - - delete events[ type ]; - } - } - - // Remove the expando if it's no longer used - if ( jQuery.isEmptyObject( events ) ) { - delete elemData.handle; - - // removeData also checks for emptiness and clears the expando if empty - // so use it instead of delete - jQuery._removeData( elem, "events" ); - } - }, - - trigger: function( event, data, elem, onlyHandlers ) { - var handle, ontype, cur, - bubbleType, special, tmp, i, - eventPath = [ elem || document ], - type = core_hasOwn.call( event, "type" ) ? event.type : event, - namespaces = core_hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : []; - - cur = tmp = elem = elem || document; - - // Don't do events on text and comment nodes - if ( elem.nodeType === 3 || elem.nodeType === 8 ) { - return; - } - - // focus/blur morphs to focusin/out; ensure we're not firing them right now - if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { - return; - } - - if ( type.indexOf(".") >= 0 ) { - // Namespaced trigger; create a regexp to match event type in handle() - namespaces = type.split("."); - type = namespaces.shift(); - namespaces.sort(); - } - ontype = type.indexOf(":") < 0 && "on" + type; - - // Caller can pass in a jQuery.Event object, Object, or just an event type string - event = event[ jQuery.expando ] ? - event : - new jQuery.Event( type, typeof event === "object" && event ); - - // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true) - event.isTrigger = onlyHandlers ? 2 : 3; - event.namespace = namespaces.join("."); - event.namespace_re = event.namespace ? - new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) : - null; - - // Clean up the event in case it is being reused - event.result = undefined; - if ( !event.target ) { - event.target = elem; - } - - // Clone any incoming data and prepend the event, creating the handler arg list - data = data == null ? - [ event ] : - jQuery.makeArray( data, [ event ] ); - - // Allow special events to draw outside the lines - special = jQuery.event.special[ type ] || {}; - if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) { - return; - } - - // Determine event propagation path in advance, per W3C events spec (#9951) - // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) - if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { - - bubbleType = special.delegateType || type; - if ( !rfocusMorph.test( bubbleType + type ) ) { - cur = cur.parentNode; - } - for ( ; cur; cur = cur.parentNode ) { - eventPath.push( cur ); - tmp = cur; - } - - // Only add window if we got to document (e.g., not plain obj or detached DOM) - if ( tmp === (elem.ownerDocument || document) ) { - eventPath.push( tmp.defaultView || tmp.parentWindow || window ); - } - } - - // Fire handlers on the event path - i = 0; - while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) { - - event.type = i > 1 ? - bubbleType : - special.bindType || type; - - // jQuery handler - handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" ); - if ( handle ) { - handle.apply( cur, data ); - } - - // Native handler - handle = ontype && cur[ ontype ]; - if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) { - event.preventDefault(); - } - } - event.type = type; - - // If nobody prevented the default action, do it now - if ( !onlyHandlers && !event.isDefaultPrevented() ) { - - if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) && - jQuery.acceptData( elem ) ) { - - // Call a native DOM method on the target with the same name name as the event. - // Can't use an .isFunction() check here because IE6/7 fails that test. - // Don't do default actions on window, that's where global variables be (#6170) - if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) { - - // Don't re-trigger an onFOO event when we call its FOO() method - tmp = elem[ ontype ]; - - if ( tmp ) { - elem[ ontype ] = null; - } - - // Prevent re-triggering of the same event, since we already bubbled it above - jQuery.event.triggered = type; - try { - elem[ type ](); - } catch ( e ) { - // IE<9 dies on focus/blur to hidden element (#1486,#12518) - // only reproducible on winXP IE8 native, not IE9 in IE8 mode - } - jQuery.event.triggered = undefined; - - if ( tmp ) { - elem[ ontype ] = tmp; - } - } - } - } - - return event.result; - }, - - dispatch: function( event ) { - - // Make a writable jQuery.Event from the native event object - event = jQuery.event.fix( event ); - - var i, ret, handleObj, matched, j, - handlerQueue = [], - args = core_slice.call( arguments ), - handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [], - special = jQuery.event.special[ event.type ] || {}; - - // Use the fix-ed jQuery.Event rather than the (read-only) native event - args[0] = event; - event.delegateTarget = this; - - // Call the preDispatch hook for the mapped type, and let it bail if desired - if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { - return; - } - - // Determine handlers - handlerQueue = jQuery.event.handlers.call( this, event, handlers ); - - // Run delegates first; they may want to stop propagation beneath us - i = 0; - while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) { - event.currentTarget = matched.elem; - - j = 0; - while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) { - - // Triggered event must either 1) have no namespace, or - // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace). - if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) { - - event.handleObj = handleObj; - event.data = handleObj.data; - - ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) - .apply( matched.elem, args ); - - if ( ret !== undefined ) { - if ( (event.result = ret) === false ) { - event.preventDefault(); - event.stopPropagation(); - } - } - } - } - } - - // Call the postDispatch hook for the mapped type - if ( special.postDispatch ) { - special.postDispatch.call( this, event ); - } - - return event.result; - }, - - handlers: function( event, handlers ) { - var sel, handleObj, matches, i, - handlerQueue = [], - delegateCount = handlers.delegateCount, - cur = event.target; - - // Find delegate handlers - // Black-hole SVG instance trees (#13180) - // Avoid non-left-click bubbling in Firefox (#3861) - if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) { - - /* jshint eqeqeq: false */ - for ( ; cur != this; cur = cur.parentNode || this ) { - /* jshint eqeqeq: true */ - - // Don't check non-elements (#13208) - // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) - if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) { - matches = []; - for ( i = 0; i < delegateCount; i++ ) { - handleObj = handlers[ i ]; - - // Don't conflict with Object.prototype properties (#13203) - sel = handleObj.selector + " "; - - if ( matches[ sel ] === undefined ) { - matches[ sel ] = handleObj.needsContext ? - jQuery( sel, this ).index( cur ) >= 0 : - jQuery.find( sel, this, null, [ cur ] ).length; - } - if ( matches[ sel ] ) { - matches.push( handleObj ); - } - } - if ( matches.length ) { - handlerQueue.push({ elem: cur, handlers: matches }); - } - } - } - } - - // Add the remaining (directly-bound) handlers - if ( delegateCount < handlers.length ) { - handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) }); - } - - return handlerQueue; - }, - - fix: function( event ) { - if ( event[ jQuery.expando ] ) { - return event; - } - - // Create a writable copy of the event object and normalize some properties - var i, prop, copy, - type = event.type, - originalEvent = event, - fixHook = this.fixHooks[ type ]; - - if ( !fixHook ) { - this.fixHooks[ type ] = fixHook = - rmouseEvent.test( type ) ? this.mouseHooks : - rkeyEvent.test( type ) ? this.keyHooks : - {}; - } - copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; - - event = new jQuery.Event( originalEvent ); - - i = copy.length; - while ( i-- ) { - prop = copy[ i ]; - event[ prop ] = originalEvent[ prop ]; - } - - // Support: IE<9 - // Fix target property (#1925) - if ( !event.target ) { - event.target = originalEvent.srcElement || document; - } - - // Support: Chrome 23+, Safari? - // Target should not be a text node (#504, #13143) - if ( event.target.nodeType === 3 ) { - event.target = event.target.parentNode; - } - - // Support: IE<9 - // For mouse/key events, metaKey==false if it's undefined (#3368, #11328) - event.metaKey = !!event.metaKey; - - return fixHook.filter ? fixHook.filter( event, originalEvent ) : event; - }, - - // Includes some event props shared by KeyEvent and MouseEvent - props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), - - fixHooks: {}, - - keyHooks: { - props: "char charCode key keyCode".split(" "), - filter: function( event, original ) { - - // Add which for key events - if ( event.which == null ) { - event.which = original.charCode != null ? original.charCode : original.keyCode; - } - - return event; - } - }, - - mouseHooks: { - props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "), - filter: function( event, original ) { - var body, eventDoc, doc, - button = original.button, - fromElement = original.fromElement; - - // Calculate pageX/Y if missing and clientX/Y available - if ( event.pageX == null && original.clientX != null ) { - eventDoc = event.target.ownerDocument || document; - doc = eventDoc.documentElement; - body = eventDoc.body; - - event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); - event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 ); - } - - // Add relatedTarget, if necessary - if ( !event.relatedTarget && fromElement ) { - event.relatedTarget = fromElement === event.target ? original.toElement : fromElement; - } - - // Add which for click: 1 === left; 2 === middle; 3 === right - // Note: button is not normalized, so don't use it - if ( !event.which && button !== undefined ) { - event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); - } - - return event; - } - }, - - special: { - load: { - // Prevent triggered image.load events from bubbling to window.load - noBubble: true - }, - focus: { - // Fire native event if possible so blur/focus sequence is correct - trigger: function() { - if ( this !== safeActiveElement() && this.focus ) { - try { - this.focus(); - return false; - } catch ( e ) { - // Support: IE<9 - // If we error on focus to hidden element (#1486, #12518), - // let .trigger() run the handlers - } - } - }, - delegateType: "focusin" - }, - blur: { - trigger: function() { - if ( this === safeActiveElement() && this.blur ) { - this.blur(); - return false; - } - }, - delegateType: "focusout" - }, - click: { - // For checkbox, fire native event so checked state will be right - trigger: function() { - if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) { - this.click(); - return false; - } - }, - - // For cross-browser consistency, don't fire native .click() on links - _default: function( event ) { - return jQuery.nodeName( event.target, "a" ); - } - }, - - beforeunload: { - postDispatch: function( event ) { - - // Even when returnValue equals to undefined Firefox will still show alert - if ( event.result !== undefined ) { - event.originalEvent.returnValue = event.result; - } - } - } - }, - - simulate: function( type, elem, event, bubble ) { - // Piggyback on a donor event to simulate a different one. - // Fake originalEvent to avoid donor's stopPropagation, but if the - // simulated event prevents default then we do the same on the donor. - var e = jQuery.extend( - new jQuery.Event(), - event, - { - type: type, - isSimulated: true, - originalEvent: {} - } - ); - if ( bubble ) { - jQuery.event.trigger( e, null, elem ); - } else { - jQuery.event.dispatch.call( elem, e ); - } - if ( e.isDefaultPrevented() ) { - event.preventDefault(); - } - } -}; - -jQuery.removeEvent = document.removeEventListener ? - function( elem, type, handle ) { - if ( elem.removeEventListener ) { - elem.removeEventListener( type, handle, false ); - } - } : - function( elem, type, handle ) { - var name = "on" + type; - - if ( elem.detachEvent ) { - - // #8545, #7054, preventing memory leaks for custom events in IE6-8 - // detachEvent needed property on element, by name of that event, to properly expose it to GC - if ( typeof elem[ name ] === core_strundefined ) { - elem[ name ] = null; - } - - elem.detachEvent( name, handle ); - } - }; - -jQuery.Event = function( src, props ) { - // Allow instantiation without the 'new' keyword - if ( !(this instanceof jQuery.Event) ) { - return new jQuery.Event( src, props ); - } - - // Event object - if ( src && src.type ) { - this.originalEvent = src; - this.type = src.type; - - // Events bubbling up the document may have been marked as prevented - // by a handler lower down the tree; reflect the correct value. - this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false || - src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse; - - // Event type - } else { - this.type = src; - } - - // Put explicitly provided properties onto the event object - if ( props ) { - jQuery.extend( this, props ); - } - - // Create a timestamp if incoming event doesn't have one - this.timeStamp = src && src.timeStamp || jQuery.now(); - - // Mark it as fixed - this[ jQuery.expando ] = true; -}; - -// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding -// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html -jQuery.Event.prototype = { - isDefaultPrevented: returnFalse, - isPropagationStopped: returnFalse, - isImmediatePropagationStopped: returnFalse, - - preventDefault: function() { - var e = this.originalEvent; - - this.isDefaultPrevented = returnTrue; - if ( !e ) { - return; - } - - // If preventDefault exists, run it on the original event - if ( e.preventDefault ) { - e.preventDefault(); - - // Support: IE - // Otherwise set the returnValue property of the original event to false - } else { - e.returnValue = false; - } - }, - stopPropagation: function() { - var e = this.originalEvent; - - this.isPropagationStopped = returnTrue; - if ( !e ) { - return; - } - // If stopPropagation exists, run it on the original event - if ( e.stopPropagation ) { - e.stopPropagation(); - } - - // Support: IE - // Set the cancelBubble property of the original event to true - e.cancelBubble = true; - }, - stopImmediatePropagation: function() { - this.isImmediatePropagationStopped = returnTrue; - this.stopPropagation(); - } -}; - -// Create mouseenter/leave events using mouseover/out and event-time checks -jQuery.each({ - mouseenter: "mouseover", - mouseleave: "mouseout" -}, function( orig, fix ) { - jQuery.event.special[ orig ] = { - delegateType: fix, - bindType: fix, - - handle: function( event ) { - var ret, - target = this, - related = event.relatedTarget, - handleObj = event.handleObj; - - // For mousenter/leave call the handler if related is outside the target. - // NB: No relatedTarget if the mouse left/entered the browser window - if ( !related || (related !== target && !jQuery.contains( target, related )) ) { - event.type = handleObj.origType; - ret = handleObj.handler.apply( this, arguments ); - event.type = fix; - } - return ret; - } - }; -}); - -// IE submit delegation -if ( !jQuery.support.submitBubbles ) { - - jQuery.event.special.submit = { - setup: function() { - // Only need this for delegated form submit events - if ( jQuery.nodeName( this, "form" ) ) { - return false; - } - - // Lazy-add a submit handler when a descendant form may potentially be submitted - jQuery.event.add( this, "click._submit keypress._submit", function( e ) { - // Node name check avoids a VML-related crash in IE (#9807) - var elem = e.target, - form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined; - if ( form && !jQuery._data( form, "submitBubbles" ) ) { - jQuery.event.add( form, "submit._submit", function( event ) { - event._submit_bubble = true; - }); - jQuery._data( form, "submitBubbles", true ); - } - }); - // return undefined since we don't need an event listener - }, - - postDispatch: function( event ) { - // If form was submitted by the user, bubble the event up the tree - if ( event._submit_bubble ) { - delete event._submit_bubble; - if ( this.parentNode && !event.isTrigger ) { - jQuery.event.simulate( "submit", this.parentNode, event, true ); - } - } - }, - - teardown: function() { - // Only need this for delegated form submit events - if ( jQuery.nodeName( this, "form" ) ) { - return false; - } - - // Remove delegated handlers; cleanData eventually reaps submit handlers attached above - jQuery.event.remove( this, "._submit" ); - } - }; -} - -// IE change delegation and checkbox/radio fix -if ( !jQuery.support.changeBubbles ) { - - jQuery.event.special.change = { - - setup: function() { - - if ( rformElems.test( this.nodeName ) ) { - // IE doesn't fire change on a check/radio until blur; trigger it on click - // after a propertychange. Eat the blur-change in special.change.handle. - // This still fires onchange a second time for check/radio after blur. - if ( this.type === "checkbox" || this.type === "radio" ) { - jQuery.event.add( this, "propertychange._change", function( event ) { - if ( event.originalEvent.propertyName === "checked" ) { - this._just_changed = true; - } - }); - jQuery.event.add( this, "click._change", function( event ) { - if ( this._just_changed && !event.isTrigger ) { - this._just_changed = false; - } - // Allow triggered, simulated change events (#11500) - jQuery.event.simulate( "change", this, event, true ); - }); - } - return false; - } - // Delegated event; lazy-add a change handler on descendant inputs - jQuery.event.add( this, "beforeactivate._change", function( e ) { - var elem = e.target; - - if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) { - jQuery.event.add( elem, "change._change", function( event ) { - if ( this.parentNode && !event.isSimulated && !event.isTrigger ) { - jQuery.event.simulate( "change", this.parentNode, event, true ); - } - }); - jQuery._data( elem, "changeBubbles", true ); - } - }); - }, - - handle: function( event ) { - var elem = event.target; - - // Swallow native change events from checkbox/radio, we already triggered them above - if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) { - return event.handleObj.handler.apply( this, arguments ); - } - }, - - teardown: function() { - jQuery.event.remove( this, "._change" ); - - return !rformElems.test( this.nodeName ); - } - }; -} - -// Create "bubbling" focus and blur events -if ( !jQuery.support.focusinBubbles ) { - jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { - - // Attach a single capturing handler while someone wants focusin/focusout - var attaches = 0, - handler = function( event ) { - jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true ); - }; - - jQuery.event.special[ fix ] = { - setup: function() { - if ( attaches++ === 0 ) { - document.addEventListener( orig, handler, true ); - } - }, - teardown: function() { - if ( --attaches === 0 ) { - document.removeEventListener( orig, handler, true ); - } - } - }; - }); -} - -jQuery.fn.extend({ - - on: function( types, selector, data, fn, /*INTERNAL*/ one ) { - var type, origFn; - - // Types can be a map of types/handlers - if ( typeof types === "object" ) { - // ( types-Object, selector, data ) - if ( typeof selector !== "string" ) { - // ( types-Object, data ) - data = data || selector; - selector = undefined; - } - for ( type in types ) { - this.on( type, selector, data, types[ type ], one ); - } - return this; - } - - if ( data == null && fn == null ) { - // ( types, fn ) - fn = selector; - data = selector = undefined; - } else if ( fn == null ) { - if ( typeof selector === "string" ) { - // ( types, selector, fn ) - fn = data; - data = undefined; - } else { - // ( types, data, fn ) - fn = data; - data = selector; - selector = undefined; - } - } - if ( fn === false ) { - fn = returnFalse; - } else if ( !fn ) { - return this; - } - - if ( one === 1 ) { - origFn = fn; - fn = function( event ) { - // Can use an empty set, since event contains the info - jQuery().off( event ); - return origFn.apply( this, arguments ); - }; - // Use same guid so caller can remove using origFn - fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); - } - return this.each( function() { - jQuery.event.add( this, types, fn, data, selector ); - }); - }, - one: function( types, selector, data, fn ) { - return this.on( types, selector, data, fn, 1 ); - }, - off: function( types, selector, fn ) { - var handleObj, type; - if ( types && types.preventDefault && types.handleObj ) { - // ( event ) dispatched jQuery.Event - handleObj = types.handleObj; - jQuery( types.delegateTarget ).off( - handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType, - handleObj.selector, - handleObj.handler - ); - return this; - } - if ( typeof types === "object" ) { - // ( types-object [, selector] ) - for ( type in types ) { - this.off( type, selector, types[ type ] ); - } - return this; - } - if ( selector === false || typeof selector === "function" ) { - // ( types [, fn] ) - fn = selector; - selector = undefined; - } - if ( fn === false ) { - fn = returnFalse; - } - return this.each(function() { - jQuery.event.remove( this, types, fn, selector ); - }); - }, - - trigger: function( type, data ) { - return this.each(function() { - jQuery.event.trigger( type, data, this ); - }); - }, - triggerHandler: function( type, data ) { - var elem = this[0]; - if ( elem ) { - return jQuery.event.trigger( type, data, elem, true ); - } - } -}); -var isSimple = /^.[^:#\[\.,]*$/, - rparentsprev = /^(?:parents|prev(?:Until|All))/, - rneedsContext = jQuery.expr.match.needsContext, - // methods guaranteed to produce a unique set when starting from a unique set - guaranteedUnique = { - children: true, - contents: true, - next: true, - prev: true - }; - -jQuery.fn.extend({ - find: function( selector ) { - var i, - ret = [], - self = this, - len = self.length; - - if ( typeof selector !== "string" ) { - return this.pushStack( jQuery( selector ).filter(function() { - for ( i = 0; i < len; i++ ) { - if ( jQuery.contains( self[ i ], this ) ) { - return true; - } - } - }) ); - } - - for ( i = 0; i < len; i++ ) { - jQuery.find( selector, self[ i ], ret ); - } - - // Needed because $( selector, context ) becomes $( context ).find( selector ) - ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret ); - ret.selector = this.selector ? this.selector + " " + selector : selector; - return ret; - }, - - has: function( target ) { - var i, - targets = jQuery( target, this ), - len = targets.length; - - return this.filter(function() { - for ( i = 0; i < len; i++ ) { - if ( jQuery.contains( this, targets[i] ) ) { - return true; - } - } - }); - }, - - not: function( selector ) { - return this.pushStack( winnow(this, selector || [], true) ); - }, - - filter: function( selector ) { - return this.pushStack( winnow(this, selector || [], false) ); - }, - - is: function( selector ) { - return !!winnow( - this, - - // If this is a positional/relative selector, check membership in the returned set - // so $("p:first").is("p:last") won't return true for a doc with two "p". - typeof selector === "string" && rneedsContext.test( selector ) ? - jQuery( selector ) : - selector || [], - false - ).length; - }, - - closest: function( selectors, context ) { - var cur, - i = 0, - l = this.length, - ret = [], - pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ? - jQuery( selectors, context || this.context ) : - 0; - - for ( ; i < l; i++ ) { - for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) { - // Always skip document fragments - if ( cur.nodeType < 11 && (pos ? - pos.index(cur) > -1 : - - // Don't pass non-elements to Sizzle - cur.nodeType === 1 && - jQuery.find.matchesSelector(cur, selectors)) ) { - - cur = ret.push( cur ); - break; - } - } - } - - return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret ); - }, - - // Determine the position of an element within - // the matched set of elements - index: function( elem ) { - - // No argument, return index in parent - if ( !elem ) { - return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1; - } - - // index in selector - if ( typeof elem === "string" ) { - return jQuery.inArray( this[0], jQuery( elem ) ); - } - - // Locate the position of the desired element - return jQuery.inArray( - // If it receives a jQuery object, the first element is used - elem.jquery ? elem[0] : elem, this ); - }, - - add: function( selector, context ) { - var set = typeof selector === "string" ? - jQuery( selector, context ) : - jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ), - all = jQuery.merge( this.get(), set ); - - return this.pushStack( jQuery.unique(all) ); - }, - - addBack: function( selector ) { - return this.add( selector == null ? - this.prevObject : this.prevObject.filter(selector) - ); - } -}); - -function sibling( cur, dir ) { - do { - cur = cur[ dir ]; - } while ( cur && cur.nodeType !== 1 ); - - return cur; -} - -jQuery.each({ - parent: function( elem ) { - var parent = elem.parentNode; - return parent && parent.nodeType !== 11 ? parent : null; - }, - parents: function( elem ) { - return jQuery.dir( elem, "parentNode" ); - }, - parentsUntil: function( elem, i, until ) { - return jQuery.dir( elem, "parentNode", until ); - }, - next: function( elem ) { - return sibling( elem, "nextSibling" ); - }, - prev: function( elem ) { - return sibling( elem, "previousSibling" ); - }, - nextAll: function( elem ) { - return jQuery.dir( elem, "nextSibling" ); - }, - prevAll: function( elem ) { - return jQuery.dir( elem, "previousSibling" ); - }, - nextUntil: function( elem, i, until ) { - return jQuery.dir( elem, "nextSibling", until ); - }, - prevUntil: function( elem, i, until ) { - return jQuery.dir( elem, "previousSibling", until ); - }, - siblings: function( elem ) { - return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem ); - }, - children: function( elem ) { - return jQuery.sibling( elem.firstChild ); - }, - contents: function( elem ) { - return jQuery.nodeName( elem, "iframe" ) ? - elem.contentDocument || elem.contentWindow.document : - jQuery.merge( [], elem.childNodes ); - } -}, function( name, fn ) { - jQuery.fn[ name ] = function( until, selector ) { - var ret = jQuery.map( this, fn, until ); - - if ( name.slice( -5 ) !== "Until" ) { - selector = until; - } - - if ( selector && typeof selector === "string" ) { - ret = jQuery.filter( selector, ret ); - } - - if ( this.length > 1 ) { - // Remove duplicates - if ( !guaranteedUnique[ name ] ) { - ret = jQuery.unique( ret ); - } - - // Reverse order for parents* and prev-derivatives - if ( rparentsprev.test( name ) ) { - ret = ret.reverse(); - } - } - - return this.pushStack( ret ); - }; -}); - -jQuery.extend({ - filter: function( expr, elems, not ) { - var elem = elems[ 0 ]; - - if ( not ) { - expr = ":not(" + expr + ")"; - } - - return elems.length === 1 && elem.nodeType === 1 ? - jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] : - jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) { - return elem.nodeType === 1; - })); - }, - - dir: function( elem, dir, until ) { - var matched = [], - cur = elem[ dir ]; - - while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) { - if ( cur.nodeType === 1 ) { - matched.push( cur ); - } - cur = cur[dir]; - } - return matched; - }, - - sibling: function( n, elem ) { - var r = []; - - for ( ; n; n = n.nextSibling ) { - if ( n.nodeType === 1 && n !== elem ) { - r.push( n ); - } - } - - return r; - } -}); - -// Implement the identical functionality for filter and not -function winnow( elements, qualifier, not ) { - if ( jQuery.isFunction( qualifier ) ) { - return jQuery.grep( elements, function( elem, i ) { - /* jshint -W018 */ - return !!qualifier.call( elem, i, elem ) !== not; - }); - - } - - if ( qualifier.nodeType ) { - return jQuery.grep( elements, function( elem ) { - return ( elem === qualifier ) !== not; - }); - - } - - if ( typeof qualifier === "string" ) { - if ( isSimple.test( qualifier ) ) { - return jQuery.filter( qualifier, elements, not ); - } - - qualifier = jQuery.filter( qualifier, elements ); - } - - return jQuery.grep( elements, function( elem ) { - return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not; - }); -} -function createSafeFragment( document ) { - var list = nodeNames.split( "|" ), - safeFrag = document.createDocumentFragment(); - - if ( safeFrag.createElement ) { - while ( list.length ) { - safeFrag.createElement( - list.pop() - ); - } - } - return safeFrag; -} - -var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" + - "header|hgroup|mark|meter|nav|output|progress|section|summary|time|video", - rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g, - rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"), - rleadingWhitespace = /^\s+/, - rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi, - rtagName = /<([\w:]+)/, - rtbody = /\s*$/g, - - // We have to close these tags to support XHTML (#13200) - wrapMap = { - option: [ 1, "" ], - legend: [ 1, "
", "
" ], - area: [ 1, "", "" ], - param: [ 1, "", "" ], - thead: [ 1, "", "
" ], - tr: [ 2, "", "
" ], - col: [ 2, "", "
" ], - td: [ 3, "", "
" ], - - // IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags, - // unless wrapped in a div with non-breaking characters in front of it. - _default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X
", "
" ] - }, - safeFragment = createSafeFragment( document ), - fragmentDiv = safeFragment.appendChild( document.createElement("div") ); - -wrapMap.optgroup = wrapMap.option; -wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; -wrapMap.th = wrapMap.td; - -jQuery.fn.extend({ - text: function( value ) { - return jQuery.access( this, function( value ) { - return value === undefined ? - jQuery.text( this ) : - this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) ); - }, null, value, arguments.length ); - }, - - append: function() { - return this.domManip( arguments, function( elem ) { - if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { - var target = manipulationTarget( this, elem ); - target.appendChild( elem ); - } - }); - }, - - prepend: function() { - return this.domManip( arguments, function( elem ) { - if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { - var target = manipulationTarget( this, elem ); - target.insertBefore( elem, target.firstChild ); - } - }); - }, - - before: function() { - return this.domManip( arguments, function( elem ) { - if ( this.parentNode ) { - this.parentNode.insertBefore( elem, this ); - } - }); - }, - - after: function() { - return this.domManip( arguments, function( elem ) { - if ( this.parentNode ) { - this.parentNode.insertBefore( elem, this.nextSibling ); - } - }); - }, - - // keepData is for internal use only--do not document - remove: function( selector, keepData ) { - var elem, - elems = selector ? jQuery.filter( selector, this ) : this, - i = 0; - - for ( ; (elem = elems[i]) != null; i++ ) { - - if ( !keepData && elem.nodeType === 1 ) { - jQuery.cleanData( getAll( elem ) ); - } - - if ( elem.parentNode ) { - if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) { - setGlobalEval( getAll( elem, "script" ) ); - } - elem.parentNode.removeChild( elem ); - } - } - - return this; - }, - - empty: function() { - var elem, - i = 0; - - for ( ; (elem = this[i]) != null; i++ ) { - // Remove element nodes and prevent memory leaks - if ( elem.nodeType === 1 ) { - jQuery.cleanData( getAll( elem, false ) ); - } - - // Remove any remaining nodes - while ( elem.firstChild ) { - elem.removeChild( elem.firstChild ); - } - - // If this is a select, ensure that it displays empty (#12336) - // Support: IE<9 - if ( elem.options && jQuery.nodeName( elem, "select" ) ) { - elem.options.length = 0; - } - } - - return this; - }, - - clone: function( dataAndEvents, deepDataAndEvents ) { - dataAndEvents = dataAndEvents == null ? false : dataAndEvents; - deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; - - return this.map( function () { - return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); - }); - }, - - html: function( value ) { - return jQuery.access( this, function( value ) { - var elem = this[0] || {}, - i = 0, - l = this.length; - - if ( value === undefined ) { - return elem.nodeType === 1 ? - elem.innerHTML.replace( rinlinejQuery, "" ) : - undefined; - } - - // See if we can take a shortcut and just use innerHTML - if ( typeof value === "string" && !rnoInnerhtml.test( value ) && - ( jQuery.support.htmlSerialize || !rnoshimcache.test( value ) ) && - ( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) && - !wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) { - - value = value.replace( rxhtmlTag, "<$1>" ); - - try { - for (; i < l; i++ ) { - // Remove element nodes and prevent memory leaks - elem = this[i] || {}; - if ( elem.nodeType === 1 ) { - jQuery.cleanData( getAll( elem, false ) ); - elem.innerHTML = value; - } - } - - elem = 0; - - // If using innerHTML throws an exception, use the fallback method - } catch(e) {} - } - - if ( elem ) { - this.empty().append( value ); - } - }, null, value, arguments.length ); - }, - - replaceWith: function() { - var - // Snapshot the DOM in case .domManip sweeps something relevant into its fragment - args = jQuery.map( this, function( elem ) { - return [ elem.nextSibling, elem.parentNode ]; - }), - i = 0; - - // Make the changes, replacing each context element with the new content - this.domManip( arguments, function( elem ) { - var next = args[ i++ ], - parent = args[ i++ ]; - - if ( parent ) { - // Don't use the snapshot next if it has moved (#13810) - if ( next && next.parentNode !== parent ) { - next = this.nextSibling; - } - jQuery( this ).remove(); - parent.insertBefore( elem, next ); - } - // Allow new content to include elements from the context set - }, true ); - - // Force removal if there was no new content (e.g., from empty arguments) - return i ? this : this.remove(); - }, - - detach: function( selector ) { - return this.remove( selector, true ); - }, - - domManip: function( args, callback, allowIntersection ) { - - // Flatten any nested arrays - args = core_concat.apply( [], args ); - - var first, node, hasScripts, - scripts, doc, fragment, - i = 0, - l = this.length, - set = this, - iNoClone = l - 1, - value = args[0], - isFunction = jQuery.isFunction( value ); - - // We can't cloneNode fragments that contain checked, in WebKit - if ( isFunction || !( l <= 1 || typeof value !== "string" || jQuery.support.checkClone || !rchecked.test( value ) ) ) { - return this.each(function( index ) { - var self = set.eq( index ); - if ( isFunction ) { - args[0] = value.call( this, index, self.html() ); - } - self.domManip( args, callback, allowIntersection ); - }); - } - - if ( l ) { - fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, !allowIntersection && this ); - first = fragment.firstChild; - - if ( fragment.childNodes.length === 1 ) { - fragment = first; - } - - if ( first ) { - scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); - hasScripts = scripts.length; - - // Use the original fragment for the last item instead of the first because it can end up - // being emptied incorrectly in certain situations (#8070). - for ( ; i < l; i++ ) { - node = fragment; - - if ( i !== iNoClone ) { - node = jQuery.clone( node, true, true ); - - // Keep references to cloned scripts for later restoration - if ( hasScripts ) { - jQuery.merge( scripts, getAll( node, "script" ) ); - } - } - - callback.call( this[i], node, i ); - } - - if ( hasScripts ) { - doc = scripts[ scripts.length - 1 ].ownerDocument; - - // Reenable scripts - jQuery.map( scripts, restoreScript ); - - // Evaluate executable scripts on first document insertion - for ( i = 0; i < hasScripts; i++ ) { - node = scripts[ i ]; - if ( rscriptType.test( node.type || "" ) && - !jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) { - - if ( node.src ) { - // Hope ajax is available... - jQuery._evalUrl( node.src ); - } else { - jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) ); - } - } - } - } - - // Fix #11809: Avoid leaking memory - fragment = first = null; - } - } - - return this; - } -}); - -// Support: IE<8 -// Manipulating tables requires a tbody -function manipulationTarget( elem, content ) { - return jQuery.nodeName( elem, "table" ) && - jQuery.nodeName( content.nodeType === 1 ? content : content.firstChild, "tr" ) ? - - elem.getElementsByTagName("tbody")[0] || - elem.appendChild( elem.ownerDocument.createElement("tbody") ) : - elem; -} - -// Replace/restore the type attribute of script elements for safe DOM manipulation -function disableScript( elem ) { - elem.type = (jQuery.find.attr( elem, "type" ) !== null) + "/" + elem.type; - return elem; -} -function restoreScript( elem ) { - var match = rscriptTypeMasked.exec( elem.type ); - if ( match ) { - elem.type = match[1]; - } else { - elem.removeAttribute("type"); - } - return elem; -} - -// Mark scripts as having already been evaluated -function setGlobalEval( elems, refElements ) { - var elem, - i = 0; - for ( ; (elem = elems[i]) != null; i++ ) { - jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) ); - } -} - -function cloneCopyEvent( src, dest ) { - - if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) { - return; - } - - var type, i, l, - oldData = jQuery._data( src ), - curData = jQuery._data( dest, oldData ), - events = oldData.events; - - if ( events ) { - delete curData.handle; - curData.events = {}; - - for ( type in events ) { - for ( i = 0, l = events[ type ].length; i < l; i++ ) { - jQuery.event.add( dest, type, events[ type ][ i ] ); - } - } - } - - // make the cloned public data object a copy from the original - if ( curData.data ) { - curData.data = jQuery.extend( {}, curData.data ); - } -} - -function fixCloneNodeIssues( src, dest ) { - var nodeName, e, data; - - // We do not need to do anything for non-Elements - if ( dest.nodeType !== 1 ) { - return; - } - - nodeName = dest.nodeName.toLowerCase(); - - // IE6-8 copies events bound via attachEvent when using cloneNode. - if ( !jQuery.support.noCloneEvent && dest[ jQuery.expando ] ) { - data = jQuery._data( dest ); - - for ( e in data.events ) { - jQuery.removeEvent( dest, e, data.handle ); - } - - // Event data gets referenced instead of copied if the expando gets copied too - dest.removeAttribute( jQuery.expando ); - } - - // IE blanks contents when cloning scripts, and tries to evaluate newly-set text - if ( nodeName === "script" && dest.text !== src.text ) { - disableScript( dest ).text = src.text; - restoreScript( dest ); - - // IE6-10 improperly clones children of object elements using classid. - // IE10 throws NoModificationAllowedError if parent is null, #12132. - } else if ( nodeName === "object" ) { - if ( dest.parentNode ) { - dest.outerHTML = src.outerHTML; - } - - // This path appears unavoidable for IE9. When cloning an object - // element in IE9, the outerHTML strategy above is not sufficient. - // If the src has innerHTML and the destination does not, - // copy the src.innerHTML into the dest.innerHTML. #10324 - if ( jQuery.support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) { - dest.innerHTML = src.innerHTML; - } - - } else if ( nodeName === "input" && manipulation_rcheckableType.test( src.type ) ) { - // IE6-8 fails to persist the checked state of a cloned checkbox - // or radio button. Worse, IE6-7 fail to give the cloned element - // a checked appearance if the defaultChecked value isn't also set - - dest.defaultChecked = dest.checked = src.checked; - - // IE6-7 get confused and end up setting the value of a cloned - // checkbox/radio button to an empty string instead of "on" - if ( dest.value !== src.value ) { - dest.value = src.value; - } - - // IE6-8 fails to return the selected option to the default selected - // state when cloning options - } else if ( nodeName === "option" ) { - dest.defaultSelected = dest.selected = src.defaultSelected; - - // IE6-8 fails to set the defaultValue to the correct value when - // cloning other types of input fields - } else if ( nodeName === "input" || nodeName === "textarea" ) { - dest.defaultValue = src.defaultValue; - } -} - -jQuery.each({ - appendTo: "append", - prependTo: "prepend", - insertBefore: "before", - insertAfter: "after", - replaceAll: "replaceWith" -}, function( name, original ) { - jQuery.fn[ name ] = function( selector ) { - var elems, - i = 0, - ret = [], - insert = jQuery( selector ), - last = insert.length - 1; - - for ( ; i <= last; i++ ) { - elems = i === last ? this : this.clone(true); - jQuery( insert[i] )[ original ]( elems ); - - // Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get() - core_push.apply( ret, elems.get() ); - } - - return this.pushStack( ret ); - }; -}); - -function getAll( context, tag ) { - var elems, elem, - i = 0, - found = typeof context.getElementsByTagName !== core_strundefined ? context.getElementsByTagName( tag || "*" ) : - typeof context.querySelectorAll !== core_strundefined ? context.querySelectorAll( tag || "*" ) : - undefined; - - if ( !found ) { - for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) { - if ( !tag || jQuery.nodeName( elem, tag ) ) { - found.push( elem ); - } else { - jQuery.merge( found, getAll( elem, tag ) ); - } - } - } - - return tag === undefined || tag && jQuery.nodeName( context, tag ) ? - jQuery.merge( [ context ], found ) : - found; -} - -// Used in buildFragment, fixes the defaultChecked property -function fixDefaultChecked( elem ) { - if ( manipulation_rcheckableType.test( elem.type ) ) { - elem.defaultChecked = elem.checked; - } -} - -jQuery.extend({ - clone: function( elem, dataAndEvents, deepDataAndEvents ) { - var destElements, node, clone, i, srcElements, - inPage = jQuery.contains( elem.ownerDocument, elem ); - - if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) { - clone = elem.cloneNode( true ); - - // IE<=8 does not properly clone detached, unknown element nodes - } else { - fragmentDiv.innerHTML = elem.outerHTML; - fragmentDiv.removeChild( clone = fragmentDiv.firstChild ); - } - - if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) && - (elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) { - - // We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2 - destElements = getAll( clone ); - srcElements = getAll( elem ); - - // Fix all IE cloning issues - for ( i = 0; (node = srcElements[i]) != null; ++i ) { - // Ensure that the destination node is not null; Fixes #9587 - if ( destElements[i] ) { - fixCloneNodeIssues( node, destElements[i] ); - } - } - } - - // Copy the events from the original to the clone - if ( dataAndEvents ) { - if ( deepDataAndEvents ) { - srcElements = srcElements || getAll( elem ); - destElements = destElements || getAll( clone ); - - for ( i = 0; (node = srcElements[i]) != null; i++ ) { - cloneCopyEvent( node, destElements[i] ); - } - } else { - cloneCopyEvent( elem, clone ); - } - } - - // Preserve script evaluation history - destElements = getAll( clone, "script" ); - if ( destElements.length > 0 ) { - setGlobalEval( destElements, !inPage && getAll( elem, "script" ) ); - } - - destElements = srcElements = node = null; - - // Return the cloned set - return clone; - }, - - buildFragment: function( elems, context, scripts, selection ) { - var j, elem, contains, - tmp, tag, tbody, wrap, - l = elems.length, - - // Ensure a safe fragment - safe = createSafeFragment( context ), - - nodes = [], - i = 0; - - for ( ; i < l; i++ ) { - elem = elems[ i ]; - - if ( elem || elem === 0 ) { - - // Add nodes directly - if ( jQuery.type( elem ) === "object" ) { - jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem ); - - // Convert non-html into a text node - } else if ( !rhtml.test( elem ) ) { - nodes.push( context.createTextNode( elem ) ); - - // Convert html into DOM nodes - } else { - tmp = tmp || safe.appendChild( context.createElement("div") ); - - // Deserialize a standard representation - tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase(); - wrap = wrapMap[ tag ] || wrapMap._default; - - tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1>" ) + wrap[2]; - - // Descend through wrappers to the right content - j = wrap[0]; - while ( j-- ) { - tmp = tmp.lastChild; - } - - // Manually add leading whitespace removed by IE - if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) { - nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) ); - } - - // Remove IE's autoinserted from table fragments - if ( !jQuery.support.tbody ) { - - // String was a , *may* have spurious - elem = tag === "table" && !rtbody.test( elem ) ? - tmp.firstChild : - - // String was a bare or - wrap[1] === "
" && !rtbody.test( elem ) ? - tmp : - 0; - - j = elem && elem.childNodes.length; - while ( j-- ) { - if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) { - elem.removeChild( tbody ); - } - } - } - - jQuery.merge( nodes, tmp.childNodes ); - - // Fix #12392 for WebKit and IE > 9 - tmp.textContent = ""; - - // Fix #12392 for oldIE - while ( tmp.firstChild ) { - tmp.removeChild( tmp.firstChild ); - } - - // Remember the top-level container for proper cleanup - tmp = safe.lastChild; - } - } - } - - // Fix #11356: Clear elements from fragment - if ( tmp ) { - safe.removeChild( tmp ); - } - - // Reset defaultChecked for any radios and checkboxes - // about to be appended to the DOM in IE 6/7 (#8060) - if ( !jQuery.support.appendChecked ) { - jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked ); - } - - i = 0; - while ( (elem = nodes[ i++ ]) ) { - - // #4087 - If origin and destination elements are the same, and this is - // that element, do not do anything - if ( selection && jQuery.inArray( elem, selection ) !== -1 ) { - continue; - } - - contains = jQuery.contains( elem.ownerDocument, elem ); - - // Append to fragment - tmp = getAll( safe.appendChild( elem ), "script" ); - - // Preserve script evaluation history - if ( contains ) { - setGlobalEval( tmp ); - } - - // Capture executables - if ( scripts ) { - j = 0; - while ( (elem = tmp[ j++ ]) ) { - if ( rscriptType.test( elem.type || "" ) ) { - scripts.push( elem ); - } - } - } - } - - tmp = null; - - return safe; - }, - - cleanData: function( elems, /* internal */ acceptData ) { - var elem, type, id, data, - i = 0, - internalKey = jQuery.expando, - cache = jQuery.cache, - deleteExpando = jQuery.support.deleteExpando, - special = jQuery.event.special; - - for ( ; (elem = elems[i]) != null; i++ ) { - - if ( acceptData || jQuery.acceptData( elem ) ) { - - id = elem[ internalKey ]; - data = id && cache[ id ]; - - if ( data ) { - if ( data.events ) { - for ( type in data.events ) { - if ( special[ type ] ) { - jQuery.event.remove( elem, type ); - - // This is a shortcut to avoid jQuery.event.remove's overhead - } else { - jQuery.removeEvent( elem, type, data.handle ); - } - } - } - - // Remove cache only if it was not already removed by jQuery.event.remove - if ( cache[ id ] ) { - - delete cache[ id ]; - - // IE does not allow us to delete expando properties from nodes, - // nor does it have a removeAttribute function on Document nodes; - // we must handle all of these cases - if ( deleteExpando ) { - delete elem[ internalKey ]; - - } else if ( typeof elem.removeAttribute !== core_strundefined ) { - elem.removeAttribute( internalKey ); - - } else { - elem[ internalKey ] = null; - } - - core_deletedIds.push( id ); - } - } - } - } - }, - - _evalUrl: function( url ) { - return jQuery.ajax({ - url: url, - type: "GET", - dataType: "script", - async: false, - global: false, - "throws": true - }); - } -}); -jQuery.fn.extend({ - wrapAll: function( html ) { - if ( jQuery.isFunction( html ) ) { - return this.each(function(i) { - jQuery(this).wrapAll( html.call(this, i) ); - }); - } - - if ( this[0] ) { - // The elements to wrap the target around - var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true); - - if ( this[0].parentNode ) { - wrap.insertBefore( this[0] ); - } - - wrap.map(function() { - var elem = this; - - while ( elem.firstChild && elem.firstChild.nodeType === 1 ) { - elem = elem.firstChild; - } - - return elem; - }).append( this ); - } - - return this; - }, - - wrapInner: function( html ) { - if ( jQuery.isFunction( html ) ) { - return this.each(function(i) { - jQuery(this).wrapInner( html.call(this, i) ); - }); - } - - return this.each(function() { - var self = jQuery( this ), - contents = self.contents(); - - if ( contents.length ) { - contents.wrapAll( html ); - - } else { - self.append( html ); - } - }); - }, - - wrap: function( html ) { - var isFunction = jQuery.isFunction( html ); - - return this.each(function(i) { - jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html ); - }); - }, - - unwrap: function() { - return this.parent().each(function() { - if ( !jQuery.nodeName( this, "body" ) ) { - jQuery( this ).replaceWith( this.childNodes ); - } - }).end(); - } -}); -var iframe, getStyles, curCSS, - ralpha = /alpha\([^)]*\)/i, - ropacity = /opacity\s*=\s*([^)]*)/, - rposition = /^(top|right|bottom|left)$/, - // swappable if display is none or starts with table except "table", "table-cell", or "table-caption" - // see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display - rdisplayswap = /^(none|table(?!-c[ea]).+)/, - rmargin = /^margin/, - rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ), - rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ), - rrelNum = new RegExp( "^([+-])=(" + core_pnum + ")", "i" ), - elemdisplay = { BODY: "block" }, - - cssShow = { position: "absolute", visibility: "hidden", display: "block" }, - cssNormalTransform = { - letterSpacing: 0, - fontWeight: 400 - }, - - cssExpand = [ "Top", "Right", "Bottom", "Left" ], - cssPrefixes = [ "Webkit", "O", "Moz", "ms" ]; - -// return a css property mapped to a potentially vendor prefixed property -function vendorPropName( style, name ) { - - // shortcut for names that are not vendor prefixed - if ( name in style ) { - return name; - } - - // check for vendor prefixed names - var capName = name.charAt(0).toUpperCase() + name.slice(1), - origName = name, - i = cssPrefixes.length; - - while ( i-- ) { - name = cssPrefixes[ i ] + capName; - if ( name in style ) { - return name; - } - } - - return origName; -} - -function isHidden( elem, el ) { - // isHidden might be called from jQuery#filter function; - // in that case, element will be second argument - elem = el || elem; - return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem ); -} - -function showHide( elements, show ) { - var display, elem, hidden, - values = [], - index = 0, - length = elements.length; - - for ( ; index < length; index++ ) { - elem = elements[ index ]; - if ( !elem.style ) { - continue; - } - - values[ index ] = jQuery._data( elem, "olddisplay" ); - display = elem.style.display; - if ( show ) { - // Reset the inline display of this element to learn if it is - // being hidden by cascaded rules or not - if ( !values[ index ] && display === "none" ) { - elem.style.display = ""; - } - - // Set elements which have been overridden with display: none - // in a stylesheet to whatever the default browser style is - // for such an element - if ( elem.style.display === "" && isHidden( elem ) ) { - values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) ); - } - } else { - - if ( !values[ index ] ) { - hidden = isHidden( elem ); - - if ( display && display !== "none" || !hidden ) { - jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) ); - } - } - } - } - - // Set the display of most of the elements in a second loop - // to avoid the constant reflow - for ( index = 0; index < length; index++ ) { - elem = elements[ index ]; - if ( !elem.style ) { - continue; - } - if ( !show || elem.style.display === "none" || elem.style.display === "" ) { - elem.style.display = show ? values[ index ] || "" : "none"; - } - } - - return elements; -} - -jQuery.fn.extend({ - css: function( name, value ) { - return jQuery.access( this, function( elem, name, value ) { - var len, styles, - map = {}, - i = 0; - - if ( jQuery.isArray( name ) ) { - styles = getStyles( elem ); - len = name.length; - - for ( ; i < len; i++ ) { - map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles ); - } - - return map; - } - - return value !== undefined ? - jQuery.style( elem, name, value ) : - jQuery.css( elem, name ); - }, name, value, arguments.length > 1 ); - }, - show: function() { - return showHide( this, true ); - }, - hide: function() { - return showHide( this ); - }, - toggle: function( state ) { - if ( typeof state === "boolean" ) { - return state ? this.show() : this.hide(); - } - - return this.each(function() { - if ( isHidden( this ) ) { - jQuery( this ).show(); - } else { - jQuery( this ).hide(); - } - }); - } -}); - -jQuery.extend({ - // Add in style property hooks for overriding the default - // behavior of getting and setting a style property - cssHooks: { - opacity: { - get: function( elem, computed ) { - if ( computed ) { - // We should always get a number back from opacity - var ret = curCSS( elem, "opacity" ); - return ret === "" ? "1" : ret; - } - } - } - }, - - // Don't automatically add "px" to these possibly-unitless properties - cssNumber: { - "columnCount": true, - "fillOpacity": true, - "fontWeight": true, - "lineHeight": true, - "opacity": true, - "order": true, - "orphans": true, - "widows": true, - "zIndex": true, - "zoom": true - }, - - // Add in properties whose names you wish to fix before - // setting or getting the value - cssProps: { - // normalize float css property - "float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat" - }, - - // Get and set the style property on a DOM Node - style: function( elem, name, value, extra ) { - // Don't set styles on text and comment nodes - if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) { - return; - } - - // Make sure that we're working with the right name - var ret, type, hooks, - origName = jQuery.camelCase( name ), - style = elem.style; - - name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) ); - - // gets hook for the prefixed version - // followed by the unprefixed version - hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ]; - - // Check if we're setting a value - if ( value !== undefined ) { - type = typeof value; - - // convert relative number strings (+= or -=) to relative numbers. #7345 - if ( type === "string" && (ret = rrelNum.exec( value )) ) { - value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) ); - // Fixes bug #9237 - type = "number"; - } - - // Make sure that NaN and null values aren't set. See: #7116 - if ( value == null || type === "number" && isNaN( value ) ) { - return; - } - - // If a number was passed in, add 'px' to the (except for certain CSS properties) - if ( type === "number" && !jQuery.cssNumber[ origName ] ) { - value += "px"; - } - - // Fixes #8908, it can be done more correctly by specifing setters in cssHooks, - // but it would mean to define eight (for every problematic property) identical functions - if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) { - style[ name ] = "inherit"; - } - - // If a hook was provided, use that value, otherwise just set the specified value - if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) { - - // Wrapped to prevent IE from throwing errors when 'invalid' values are provided - // Fixes bug #5509 - try { - style[ name ] = value; - } catch(e) {} - } - - } else { - // If a hook was provided get the non-computed value from there - if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) { - return ret; - } - - // Otherwise just get the value from the style object - return style[ name ]; - } - }, - - css: function( elem, name, extra, styles ) { - var num, val, hooks, - origName = jQuery.camelCase( name ); - - // Make sure that we're working with the right name - name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) ); - - // gets hook for the prefixed version - // followed by the unprefixed version - hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ]; - - // If a hook was provided get the computed value from there - if ( hooks && "get" in hooks ) { - val = hooks.get( elem, true, extra ); - } - - // Otherwise, if a way to get the computed value exists, use that - if ( val === undefined ) { - val = curCSS( elem, name, styles ); - } - - //convert "normal" to computed value - if ( val === "normal" && name in cssNormalTransform ) { - val = cssNormalTransform[ name ]; - } - - // Return, converting to number if forced or a qualifier was provided and val looks numeric - if ( extra === "" || extra ) { - num = parseFloat( val ); - return extra === true || jQuery.isNumeric( num ) ? num || 0 : val; - } - return val; - } -}); - -// NOTE: we've included the "window" in window.getComputedStyle -// because jsdom on node.js will break without it. -if ( window.getComputedStyle ) { - getStyles = function( elem ) { - return window.getComputedStyle( elem, null ); - }; - - curCSS = function( elem, name, _computed ) { - var width, minWidth, maxWidth, - computed = _computed || getStyles( elem ), - - // getPropertyValue is only needed for .css('filter') in IE9, see #12537 - ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined, - style = elem.style; - - if ( computed ) { - - if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) { - ret = jQuery.style( elem, name ); - } - - // A tribute to the "awesome hack by Dean Edwards" - // Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right - // Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels - // this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values - if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) { - - // Remember the original values - width = style.width; - minWidth = style.minWidth; - maxWidth = style.maxWidth; - - // Put in the new values to get a computed value out - style.minWidth = style.maxWidth = style.width = ret; - ret = computed.width; - - // Revert the changed values - style.width = width; - style.minWidth = minWidth; - style.maxWidth = maxWidth; - } - } - - return ret; - }; -} else if ( document.documentElement.currentStyle ) { - getStyles = function( elem ) { - return elem.currentStyle; - }; - - curCSS = function( elem, name, _computed ) { - var left, rs, rsLeft, - computed = _computed || getStyles( elem ), - ret = computed ? computed[ name ] : undefined, - style = elem.style; - - // Avoid setting ret to empty string here - // so we don't default to auto - if ( ret == null && style && style[ name ] ) { - ret = style[ name ]; - } - - // From the awesome hack by Dean Edwards - // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 - - // If we're not dealing with a regular pixel number - // but a number that has a weird ending, we need to convert it to pixels - // but not position css attributes, as those are proportional to the parent element instead - // and we can't measure the parent instead because it might trigger a "stacking dolls" problem - if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) { - - // Remember the original values - left = style.left; - rs = elem.runtimeStyle; - rsLeft = rs && rs.left; - - // Put in the new values to get a computed value out - if ( rsLeft ) { - rs.left = elem.currentStyle.left; - } - style.left = name === "fontSize" ? "1em" : ret; - ret = style.pixelLeft + "px"; - - // Revert the changed values - style.left = left; - if ( rsLeft ) { - rs.left = rsLeft; - } - } - - return ret === "" ? "auto" : ret; - }; -} - -function setPositiveNumber( elem, value, subtract ) { - var matches = rnumsplit.exec( value ); - return matches ? - // Guard against undefined "subtract", e.g., when used as in cssHooks - Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) : - value; -} - -function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) { - var i = extra === ( isBorderBox ? "border" : "content" ) ? - // If we already have the right measurement, avoid augmentation - 4 : - // Otherwise initialize for horizontal or vertical properties - name === "width" ? 1 : 0, - - val = 0; - - for ( ; i < 4; i += 2 ) { - // both box models exclude margin, so add it if we want it - if ( extra === "margin" ) { - val += jQuery.css( elem, extra + cssExpand[ i ], true, styles ); - } - - if ( isBorderBox ) { - // border-box includes padding, so remove it if we want content - if ( extra === "content" ) { - val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles ); - } - - // at this point, extra isn't border nor margin, so remove border - if ( extra !== "margin" ) { - val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles ); - } - } else { - // at this point, extra isn't content, so add padding - val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles ); - - // at this point, extra isn't content nor padding, so add border - if ( extra !== "padding" ) { - val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles ); - } - } - } - - return val; -} - -function getWidthOrHeight( elem, name, extra ) { - - // Start with offset property, which is equivalent to the border-box value - var valueIsBorderBox = true, - val = name === "width" ? elem.offsetWidth : elem.offsetHeight, - styles = getStyles( elem ), - isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box"; - - // some non-html elements return undefined for offsetWidth, so check for null/undefined - // svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285 - // MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668 - if ( val <= 0 || val == null ) { - // Fall back to computed then uncomputed css if necessary - val = curCSS( elem, name, styles ); - if ( val < 0 || val == null ) { - val = elem.style[ name ]; - } - - // Computed unit is not pixels. Stop here and return. - if ( rnumnonpx.test(val) ) { - return val; - } - - // we need the check for style in case a browser which returns unreliable values - // for getComputedStyle silently falls back to the reliable elem.style - valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] ); - - // Normalize "", auto, and prepare for extra - val = parseFloat( val ) || 0; - } - - // use the active box-sizing model to add/subtract irrelevant styles - return ( val + - augmentWidthOrHeight( - elem, - name, - extra || ( isBorderBox ? "border" : "content" ), - valueIsBorderBox, - styles - ) - ) + "px"; -} - -// Try to determine the default display value of an element -function css_defaultDisplay( nodeName ) { - var doc = document, - display = elemdisplay[ nodeName ]; - - if ( !display ) { - display = actualDisplay( nodeName, doc ); - - // If the simple way fails, read from inside an iframe - if ( display === "none" || !display ) { - // Use the already-created iframe if possible - iframe = ( iframe || - jQuery("