on 63edd4b help sign in
177 files changed+4559−3826
since splitsnapshots
unifiedsplit
.azure/azure-linux-template.yml−93 .azure/azure-osx-template.yml−30 .azure/azure-pipelines.yml−30 .azure/azure-windows-template.yml−23 .github/ISSUE_TEMPLATE.md−28 .github/PULL_REQUEST_TEMPLATE.md−14 .gitignore−2 .travis.yml+182 CONTRIBUTING.md−94 LICENSE+1−1 README.md+1−1 auto-update/ChangeLog.md−19 auto-update/Control/Debounce.hs+53−19 auto-update/Control/Debounce/Internal.hs−98 auto-update/Control/Reaper.hs+4−5 auto-update/auto-update.cabal+9−13 auto-update/test/Control/AutoUpdateSpec.hs+25−26 auto-update/test/Control/DebounceSpec.hs−120 auto-update/test/Control/ReaperSpec.hs+27−29 hcar-wai.tex+58 hcar-warp.tex+34 mime-types/ChangeLog.md−8 mime-types/Network/Mime.hs−2 mime-types/mime-types.cabal+1−1 sources.txt+11 stack-lts-11.yaml−27 stack-lts-12.yaml−26 stack-nightly.yaml−20 stack.yaml+12−12 time-manager/time-manager.cabal−19 wai-app-static/ChangeLog.md−29 wai-app-static/Network/Wai/Application/Static.hs+42−48 wai-app-static/Util.hs+1−8 wai-app-static/WaiAppStatic/CmdLine.hs+1−8 wai-app-static/WaiAppStatic/Listing.hs+2−2 wai-app-static/WaiAppStatic/Storage/Embedded/Runtime.hs+3−3 wai-app-static/WaiAppStatic/Storage/Embedded/TH.hs+3−2 wai-app-static/WaiAppStatic/Types.hs+2−3 wai-app-static/test/EmbeddedTestEntries.hs−5 wai-app-static/test/WaiAppEmbeddedTest.hs−9 wai-app-static/test/WaiAppStaticTest.hs+8−19 wai-app-static/wai-app-static.cabal+6−6 wai-conduit/ChangeLog.md−4 wai-conduit/Network/Wai/Conduit.hs+7−6 wai-conduit/example/Main.hs−19 wai-conduit/wai-conduit.cabal+3−2 wai-extra/ChangeLog.md−96 wai-extra/Network/Wai/EventSource.hs+1−24 wai-extra/Network/Wai/EventSource/EventStream.hs+10−9 wai-extra/Network/Wai/Handler/CGI.hs+16−17 wai-extra/Network/Wai/Header.hs+1−1 wai-extra/Network/Wai/Middleware/ForceSSL.hs+8−2 wai-extra/Network/Wai/Middleware/Gzip.hs+13−30 wai-extra/Network/Wai/Middleware/HttpAuth.hs+10−18 wai-extra/Network/Wai/Middleware/Jsonp.hs+7−7 wai-extra/Network/Wai/Middleware/MethodOverride.hs+5−4 wai-extra/Network/Wai/Middleware/RequestLogger.hs+19−68 wai-extra/Network/Wai/Middleware/RequestLogger/JSON.hs+10−48 wai-extra/Network/Wai/Middleware/Rewrite.hs+14−321 wai-extra/Network/Wai/Middleware/Timeout.hs−33 wai-extra/Network/Wai/Parse.hs+13−28 wai-extra/Network/Wai/Test.hs+35−28 wai-extra/Network/Wai/Test/Internal.hs−35 wai-extra/README.md+1−14 wai-extra/app/Main.hs+55 wai-extra/example/index.html → wai-extra/app/index.html+2−3 wai-extra/example/Main.hs−62 wai-extra/test/Network/Wai/Middleware/ForceSSLSpec.hs+5−9 wai-extra/test/Network/Wai/Middleware/TimeoutSpec.hs−57 wai-extra/test/Network/Wai/ParseSpec.hs+5−15 wai-extra/test/Network/Wai/TestSpec.hs+12−46 wai-extra/wai-extra.cabal+11−33 wai-frontend-monadcgi/ChangeLog.md−4 wai-frontend-monadcgi/Network/Wai/Frontend/MonadCGI.hs+1−4 wai-frontend-monadcgi/wai-frontend-monadcgi.cabal+1−1 wai-handler-fastcgi/.gitignore+4 wai-handler-fastcgi/ChangeLog.md+3 time-manager/LICENSE → wai-handler-fastcgi/LICENSE wai-handler-fastcgi/Network/Wai/Handler/FastCGI.hsc+192 wai-handler-fastcgi/README wai-handler-fastcgi/README.md+3 wai-handler-fastcgi/Setup.lhs+7 wai-handler-fastcgi/configure+9 wai-handler-fastcgi/fastcgi.buildinfo.in+3 wai-handler-fastcgi/lighttpd.conf+19 wai-handler-fastcgi/test.hs+19 wai-handler-fastcgi/wai-handler-fastcgi.cabal+31 wai-handler-launch/.gitignore+2 wai-handler-launch/ChangeLog.md+23 wai-handler-launch/LICENSE+20 wai-handler-launch/Network/Wai/Handler/Launch.hs+222 wai-handler-launch/README wai-handler-launch/README.md+4 wai-handler-launch/Setup.lhs+7 wai-handler-launch/runtests.hs+22 wai-handler-launch/test.hs+7 wai-handler-launch/wai-handler-launch.cabal+37 wai-handler-launch/windows.c+12 wai-handler-webkit/.gitignore+2 wai-handler-webkit/ChangeLog.md+3 wai-handler-webkit/LICENSE+20 wai-handler-webkit/Network/Wai/Handler/Webkit.hs+21 wai-handler-webkit/README.md+53 wai-handler-webkit/Setup.lhs+7 wai-handler-webkit/sample.hs+10 wai-handler-webkit/wai-handler-webkit.cabal+30 wai-handler-webkit/webkit.cpp+19 wai-http2-extra/Network/Wai/Middleware/Push/Referer.hs+2−4 wai-http2-extra/wai-http2-extra.cabal+2−9 wai-websockets/ChangeLog.md−12 wai-websockets/Network/Wai/Handler/WebSockets.hs+3−3 wai-websockets/server.lhs+3−9 wai-websockets/wai-websockets.cabal+3−2 wai/ChangeLog.md−14 wai/Network/Wai.hs+21−20 wai/Network/Wai/Internal.hs+7−10 wai/README.md+1−1 wai/test/Network/WaiSpec.hs+9−7 wai/wai.cabal+10−8 wai/webkit-sample/webkit-sample.hs+2−2 warp-tls/ChangeLog.md−47 warp-tls/Network/Wai/Handler/WarpTLS.hs+59−103 warp-tls/warp-tls.cabal+6−14 warp/ChangeLog.md−188 warp/Network/Wai/Handler/Warp.hs+8−87 warp/Network/Wai/Handler/Warp/Buffer.hs+2−4 warp/Network/Wai/Handler/Warp/Conduit.hs+6−2 warp/Network/Wai/Handler/Warp/Counter.hs+4−3 warp/Network/Wai/Handler/Warp/Date.hs+4−1 warp/Network/Wai/Handler/Warp/FdCache.hs+27−20 warp/Network/Wai/Handler/Warp/File.hs+59−15 warp/Network/Wai/Handler/Warp/FileInfoCache.hs+26−23 warp/Network/Wai/Handler/Warp/HTTP2.hs+56−72 warp/Network/Wai/Handler/Warp/HTTP2/EncodeFrame.hs+35 warp/Network/Wai/Handler/Warp/HTTP2/File.hs+185−23 warp/Network/Wai/Handler/Warp/HTTP2/HPACK.hs+99 warp/Network/Wai/Handler/Warp/HTTP2/Manager.hs+97 warp/Network/Wai/Handler/Warp/HTTP2/PushPromise.hs−36 warp/Network/Wai/Handler/Warp/HTTP2/Receiver.hs+384 warp/Network/Wai/Handler/Warp/HTTP2/Request.hs+33−32 warp/Network/Wai/Handler/Warp/HTTP2/Response.hs−127 warp/Network/Wai/Handler/Warp/HTTP2/Sender.hs+541 warp/Network/Wai/Handler/Warp/HTTP2/Types.hs+267−16 warp/Network/Wai/Handler/Warp/HTTP2/Worker.hs+319 warp/Network/Wai/Handler/Warp/HashMap.hs+16−26 warp/Network/Wai/Handler/Warp/Header.hs−3 warp/Network/Wai/Handler/Warp/IO.hs+1−2 warp/Network/Wai/Handler/Warp/IORef.hs+26 warp/Network/Wai/Handler/Warp/Imports.hs−27 warp/Network/Wai/Handler/Warp/Internal.hs+2−7 warp/Network/Wai/Handler/Warp/MultiMap.hs+43−64 warp/Network/Wai/Handler/Warp/PackInt.hs+6−6 warp/Network/Wai/Handler/Warp/ReadInt.hs+2−2 warp/Network/Wai/Handler/Warp/Recv.hs+17−44 warp/Network/Wai/Handler/Warp/Request.hs+38−48 warp/Network/Wai/Handler/Warp/RequestHeader.hs+6−5 warp/Network/Wai/Handler/Warp/Response.hs+64−41 warp/Network/Wai/Handler/Warp/ResponseHeader.hs+5−3 warp/Network/Wai/Handler/Warp/Run.hs+95−188 warp/Network/Wai/Handler/Warp/SendFile.hs+8−4 warp/Network/Wai/Handler/Warp/Settings.hs+19−60 warp/Network/Wai/Handler/Warp/Some.hs+73 time-manager/System/TimeManager.hs → warp/Network/Wai/Handler/Warp/Timeout.hs+8−11 warp/Network/Wai/Handler/Warp/Types.hs+34−34 warp/Network/Wai/Handler/Warp/Windows.hs+1−5 warp/Network/Wai/Handler/Warp/WithApplication.hs+12−10 warp/bench/Parser.hs+10−15 warp/test/ExceptionSpec.hs+13−13 warp/test/FdCacheSpec.hs+1−1 warp/test/FileSpec.hs+1−1 warp/test/HTTP.hs+28−26 warp/test/RequestSpec.hs+7−11 warp/test/ResponseHeaderSpec.hs+5−25 warp/test/ResponseSpec.hs+23−15 warp/test/RunSpec.hs+86−136 warp/test/WithApplicationSpec.hs+16−16 warp/warp.cabal+51−113
.azure/azure-linux-template.ymldeleted−93
@@ -1,93 +0,0 @@
1−jobs:
2−- job: ${{ parameters.name }}
3− timeoutInMinutes: 180
4− pool:
5− vmImage: ${{ parameters.vmImage }}
6− strategy:
7− matrix:
8− stack-lts-11:
9− BUILD: stack
10− STACK_YAML: stack-lts-11.yaml
11− ARGS: "--resolver lts-11"
12− stack-lts-12:
13− BUILD: stack
14− STACK_YAML: stack-lts-12.yaml
15− ARGS: "--resolver lts-12"
16− stack-lts-14:
17− BUILD: stack
18− ARGS: "--resolver lts-14"
19− stack-nightly:
20− BUILD: stack
21− STACK_YAML: stack-nightly.yaml
22− ARGS: "--resolver nightly"
23− cabal-8.2.2:
24− BUILD: cabal
25− GHCVER: 8.4.4
26− CABALVER: 2.0
27− cabal-8.4.4:
28− BUILD: cabal
29− GHCVER: 8.4.4
30− CABALVER: 2.2
31− cabal-8.6.5:
32− BUILD: cabal
33− GHCVER: 8.6.5
34− CABALVER: 2.4
35− maxParallel: 6
36− steps:
37− - script: |
38− export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root;
39− mkdir -p ~/.local/bin
40− curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
41− case "$BUILD" in
42− cabal)
43− sudo add-apt-repository -y ppa:hvr/ghc
44− sudo apt-get update
45− sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER
46− # See note here: https://github.com/haskell-CI/haskell-ci#alex--happy-with-ghc--78
47− if [ "$GHCVER" = "head" ] || [ "${GHCVER%.*}" = "7.8" ] || [ "${GHCVER%.*}" = "7.10" ]; then
48− sudo apt-get install happy-1.19.4 alex-3.1.3
49− export PATH=/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:$PATH
50− else
51− sudo apt-get install happy alex
52− fi
53− export PATH=$HOME/.local/bin:/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
54− cabal --version
55− cabal update
56− PACKAGES=$(stack --install-ghc query locals | grep '^ *path' | sed 's@^ *path:@@')
57− cabal install --only-dependencies --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1 $CABALARGS $PACKAGES
58− ;;
59− *)
60− export PATH=$HOME/.local/bin:$PATH
61− stack --install-ghc $ARGS test --bench --only-dependencies
62− ;;
63− esac
64− set -ex
65− case "$BUILD" in
66− cabal)
67− cabal install --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1 $CABALARGS $PACKAGES
68−
69− ORIGDIR=$(pwd)
70− for dir in $PACKAGES
71− do
72− cd $dir
73− cabal check || [ "$CABALVER" == "1.22" ] # https://github.com/yesodweb/wai/pull/754#issuecomment-504866279
74− cabal sdist
75− PKGVER=$(cabal info . | awk '{print $2;exit}')
76− SRC_TGZ=$PKGVER.tar.gz
77− cd dist
78− tar zxfv "$SRC_TGZ"
79− cd "$PKGVER"
80− cabal configure --enable-tests --ghc-options -O0
81− cabal build
82− cabal test --show-details=streaming
83− cd $ORIGDIR
84− done
85− ;;
86− *)
87− stack $ARGS test --bench --no-run-benchmarks --haddock --no-haddock-deps
88− ;;
89− esac
90− set +ex
91− env:
92− OS_NAME: ${{ parameters.os }}
93− displayName: 'Installation ${{parameters.os}} & Test'
.azure/azure-osx-template.ymldeleted−30
@@ -1,30 +0,0 @@
1−jobs:
2−- job: ${{ parameters.name }}
3− timeoutInMinutes: 180
4− pool:
5− vmImage: ${{ parameters.vmImage }}
6− strategy:
7− matrix:
8− stack-lts-11:
9− BUILD: stack
10− STACK_YAML: stack-lts-11.yaml
11− ARGS: "--resolver lts-11"
12− stack-lts-12:
13− BUILD: stack
14− STACK_YAML: stack-lts-12.yaml
15− ARGS: "--resolver lts-12"
16− stack-lts-14:
17− BUILD: stack
18− ARGS: "--resolver lts-14"
19− maxParallel: 3
20− steps:
21− - script: |
22− export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root;
23− mkdir -p ~/.local/bin
24− curl -skL https://get.haskellstack.org/stable/osx-x86_64.tar.gz | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin;
25− export PATH=$HOME/.local/bin:$PATH
26− stack --install-ghc $ARGS test --bench --only-dependencies
27− stack $ARGS test --bench --no-run-benchmarks --haddock --no-haddock-deps
28− env:
29− OS_NAME: ${{ parameters.os }}
30− displayName: 'Installation ${{parameters.os}} & Test'
.azure/azure-pipelines.ymldeleted−30
@@ -1,30 +0,0 @@
1−# This is the complex Azure configuration, which is intended for use
2−# on open source libraries which need compatibility across multiple GHC
3−# versions, must work with cabal-install, and should be
4−# cross-platform. For more information and other options, see:
5−#
6−# https://docs.haskellstack.org/en/stable/azure_ci/
7−#
8−# Copy these contents into the root directory of your Github project in a file
9−# named azure-pipelines.yml
10−#
11−# For better organization, you split various jobs into seprate parts
12−# and each of them are controlled via individual file.
13−jobs:
14−- template: azure-linux-template.yml
15− parameters:
16− name: Linux
17− vmImage: ubuntu-16.04
18− os: linux
19−
20−- template: azure-osx-template.yml
21− parameters:
22− name: macOS
23− vmImage: macOS-10.13
24− os: osx
25−
26−- template: azure-windows-template.yml
27− parameters:
28− name: Windows
29− vmImage: vs2017-win2016
30− os: windows
.azure/azure-windows-template.ymldeleted−23
@@ -1,23 +0,0 @@
1−jobs:
2−- job: ${{ parameters.name }}
3− timeoutInMinutes: 180
4− pool:
5− vmImage: ${{ parameters.vmImage }}
6− strategy:
7− matrix:
8− stack-lts-14:
9− BUILD: stack
10− ARGS: "--resolver lts-14"
11− maxParallel: 3
12− steps:
13− - bash: |
14− export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root;
15− curl -sSkL http://www.stackage.org/stack/windows-x86_64 -o /usr/bin/stack.zip
16− unzip -o /usr/bin/stack.zip -d /usr/bin/
17− stack setup $ARGS > /dev/null
18− stack --install-ghc $ARGS test --bench --only-dependencies
19− stack $ARGS test --bench --no-run-benchmarks --no-run-tests
20− stack $ARGS test --bench --no-run-benchmarks --jobs 1 # non-parallel test execution
21− env:
22− OS_NAME: ${{ parameters.os }}
23− displayName: 'Installation ${{parameters.os}} & Test'
.github/ISSUE_TEMPLATE.mddeleted−28
@@ -1,28 +0,0 @@
1−<!---
2−
3−### Bug Reports
4−
5−Reporting a bug? If relevant, we recommend including:
6−
7−* Your OS name and version
8−* The versions of tools you're using (e.g. `stack`, `ghc`).
9−* The versions of dependencies you're using
10−
11−For your convenience, we recommend pasting this script into bash and uploading the output [as a gist](https://gist.github.com/).
12−
13−```
14−command -v sw_vers && sw_vers # OS X only
15−command -v uname && uname -a # Kernel version
16−command -v stack && stack --version
17−command -v stack && stack ghc -- --version
18−command -v stack && stack list-dependencies
19−```
20−
21−* Also, is there anything custom or unusual about your setup? i.e. new or prerelease versions of GHC, Stack, etc.
22−
23−* Finally, if possible, please reproduce the error in a small script, or if necessary create a new Github repo with the smallest possible reproducing case. [Stack's scripting support](https://docs.haskellstack.org/en/stable/GUIDE/#script-interpreter) might be useful for creating your reproduction example.
24−
25−### Support
26−
27−Please direct support questions to [Stack Overflow](https://stackoverflow.com/questions/tagged/yesod+haskell) or the [Yesod Google Group](https://groups.google.com/forum/#!forum/yesodweb). If you don't get a response there, or you suspect there may be a bug in Wai causing your problem, you're welcome to ask here.
28−-->
.github/PULL_REQUEST_TEMPLATE.mddeleted−14
@@ -1,14 +0,0 @@
1−Before submitting your PR, check that you've:
2−
3−- [ ] Bumped the version number
4−- [ ] Documented new APIs with [Haddock markup](https://www.haskell.org/haddock/doc/html/index.html)
5−- [ ] Added [`@since` declarations](http://haskell-haddock.readthedocs.io/en/latest/markup.html#since) to the Haddock
6−
7−After submitting your PR:
8−
9−- [ ] Update the Changelog.md file with a link to your PR
10−- [ ] Check that CI passes (or if it fails, for reasons unrelated to your change, like CI timeouts)
11−
12−<!---Thanks so much for contributing! :)
13−
14−_If these checkboxes don't apply to your PR, you can delete them_-->
.gitignore−2
@@ -8,5 +8,3 @@ tarballs/
88.cabal-sandbox/
99cabal.sandbox.config
1010.stack-work/
11−*~
12−stack*.yaml.lock
.travis.ymlnew file+182
@@ -0,0 +1,182 @@
1+# Copy these contents into the root directory of your Github project in a file
2+# named .travis.yml
3+
4+# Use new container infrastructure to enable caching
5+sudo: false
6+
7+# Choose a lightweight base image; we provide our own build tools.
8+language: c
9+
10+# Caching so the next build will be fast too.
11+cache:
12+ directories:
13+ - $HOME/.ghc
14+ - $HOME/.cabal
15+ - $HOME/.stack
16+
17+# The different configurations we want to test. We have BUILD=cabal which uses
18+# cabal-install, and BUILD=stack which uses Stack. More documentation on each
19+# of those below.
20+#
21+# We set the compiler values here to tell Travis to use a different
22+# cache file per set of arguments.
23+#
24+# If you need to have different apt packages for each combination in the
25+# matrix, you can use a line such as:
26+# addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
27+matrix:
28+ include:
29+ # We grab the appropriate GHC and cabal-install versions from hvr's PPA. See:
30+ # https://github.com/hvr/multi-ghc-travis
31+ - env: BUILD=cabal GHCVER=7.6.3 CABALVER=1.22 HAPPYVER=1.19.5 ALEXVER=3.1.7
32+ compiler: ": #GHC 7.6.3"
33+ addons: {apt: {packages: [libfcgi-dev,cabal-install-1.22,ghc-7.6.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
34+ - env: BUILD=cabal GHCVER=7.8.4 CABALVER=1.18 HAPPYVER=1.19.5 ALEXVER=3.1.7
35+ compiler: ": #GHC 7.8.4"
36+ addons: {apt: {packages: [libfcgi-dev,cabal-install-1.18,ghc-7.8.4,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
37+ - env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22 HAPPYVER=1.19.5 ALEXVER=3.1.7
38+ compiler: ": #GHC 7.10.3"
39+ addons: {apt: {packages: [libfcgi-dev,cabal-install-1.22,ghc-7.10.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
40+
41+ # Build with the newest GHC and cabal-install. This is an accepted failure,
42+ # see below.
43+ - env: BUILD=cabal GHCVER=head CABALVER=head HAPPYVER=1.19.5 ALEXVER=3.1.7
44+ compiler: ": #GHC HEAD"
45+ addons: {apt: {packages: [libfcgi-dev,cabal-install-head,ghc-head,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
46+
47+ # The Stack builds. We can pass in arbitrary Stack arguments via the ARGS
48+ # variable, such as using --stack-yaml to point to a different file.
49+ - env: BUILD=stack ARGS=""
50+ compiler: ": #stack default"
51+ addons: {apt: {packages: [libfcgi-dev,ghc-7.10.3], sources: [hvr-ghc]}}
52+
53+ #- env: BUILD=stack ARGS="--resolver lts-2"
54+ # compiler: ": #stack 7.8.4"
55+ # addons: {apt: {packages: [libfcgi-dev,ghc-7.8.4], sources: [hvr-ghc]}}
56+
57+ - env: BUILD=stack ARGS="--resolver lts-3"
58+ compiler: ": #stack 7.10.2"
59+ addons: {apt: {packages: [libfcgi-dev,ghc-7.10.2], sources: [hvr-ghc]}}
60+
61+ - env: BUILD=stack ARGS="--resolver lts-5"
62+ compiler: ": #stack 7.10.3"
63+ addons: {apt: {packages: [libfcgi-dev,ghc-7.10.3], sources: [hvr-ghc]}}
64+
65+ # Nightly builds are allowed to fail
66+ - env: BUILD=stack ARGS="--resolver nightly"
67+ compiler: ": #stack nightly"
68+ addons: {apt: {packages: [libfcgi-dev,libgmp,libgmp-dev]}}
69+
70+ # Build on OS X in addition to Linux
71+ - env: BUILD=stack ARGS=""
72+ compiler: ": #stack default osx"
73+ os: osx
74+
75+ #- env: BUILD=stack ARGS="--resolver lts-2"
76+ # compiler: ": #stack 7.8.4 osx"
77+ # os: osx
78+
79+ - env: BUILD=stack ARGS="--resolver lts-3"
80+ compiler: ": #stack 7.10.2 osx"
81+ os: osx
82+
83+ - env: BUILD=stack ARGS="--resolver lts-5"
84+ compiler: ": #stack 7.10.3 osx"
85+ os: osx
86+
87+ - env: BUILD=stack ARGS="--resolver nightly"
88+ compiler: ": #stack nightly osx"
89+ os: osx
90+
91+ allow_failures:
92+ - env: BUILD=cabal GHCVER=head CABALVER=head HAPPYVER=1.19.5 ALEXVER=3.1.7
93+ - env: BUILD=stack ARGS="--resolver nightly"
94+
95+before_install:
96+# Using compiler above sets CC to an invalid value, so unset it
97+- unset CC
98+
99+# We want to always allow newer versions of packages when building on GHC HEAD
100+- CABALARGS=""
101+- if [ "x$GHCVER" = "xhead" ]; then CABALARGS=--allow-newer; fi
102+# Due to https://github.com/haskell/cabal/issues/3453, we don't build benchmarks on GHC 7.6.3
103+- if [ "x$GHCVER" != "x7.6.3" ]; then CABALARGS="$CABALARGS --enable-benchmarks"; fi
104+
105+# Download and unpack the stack executable
106+- export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$HOME/.local/bin:/opt/alex/$ALEXVER/bin:/opt/happy/$HAPPYVER/bin:$HOME/.cabal/bin:$PATH
107+- mkdir -p ~/.local/bin
108+- |
109+ if [ `uname` = "Darwin" ]
110+ then
111+ travis_retry curl --insecure -L https://www.stackage.org/stack/osx-x86_64 | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin
112+
113+ # brew no longer has fcgi
114+ # brew install fcgi
115+ grep -v wai-handler-fastcgi < stack.yaml > tmp
116+ mv tmp stack.yaml
117+ else
118+ travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
119+ fi
120+
121+ # Use the more reliable S3 mirror of Hackage
122+ mkdir -p $HOME/.cabal
123+ echo 'remote-repo: hackage.haskell.org:http://hackage.fpcomplete.com/' > $HOME/.cabal/config
124+ echo 'remote-repo-cache: $HOME/.cabal/packages' >> $HOME/.cabal/config
125+
126+ if [ "$CABALVER" != "1.16" ]
127+ then
128+ echo 'jobs: $ncpus' >> $HOME/.cabal/config
129+ fi
130+
131+# Get the list of packages from the stack.yaml file
132+- PACKAGES=$(stack --install-ghc query locals | grep '^ *path' | sed 's@^ *path:@@')
133+
134+install:
135+- echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
136+- if [ -f configure.ac ]; then autoreconf -i; fi
137+- |
138+ set -ex
139+ case "$BUILD" in
140+ stack)
141+ stack --no-terminal --install-ghc $ARGS test --only-dependencies
142+ ;;
143+ cabal)
144+ cabal --version
145+ travis_retry cabal update
146+
147+ # Due to dependency on wai-logger (which depends on some packages here),
148+ # we can't build just dependencies
149+ #
150+ # cabal install --only-dependencies --enable-tests --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1 $CABALARGS $PACKAGES
151+ cabal install hspec-discover
152+ ;;
153+ esac
154+ set +ex
155+
156+script:
157+- |
158+ set -ex
159+ case "$BUILD" in
160+ stack)
161+ stack --no-terminal $ARGS test --haddock --no-haddock-deps
162+ ;;
163+ cabal)
164+ cabal install --enable-tests --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1 $CABALARGS $PACKAGES
165+
166+ ORIGDIR=$(pwd)
167+ for dir in $PACKAGES
168+ do
169+ cd $dir
170+ cabal check || [ "$CABALVER" == "1.16" ]
171+ cabal sdist
172+ NAMEVER=$(cabal info . | awk '{print $2;exit}')
173+ SRC_TGZ=dist/$NAMEVER.tar.gz
174+ tar zxf $SRC_TGZ
175+ cd $NAMEVER
176+ cabal configure --enable-tests
177+ cabal build
178+ cd $ORIGDIR
179+ done
180+ ;;
181+ esac
182+ set +ex
CONTRIBUTING.mddeleted−94
@@ -1,94 +0,0 @@
1−# Contributing
2−
3−Thanks for your interest in contributing to Wai! This file has some tips for developing Wai and getting a pull request accepted.
4−
5−## Development
6−
7−Wai is a mega-repo that contains many Haskell packages, each in a different directory. All the subprojects can be developed with Stack, using `stack <command> <subproject>`, e.g.
8−
9−* `stack build mime-types`
10−* `stack test auto-update`
11−* `stack haddock warp`
12−
13−If you'd like to test your changes in a full-fledged Wai app, you can use Stack to build against it, e.g.:
14−
15−```
16−packages:
17−- '/path/to/this/repo/wai'
18−```
19−
20−## Coding Guidelines
21−
22−### Safety
23−
24−Avoid partial functions. Even if you know the partial function is safe in your instance, partial functions require more reasoning from the programmer and are not resilient to refactoring. For the rare cases where a partial function is appropriate, a custom `error` should be used.
25−
26−### Style
27−
28−Keep coding style consistent with the rest of the file, but don't worry about style too much otherwise. PRs changing code style are viewed skeptically.
29−
30−### Dependencies
31−
32−Avoid adding unnecessary dependencies. If a dependency provides only a minor convenience for your implementation, it's probably better to skip it.
33−
34−If you do add a new dependency, try to support a wide range of versions of it.
35−
36−### Backwards Compatibility
37−
38−Backwards incompatible changes are viewed skeptically—best to ask in an issue to see if a particular backwards incompatible change would be approved. If possible keep backwards compatibility by adding new APIs and deprecating old ones.
39−
40−Keep backwards compatibility with old versions of dependencies when possible.
41−
42−## PR Guidelines
43−
44−### PR Scope
45−
46−As much as possible, keep separate changes in separate PRs.
47−
48−### Testing
49−
50−Tests are recommended, but not required.
51−
52−### Documentation
53−
54−All public APIs must be documented. Documenting private functions is optional, but may be nice depending on their complexity. Example documentation:
55−
56−```
57−-- | Generate an action which will either read from an automatically
58−-- updated value, or run the update action in the current thread.
59−--
60−-- ==== __Examples__
61−--
62−-- > getTime <- mkAutoUpdate defaultUpdateSettings
63−--
64−-- @since 0.1.0
65−mkAutoUpdate :: UpdateSettings a -> IO (IO a)
66−```
67−
68−Examples are recommended, but not required, in documentation. Marking new APIs with `@since <version number>` is required.
69−
70−### Versioning
71−
72−Wai packages roughly follow the Haskell Package Versioning Policy style of A.B.C.[D] (MAJOR.MAJOR.MINOR.[PATCH])
73−
74−* A - Used for massive changes in the library. (Example: 1.2.3.4 becomes 2.0.0)
75−* B - Used for smaller breaking changes, like removing, renaming, or changing behavior of existing public API. (Example: 1.2.3.4 becomes 1.3.0)
76−* C - Used for new public APIs (Example: 1.2.3.4 becomes 1.2.4)
77−* D - Used for bug fixes (Example: 1.2.3.4 becomes 1.2.3.5).
78− * D is optional in the version number, so 2.0.0 is a valid version.
79−
80−Documentation changes don't require a new version.
81−
82−If you feel there is ambiguity to a change (e.g. fixing a bug in a function, when people may be relying on the old broken behavior), you can ask in an issue or pull request.
83−
84−Unlike in the Package Versioning Policy, deprecations are not counted as MAJOR changes.
85−
86−In some cases, dropping compatibility with a major version of a dependency (e.g. changing from transformers >= 0.3 to transformers >= 0.4), is considered a breaking change.
87−
88−### Changelog
89−
90−After you submit a PR, update the subproject's Changelog.md file with the new version number and a link to your PR. If your PR does not need to bump the version number, include the change in an "Unreleased" section at the top.
91−
92−### Releases
93−
94−Releases should be done as soon as possible after a pull request is merged—don't be shy about reminding us to make a release if we forget.
LICENSE+1−1
@@ -1,4 +1,4 @@
1−Copyright (c) 2012-2017 Michael Snoyman, http://www.yesodweb.com/
1+Copyright (c) 2012 Michael Snoyman, http://www.yesodweb.com/
22
33Permission is hereby granted, free of charge, to any person obtaining
44a copy of this software and associated documentation files (the
README.md+1−1
@@ -10,4 +10,4 @@ Code can be written that works with any web framework targeting WAI.
1010
1111[Haddock Documentation](http://hackage.haskell.org/package/wai)
1212
13−[![Build Status](https://dev.azure.com/yesodweb/wai/_apis/build/status/yesodweb.wai?branchName=master)](https://dev.azure.com/yesodweb/wai/_build/latest?definitionId=1&branchName=master)
13+[![Build Status](https://travis-ci.org/yesodweb/wai.svg?branch=master)](https://travis-ci.org/yesodweb/wai)
auto-update/ChangeLog.md−19
@@ -1,22 +1,3 @@
1−# ChangeLog for auto-update
2−
3−## 0.1.6
4−
5−* Add control of activation on leading vs. trailing edges for Control.Debounce
6− [#756](https://github.com/yesodweb/wai/pull/756)
7−
8−## 0.1.5
9−
10−* Using the Strict and StrictData language extensions for GHC >8.
11− [#752](https://github.com/yesodweb/wai/pull/752)
12−
13−## 0.1.4.1
14−
15−* [#693](https://github.com/yesodweb/wai/pull/693):
16− Improve documentation for `reaperAction` function.
17−* [#732](https://github.com/yesodweb/wai/pull/732):
18− Fixed memory leak in `reaperAdd` function.
19−
201## 0.1.4
212
223* Provide updateActionModify API in AutoUpdate [#547](https://github.com/yesodweb/wai/pull/547)
auto-update/Control/Debounce.hs+53−19
@@ -11,7 +11,6 @@
1111-- printString <- 'mkDebounce' 'defaultDebounceSettings'
1212-- { 'debounceAction' = putStrLn "Running action"
1313-- , 'debounceFreq' = 5000000 -- 5 seconds
14−-- , 'debounceEdge' = 'DI.trailingEdge' -- Trigger on the trailing edge
1514-- }
1615-- @
1716--
@@ -26,35 +25,70 @@
2625-- @since 0.1.2
2726module Control.Debounce
2827 ( -- * Type
29− DI.DebounceSettings
28+ DebounceSettings
3029 , defaultDebounceSettings
3130 -- * Accessors
32− , DI.debounceFreq
33− , DI.debounceAction
34− , DI.debounceEdge
35− , DI.leadingEdge
36− , DI.trailingEdge
31+ , debounceFreq
32+ , debounceAction
3733 -- * Creation
3834 , mkDebounce
3935 ) where
4036
41−import Control.Concurrent (newEmptyMVar, threadDelay)
42−import qualified Control.Debounce.Internal as DI
37+import Control.Concurrent (forkIO, threadDelay)
38+import Control.Concurrent.MVar (newEmptyMVar, takeMVar, tryPutMVar)
39+import Control.Exception (SomeException, handle, mask_)
40+import Control.Monad (forever, void)
41+
42+-- | Settings to control how debouncing should work.
43+--
44+-- This should be constructed using 'defaultDebounceSettings' and record
45+-- update syntax, e.g.:
46+--
47+-- @
48+-- let settings = 'defaultDebounceSettings' { 'debounceAction' = flushLog }
49+-- @
50+--
51+-- @since 0.1.2
52+data DebounceSettings = DebounceSettings
53+ { debounceFreq :: Int
54+ -- ^ Microseconds lag required between subsequence calls to the debounced
55+ -- action.
56+ --
57+ -- Default: 1 second (1000000)
58+ --
59+ -- @since 0.1.2
60+ , debounceAction :: IO ()
61+ -- ^ Action to be performed.
62+ --
63+ -- Note: all exceptions thrown by this action will be silently discarded.
64+ --
65+ -- Default: does nothing.
66+ --
67+ -- @since 0.1.2
68+ }
4369
4470-- | Default value for creating a 'DebounceSettings'.
4571--
4672-- @since 0.1.2
47−defaultDebounceSettings :: DI.DebounceSettings
48−defaultDebounceSettings = DI.DebounceSettings
49− { DI.debounceFreq = 1000000
50− , DI.debounceAction = return ()
51− , DI.debounceEdge = DI.leadingEdge
73+defaultDebounceSettings :: DebounceSettings
74+defaultDebounceSettings = DebounceSettings
75+ { debounceFreq = 1000000
76+ , debounceAction = return ()
5277 }
5378
54−-- | Generate an action which will trigger the debounced action to be performed.
79+-- | Generate an action which will trigger the debounced action to be
80+-- performed. The action will either be performed immediately, or after the
81+-- current cooldown period has expired.
5582--
5683-- @since 0.1.2
57−mkDebounce :: DI.DebounceSettings -> IO (IO ())
58−mkDebounce settings = do
59− baton <- newEmptyMVar
60− DI.mkDebounceInternal baton threadDelay settings
84+mkDebounce :: DebounceSettings -> IO (IO ())
85+mkDebounce (DebounceSettings freq action) = do
86+ baton <- newEmptyMVar
87+ mask_ $ void $ forkIO $ forever $ do
88+ takeMVar baton
89+ ignoreExc action
90+ threadDelay freq
91+ return $ void $ tryPutMVar baton ()
92+
93+ignoreExc :: IO () -> IO ()
94+ignoreExc = handle $ \(_ :: SomeException) -> return ()
auto-update/Control/Debounce/Internal.hsdeleted−98
@@ -1,98 +0,0 @@
1−{-# LANGUAGE ScopedTypeVariables #-}
2−
3−-- | Unstable API which exposes internals for testing.
4−module Control.Debounce.Internal (
5− DebounceSettings(..)
6− , DebounceEdge(..)
7− , leadingEdge
8− , trailingEdge
9− , mkDebounceInternal
10− ) where
11−
12−import Control.Concurrent (forkIO)
13−import Control.Concurrent.MVar (takeMVar, tryPutMVar, tryTakeMVar, MVar)
14−import Control.Exception (SomeException, handle, mask_)
15−import Control.Monad (forever, void)
16−
17−-- | Settings to control how debouncing should work.
18−--
19−-- This should be constructed using 'defaultDebounceSettings' and record
20−-- update syntax, e.g.:
21−--
22−-- @
23−-- let settings = 'defaultDebounceSettings' { 'debounceAction' = flushLog }
24−-- @
25−--
26−-- @since 0.1.2
27−data DebounceSettings = DebounceSettings
28− { debounceFreq :: Int
29− -- ^ Length of the debounce timeout period in microseconds.
30− --
31− -- Default: 1 second (1000000)
32− --
33− -- @since 0.1.2
34− , debounceAction :: IO ()
35− -- ^ Action to be performed.
36− --
37− -- Note: all exceptions thrown by this action will be silently discarded.
38− --
39− -- Default: does nothing.
40− --
41− -- @since 0.1.2
42− , debounceEdge :: DebounceEdge
43− -- ^ Whether to perform the action on the leading edge or trailing edge of
44− -- the timeout.
45− --
46− -- Default: 'trailingEdge'.
47− --
48− -- @since 0.1.6
49− }
50−
51−-- | Setting to control whether the action happens at the leading and/or trailing
52−-- edge of the timeout.
53−--
54−-- @since 0.1.6
55−data DebounceEdge =
56− Leading
57− -- ^ Perform the action immediately, and then begin a cooldown period.
58− -- If the trigger happens again during the cooldown, wait until the end of the cooldown
59− -- and then perform the action again, then enter a new cooldown period.
60− | Trailing
61− -- ^ Start a cooldown period and perform the action when the period ends. If another trigger
62− -- happens during the cooldown, it has no effect.
63− deriving (Show, Eq)
64−
65−
66−-- | Perform the action immediately, and then begin a cooldown period.
67−-- If the trigger happens again during the cooldown, wait until the end of the cooldown
68−-- and then perform the action again, then enter a new cooldown period.
69−--
70−-- @since 0.1.6
71−leadingEdge :: DebounceEdge
72−leadingEdge = Leading
73−
74−-- | Start a cooldown period and perform the action when the period ends. If another trigger
75−-- happens during the cooldown, it has no effect.
76−--
77−-- @since 0.1.6
78−trailingEdge :: DebounceEdge
79−trailingEdge = Trailing
80−
81−mkDebounceInternal :: MVar () -> (Int -> IO ()) -> DebounceSettings -> IO (IO ())
82−mkDebounceInternal baton delayFn (DebounceSettings freq action edge) = do
83− mask_ $ void $ forkIO $ forever $ do
84− takeMVar baton
85− case edge of
86− Leading -> do
87− ignoreExc action
88− delayFn freq
89− Trailing -> do
90− delayFn freq
91− -- Empty the baton of any other activations during the interval
92− void $ tryTakeMVar baton
93− ignoreExc action
94−
95− return $ void $ tryPutMVar baton ()
96−
97−ignoreExc :: IO () -> IO ()
98−ignoreExc = handle $ \(_ :: SomeException) -> return ()
auto-update/Control/Reaper.hs+4−5
@@ -49,9 +49,8 @@ data ReaperSettings workload item = ReaperSettings
4949 -- ^ The action to perform on a workload. The result of this is a
5050 -- \"workload modifying\" function. In the common case of using lists,
5151 -- the result should be a difference list that prepends the remaining
52− -- workload to the temporary workload. The temporary workload here
53− -- refers to items added to the workload while the reaper action is
54− -- running. For help with setting up such an action, see 'mkListAction'.
52+ -- workload to the temporary workload. For help with setting up such
53+ -- an action, see 'mkListAction'.
5554 --
5655 -- Default: do nothing with the workload, and then prepend it to the
5756 -- temporary workload. This is incredibly useless; you should
@@ -113,7 +112,7 @@ data Reaper workload item = Reaper {
113112
114113-- | State of reaper.
115114data State workload = NoReaper -- ^ No reaper thread
116− | Workload !workload -- ^ The current jobs
115+ | Workload workload -- ^ The current jobs
117116
118117-- | Create a reaper addition function. This function can be used to add
119118-- new items to the workload. Spawning of reaper threads will be handled
@@ -154,7 +153,7 @@ add settings@ReaperSettings{..} stateRef tidRef item =
154153 next <- atomicModifyIORef' stateRef cons
155154 next
156155 where
157− cons NoReaper = let wl = reaperCons item reaperEmpty
156+ cons NoReaper = let !wl = reaperCons item reaperEmpty
158157 in (Workload wl, spawn settings stateRef tidRef)
159158 cons (Workload wl) = let wl' = reaperCons item wl
160159 in (Workload wl', return ())
auto-update/auto-update.cabal+9−13
@@ -1,5 +1,5 @@
11name: auto-update
2−version: 0.1.6
2+version: 0.1.4
33synopsis: Efficiently run periodic, on-demand actions
44description: API docs and the README are available at <http://www.stackage.org/package/auto-update>.
55homepage: https://github.com/yesodweb/wai
@@ -17,22 +17,18 @@ library
1717 ghc-options: -Wall
1818 exposed-modules: Control.AutoUpdate
1919 Control.Debounce
20− Control.Debounce.Internal
2120 Control.Reaper
2221 other-modules: Control.AutoUpdate.Util
2322 build-depends: base >= 4 && < 5
2423 default-language: Haskell2010
25− if impl(ghc >= 8)
26− default-extensions: Strict StrictData
2724
2825-- Test suite is currently not robust enough, gives too many false negatives.
2926
30−test-suite spec
31− main-is: Spec.hs
32− other-modules: Control.AutoUpdateSpec
33− Control.DebounceSpec
34− Control.ReaperSpec
35− hs-source-dirs: test
36− type: exitcode-stdio-1.0
37− build-depends: base, auto-update, exceptions, hspec, retry, HUnit
38− default-language: Haskell2010
27+-- test-suite spec
28+-- main-is: Spec.hs
29+-- other-modules: Control.AutoUpdateSpec
30+-- Control.ReaperSpec
31+-- hs-source-dirs: test
32+-- type: exitcode-stdio-1.0
33+-- build-depends: base, auto-update, hspec
34+-- default-language: Haskell2010
auto-update/test/Control/AutoUpdateSpec.hs+25−26
@@ -1,35 +1,34 @@
11module Control.AutoUpdateSpec (spec) where
22
3−import Control.AutoUpdate
4−import Control.Concurrent (threadDelay)
5−import Control.Monad (replicateM_, forM_)
6−import Data.IORef
73import Test.Hspec
84import Test.Hspec.QuickCheck
5+import Data.IORef
6+import Control.Concurrent (threadDelay)
7+import Control.Monad (replicateM_, forM_)
8+import Control.AutoUpdate
99
1010spec :: Spec
11−spec = return ()
12− -- do
13− -- prop "incrementer" $ \st' -> do
14− -- let st = abs st' `mod` 10000
15− -- ref <- newIORef 0
16− -- next <- mkAutoUpdate defaultUpdateSettings
17− -- { updateAction = atomicModifyIORef ref $ \i ->
18− -- let i' = succ i in i' `seq` (i', i')
19− -- , updateSpawnThreshold = st
20− -- , updateFreq = 10000
21− -- }
11+spec = do
12+ prop "incrementer" $ \st' -> do
13+ let st = abs st' `mod` 10000
14+ ref <- newIORef 0
15+ next <- mkAutoUpdate defaultUpdateSettings
16+ { updateAction = atomicModifyIORef ref $ \i ->
17+ let i' = succ i in i' `seq` (i', i')
18+ , updateSpawnThreshold = st
19+ , updateFreq = 10000
20+ }
2221
23− -- forM_ [1..st + 1] $ \i -> do
24− -- j <- next
25− -- j `shouldBe` i
22+ forM_ [1..st + 1] $ \i -> do
23+ j <- next
24+ j `shouldBe` i
2625
27− -- replicateM_ 50 $ do
28− -- i <- next
29− -- i `shouldBe` st + 2
26+ replicateM_ 50 $ do
27+ i <- next
28+ i `shouldBe` st + 2
3029
31− -- threadDelay 60000
32− -- last1 <- readIORef ref
33− -- threadDelay 20000
34− -- last2 <- readIORef ref
35− -- last2 `shouldBe` last1
30+ threadDelay 60000
31+ last1 <- readIORef ref
32+ threadDelay 20000
33+ last2 <- readIORef ref
34+ last2 `shouldBe` last1
auto-update/test/Control/DebounceSpec.hsdeleted−120
@@ -1,120 +0,0 @@
1−{-# LANGUAGE ScopedTypeVariables #-}
2−module Control.DebounceSpec (spec) where
3−
4−import Control.Concurrent
5−import Control.Debounce
6−import qualified Control.Debounce.Internal as DI
7−import Control.Monad
8−import Control.Monad.Catch
9−import Control.Retry
10−import Data.IORef
11−import Test.HUnit.Lang
12−import Test.Hspec
13−
14−spec :: Spec
15−spec = describe "mkDebounce" $ do
16− describe "Leading edge" $ do
17− it "works for a single event" $ do
18− (ref, debounced, baton, returnFromWait) <- getDebounce leadingEdge
19−
20− debounced
21− waitUntil 5 $ readIORef ref >>= (`shouldBe` 1)
22−
23− returnFromWait
24− pause
25− readIORef ref >>= (`shouldBe` 1)
26−
27− -- Try another round
28− debounced
29− waitUntil 5 $ readIORef ref >>= (`shouldBe` 2)
30−
31− returnFromWait
32− pause
33− readIORef ref >>= (`shouldBe` 2)
34−
35− it "works for multiple events" $ do
36− (ref, debounced, baton, returnFromWait) <- getDebounce leadingEdge
37−
38− debounced
39− waitForBatonToBeTaken baton
40− debounced
41− pause
42− waitUntil 5 $ readIORef ref >>= (`shouldBe` 1)
43−
44− returnFromWait
45− pause
46− readIORef ref >>= (`shouldBe` 2)
47−
48− describe "Trailing edge" $ do
49− it "works for a single event" $ do
50− (ref, debounced, baton, returnFromWait) <- getDebounce trailingEdge
51−
52− debounced
53− pause
54− waitUntil 5 $ readIORef ref >>= (`shouldBe` 0)
55−
56− returnFromWait
57− waitUntil 5 $ readIORef ref >>= (`shouldBe` 1)
58−
59− -- Try another round
60− debounced
61− pause
62− waitUntil 5 $ readIORef ref >>= (`shouldBe` 1)
63−
64− returnFromWait
65− waitUntil 5 $ readIORef ref >>= (`shouldBe` 2)
66−
67− it "works for multiple events" $ do
68− (ref, debounced, baton, returnFromWait) <- getDebounce trailingEdge
69−
70− debounced
71− waitForBatonToBeTaken baton
72− debounced
73− pause
74− waitUntil 5 $ readIORef ref >>= (`shouldBe` 0)
75−
76− returnFromWait
77− waitUntil 5 $ readIORef ref >>= (`shouldBe` 1)
78−
79−
80−-- | Make a controllable delay function
81−getWaitAction :: IO (p -> IO (), IO ())
82−getWaitAction = do
83− waitVar <- newEmptyMVar
84− let waitAction _ = takeMVar waitVar
85− let returnFromWait = putMVar waitVar ()
86− return (waitAction, returnFromWait)
87−
88−-- | Get a debounce system with access to the internals for testing
89−getDebounce :: DI.DebounceEdge -> IO (IORef Int, IO (), MVar (), IO ())
90−getDebounce edge = do
91− ref :: IORef Int <- newIORef 0
92− let action = modifyIORef ref (+ 1)
93−
94− (waitAction, returnFromWait) <- getWaitAction
95−
96− baton <- newEmptyMVar
97−
98− debounced <- DI.mkDebounceInternal baton waitAction defaultDebounceSettings {
99− debounceFreq = 5000000 -- unused
100− , debounceAction = action
101− , debounceEdge = edge
102− }
103−
104− return (ref, debounced, baton, returnFromWait)
105−
106−-- | Pause briefly (100ms)
107−pause :: IO ()
108−pause = threadDelay 100000
109−
110−waitForBatonToBeTaken :: MVar () -> IO ()
111−waitForBatonToBeTaken baton = waitUntil 5 $ tryReadMVar baton >>= (`shouldBe` Nothing)
112−
113−-- | Wait up to n seconds for an action to complete without throwing an HUnitFailure
114−waitUntil :: Int -> IO a -> IO ()
115−waitUntil n action = recovering policy [handler] (\_status -> void action)
116− where policy = constantDelay 1000 `mappend` limitRetries (n * 1000) -- 1ms * n * 1000 tries = n seconds
117− handler _status = Handler (\(HUnitFailure {}) -> return True)
118−
119−main :: IO ()
120−main = hspec spec
auto-update/test/Control/ReaperSpec.hs+27−29
@@ -1,39 +1,37 @@
11module Control.ReaperSpec (spec) where
22
3−import Control.Concurrent
43import Control.Reaper
5−import Data.IORef
4+import Control.Concurrent
65import Test.Hspec
76import Test.Hspec.QuickCheck
7+import Data.IORef
88
9+type Item = (Int, IORef Int)
910
10−spec :: Spec
11−spec = return ()
12−-- prop "works" $ \is -> do
13−-- reaper <- mkReaper defaultReaperSettings
14−-- { reaperAction = action
15−-- , reaperDelay = 1000
16−-- }
17−
18−-- let mkTestCase i = do
19−-- ref <- newIORef 0
20−-- let expected = (abs i `mod` 10) + 1
21−-- reaperAdd reaper (expected, ref)
22−-- return (expected, ref)
23−-- testCases <- mapM mkTestCase is
11+action = mkListAction $ \(i, ref) -> do
12+ modifyIORef ref succ
13+ return $ if i > 1
14+ then Just (pred i, ref)
15+ else Nothing
2416
25−-- let test (expected, ref) = do
26−-- actual <- readIORef ref
27−-- actual `shouldBe` (expected :: Int)
28−-- threadDelay 100000
29−-- mapM_ test testCases
30−-- [] <- reaperRead reaper
31−-- return ()
17+spec :: Spec
18+spec = prop "works" $ \is -> do
19+ reaper <- mkReaper defaultReaperSettings
20+ { reaperAction = action
21+ , reaperDelay = 1000
22+ }
3223
33−-- type Item = (Int, IORef Int)
24+ let mkTestCase i = do
25+ ref <- newIORef 0
26+ let expected = (abs i `mod` 10) + 1
27+ reaperAdd reaper (expected, ref)
28+ return (expected, ref)
29+ testCases <- mapM mkTestCase is
3430
35−-- action = mkListAction $ \(i, ref) -> do
36−-- modifyIORef ref succ
37−-- return $ if i > 1
38−-- then Just (pred i, ref)
39−-- else Nothing
31+ let test (expected, ref) = do
32+ actual <- readIORef ref
33+ actual `shouldBe` (expected :: Int)
34+ threadDelay 100000
35+ mapM_ test testCases
36+ [] <- reaperRead reaper
37+ return ()
hcar-wai.texnew file+58
@@ -0,0 +1,58 @@
1+% WAI-MW.tex
2+\begin{hcarentry}{WAI}
3+\label{wai}
4+\report{Kazu Yamamoto}%05/16
5+\participants{Michael Snoyman, Greg Weber}
6+\status{stable}
7+\makeheader
8+
9+WAI (Web Application Interface) is an application interface
10+between web applications and handlers in Haskell.
11+The \texttt{Application} data type is defined as follows:
12+
13+\begin{verbatim}
14+type Application = Request -> (Response -> IO ResponseReceived) -> IO ResponseReceived
15+\end{verbatim}
16+
17+That is, a WAI application takes two arguments: a \texttt{Request} and
18+a function to send a \texttt{Response}.
19+So, the typical behavior of WAI application is
20+processing a request,
21+generating a response and
22+passing the response to the function.
23+
24+Historically speaking, this interface made possible to develop handlers
25+other than HTTP.
26+The WAI applications can run through FastCGI (wai-handler-fastcgi),
27+run as stand-alone (wai-handler-webkit), etc.
28+But the most popular handler is based on HTTP, of course.
29+The major HTTP handler for WAI is Warp which now provides
30+both HTTP/1.1 and HTTP/2. TLS (warp-tls) is also available.
31+New transports such as
32+WebSocket (wai-websocket) and Event Source (wai-extra)
33+can be implemented, too.
34+
35+It is possible to develop WAI applications directly.
36+For instance, Hoogle and Mighttpd2~\cref{mighttpd2} take this way.
37+However, you may want to use web application frameworks
38+such as Apiary, MFlow~\cref{mflow}, rest, Servant, Scotty~\cref{scotty}, Spock,
39+Yesod~\cref{yesod}, etc.
40+
41+WAI also provides \texttt{Middleware}:
42+
43+\begin{verbatim}
44+type Middleware = Application -> Application
45+\end{verbatim}
46+
47+WAI middleware can inspect and transform a request, for example by automatically gzipping a response or logging a request (wai-extra).
48+
49+Since the last HCAR, WAI has successfully released version 3.2,
50+which removes the experimental HTTP/2 module and some APIs.
51+We bumped the version from 3.0 to 3.2 for consistency with
52+Warp 3.2.
53+
54+\FurtherReading
55+\begin{compactitem}
56+\item\url{https://groups.google.com/d/forum/haskell-wai}
57+\end{compactitem}
58+\end{hcarentry}
hcar-warp.texnew file+34
@@ -0,0 +1,34 @@
1+% Warp-MW.tex
2+\begin{hcarentry}{Warp}
3+\label{warp}
4+\report{Kazu Yamamoto}%05/16
5+\participants{Michael Snoyman}
6+%\status{stable}
7+\makeheader
8+
9+Warp is a high performance, easy to deploy HTTP handler for WAI~\cref{wai}.
10+Its supports both HTTP/1.1 and HTTP/2.
11+
12+Since the last HCAR, we have released Warp 3.2 which
13+removes the experimental HTTP/2 APIs.
14+The performance of HTTP/2 was drastically improved.
15+The logic to handle static files such as \texttt{If-Modified-Since}
16+was imported from Mighttpd2~\cref{mighttpd2}.
17+
18+\FurtherReading
19+\begin{compactitem}
20+\item``Warp: A Haskell Web Server''
21+ \begin{itemize}
22+ \item the May/June 2011 issue of IEEE Internet Computing
23+ \item Issue page: \url{http://www.computer.org/portal/web/csdl/abs/mags/ic/2011/03/mic201103toc.htm}
24+ \item PDF: \url{http://steve.vinoski.net/pdf/IC-Warp\_a\_Haskell\_Web\_Server.pdf}
25+ \end{itemize}
26+\item ``Warp''
27+ \begin{itemize}
28+ \item The Performance of Open Srouce Applications
29+ \item HTML: \url{http://www.aosabook.org/en/posa/warp.html}
30+ \end{itemize}
31+\end{compactitem}
32+\end{hcarentry}
33+
34+\end{hcarentry}
mime-types/ChangeLog.md−8
@@ -1,11 +1,3 @@
1−## 0.1.0.9
2−
3−* Add mjs mime type
4−
5−## 0.1.0.8
6−
7−* Add wasm mime type
8−
91## 0.1.0.7
102
113* Add support for .less files [#534](https://github.com/yesodweb/wai/pull/534)
mime-types/Network/Mime.hs−2
@@ -531,7 +531,6 @@ defaultMimeMap = Map.fromAscList [
531531 , ("mime", "message/rfc822")
532532 , ("mj2", "video/mj2")
533533 , ("mjp2", "video/mj2")
534− , ("mjs", "application/javascript")
535534 , ("mk3d", "video/x-matroska")
536535 , ("mka", "audio/x-matroska")
537536 , ("mks", "video/x-matroska")
@@ -980,7 +979,6 @@ defaultMimeMap = Map.fromAscList [
980979 , ("w3d", "application/x-director")
981980 , ("wad", "application/x-doom")
982981 , ("war", "application/java-archive")
983− , ("wasm", "application/wasm")
984982 , ("wav", "audio/x-wav")
985983 , ("wax", "audio/x-ms-wax")
986984 , ("wbmp", "image/vnd.wap.wbmp")
mime-types/mime-types.cabal+1−1
@@ -1,5 +1,5 @@
11name: mime-types
2−version: 0.1.0.9
2+version: 0.1.0.7
33synopsis: Basic mime-type handling types and functions
44description: API docs and the README are available at <http://www.stackage.org/package/mime-types>.
55homepage: https://github.com/yesodweb/wai
sources.txtnew file+11
@@ -0,0 +1,11 @@
1+./wai
2+./wai-extra
3+./warp
4+./warp-tls
5+./wai-app-static
6+./wai-handler-fastcgi
7+./wai-handler-launch
8+./wai-websockets
9+./wai-conduit
10+./mime-types
11+./auto-update
stack-lts-11.yamldeleted−27
@@ -1,27 +0,0 @@
1−resolver: lts-11.21
2−packages:
3−- ./auto-update
4−- ./mime-types
5−- ./wai
6−- ./wai-extra
7−- ./warp
8−- ./warp-tls
9−- ./wai-app-static
10−- ./wai-websockets
11−- ./wai-conduit
12−- ./time-manager
13−flags:
14− wai-extra:
15− build-example: true
16−extra-deps:
17−- streaming-commons-0.2.1.0@sha256:163af02944f374f316e35257c1afbffefd2c2852a85a151d1ea0ad22152cf28d,4990
18−- http2-2.0.0
19−- network-byte-order-0.1.1.0
20−- tls-1.5.3
21−- tls-session-manager-0.0.4
22−- x509-1.7.5
23−nix:
24− enable: false
25− packages:
26− - fcgi
27− - zlib
stack-lts-12.yamldeleted−26
@@ -1,26 +0,0 @@
1−resolver: lts-12.6
2−packages:
3−- ./auto-update
4−- ./mime-types
5−- ./wai
6−- ./wai-extra
7−- ./warp
8−- ./warp-tls
9−- ./wai-app-static
10−- ./wai-websockets
11−- ./wai-conduit
12−- ./time-manager
13−flags:
14− wai-extra:
15− build-example: true
16−nix:
17− enable: false
18− packages:
19− - fcgi
20− - zlib
21−extra-deps:
22−- http2-2.0.0
23−- network-byte-order-0.1.1.0
24−- tls-1.5.3
25−- tls-session-manager-0.0.4
26−- x509-1.7.5
stack-nightly.yamldeleted−20
@@ -1,20 +0,0 @@
1−resolver: nightly-2020-01-08
2−packages:
3−- ./auto-update
4−- ./mime-types
5−- ./wai
6−- ./wai-extra
7−- ./warp
8−- ./warp-tls
9−- ./wai-app-static
10−- ./wai-websockets
11−- ./wai-conduit
12−- ./time-manager
13−flags:
14− wai-extra:
15− build-example: true
16−nix:
17− enable: false
18− packages:
19− - fcgi
20− - zlib
stack.yaml+12−12
@@ -1,25 +1,25 @@
1−resolver: lts-14.22
1+resolver: lts-4.1
22packages:
3−- ./auto-update
4−- ./mime-types
53- ./wai
64- ./wai-extra
75- ./warp
86- ./warp-tls
97- ./wai-app-static
8+- ./wai-handler-fastcgi
9+- ./wai-handler-launch
1010- ./wai-websockets
1111- ./wai-conduit
12−- ./time-manager
13−flags:
14− wai-extra:
15− build-example: true
12+- ./mime-types
13+- ./auto-update
14+extra-deps:
15+- http2-1.6.0
16+- cryptonite-0.15
17+- memory-0.11
18+- tls-1.3.5
19+- fast-logger-2.4.5
20+- wai-logger-2.2.7
1621nix:
1722 enable: false
1823 packages:
1924 - fcgi
2025 - zlib
21−extra-deps:
22−- http2-2.0.0
23−- network-byte-order-0.1.1.0
24−- tls-1.5.3
25−- tls-session-manager-0.0.4
time-manager/time-manager.cabaldeleted−19
@@ -1,19 +0,0 @@
1−Name: time-manager
2−Version: 0.0.0
3−Synopsis: Scalable timer
4−License: MIT
5−License-file: LICENSE
6−Author: Michael Snoyman and Kazu Yamamoto
7−Maintainer: kazu@iij.ad.jp
8−Homepage: http://github.com/yesodweb/wai
9−Category: System
10−Build-Type: Simple
11−Cabal-Version: >=1.8
12−Stability: Stable
13−Description: Scalable timer functions provided by a timer manager.
14−
15−Library
16− Build-Depends: base >= 4.8 && < 5
17− , auto-update
18− Exposed-modules: System.TimeManager
19− Ghc-Options: -Wall
wai-app-static/ChangeLog.md−29
@@ -1,32 +1,3 @@
1−# wai-app-static changelog
2−
3−## 3.1.7.1
4−
5−* Update the test suite too
6−
7−## 3.1.7
8−
9−* Use 302 instead of 301 redirect, to avoid caching the presence of an index.html file
10−
11−## 3.1.6.3
12−
13−* The executable warp obeys `-h` option properly for host
14−now. Previously this used to invoke the help option. That can be
15−reached via `--help` as before.
16−
17−## 3.1.6.2
18−
19−* Drop dependency on blaze-builder
20−
21−## 3.1.6.1
22−
23−* Add `<>` import
24−
25−## 3.1.6
26−
27−* Make ssAddTrailingSlash work in combination with ssIndices [#569](https://github.com/yesodweb/wai/pull/569)
28−* Make ssIndices work with ssLookupFile and trailing slashes [#570](https://github.com/yesodweb/wai/pull/570)
29−
301## 3.1.5
312
323* Switch to cryponite
wai-app-static/Network/Wai/Application/Static.hs+42−48
@@ -34,7 +34,7 @@ import qualified Data.ByteString.Lazy as L
3434import Data.ByteString.Lazy.Char8 ()
3535import Control.Monad.IO.Class (liftIO)
3636
37−import Data.ByteString.Builder (toLazyByteString)
37+import Blaze.ByteString.Builder (toByteString)
3838
3939import Data.FileEmbed (embedFile)
4040
@@ -87,14 +87,14 @@ serveFolder StaticSettings {..} pieces req folder@Folder {..} =
8787 Nothing -> return $ WaiResponse $ W.responseLBS H.status403
8888 [ ("Content-Type", "text/plain")
8989 ] "Directory listings disabled"
90−
91−addTrailingSlash :: W.Request -> Maybe ByteString
92−addTrailingSlash req
93− | S8.null rp = Just "/"
94− | S8.last rp == '/' = Nothing
95− | otherwise = Just $ S8.snoc rp '/'
9690 where
97− rp = W.rawPathInfo req
91+ addTrailingSlash :: W.Request -> Maybe ByteString
92+ addTrailingSlash req
93+ | S8.null rp = Just "/"
94+ | S8.last rp == '/' = Nothing
95+ | otherwise = Just $ S8.snoc rp '/'
96+ where
97+ rp = W.rawPathInfo req
9898
9999checkPieces :: StaticSettings
100100 -> Pieces -- ^ parsed request
@@ -108,49 +108,45 @@ checkPieces _ pieces _ | any (T.null . fromPiece) $ safeInit pieces =
108108checkPieces ss@StaticSettings {..} pieces req = do
109109 res <- lookupResult
110110 case res of
111− Left location -> return $ RawRedirect location
111+ Left location -> return $ RawRedirect $ TE.encodeUtf8 location
112112 Right LRNotFound -> return NotFound
113113 Right (LRFile file) -> serveFile ss req file
114114 Right (LRFolder folder) -> serveFolder ss pieces req folder
115115 where
116− lookupResult :: IO (Either ByteString LookupResult)
116+ lookupResult :: IO (Either Text LookupResult)
117117 lookupResult = do
118118 nonIndexResult <- ssLookupFile pieces
119119 case nonIndexResult of
120120 LRFile{} -> return $ Right nonIndexResult
121121 _ -> do
122− eIndexResult <- lookupIndices (map (\ index -> dropLastIfNull pieces ++ [index]) ssIndices)
123− return $ case eIndexResult of
124− Left redirect -> Left redirect
125− Right indexResult -> case indexResult of
126− LRNotFound -> Right nonIndexResult
127− LRFile file | ssRedirectToIndex ->
128− let relPath =
129− case reverse pieces of
130− -- Served at root
131− [] -> fromPiece $ fileName file
132− lastSegment:_ ->
133− case fromPiece lastSegment of
134− -- Ends with a trailing slash
135− "" -> fromPiece $ fileName file
136− -- Lacks a trailing slash
137− lastSegment' -> T.concat
138− [ lastSegment'
139− , "/"
140− , fromPiece $ fileName file
141− ]
142− in Left $ TE.encodeUtf8 relPath
143− _ -> Right indexResult
122+ indexResult <- lookupIndices (map (\ index -> pieces ++ [index]) ssIndices)
123+ return $ case indexResult of
124+ LRNotFound -> Right nonIndexResult
125+ LRFile file | ssRedirectToIndex ->
126+ let relPath =
127+ case reverse pieces of
128+ -- Served at root
129+ [] -> fromPiece $ fileName file
130+ lastSegment:_ ->
131+ case fromPiece lastSegment of
132+ -- Ends with a trailing slash
133+ "" -> fromPiece $ fileName file
134+ -- Lacks a trailing slash
135+ lastSegment' -> T.concat
136+ [ lastSegment'
137+ , "/"
138+ , fromPiece $ fileName file
139+ ]
140+ in Left relPath
141+ _ -> Right indexResult
144142
145− lookupIndices :: [Pieces] -> IO (Either ByteString LookupResult)
143+ lookupIndices :: [Pieces] -> IO LookupResult
146144 lookupIndices (x : xs) = do
147145 res <- ssLookupFile x
148146 case res of
149147 LRNotFound -> lookupIndices xs
150− _ -> return $ case (ssAddTrailingSlash, addTrailingSlash req) of
151− (True, Just redirect) -> Left redirect
152− _ -> Right res
153− lookupIndices [] = return $ Right LRNotFound
148+ _ -> return res
149+ lookupIndices [] = return LRNotFound
154150
155151serveFile :: StaticSettings -> W.Request -> File -> IO StaticResponse
156152serveFile StaticSettings {..} req file
@@ -164,13 +160,11 @@ serveFile StaticSettings {..} req file
164160 -- Didn't match, but we have a hash value. Send the file contents
165161 -- with an ETag header.
166162 --
167− -- RFC7232 (HTTP 1.1):
168− -- > A recipient MUST ignore If-Modified-Since if the request contains an
169− -- > If-None-Match header field; the condition in If-None-Match is
170− -- > considered to be a more accurate replacement for the condition in
171− -- > If-Modified-Since, and the two are only combined for the sake of
172− -- > interoperating with older intermediaries that might not implement
173− -- > If-None-Match.
163+ -- Note: It would be arguably better to next check
164+ -- if-modified-since and return a 304 if that indicates a match as
165+ -- well. However, the circumstances under which such a situation
166+ -- could arise would be very anomolous, and should likely warrant a
167+ -- new file being sent anyway.
174168 (Just hash, _) -> respond [("ETag", hash)]
175169
176170 -- No hash value available, fall back to last modified support.
@@ -245,7 +239,7 @@ staticAppPieces ss rawPieces req sendResponse = liftIO $ do
245239 response :: StaticResponse -> IO W.ResponseReceived
246240 response (FileResponse file ch) = do
247241 mimetype <- ssGetMimeType ss file
248− -- let filesize = fileGetSize file
242+ let filesize = fileGetSize file
249243 let headers = ("Content-Type", mimetype)
250244 -- Let Warp provide the content-length, since it takes
251245 -- range requests into account
@@ -264,18 +258,18 @@ staticAppPieces ss rawPieces req sendResponse = liftIO $ do
264258 ] lbs
265259
266260 response (Redirect pieces' mHash) = do
267− let loc = ssMkRedirect ss pieces' $ L.toStrict $ toLazyByteString (H.encodePathSegments $ map fromPiece pieces')
261+ let loc = (ssMkRedirect ss) pieces' $ toByteString (H.encodePathSegments $ map fromPiece pieces')
268262 let qString = case mHash of
269263 Just hash -> replace "etag" (Just hash) (W.queryString req)
270264 Nothing -> remove "etag" (W.queryString req)
271265
272− sendResponse $ W.responseLBS H.status302
266+ sendResponse $ W.responseLBS H.status301
273267 [ ("Content-Type", "text/plain")
274268 , ("Location", S8.append loc $ H.renderQuery True qString)
275269 ] "Redirect"
276270
277271 response (RawRedirect path) =
278− sendResponse $ W.responseLBS H.status302
272+ sendResponse $ W.responseLBS H.status301
279273 [ ("Content-Type", "text/plain")
280274 , ("Location", path)
281275 ] "Redirect"
wai-app-static/Util.hs+1−8
@@ -1,10 +1,9 @@
1−{-# LANGUAGE OverloadedStrings, ViewPatterns #-}
1+{-# LANGUAGE OverloadedStrings #-}
22module Util
33 ( relativeDirFromPieces
44 , defaultMkRedirect
55 , replace
66 , remove
7− , dropLastIfNull
87 ) where
98
109import WaiAppStatic.Types
@@ -37,9 +36,3 @@ defaultMkRedirect pieces newPath
3736 | otherwise = relDir `S8.append` S8.tail newPath
3837 where
3938 relDir = TE.encodeUtf8 (relativeDirFromPieces pieces)
40−
41−dropLastIfNull :: [Piece] -> [Piece]
42−dropLastIfNull pieces = case pieces of
43− [fromPiece -> ""] -> []
44− (a : r) -> a : dropLastIfNull r
45− [] -> []
wai-app-static/WaiAppStatic/CmdLine.hs+1−8
@@ -25,7 +25,6 @@ import Network.Mime (defaultMimeMap, mimeByExt, defaultMimeType)
2525import WaiAppStatic.Types (ssIndices, toPiece, ssGetMimeType, fileName, fromPiece)
2626import Data.Maybe (mapMaybe)
2727import Control.Arrow (second)
28−import Data.Monoid ((<>))
2928
3029data Args = Args
3130 { docroot :: FilePath
@@ -39,7 +38,6 @@ data Args = Args
3938 }
4039
4140#if MIN_VERSION_optparse_applicative(0, 10, 0)
42−option' :: Mod OptionFields Int -> Parser Int
4341option' = option auto
4442#else
4543option' = option
@@ -94,7 +92,7 @@ args = Args
9492-- Since 2.0.1
9593runCommandLine :: (Args -> Middleware) -> IO ()
9694runCommandLine middleware = do
97− args@Args {..} <- execParser $ info (helperOption <*> args) fullDesc
95+ args@Args {..} <- execParser $ info (helper <*> args) fullDesc
9896 let mime' = map (pack *** S8.pack) mime
9997 let mimeMap = Map.fromList mime' `Map.union` defaultMimeMap
10098 docroot' <- canonicalizePath docroot
@@ -111,8 +109,3 @@ runCommandLine middleware = do
111109 { ssIndices = if noindex then [] else mapMaybe (toPiece . pack) index
112110 , ssGetMimeType = return . mimeByExt mimeMap defaultMimeType . fromPiece . fileName
113111 }
114− where
115− helperOption :: Parser (a -> a)
116− helperOption =
117− abortOption ShowHelpText $
118− mconcat [long "help", help "Show this help text", hidden]
wai-app-static/WaiAppStatic/Listing.hs+2−2
@@ -22,7 +22,7 @@ import qualified Text.Blaze.Html.Renderer.Utf8 as HU
2222
2323-- | Provides a default directory listing, suitable for most apps.
2424--
25−-- Code below taken from Happstack: <https://github.com/Happstack/happstack-server/blob/87e6c01a65c687d06c61345430a112fc9a444a95/src/Happstack/Server/FileServe/BuildingBlocks.hs>
25+-- Code below taken from Happstack: <http://patch-tag.com/r/mae/happstack/snapshot/current/content/pretty/happstack-server/src/Happstack/Server/FileServe/BuildingBlocks.hs>
2626defaultListing :: Listing
2727defaultListing pieces (Folder contents) = do
2828 let isTop = null pieces || map Just pieces == [toPiece ""]
@@ -64,7 +64,7 @@ defaultListing pieces (Folder contents) = do
6464
6565 -- Add a link to the root of the tree
6666 showFolder' :: Bool -> Pieces -> H.Html
67− showFolder' hasTrailingSlash pieces' = showFolder hasTrailingSlash (unsafeToPiece "root" : pieces')
67+ showFolder' hasTrailingSlash pieces = showFolder hasTrailingSlash (unsafeToPiece "root" : pieces)
6868
6969 showFolder :: Bool -> Pieces -> H.Html
7070 showFolder _ [] = "/" -- won't happen
wai-app-static/WaiAppStatic/Storage/Embedded/Runtime.hs+3−3
@@ -8,7 +8,7 @@ import WaiAppStatic.Types
88import Data.ByteString (ByteString)
99import Control.Arrow ((&&&), second)
1010import Data.List
11−import Data.ByteString.Builder (byteString)
11+import Blaze.ByteString.Builder (fromByteString)
1212import qualified Network.Wai as W
1313import qualified Data.Map as Map
1414import Data.Function (on)
@@ -50,7 +50,7 @@ toEntry :: (Piece, EmbeddedEntry) -> Either FolderName File
5050toEntry (name, EEFolder{}) = Left name
5151toEntry (name, EEFile bs) = Right File
5252 { fileGetSize = fromIntegral $ S.length bs
53− , fileToResponse = \s h -> W.responseBuilder s h $ byteString bs
53+ , fileToResponse = \s h -> W.responseBuilder s h $ fromByteString bs
5454 , fileName = name
5555 , fileGetHash = return $ Just $ runHash bs
5656 , fileGetModified = Nothing
@@ -87,7 +87,7 @@ toEmbedded fps =
8787bsToFile :: Piece -> ByteString -> File
8888bsToFile name bs = File
8989 { fileGetSize = fromIntegral $ S.length bs
90− , fileToResponse = \s h -> W.responseBuilder s h $ byteString bs
90+ , fileToResponse = \s h -> W.responseBuilder s h $ fromByteString bs
9191 , fileName = name
9292 , fileGetHash = return $ Just $ runHash bs
9393 , fileGetModified = Nothing
wai-app-static/WaiAppStatic/Storage/Embedded/TH.hs+3−2
@@ -5,8 +5,9 @@ module WaiAppStatic.Storage.Embedded.TH(
55 , mkSettings
66) where
77
8−import Data.ByteString.Builder.Extra (byteStringInsert)
8+import Blaze.ByteString.Builder.ByteString (insertByteString)
99import Codec.Compression.GZip (compress)
10+import Control.Applicative
1011import Data.ByteString.Unsafe (unsafePackAddressLen)
1112import Data.Either (lefts, rights)
1213import GHC.Exts (Int(..))
@@ -129,7 +130,7 @@ embeddedToFile entry = File
129130 let h' = if embCompressed entry
130131 then h ++ [("Content-Encoding", "gzip")]
131132 else h
132− in W.responseBuilder s h' $ byteStringInsert $ embContent entry
133+ in W.responseBuilder s h' $ insertByteString $ embContent entry
133134
134135 -- Usually the fileName should just be the filename not the entire path,
135136 -- but we need the whole path to make the lookup within lookupMime
wai-app-static/WaiAppStatic/Types.hs+2−3
@@ -1,3 +1,4 @@
1+{-# LANGUAGE OverloadedStrings #-}
12module WaiAppStatic.Types
23 ( -- * Pieces
34 Piece
@@ -24,7 +25,7 @@ import qualified Network.Wai as W
2425import Data.ByteString (ByteString)
2526import System.Posix.Types (EpochTime)
2627import qualified Data.Text as T
27−import Data.ByteString.Builder (Builder)
28+import Blaze.ByteString.Builder (Builder)
2829import Network.Mime (MimeType)
2930
3031-- | An individual component of a path, or of a filepath.
@@ -59,8 +60,6 @@ toPieces :: [Text] -> Maybe Pieces
5960toPieces = mapM toPiece
6061
6162-- | Request coming from a user. Corresponds to @pathInfo@.
62−--
63−-- The root path is the empty list.
6463type Pieces = [Piece]
6564
6665-- | Values for the max-age component of the cache-control response header.
wai-app-static/test/EmbeddedTestEntries.hs−5
@@ -47,9 +47,4 @@ mkEntries = return
4747 , EmbeddableEntry "index.html"
4848 "text/html"
4949 (Right [| return ("" :: T.Text, "index file") |] )
50−
51− -- An index file in a subdir
52− , EmbeddableEntry "foo/index.html"
53− "text/html"
54− (Right [| return ("" :: T.Text, "index file in subdir") |] )
5550 ]
wai-app-static/test/WaiAppEmbeddedTest.hs−9
@@ -41,15 +41,6 @@ embSpec = do
4141 assertStatus 200 req
4242 assertBody "index file" req
4343
44− it "ssIndices works with trailing slashes" $ do
45− let testSettings = $(mkSettings mkEntries){
46− ssIndices = [unsafeToPiece "index.html"]
47− }
48− embedSettings testSettings $ do
49− req <- request (setRawPathInfo defRequest "/foo/")
50− assertStatus 200 req
51− assertBody "index file in subdir" req
52−
5344 describe "embedded, uncompressed entry" $ do
5445 it "too short" $ embed $ do
5546 req <- request (setRawPathInfo defRequest "e2.txt")
wai-app-static/test/WaiAppStaticTest.hs+8−19
@@ -5,7 +5,6 @@ import Network.Wai.Application.Static
55import WaiAppStatic.Types
66
77import Test.Hspec
8−import Test.Mockery.Directory
98import qualified Data.ByteString.Char8 as S8
109-- import qualified Data.ByteString.Lazy.Char8 as L8
1110import System.PosixCompat.Files (getFileStatus, modificationTime)
@@ -57,22 +56,22 @@ spec = do
5756 assertStatus 200 =<<
5857 request (setRawPathInfo defRequest path)
5958
60− it "404 for non-existent files" $ webApp $
59+ it "404 for non-existant files" $ webApp $
6160 assertStatus 404 =<<
6261 request (setRawPathInfo defRequest "doesNotExist")
6362
64− it "302 redirect when multiple slashes" $ webApp $ do
63+ it "301 redirect when multiple slashes" $ webApp $ do
6564 req <- request (setRawPathInfo defRequest "a//b/c")
66− assertStatus 302 req
65+ assertStatus 301 req
6766 assertHeader "Location" "../../a/b/c" req
6867
6968 let absoluteApp = flip runSession $ staticApp $ (defaultWebAppSettings "test") {
7069 ssMkRedirect = \_ u -> S8.append "http://www.example.com" u
7170 }
72− it "302 redirect when multiple slashes" $ absoluteApp $
71+ it "301 redirect when multiple slashes" $ absoluteApp $
7372 flip mapM_ ["/a//b/c", "a//b/c"] $ \path -> do
7473 req <- request (setRawPathInfo defRequest path)
75− assertStatus 302 req
74+ assertStatus 301 req
7675 assertHeader "Location" "http://www.example.com/a/b/c" req
7776
7877 describe "webApp when requesting a static asset" $ do
@@ -131,22 +130,12 @@ spec = do
131130 assertStatus 304 req
132131 assertNoHeader "Cache-Control" req
133132
134− context "302 redirect to add a trailing slash on directories if missing" $ do
133+ context "301 redirect to add a trailing slash on directories if missing" $ do
135134 it "works at the root" $ fileServerApp $ do
136135 req <- request (setRawPathInfo defRequest "/a")
137− assertStatus 302 req
136+ assertStatus 301 req
138137 assertHeader "Location" "/a/" req
139138
140− it "works when an index.html is delivered" $ do
141− let settings = (defaultFileServerSettings "."){
142− ssAddTrailingSlash = True
143− }
144− inTempDirectory $ fileServerAppWithSettings settings $ do
145− liftIO $ touch "foo/index.html"
146− req <- request (setRawPathInfo defRequest "/foo")
147− assertStatus 302 req
148− assertHeader "Location" "/foo/" req
149−
150139 let urlMapApp = flip runSession $ \req send ->
151140 case pathInfo req of
152141 "subPath":rest ->
@@ -158,7 +147,7 @@ spec = do
158147 "urlMapApp: only works at subPath"
159148 it "works with subpath at the root of the file server" $ urlMapApp $ do
160149 req <- request (setRawPathInfo defRequest "/subPath")
161− assertStatus 302 req
150+ assertStatus 301 req
162151 assertHeader "Location" "/subPath/" req
163152
164153 context "with defaultWebAppSettings" $ do
wai-app-static/wai-app-static.cabal+6−6
@@ -1,5 +1,5 @@
11name: wai-app-static
2−version: 3.1.7.1
2+version: 3.1.5
33license: MIT
44license-file: LICENSE
55author: Michael Snoyman <michael@snoyman.com>
@@ -27,7 +27,7 @@ Flag print
2727library
2828 build-depends: base >= 4 && < 5
2929 , wai >= 3.0 && < 3.3
30− , bytestring >= 0.10.4
30+ , bytestring >= 0.9.1.4
3131 , http-types >= 0.7
3232 , transformers >= 0.2.2
3333 , unix-compat >= 0.2
@@ -37,6 +37,7 @@ library
3737 , old-locale >= 1.0.0.2
3838 , file-embed >= 0.0.3.1
3939 , text >= 0.7
40+ , blaze-builder >= 0.2.1.4
4041 , cryptonite >= 0.6
4142 , memory >= 0.7
4243 , http-date
@@ -49,7 +50,7 @@ library
4950 , filepath
5051 , wai-extra >= 3.0 && < 3.1
5152 , optparse-applicative >= 0.7
52− , warp >= 3.0.11 && < 3.4
53+ , warp >= 3.0.11 && < 3.3
5354
5455 exposed-modules: Network.Wai.Application.Static
5556 WaiAppStatic.Storage.Filesystem
@@ -73,7 +74,7 @@ Executable warp
7374 , wai-app-static
7475 , directory >= 1.0
7576 , containers >= 0.2
76− , bytestring >= 0.10.4
77+ , bytestring >= 0.9.1.4
7778 , text >= 0.7
7879 , mime-types >= 0.1 && < 0.2
7980
@@ -100,9 +101,8 @@ test-suite runtests
100101 , zlib
101102 , filepath
102103 , temporary
103− , mockery
104104 -- , containers
105− ghc-options: -Wall
105+ ghc-options: -Wall
106106
107107source-repository head
108108 type: git
wai-conduit/ChangeLog.md−4
@@ -1,7 +1,3 @@
1−## 3.0.0.4
2−
3−* Drop dependency on blaze-builder
4−
51## 3.0.0.3
62
73* Support wai 3.2
wai-conduit/Network/Wai/Conduit.hs+7−6
@@ -16,17 +16,18 @@ import Data.ByteString (ByteString)
1616import qualified Data.ByteString as S
1717import Control.Monad (unless)
1818import Network.HTTP.Types
19−import Data.ByteString.Builder (Builder)
19+import Blaze.ByteString.Builder (Builder)
20+import Data.IORef
2021import qualified Data.Conduit.List as CL
2122
2223-- | Stream the request body.
2324--
2425-- Since 3.0.0
25−sourceRequestBody :: MonadIO m => Request -> ConduitT () ByteString m ()
26+sourceRequestBody :: MonadIO m => Request -> Source m ByteString
2627sourceRequestBody req =
2728 loop
2829 where
29− go = liftIO (getRequestBodyChunk req)
30+ go = liftIO (requestBody req)
3031
3132 loop = do
3233 bs <- go
@@ -37,9 +38,9 @@ sourceRequestBody req =
3738-- | Create an HTTP response out of a @Source@.
3839--
3940-- Since 3.0.0
40−responseSource :: Status -> ResponseHeaders -> ConduitT () (Flush Builder) IO () -> Response
41+responseSource :: Status -> ResponseHeaders -> Source IO (Flush Builder) -> Response
4142responseSource s hs src = responseStream s hs $ \send flush ->
42− runConduit $ src .| CL.mapM_ (\mbuilder ->
43+ src $$ CL.mapM_ (\mbuilder ->
4344 case mbuilder of
4445 Chunk b -> send b
4546 Flush -> flush)
@@ -49,7 +50,7 @@ responseSource s hs src = responseStream s hs $ \send flush ->
4950--
5051-- Since 3.0.0
5152responseRawSource :: (MonadIO m, MonadIO n)
52− => (ConduitT () ByteString m () -> ConduitT ByteString Void n () -> IO ())
53+ => (Source m ByteString -> Sink ByteString n () -> IO ())
5354 -> Response
5455 -> Response
5556responseRawSource app =
wai-conduit/example/Main.hsdeleted−19
@@ -1,19 +0,0 @@
1−#!/usr/bin/env stack
2−-- stack --resolver lts-11.10 script
3−import Network.Wai
4−import Network.Wai.Handler.Warp
5−import Network.Wai.Conduit
6−import Network.HTTP.Types
7−import Conduit
8−import Data.ByteString.Builder (byteString)
9−import Control.Monad.Trans.Resource
10−
11−main :: IO ()
12−main = run 3000 app
13−
14−app :: Application
15−app _req respond =
16− runResourceT $ withInternalState $ \is ->
17− respond $ responseSource status200 [] $
18− transPipe (`runInternalState` is) (sourceFile "Main.hs") .|
19− mapC (Chunk . byteString)
wai-conduit/wai-conduit.cabal+3−2
@@ -1,5 +1,5 @@
11name: wai-conduit
2−version: 3.0.0.4
2+version: 3.0.0.3
33synopsis: conduit wrappers for WAI
44description: API docs and the README are available at <http://www.stackage.org/package/wai-conduit>.
55homepage: https://github.com/yesodweb/wai
@@ -18,6 +18,7 @@ library
1818 , wai >= 3.0 && < 3.3
1919 , conduit
2020 , transformers
21− , bytestring >= 0.10.4
21+ , bytestring
2222 , http-types
23+ , blaze-builder
2324 default-language: Haskell2010
wai-extra/ChangeLog.md−96
@@ -1,99 +1,3 @@
1−# Changelog for wai-extra
2−
3−## 3.0.29.1
4−
5−* Fix `Network.Wai.Test.request` always sending an empty request body [#794](https://github.com/yesodweb/wai/pull/794)
6−
7−## 3.0.29
8−
9−* Export `Network.Wai.EventSource.eventStreamAppRaw` [#786](https://github.com/yesodweb/wai/pull/786)
10−
11−## 3.0.28
12−
13−* Add `Network.Wai.EventSource.eventStreamAppRaw` [#767](https://github.com/yesodweb/wai/pull/767)
14−
15−## 3.0.27
16−
17−* Add custom request log formatter which includes response headers [#762](https://github.com/yesodweb/wai/pull/762)
18−
19−## 3.0.26.1
20−
21−* When available, supply the response size to custom loggers
22− [#757](https://github.com/yesodweb/wai/pull/757)
23−
24−## 3.0.26
25−
26−* Throw 413 for too large payload
27−* Throw 431 for too large headers
28− [#741](https://github.com/yesodweb/wai/pull/741)
29−
30−## 3.0.25
31−
32−* Supporting `network` version 3.0.
33−
34−## 3.0.24.3
35−
36−* Drop unnecessary `lifted-base` dependency
37−* Drop unnecessary `stringsearch` dependency [#714](https://github.com/yesodweb/wai/pull/714)
38−
39−## 3.0.24.2
40−
41−* Consider quoted multipart form boundary markers [#700](https://github.com/yesodweb/wai/pull/700).
42−* Don't raise exceptions in `formatAsJSON` [#709](https://github.com/yesodweb/wai/pull/709)
43−
44−## 3.0.24.1
45−
46−* Fix a "file not found" exception in wai-extra [#705](https://github.com/yesodweb/wai/pull/706)
47−
48−## 3.0.24.0
49−
50−* Add timeout middleware [#702](https://github.com/yesodweb/wai/pull/702).
51−
52−## 3.0.23.0
53−
54−* Add rewriteRoot middleware [#697](https://github.com/yesodweb/wai/pull/697).
55−
56−## 3.0.22.1
57−
58−* Drop dependency on blaze-builder, requiring streaming-commons >= 0.2
59−
60−## 3.0.22.0
61−
62−* Support for streaming-commons 0.2
63−* Support for resourcet 1.2
64−
65−## 3.0.21.0
66−
67−* Export `Network.Wai.Parse.noLimitParseRequestBodyOptions` [#662](https://github.com/yesodweb/wai/pull/662).
68−
69−## 3.0.20.2
70−
71−* Revert previous change to `srequest`, which caused breakage
72−
73−## 3.0.20.1
74−
75−* Set `requestBodyLength` for `srequest` [#654](https://github.com/yesodweb/wai/pull/654)
76−
77−## 3.0.20.0
78−
79−* runSessionWith (runSession variant that gives access to ClientState) [#629](https://github.com/yesodweb/wai/pull/629)
80−
81−## 3.0.19.1
82−
83−* All loggers follow the autoFlush setting [#604](https://github.com/yesodweb/wai/pull/604)
84−
85−## 3.0.19
86−
87−* Add a new function basicAuth', which passes request to the CheckCreds argument.
88−
89−## 3.0.18
90−
91−* ForceSSL: preserve port number when redirecting to https. [#582](https://github.com/yesodweb/wai/pull/582)
92−
93−## 3.0.17
94−
95−* Gzip pre compressed [#580](https://github.com/yesodweb/wai/pull/580)
96−
971## 3.0.16.1
982
993* Fix the way the header length is checked (for limiting the max header length)
wai-extra/Network/Wai/EventSource.hs+1−24
@@ -1,18 +1,10 @@
11{-|
22 A WAI adapter to the HTML5 Server-Sent Events API.
3−
4− If running through a proxy like Nginx you might need to add the
5− headers:
6−
7− > [ ("X-Accel-Buffering", "no"), ("Cache-Control", "no-cache")]
8−
9− There is a small example using these functions in the @example@ directory.
103-}
114module Network.Wai.EventSource (
125 ServerEvent(..),
136 eventSourceAppChan,
14− eventSourceAppIO,
15− eventStreamAppRaw
7+ eventSourceAppIO
168 ) where
179
1810import Data.Function (fix)
@@ -42,18 +34,3 @@ eventSourceAppIO src _ sendResponse =
4234 case eventToBuilder se of
4335 Nothing -> return ()
4436 Just b -> sendChunk b >> flush >> loop
45−
46−-- | Make a new WAI EventSource application with a handler that emits events.
47−--
48−-- @since 3.0.28
49−eventStreamAppRaw :: ((ServerEvent -> IO()) -> IO () -> IO ()) -> Application
50−eventStreamAppRaw handler _ sendResponse =
51− sendResponse $ responseStream
52− status200
53− [(hContentType, "text/event-stream")]
54− $ \sendChunk flush -> handler (sendEvent sendChunk) flush
55− where
56− sendEvent sendChunk event =
57− case eventToBuilder event of
58− Nothing -> return ()
59− Just b -> sendChunk b
wai-extra/Network/Wai/EventSource/EventStream.hs+10−9
@@ -1,5 +1,5 @@
11{-# LANGUAGE CPP #-}
2−{- code adapted by Mathias Billman originally from Chris Smith https://github.com/cdsmith/gloss-web -}
2+{- code adapted by Mathias Billman originaly from Chris Smith https://github.com/cdsmith/gloss-web -}
33
44{-|
55 Internal module, usually you don't need to use it.
@@ -9,7 +9,8 @@ module Network.Wai.EventSource.EventStream (
99 eventToBuilder
1010 ) where
1111
12−import Data.ByteString.Builder
12+import Blaze.ByteString.Builder
13+import Blaze.ByteString.Builder.Char8
1314#if __GLASGOW_HASKELL__ < 710
1415import Data.Monoid
1516#endif
@@ -38,18 +39,18 @@ data ServerEvent
3839 Newline as a Builder.
3940-}
4041nl :: Builder
41−nl = char7 '\n'
42+nl = fromChar '\n'
4243
4344
4445{-|
4546 Field names as Builder
4647-}
4748nameField, idField, dataField, retryField, commentField :: Builder
48−nameField = string7 "event:"
49−idField = string7 "id:"
50−dataField = string7 "data:"
51−retryField = string7 "retry:"
52−commentField = char7 ':'
49+nameField = fromString "event:"
50+idField = fromString "id:"
51+dataField = fromString "data:"
52+retryField = fromString "retry:"
53+commentField = fromChar ':'
5354
5455
5556{-|
@@ -65,7 +66,7 @@ field l b = l `mappend` b `mappend` nl
6566-}
6667eventToBuilder :: ServerEvent -> Maybe Builder
6768eventToBuilder (CommentEvent txt) = Just $ field commentField txt
68−eventToBuilder (RetryEvent n) = Just $ field retryField (string8 . show $ n)
69+eventToBuilder (RetryEvent n) = Just $ field retryField (fromShow n)
6970eventToBuilder (CloseEvent) = Nothing
7071eventToBuilder (ServerEvent n i d)= Just $
7172 (name n $ evid i $ mconcat (map (field dataField) d)) `mappend` nl
wai-extra/Network/Wai/Handler/CGI.hs+16−17
@@ -19,8 +19,8 @@ import Control.Arrow ((***))
1919import Data.Char (toLower)
2020import qualified System.IO
2121import qualified Data.String as String
22−import Data.ByteString.Builder (byteString, toLazyByteString, char7, string8)
23−import Data.ByteString.Builder.Extra (flush)
22+import Blaze.ByteString.Builder (fromByteString, toLazyByteString, flush)
23+import Blaze.ByteString.Builder.Char8 (fromChar, fromString)
2424import Data.ByteString.Lazy.Internal (defaultChunkSize)
2525import System.IO (Handle)
2626import Network.HTTP.Types (Status (..), hRange, hContentType, hContentLength)
@@ -29,8 +29,7 @@ import qualified Data.CaseInsensitive as CI
2929#if __GLASGOW_HASKELL__ < 710
3030import Data.Monoid (mconcat, mempty, mappend)
3131#endif
32−
33−import qualified Data.Streaming.ByteString.Builder as Builder
32+import qualified Data.Streaming.Blaze as Blaze
3433import Data.Function (fix)
3534import Control.Monad (unless, void)
3635
@@ -131,7 +130,7 @@ runGeneric vars inputH outputH xsendfile app = do
131130 return ResponseReceived
132131 _ -> do
133132 let (s, hs, wb) = responseToStream res
134− (blazeRecv, blazeFinish) <- Builder.newBuilderRecv Builder.defaultStrategy
133+ (blazeRecv, blazeFinish) <- Blaze.newBlazeRecv Blaze.defaultStrategy
135134 wb $ \b -> do
136135 let sendBuilder builder = do
137136 popper <- blazeRecv builder
@@ -140,30 +139,30 @@ runGeneric vars inputH outputH xsendfile app = do
140139 unless (B.null bs) $ do
141140 outputH bs
142141 loop
143− sendBuilder $ headers s hs `mappend` char7 '\n'
142+ sendBuilder $ headers s hs `mappend` fromChar '\n'
144143 b sendBuilder (sendBuilder flush)
145144 blazeFinish >>= maybe (return ()) outputH
146145 return ResponseReceived
147146 where
148147 headers s hs = mconcat (map header $ status s : map header' (fixHeaders hs))
149− status (Status i m) = (byteString "Status", mconcat
150− [ string8 $ show i
151− , char7 ' '
152− , byteString m
148+ status (Status i m) = (fromByteString "Status", mconcat
149+ [ fromString $ show i
150+ , fromChar ' '
151+ , fromByteString m
153152 ])
154− header' (x, y) = (byteString $ CI.original x, byteString y)
153+ header' (x, y) = (fromByteString $ CI.original x, fromByteString y)
155154 header (x, y) = mconcat
156155 [ x
157− , byteString ": "
156+ , fromByteString ": "
158157 , y
159− , char7 '\n'
158+ , fromChar '\n'
160159 ]
161160 sfBuilder s hs sf fp = mconcat
162161 [ headers s hs
163− , header $ (byteString sf, string8 fp)
164− , char7 '\n'
165− , byteString sf
166− , byteString " not supported"
162+ , header $ (fromByteString sf, fromString fp)
163+ , fromChar '\n'
164+ , fromByteString sf
165+ , fromByteString " not supported"
167166 ]
168167 fixHeaders h =
169168 case lookup hContentType h of
wai-extra/Network/Wai/Header.hs+1−1
@@ -14,5 +14,5 @@ contentLength hdrs = lookup H.hContentLength hdrs >>= readInt
1414readInt :: S8.ByteString -> Maybe Integer
1515readInt bs =
1616 case S8.readInteger bs of
17− Just (i, rest) | S8.null rest -> Just i
17+ Just (i, "") -> Just i
1818 _ -> Nothing
wai-extra/Network/Wai/Middleware/ForceSSL.hs+8−2
@@ -17,6 +17,9 @@ import Data.Monoid (mempty)
1717import Data.Monoid ((<>))
1818import Network.HTTP.Types (hLocation, methodGet, status301, status307)
1919
20+import qualified Data.ByteString as S
21+import Data.Word8 (_colon)
22+
2023-- | For requests that don't appear secure, redirect to https
2124--
2225-- Since 3.0.7
@@ -28,10 +31,13 @@ forceSSL app req sendResponse =
2831
2932redirectResponse :: Request -> Maybe Response
3033redirectResponse req = do
31− host <- requestHeaderHost req
32− return $ responseBuilder status [(hLocation, location host)] mempty
34+ (host, _) <- S.break (== _colon) <$> requestHeaderHost req
35+
36+ return $ responseBuilder status [(hLocation, location host)] mempty
37+
3338 where
3439 location h = "https://" <> h <> rawPathInfo req <> rawQueryString req
40+
3541 status
3642 | requestMethod req == methodGet = status301
3743 | otherwise = status307
wai-extra/Network/Wai/Middleware/Gzip.hs+13−30
@@ -30,14 +30,14 @@ import Data.Default.Class
3030import Network.HTTP.Types ( Status, Header, hContentEncoding, hUserAgent
3131 , hContentType, hContentLength)
3232import System.Directory (doesFileExist, createDirectoryIfMissing)
33−import Data.ByteString.Builder (byteString)
34−import qualified Data.ByteString.Builder.Extra as Blaze (flush)
33+import Blaze.ByteString.Builder (fromByteString)
3534import Control.Exception (try, SomeException)
3635import qualified Data.Set as Set
3736import Network.Wai.Header
3837import Network.Wai.Internal
39−import qualified Data.Streaming.ByteString.Builder as B
38+import qualified Data.Streaming.Blaze as B
4039import qualified Data.Streaming.Zlib as Z
40+import qualified Blaze.ByteString.Builder as Blaze
4141import Control.Monad (unless)
4242import Data.Function (fix)
4343import Control.Exception (throwIO)
@@ -58,10 +58,6 @@ data GzipFiles
5858 -- platforms.
5959 | GzipCacheFolder FilePath -- ^ Compress files, caching them in
6060 -- some directory.
61− | GzipPreCompressed GzipFiles -- ^ If we use compression then try to use the filename with ".gz"
62− -- appended to it, if the file is missing then try next action
63− --
64− -- @since 3.0.17
6561 deriving (Show, Eq, Read)
6662
6763-- | Use default MIME settings; /do not/ compress files.
@@ -69,7 +65,7 @@ instance Default GzipSettings where
6965 def = GzipSettings GzipIgnore defaultCheckMime
7066
7167-- | MIME types that will be compressed by default:
72−-- @text/@ @*@, @application/json@, @application/javascript@,
68+-- @text/*@, @application/json@, @application/javascript@,
7369-- @application/ecmascript@, @image/x-icon@.
7470defaultCheckMime :: S.ByteString -> Bool
7571defaultCheckMime bs =
@@ -89,9 +85,6 @@ defaultCheckMime bs =
8985-- if gzip is supported.
9086--
9187-- File responses will be compressed according to the 'GzipFiles' setting.
92−--
93−-- Will only be applied based on the 'gzipCheckMime' setting. For default
94−-- behavior, see 'defaultCheckMime'.
9588gzip :: GzipSettings -> Middleware
9689gzip set app env sendResponse = app env $ \res ->
9790 case res of
@@ -99,23 +92,13 @@ gzip set app env sendResponse = app env $ \res ->
9992 ResponseFile{} | gzipFiles set == GzipIgnore -> sendResponse res
10093 _ -> if "gzip" `elem` enc && not isMSIE6 && not (isEncoded res) && (bigEnough res)
10194 then
102− let runAction x = case x of
103− (ResponseFile s hs file Nothing, GzipPreCompressed nextAction) ->
104− let
105− compressedVersion = file ++ ".gz"
106− in
107− doesFileExist compressedVersion >>= \y ->
108− if y
109− then (sendResponse $ ResponseFile s (fixHeaders hs) compressedVersion Nothing)
110− else (runAction (ResponseFile s hs file Nothing, nextAction))
111− (ResponseFile s hs file Nothing, GzipCacheFolder cache) ->
112− case lookup hContentType hs of
113− Just m
114− | gzipCheckMime set m -> compressFile s hs file cache sendResponse
115− _ -> sendResponse res
116− (ResponseFile {}, GzipIgnore) -> sendResponse res
117− _ -> compressE set res sendResponse
118− in runAction (res, gzipFiles set)
95+ case (res, gzipFiles set) of
96+ (ResponseFile s hs file Nothing, GzipCacheFolder cache) ->
97+ case lookup hContentType hs of
98+ Just m
99+ | gzipCheckMime set m -> compressFile s hs file cache sendResponse
100+ _ -> sendResponse res
101+ _ -> compressE set res sendResponse
119102 else sendResponse res
120103 where
121104 enc = fromMaybe [] $ (splitCommas . S8.unpack)
@@ -185,7 +168,7 @@ compressE set res sendResponse =
185168 Just m | gzipCheckMime set m ->
186169 let hs' = fixHeaders hs
187170 in wb $ \body -> sendResponse $ responseStream s hs' $ \sendChunk flush -> do
188− (blazeRecv, _) <- B.newBuilderRecv B.defaultStrategy
171+ (blazeRecv, _) <- B.newBlazeRecv B.defaultStrategy
189172 deflate <- Z.initDeflate 1 (Z.WindowBits 31)
190173 let sendBuilder builder = do
191174 popper <- blazeRecv builder
@@ -204,7 +187,7 @@ compressE set res sendResponse =
204187 case result of
205188 Z.PRDone -> return ()
206189 Z.PRNext bs' -> do
207− sendChunk $ byteString bs'
190+ sendChunk $ fromByteString bs'
208191 loop
209192 Z.PRError e -> throwIO e
210193
wai-extra/Network/Wai/Middleware/HttpAuth.hs+10−18
@@ -5,7 +5,6 @@
55module Network.Wai.Middleware.HttpAuth
66 ( -- * Middleware
77 basicAuth
8− , basicAuth'
98 , CheckCreds
109 , AuthSettings
1110 , authRealm
@@ -37,19 +36,11 @@ type CheckCreds = ByteString
3736--
3837-- > basicAuth (\u p -> return $ u == "michael" && p == "mypass") "My Realm"
3938--
40−-- @since 1.3.4
39+-- Since 1.3.4
4140basicAuth :: CheckCreds
4241 -> AuthSettings
4342 -> Middleware
44−basicAuth checkCreds = basicAuth' (\_ -> checkCreds)
45−
46−-- | Like 'basicAuth', but also passes a request to the authentication function.
47−--
48−-- @since 3.0.19
49−basicAuth' :: (Request -> CheckCreds)
50− -> AuthSettings
51− -> Middleware
52−basicAuth' checkCreds AuthSettings {..} app req sendResponse = do
43+basicAuth checkCreds AuthSettings {..} app req sendResponse = do
5344 isProtected <- authIsProtected req
5445 allowed <- if isProtected then check else return True
5546 if allowed
@@ -60,7 +51,8 @@ basicAuth' checkCreds AuthSettings {..} app req sendResponse = do
6051 case (lookup hAuthorization $ requestHeaders req)
6152 >>= extractBasicAuth of
6253 Nothing -> return False
63− Just (username, password) -> checkCreds req username password
54+ Just (username, password) -> checkCreds username password
55+
6456
6557-- | Basic authentication settings. This value is an instance of
6658-- @IsString@, so the recommended approach to create a value is to
@@ -69,23 +61,23 @@ basicAuth' checkCreds AuthSettings {..} app req sendResponse = do
6961--
7062-- > "My Realm" { authIsProtected = someFunc } :: AuthSettings
7163--
72−-- @since 1.3.4
64+-- Since 1.3.4
7365data AuthSettings = AuthSettings
7466 { authRealm :: !ByteString
7567 -- ^
7668 --
77− -- @since 1.3.4
69+ -- Since 1.3.4
7870 , authOnNoAuth :: !(ByteString -> Application)
7971 -- ^ Takes the realm and returns an appropriate 401 response when
8072 -- authentication is not provided.
8173 --
82− -- @since 1.3.4
74+ -- Since 1.3.4
8375 , authIsProtected :: !(Request -> IO Bool)
8476 -- ^ Determine if access to the requested resource is restricted.
8577 --
8678 -- Default: always returns @True@.
8779 --
88− -- @since 1.3.4
80+ -- Since 1.3.4
8981 }
9082
9183instance IsString AuthSettings where
@@ -107,7 +99,7 @@ instance IsString AuthSettings where
10799-- | Extract basic authentication data from usually __Authorization__
108100-- header value. Returns username and password
109101--
110−-- @since 3.0.5
102+-- Since 3.0.5
111103extractBasicAuth :: ByteString -> Maybe (ByteString, ByteString)
112104extractBasicAuth bs =
113105 let (x, y) = S.break isSpace bs
@@ -123,7 +115,7 @@ extractBasicAuth bs =
123115-- | Extract bearer authentication data from __Authorization__ header
124116-- value. Returns bearer token
125117--
126−-- @since 3.0.5
118+-- Since 3.0.5
127119extractBearerAuth :: ByteString -> Maybe ByteString
128120extractBearerAuth bs =
129121 let (x, y) = S.break isSpace bs
wai-extra/Network/Wai/Middleware/Jsonp.hs+7−7
@@ -18,8 +18,8 @@ import Network.Wai
1818import Network.Wai.Internal
1919import Data.ByteString (ByteString)
2020import qualified Data.ByteString.Char8 as B8
21−import Data.ByteString.Builder.Extra (byteStringCopy)
22−import Data.ByteString.Builder (char7)
21+import Blaze.ByteString.Builder (copyByteString)
22+import Blaze.ByteString.Builder.Char8 (fromChar)
2323#if __GLASGOW_HASKELL__ < 710
2424import Data.Monoid (mappend)
2525#endif
@@ -60,10 +60,10 @@ jsonp app env sendResponse = do
6060 sendResponse $ case checkJSON hs of
6161 Nothing -> r
6262 Just hs' -> responseBuilder s hs' $
63− byteStringCopy c
64− `mappend` char7 '('
63+ copyByteString c
64+ `mappend` fromChar '('
6565 `mappend` b
66− `mappend` char7 ')'
66+ `mappend` fromChar ')'
6767 go c r =
6868 case checkJSON hs of
6969 Just hs' -> addCallback c s hs' wb
@@ -81,9 +81,9 @@ jsonp app env sendResponse = do
8181
8282 addCallback cb s hs wb =
8383 wb $ \body -> sendResponse $ responseStream s hs $ \sendChunk flush -> do
84− sendChunk $ byteStringCopy cb `mappend` char7 '('
84+ sendChunk $ copyByteString cb `mappend` fromChar '('
8585 _ <- body sendChunk flush
86− sendChunk $ char7 ')'
86+ sendChunk $ fromChar ')'
8787
8888changeVal :: Eq a
8989 => a
wai-extra/Network/Wai/Middleware/MethodOverride.hs+5−4
@@ -5,11 +5,12 @@ module Network.Wai.Middleware.MethodOverride
55import Network.Wai
66import Control.Monad (join)
77
8−-- | Overriding of HTTP request method via `_method` query string parameter.
8+-- | Allows overriding of the HTTP request method via the _method query string
9+-- parameter.
910--
10−-- This middleware only applies when the initial request method is POST.
11−-- Allows submitting of normal HTML forms, without worries of semantic
12−-- mismatches with the HTTP spec.
11+-- This middleware only applies when the initial request method is POST. This
12+-- allow submitting of normal HTML forms, without worries of semantics
13+-- mismatches in the HTTP spec.
1314methodOverride :: Middleware
1415methodOverride app req =
1516 app req'
wai-extra/Network/Wai/Middleware/RequestLogger.hs+19−68
@@ -14,16 +14,15 @@ module Network.Wai.Middleware.RequestLogger
1414 , OutputFormat (..)
1515 , OutputFormatter
1616 , OutputFormatterWithDetails
17− , OutputFormatterWithDetailsAndHeaders
1817 , Destination (..)
1918 , Callback
2019 , IPAddrSource (..)
2120 ) where
2221
2322import System.IO (Handle, hFlush, stdout)
24−import qualified Data.ByteString.Builder as B (Builder, byteString)
23+import qualified Blaze.ByteString.Builder as B
2524import qualified Data.ByteString as BS
26−import Data.ByteString.Char8 (pack)
25+import Data.ByteString.Char8 (pack, unpack)
2726import Control.Monad (when)
2827import Control.Monad.IO.Class (liftIO)
2928import Network.Wai
@@ -41,7 +40,7 @@ import Network.Wai.Parse (sinkRequestBody, lbsBackEnd, fileName, Param, File
4140import qualified Data.ByteString.Lazy as LBS
4241import qualified Data.ByteString.Char8 as S8
4342import System.Console.ANSI
44−import Data.IORef
43+import Data.IORef.Lifted
4544import System.IO.Unsafe
4645import Network.Wai.Internal (Response (..))
4746import Data.Default.Class (Default (def))
@@ -50,42 +49,14 @@ import Network.Wai.Middleware.RequestLogger.Internal
5049import Network.Wai.Header (contentLength)
5150import Data.Text.Encoding (decodeUtf8')
5251
53−data OutputFormat
54− = Apache IPAddrSource
55− | Detailed Bool -- ^ use colors?
56− | CustomOutputFormat OutputFormatter
57− | CustomOutputFormatWithDetails OutputFormatterWithDetails
58− | CustomOutputFormatWithDetailsAndHeaders OutputFormatterWithDetailsAndHeaders
52+data OutputFormat = Apache IPAddrSource
53+ | Detailed Bool -- ^ use colors?
54+ | CustomOutputFormat OutputFormatter
55+ | CustomOutputFormatWithDetails OutputFormatterWithDetails
5956
6057type OutputFormatter = ZonedDate -> Request -> Status -> Maybe Integer -> LogStr
61−
62−type OutputFormatterWithDetails
63− = ZonedDate
64− -> Request
65− -> Status
66− -> Maybe Integer
67− -> NominalDiffTime
68− -> [S8.ByteString]
69− -> B.Builder
70− -> LogStr
71−
72−-- | Same as @OutputFormatterWithDetails@ but with response headers included
73−--
74−-- This is useful if you wish to include arbitrary application data in your
75−-- logs, e.g., an authenticated user ID, which you would set in a response
76−-- header in your application and retrieve in the log formatter.
77−--
78−-- @since 3.0.27
79−type OutputFormatterWithDetailsAndHeaders
80− = ZonedDate -- ^ When the log message was generated
81− -> Request -- ^ The WAI request
82− -> Status -- ^ HTTP status code
83− -> Maybe Integer -- ^ Response size
84− -> NominalDiffTime -- ^ Duration of the request
85− -> [S8.ByteString] -- ^ The request body
86− -> B.Builder -- ^ Raw response
87− -> [Header] -- ^ The response headers
88− -> LogStr
58+type OutputFormatterWithDetails =
59+ ZonedDate -> Request -> Status -> Maybe Integer -> NominalDiffTime -> [S8.ByteString] -> B.Builder -> LogStr
8960
9061data Destination = Handle Handle
9162 | Logger LoggerSet
@@ -124,22 +95,20 @@ mkRequestLogger RequestLoggerSettings{..} = do
12495 Handle h -> (BS.hPutStr h . logToByteString, when autoFlush (hFlush h))
12596 Logger l -> (pushLogStr l, when autoFlush (flushLogStr l))
12697 Callback c -> (c, return ())
127− callbackAndFlush str = callback str >> flusher
12898 case outputFormat of
12999 Apache ipsrc -> do
130100 getdate <- getDateGetter flusher
131101 apache <- initLogger ipsrc (LogCallback callback flusher) getdate
132102 return $ apacheMiddleware apache
133− Detailed useColors -> detailedMiddleware callbackAndFlush useColors
103+ Detailed useColors -> detailedMiddleware
104+ (\str -> callback str >> flusher)
105+ useColors
134106 CustomOutputFormat formatter -> do
135107 getDate <- getDateGetter flusher
136− return $ customMiddleware callbackAndFlush getDate formatter
108+ return $ customMiddleware callback getDate formatter
137109 CustomOutputFormatWithDetails formatter -> do
138110 getdate <- getDateGetter flusher
139− return $ customMiddlewareWithDetails callbackAndFlush getdate formatter
140− CustomOutputFormatWithDetailsAndHeaders formatter -> do
141− getdate <- getDateGetter flusher
142− return $ customMiddlewareWithDetailsAndHeaders callbackAndFlush getdate formatter
111+ return $ customMiddlewareWithDetails callback getdate formatter
143112
144113apacheMiddleware :: ApacheLoggerActions -> Middleware
145114apacheMiddleware ala app req sendResponse = app req $ \res -> do
@@ -150,8 +119,8 @@ apacheMiddleware ala app req sendResponse = app req $ \res -> do
150119customMiddleware :: Callback -> IO ZonedDate -> OutputFormatter -> Middleware
151120customMiddleware cb getdate formatter app req sendResponse = app req $ \res -> do
152121 date <- liftIO getdate
153− let msize = contentLength (responseHeaders res)
154− liftIO $ cb $ formatter date req (responseStatus res) msize
122+ -- We use Nothing for the response size since we generally don't know it
123+ liftIO $ cb $ formatter date req (responseStatus res) Nothing
155124 sendResponse res
156125
157126customMiddlewareWithDetails :: Callback -> IO ZonedDate -> OutputFormatterWithDetails -> Middleware
@@ -161,33 +130,15 @@ customMiddlewareWithDetails cb getdate formatter app req sendResponse = do
161130 app req' $ \res -> do
162131 t1 <- getCurrentTime
163132 date <- liftIO getdate
164− let msize = contentLength (responseHeaders res)
165− builderIO <- newIORef $ B.byteString ""
133+ -- We use Nothing for the response size since we generally don't know it
134+ builderIO <- newIORef $ B.fromByteString ""
166135 res' <- recordChunks builderIO res
167136 rspRcv <- sendResponse res'
168137 _ <- liftIO . cb .
169− formatter date req' (responseStatus res') msize (t1 `diffUTCTime` t0) reqBody =<<
138+ formatter date req' (responseStatus res') Nothing (t1 `diffUTCTime` t0) reqBody =<<
170139 readIORef builderIO
171140 return rspRcv
172141
173−customMiddlewareWithDetailsAndHeaders :: Callback -> IO ZonedDate -> OutputFormatterWithDetailsAndHeaders -> Middleware
174−customMiddlewareWithDetailsAndHeaders cb getdate formatter app req sendResponse = do
175− (req', reqBody) <- getRequestBody req
176− t0 <- getCurrentTime
177− app req' $ \res -> do
178− t1 <- getCurrentTime
179− date <- liftIO getdate
180− let msize = contentLength (responseHeaders res)
181− builderIO <- newIORef $ B.byteString ""
182− res' <- recordChunks builderIO res
183− rspRcv <- sendResponse res'
184− _ <- do
185− rawResponse <- readIORef builderIO
186− let status = responseStatus res'
187− duration = t1 `diffUTCTime` t0
188− resHeaders = responseHeaders res'
189− liftIO . cb $ formatter date req' status msize duration reqBody rawResponse resHeaders
190− return rspRcv
191142-- | Production request logger middleware.
192143--
193144-- This uses the 'Apache' logging format, and takes IP addresses for clients from
wai-extra/Network/Wai/Middleware/RequestLogger/JSON.hs+10−48
@@ -1,13 +1,8 @@
11{-# LANGUAGE RecordWildCards #-}
2−{-# LANGUAGE CPP #-}
32
4−module Network.Wai.Middleware.RequestLogger.JSON
5− ( formatAsJSON
6− , formatAsJSONWithHeaders
7− ) where
3+module Network.Wai.Middleware.RequestLogger.JSON (formatAsJSON) where
84
9−import qualified Data.ByteString.Builder as BB (toLazyByteString)
10−import Data.ByteString.Lazy (toStrict)
5+import qualified Blaze.ByteString.Builder as BB
116import Data.Aeson
127import Data.CaseInsensitive (original)
138import Data.Monoid ((<>))
@@ -15,8 +10,7 @@ import qualified Data.ByteString.Char8 as S8
1510import Data.IP
1611import qualified Data.Text as T
1712import Data.Text (Text)
18−import Data.Text.Encoding (decodeUtf8With)
19−import Data.Text.Encoding.Error (lenientDecode)
13+import Data.Text.Encoding (decodeUtf8)
2014import Data.Time (NominalDiffTime)
2115import Data.Word (Word32)
2216import Network.HTTP.Types as H
@@ -37,34 +31,10 @@ formatAsJSON date req status responseSize duration reqBody response =
3731 , "size" .= responseSize
3832 , "body" .=
3933 if statusCode status >= 400
40− then Just . decodeUtf8With lenientDecode . toStrict . BB.toLazyByteString $ response
34+ then Just . decodeUtf8 . BB.toByteString $ response
4135 else Nothing
4236 ]
43− , "time" .= decodeUtf8With lenientDecode date
44− ]) <> "\n"
45−
46−-- | Same as @formatAsJSON@ but with response headers included
47−--
48−-- This is useful for passing arbitrary data from your application out to the
49−-- WAI layer for it to be logged, but you may need to be careful to
50−-- subsequently redact any headers which may contain sensitive data.
51−--
52−-- @since 3.0.27
53−formatAsJSONWithHeaders :: OutputFormatterWithDetailsAndHeaders
54−formatAsJSONWithHeaders date req status resSize duration reqBody res resHeaders =
55− toLogStr (encode $
56− object
57− [ "request" .= requestToJSON duration req reqBody
58− , "response" .= object
59− [ "status" .= statusCode status
60− , "size" .= resSize
61− , "headers" .= responseHeadersToJSON resHeaders
62− , "body" .=
63− if statusCode status >= 400
64− then Just . decodeUtf8With lenientDecode . toStrict . BB.toLazyByteString $ res
65− else Nothing
66− ]
67− , "time" .= decodeUtf8With lenientDecode date
37+ , "time" .= decodeUtf8 date
6838 ]) <> "\n"
6939
7040word32ToHostAddress :: Word32 -> Text
@@ -76,12 +46,12 @@ readAsDouble = read
7646requestToJSON :: NominalDiffTime -> Request -> [S8.ByteString] -> Value
7747requestToJSON duration req reqBody =
7848 object
79− [ "method" .= decodeUtf8With lenientDecode (requestMethod req)
80− , "path" .= decodeUtf8With lenientDecode (rawPathInfo req)
49+ [ "method" .= decodeUtf8 (requestMethod req)
50+ , "path" .= decodeUtf8 (rawPathInfo req)
8151 , "queryString" .= map queryItemToJSON (queryString req)
8252 , "durationMs" .= (readAsDouble . printf "%.2f" . rationalToDouble $ toRational duration * 1000)
8353 , "size" .= requestBodyLengthToJSON (requestBodyLength req)
84− , "body" .= decodeUtf8With lenientDecode (S8.concat reqBody)
54+ , "body" .= decodeUtf8 (S8.concat reqBody)
8555 , "remoteHost" .= sockToJSON (remoteHost req)
8656 , "httpVersion" .= httpVersionToJSON (httpVersion req)
8757 , "headers" .= requestHeadersToJSON (requestHeaders req)
@@ -103,13 +73,11 @@ sockToJSON (SockAddrInet6 pn _ ha _) =
10373 ]
10474sockToJSON (SockAddrUnix sock) =
10575 object [ "unix" .= sock ]
106−#if !MIN_VERSION_network(3,0,0)
10776sockToJSON (SockAddrCan i) =
10877 object [ "can" .= i ]
109−#endif
11078
11179queryItemToJSON :: QueryItem -> Value
112−queryItemToJSON (name, mValue) = toJSON (decodeUtf8With lenientDecode name, fmap (decodeUtf8With lenientDecode) mValue)
80+queryItemToJSON (name, mValue) = toJSON (decodeUtf8 name, fmap decodeUtf8 mValue)
11381
11482requestHeadersToJSON :: RequestHeaders -> Value
11583requestHeadersToJSON = toJSON . map hToJ where
@@ -117,14 +85,8 @@ requestHeadersToJSON = toJSON . map hToJ where
11785 hToJ ("Cookie", _) = toJSON ("Cookie" :: Text, "-RDCT-" :: Text)
11886 hToJ hd = headerToJSON hd
11987
120−responseHeadersToJSON :: [Header] -> Value
121−responseHeadersToJSON = toJSON . map hToJ where
122− -- Redact cookies
123− hToJ ("Set-Cookie", _) = toJSON ("Set-Cookie" :: Text, "-RDCT-" :: Text)
124− hToJ hd = headerToJSON hd
125−
12688headerToJSON :: Header -> Value
127−headerToJSON (headerName, header) = toJSON (decodeUtf8With lenientDecode . original $ headerName, decodeUtf8With lenientDecode header)
89+headerToJSON (headerName, header) = toJSON (decodeUtf8 . original $ headerName, decodeUtf8 header)
12890
12991portToJSON :: PortNumber -> Value
13092portToJSON = toJSON . toInteger
wai-extra/Network/Wai/Middleware/Rewrite.hs+14−321
@@ -1,339 +1,32 @@
1−{-# LANGUAGE TupleSections #-}
2−{-# LANGUAGE CPP #-}
3−
41module Network.Wai.Middleware.Rewrite
5− ( -- * How to use this module
6− -- $howto
7−
8− -- ** A note on semantics
9−
10− -- $semantics
11−
12− -- ** Paths and Queries
13−
14− -- $pathsandqueries
15− PathsAndQueries
16−
17− -- ** An example rewriting paths with queries
18−
19− -- $takeover
20−
21− -- ** Upgrading from wai-extra ≤ 3.0.16.1
22−
23− -- $upgrading
24−
25− -- * 'Middleware'
26−
27− -- ** Recommended functions
28− , rewriteWithQueries
29− , rewritePureWithQueries
30− , rewriteRoot
31−
32− -- ** Deprecated
33− , rewrite
34− , rewritePure
35−
36− -- * Operating on 'Request's
37−
38− , rewriteRequest
39− , rewriteRequestPure
2+ ( rewrite, rewritePure
403 ) where
414
425import Network.Wai
436import Control.Monad.IO.Class (liftIO)
447import Data.Text (Text)
45−import Data.Functor.Identity (Identity(..))
468import qualified Data.Text.Encoding as TE
479import qualified Data.Text as T
4810import Network.HTTP.Types as H
4911
50−-- GHC ≤ 7.10 does not export Applicative functions from the prelude.
51−#if __GLASGOW_HASKELL__ <= 710
52−import Control.Applicative
53−#endif
54−
55−-- $howto
56−-- This module provides 'Middleware' to rewrite URL paths. It also provides
57−-- functions that will convert a 'Request' to a modified 'Request'.
58−-- Both operations require a function that takes URL parameters and
59−-- headers, and returns new URL parameters. Parameters are pieces of URL
60−-- paths and query parameters.
61−--
62−-- If you are a new user of the library, use 'rewriteWithQueries' or
63−-- 'rewritePureWithQueries' for middleware. For modifying 'Request's
64−-- directly, use 'rewriteRequest' or 'rewriteRequestPure'.
6512
66−-- $semantics
67−--
68−-- Versions of this library in wai-extra ≤ 3.0.16.1 exported only
69−-- 'rewrite' and 'rewritePure' and both modified 'rawPathInfo' of the
70−-- underlying requests. Such modification has been proscribed. The
71−-- semantics of these functions have not changed; instead the recommended
72−-- approach is to use 'rewriteWithQueries' and 'rewritePureWithQueries'.
73−-- The new functions are slightly different, as described in the section
74−-- on upgrading; code for previous library versions can be upgraded with
75−-- a single change, and as the type of the new function is different the
76−-- compiler will indicate where this change must be made.
77−--
78−-- The 'rewriteRequest' and 'rewriteRequestPure' functions use the new
79−-- semantics, too.
80−
81−-- $pathsandqueries
82−--
83−-- This library defines the type synonym `PathsAndQueries` to make code
84−-- handling paths and queries easier to read.
85−--
86−-- /e.g./ /\/foo\/bar/ would look like
87−--
88−-- > ["foo", "bar"] :: Text
89−--
90−-- /?bar=baz/ would look like
91−--
92−-- > [("bar", Just "baz")] :: QueryText
93−--
94−-- Together,
95−--
96−-- /\/foo?bar=baz/ would look like
97−--
98−-- > (["foo"],[("bar", Just "baz")]) :: PathsAndQueries
13+-- | rewrite based on your own conversion rules
14+rewrite :: ([Text] -> H.RequestHeaders -> IO [Text]) -> Middleware
15+rewrite convert app req sendResponse = do
16+ newPathInfo <- liftIO $ convert (pathInfo req) (requestHeaders req)
17+ let rawPInfo = TE.encodeUtf8 $ T.intercalate "/" newPathInfo
18+ app req { pathInfo = newPathInfo, rawPathInfo = rawPInfo } sendResponse
9919
100−-- $takeover
101−-- Let’s say we want to replace a website written in PHP with one written
102−-- using WAI. We’ll use the
103−-- <https://hackage.haskell.org/package/http-reverse-proxy http-reverse-proxy>
104−-- package to serve the old
105−-- site from the new site, but there’s a problem. The old site uses pages like
106−--
107−-- @
108−-- index.php?page=/page/
109−-- @
110−--
111−-- whereas the new site would look like
112−--
113−-- @
114−-- index\//page/
115−-- @
116−--
117−-- In doing this, we want to separate the migration code from our new
118−-- website. So we’d like to handle links internally using the path
119−-- formulation, but externally have the old links still work.
120−--
121−-- Therefore, we will use middleware ('rewritePureWithQueries') from this
122−-- module to rewrite incoming requests from the query formulation to the
123−-- paths formulation.
124−--
125−-- > {-# LANGUAGE ViewPatterns #-}
126−-- >
127−-- > rewritePathFromPhp :: Middleware
128−-- > rewritePathFromPhp = rewritePureWithQueries pathFromPhp
129−-- >
130−-- > pathFromPhp :: PathsAndQueries -> H.RequestHeaders -> PathsAndQueries
131−-- > pathFromPhp (pieces, queries) _ = piecesConvert pieces queries
132−-- > where
133−-- > piecesConvert :: [Text] -> H.Query -> PathsAndQueries
134−-- > piecesConvert ["index.php"] qs@(join . lookup "page" -> Just page) =
135−-- > ( ["index", TE.decodeUtf8With TE.lenientDecode page]
136−-- > , delete ("page", pure page) qs
137−-- > )
138−-- > piecesConvert ps qs = (ps, qs)
139−--
140−-- On the other side, we will use 'rewriteRequestPure' to rewrite outgoing
141−-- requests to the original website from the reverse proxy code (using the
142−-- 'Network.HTTP.ReverseProxy.WPRModifiedRequest' or
143−-- 'Network.HTTP.ReverseProxy.WPRModifiedRequestSecure' constructors. Note,
144−-- these links will only work if the haddock documentation for
145−-- <https://hackage.haskell.org/package/http-reverse-proxy http-reverse-proxy>
146−-- is installed).
147−--
148−-- > rewritePhpFromPath :: Request -> Request
149−-- > rewritePhpFromPath = rewriteRequestPure phpFromPath
150−-- >
151−-- > phpFromPath :: PathsAndQueries -> H.RequestHeaders -> PathsAndQueries
152−-- > phpFromPath (pieces, queries) _ = piecesConvert pieces queries
153−-- > where
154−-- > piecesConvert :: [Text] -> H.Query -> PathsAndQueries
155−-- > piecesConvert ["index", page] qs = ( ["index.php"], ("page", pure . TE.encodeUtf8 $ page) : qs )
156−-- > piecesConvert ps qs = (ps, qs)
157−--
158−-- For the whole example, see
159−-- <https://gist.github.com/dbaynard/c844d0df124f68ec8b6da152c581ce6d>.
20+-- | rewrite based on your own conversion rules
21+-- Example convert function:
16022
161−-- $upgrading
162−-- It is quite simple to upgrade from 'rewrite' and 'rewritePure', to
163−-- 'rewriteWithQueries' and 'rewritePureWithQueries'.
164−-- Insert 'Data.Bifunctor.first', which specialises to
165−--
166−-- @
167−-- 'Data.Bifunctor.first' :: (['Text'] -> ['Text']) -> 'PathsAndQueries' -> 'PathsAndQueries'
168−-- @
169−--
170−-- as the following example demonstrates.
171−--
172−-- Old versions of the library could only handle path pieces, not queries.
173−-- This could have been supplied to 'rewritePure'.
174−--
175−-- @
176−-- staticConvert' :: [Text] -> H.RequestHeaders -> [Text]
177−-- staticConvert' pieces _ = piecesConvert pieces
178−-- where
179−-- piecesConvert [] = ["static", "html", "pages.html"]
180−-- piecesConvert route@("pages":_) = "static":"html":route
181−-- @
182−--
183−-- Instead, use this function, supplied to 'rewritePureWithQueries'.
184−--
185−-- @
186−-- staticConvert :: 'PathsAndQueries' -> H.RequestHeaders -> 'PathsAndQueries'
187−-- staticConvert pathsAndQueries _ = 'Data.Bifunctor.first' piecesConvert pathsAndQueries
23+-- staticConvert :: [Text] -> H.RequestHeaders -> [Text]
24+-- staticConvert pieces _ = piecesConvert pieces
18825-- where
18926-- piecesConvert [] = ["static", "html", "pages.html"]
19027-- piecesConvert route@("pages":_) = "static":"html":route
191−-- @
192−--
193−-- The former formulation is deprecated for two reasons:
194−--
195−-- 1. The original formulation of 'rewrite' modified 'rawPathInfo', which
196−-- is deprecated behaviour.
197−--
198−-- 2. The original formulation did not allow query parameters to
199−-- influence the path.
200−--
201−-- Concerning the first point, take care with semantics of your program when
202−-- upgrading as the upgraded functions no longer modify 'rawPathInfo'.
203−
204−--------------------------------------------------
205−-- * Types
206−--------------------------------------------------
207−
208−-- | A tuple of the path sections as ['Text'] and query parameters as
209−-- 'H.Query'. This makes writing type signatures for the conversion
210−-- function far more pleasant.
211−--
212−-- Note that this uses 'H.Query' not 'H.QueryText' to more accurately
213−-- reflect the paramaters that can be supplied in URLs. It may be safe to
214−-- treat parameters as text; use the 'H.queryToQueryText' and
215−-- 'H.queryTextToQuery' functions to interconvert.
216−type PathsAndQueries = ([Text], H.Query)
217−
218−--------------------------------------------------
219−-- * Rewriting 'Middleware'
220−--------------------------------------------------
221−
222−-- | Rewrite based on your own conversion function for paths only, to be
223−-- supplied by users of this library (with the conversion operating in 'IO').
224−--
225−-- For new code, use 'rewriteWithQueries' instead.
226−rewrite :: ([Text] -> H.RequestHeaders -> IO [Text]) -> Middleware
227−rewrite convert app req sendResponse = do
228− let convertIO = pathsOnly . curry $ liftIO . uncurry convert
229− newReq <- rewriteRequestRawM convertIO req
230− app newReq sendResponse
231−{-# WARNING rewrite [
232− "This modifies the 'rawPathInfo' field of a 'Request'."
233− , " This is not recommended behaviour; it is however how"
234− , " this function has worked in the past."
235− , " Use 'rewriteWithQueries' instead"] #-}
236−
237−-- | Rewrite based on pure conversion function for paths only, to be
238−-- supplied by users of this library.
239−--
240−-- For new code, use 'rewritePureWithQueries' instead.
24128rewritePure :: ([Text] -> H.RequestHeaders -> [Text]) -> Middleware
24229rewritePure convert app req =
243− let convertPure = pathsOnly . curry $ Identity . uncurry convert
244− newReq = runIdentity $ rewriteRequestRawM convertPure req
245− in app newReq
246−{-# WARNING rewritePure [
247− "This modifies the 'rawPathInfo' field of a 'Request'."
248− , " This is not recommended behaviour; it is however how"
249− , " this function has worked in the past."
250− , " Use 'rewritePureWithQueries' instead"] #-}
251−
252−-- | Rewrite based on your own conversion function for paths and queries.
253−-- This function is to be supplied by users of this library, and operates
254−-- in 'IO'.
255−rewriteWithQueries :: (PathsAndQueries -> H.RequestHeaders -> IO PathsAndQueries)
256− -> Middleware
257−rewriteWithQueries convert app req sendResponse = do
258− newReq <- rewriteRequestM convert req
259− app newReq sendResponse
260−
261−-- | Rewrite based on pure conversion function for paths and queries. This
262−-- function is to be supplied by users of this library.
263−rewritePureWithQueries :: (PathsAndQueries -> H.RequestHeaders -> PathsAndQueries)
264− -> Middleware
265−rewritePureWithQueries convert app req = app $ rewriteRequestPure convert req
266−
267−-- | Rewrite root requests (/) to a specified path
268−--
269−-- Note that /index.html/ in example below should already be a valid route.
270−--
271−-- @
272−-- rewriteRoot "index.html" :: Middleware
273−-- @
274−--
275−-- @since 3.0.23.0
276−rewriteRoot :: Text -> Middleware
277−rewriteRoot root = rewritePureWithQueries onlyRoot
278− where
279− onlyRoot ([], q) _ = ([root], q)
280− onlyRoot paths _ = paths
281−
282−--------------------------------------------------
283−-- * Modifying 'Request's directly
284−--------------------------------------------------
285−
286−-- | Modify a 'Request' using the supplied function in 'IO'. This is suitable for
287−-- the reverse proxy example.
288−rewriteRequest :: (PathsAndQueries -> H.RequestHeaders -> IO PathsAndQueries)
289− -> Request -> IO Request
290−rewriteRequest convert req =
291− let convertIO = curry $ liftIO . uncurry convert
292− in rewriteRequestRawM convertIO req
293−
294−-- | Modify a 'Request' using the pure supplied function. This is suitable for
295−-- the reverse proxy example.
296−rewriteRequestPure :: (PathsAndQueries -> H.RequestHeaders -> PathsAndQueries)
297− -> Request -> Request
298−rewriteRequestPure convert req =
299− let convertPure = curry $ Identity . uncurry convert
300− in runIdentity $ rewriteRequestRawM convertPure req
301−
302−--------------------------------------------------
303−-- * Helper functions
304−--------------------------------------------------
305−
306−-- | This helper function factors out the common behaviour of rewriting requests.
307−rewriteRequestM :: (Applicative m, Monad m)
308− => (PathsAndQueries -> H.RequestHeaders -> m PathsAndQueries)
309− -> Request -> m Request
310−rewriteRequestM convert req = do
311− (pInfo, qByteStrings) <- curry convert (pathInfo req) (queryString req) (requestHeaders req)
312− pure req {pathInfo = pInfo, queryString = qByteStrings}
313−
314−-- | This helper function preserves the semantics of wai-extra ≤ 3.0, in
315−-- which the rewrite functions modify the 'rawPathInfo' parameter. Note
316−-- that this has not been extended to modify the 'rawQueryInfo' as
317−-- modifying either of these values has been deprecated.
318−rewriteRequestRawM :: (Applicative m, Monad m)
319− => (PathsAndQueries -> H.RequestHeaders -> m PathsAndQueries)
320− -> Request -> m Request
321−rewriteRequestRawM convert req = do
322− newReq <- rewriteRequestM convert req
323− let rawPInfo = TE.encodeUtf8 . T.intercalate "/" . pathInfo $ newReq
324− pure newReq { rawPathInfo = rawPInfo }
325−{-# WARNING rewriteRequestRawM [
326− "This modifies the 'rawPathInfo' field of a 'Request'."
327− , " This is not recommended behaviour; it is however how"
328− , " this function has worked in the past."
329− , " Use 'rewriteRequestM' instead"] #-}
330−
331−-- | Produce a function that works on 'PathsAndQueries' from one working
332−-- only on paths. This is not exported, as it is only needed to handle
333−-- code written for versions ≤ 3.0 of the library; see the
334−-- example above using 'Data.Bifunctor.first' to do something similar.
335−pathsOnly :: (Applicative m, Monad m)
336− => ([Text] -> H.RequestHeaders -> m [Text])
337− -> PathsAndQueries -> H.RequestHeaders -> m PathsAndQueries
338−pathsOnly convert psAndQs headers = (,[]) <$> convert (fst psAndQs) headers
339−{-# INLINE pathsOnly #-}
30+ let pInfo = convert (pathInfo req) (requestHeaders req)
31+ rawPInfo = TE.encodeUtf8 $ T.intercalate "/" pInfo
32+ in app req { pathInfo = pInfo, rawPathInfo = rawPInfo }
wai-extra/Network/Wai/Middleware/Timeout.hsdeleted−33
@@ -1,33 +0,0 @@
1−-- | Timeout requests
2−module Network.Wai.Middleware.Timeout
3− ( timeout
4− , timeoutStatus
5− , timeoutAs
6− ) where
7−
8−import Network.HTTP.Types (Status, status503)
9−import Network.Wai
10−import qualified System.Timeout as Timeout
11−
12−-- | Time out the request after the given number of seconds
13−--
14−-- Timeouts respond with @'status503'@. See @'timeoutStatus'@ or @'timeoutAs'@
15−-- to customize the behavior of the timed-out case.
16−--
17−-- @since 3.0.24.0@
18−timeout :: Int -> Middleware
19−timeout = timeoutStatus status503
20−
21−-- | Time out with the given @'Status'@
22−--
23−-- @since 3.0.24.0@
24−timeoutStatus :: Status -> Int -> Middleware
25−timeoutStatus status = timeoutAs $ responseLBS status [] ""
26−
27−-- | Time out with the given @'Response'@
28−--
29−-- @since 3.0.24.0@
30−timeoutAs :: Response -> Int -> Middleware
31−timeoutAs timeoutReponse seconds app req respond =
32− maybe (respond timeoutReponse) pure
33− =<< Timeout.timeout (seconds * 1000000) (app req respond)
wai-extra/Network/Wai/Parse.hs+13−28
@@ -22,7 +22,6 @@ module Network.Wai.Parse
2222 , parseContentType
2323 , ParseRequestBodyOptions
2424 , defaultParseRequestBodyOptions
25− , noLimitParseRequestBodyOptions
2625 , parseRequestBodyEx
2726 , setMaxRequestKeyLength
2827 , clearMaxRequestKeyLength
@@ -48,7 +47,7 @@ module Network.Wai.Parse
4847#endif
4948 ) where
5049
51−import qualified Control.Exception as E
50+import qualified Data.ByteString.Search as Search
5251import qualified Data.ByteString as S
5352import qualified Data.ByteString.Lazy as L
5453import qualified Data.ByteString.Char8 as S8
@@ -59,16 +58,13 @@ import Data.List (sortBy)
5958import Data.Function (on, fix)
6059import System.Directory (removeFile, getTemporaryDirectory)
6160import System.IO (hClose, openBinaryTempFile)
62−import System.IO.Error (isDoesNotExistError)
6361import Network.Wai
6462import qualified Network.HTTP.Types as H
6563import Control.Applicative ((<$>))
66−import Control.Exception (catchJust)
67−import Control.Monad (when, unless, guard)
64+import Control.Monad (when, unless)
6865import Control.Monad.Trans.Resource (allocate, release, register, InternalState, runInternalState)
6966import Data.IORef
7067import Network.HTTP.Types (hContentType)
71−import Network.HTTP2( HTTP2Error (..), ErrorCodeId (..) )
7268import Data.CaseInsensitive (mk)
7369
7470import Prelude hiding (lines)
@@ -131,7 +127,7 @@ tempFileBackEndOpts :: IO FilePath -- ^ get temporary directory
131127 -> IO FilePath
132128tempFileBackEndOpts getTmpDir pattrn internalState _ _ popper = do
133129 (key, (fp, h)) <- flip runInternalState internalState $ allocate it (hClose . snd)
134− _ <- runInternalState (register $ removeFileQuiet fp) internalState
130+ _ <- runInternalState (register $ removeFile fp) internalState
135131 fix $ \loop -> do
136132 bs <- popper
137133 unless (S.null bs) $ do
@@ -143,9 +139,6 @@ tempFileBackEndOpts getTmpDir pattrn internalState _ _ popper = do
143139 it = do
144140 tempDir <- getTmpDir
145141 openBinaryTempFile tempDir pattrn
146− removeFileQuiet fp = catchJust (guard . isDoesNotExistError)
147− (removeFile fp)
148− (const $ return ())
149142
150143-- | A data structure that describes the behavior of
151144-- the parseRequestBodyEx function.
@@ -191,7 +184,7 @@ setMaxRequestNumFiles l p = p { prboMaxNumFiles=Just l }
191184clearMaxRequestNumFiles :: ParseRequestBodyOptions -> ParseRequestBodyOptions
192185clearMaxRequestNumFiles p = p { prboMaxNumFiles=Nothing }
193186
194−-- | Set the maximum filesize per file (in bytes).
187+-- | Set the maximum filesize per file.
195188--
196189-- @since 3.0.16.0
197190setMaxRequestFileSize :: Int64 -> ParseRequestBodyOptions -> ParseRequestBodyOptions
@@ -273,7 +266,7 @@ defaultParseRequestBodyOptions = ParseRequestBodyOptions
273266
274267-- | Do not impose any memory limits.
275268--
276−-- @since 3.0.21.0
269+-- @since 3.0.16.0
277270noLimitParseRequestBodyOptions :: ParseRequestBodyOptions
278271noLimitParseRequestBodyOptions = ParseRequestBodyOptions
279272 { prboKeyLength=Nothing
@@ -327,7 +320,7 @@ getRequestBodyType req = do
327320-- | Parse a content type value, turning a single @ByteString@ into the actual
328321-- content type and a list of pairs of attributes.
329322--
330−-- @since 1.3.2
323+-- Since 1.3.2
331324parseContentType :: S.ByteString -> (S.ByteString, [(S.ByteString, S.ByteString)])
332325parseContentType a = do
333326 let (ctype, b) = S.break (== semicolon) a
@@ -337,9 +330,6 @@ parseContentType a = do
337330 semicolon = 59
338331 equals = 61
339332 space = 32
340− dq s = if S.length s > 2 && S.head s == 34 && S.last s == 34 -- quote
341− then S.tail $ S.init s
342− else s
343333 goAttrs front bs
344334 | S.null bs = front []
345335 | otherwise =
@@ -348,7 +338,7 @@ parseContentType a = do
348338 goAttr bs =
349339 let (k, v') = S.break (== equals) bs
350340 v = S.drop 1 v'
351− in (strip k, dq $ strip v)
341+ in (strip k, strip v)
352342 strip = S.dropWhile (== space) . fst . S.breakEnd (/= space)
353343
354344-- | Parse the body of an HTTP request.
@@ -356,7 +346,7 @@ parseContentType a = do
356346-- Note: This function does not limit the memory it allocates.
357347-- When dealing with untrusted data (as is usually the case when
358348-- receiving input from the internet), it is recommended to
359−-- use the 'parseRequestBodyEx' function instead.
349+-- use the parseRequestBodyEx function instead.
360350parseRequestBody :: BackEnd y
361351 -> Request
362352 -> IO ([Param], [File y])
@@ -428,8 +418,6 @@ conduitRequestBodyEx o backend (Multipart bound) rbody add =
428418
429419
430420-- | Take one header or subheader line.
431−-- Since: 3.0.26
432−-- Throw 431 if headers too large.
433421takeLine :: Maybe Int -> Source -> IO (Maybe S.ByteString)
434422takeLine maxlen src =
435423 go ""
@@ -438,8 +426,7 @@ takeLine maxlen src =
438426 bs <- readSource src
439427 case maxlen of
440428 Just maxlen' -> when (S.length front > maxlen') $
441− E.throwIO $ ConnectionError (UnknownErrorCode 431)
442− "Request Header Fields Too Large"
429+ error "Header line length exceeds allowed maximum."
443430 Nothing -> return ()
444431 if S.null bs
445432 then close front
@@ -455,8 +442,7 @@ takeLine maxlen src =
455442 let res = front `S.append` x
456443 case maxlen of
457444 Just maxlen' -> when (S.length res > maxlen') $
458− E.throwIO $ ConnectionError (UnknownErrorCode 431)
459− "Request Header Fields Too Large"
445+ error "Header line length exceeds allowed maximum."
460446 Nothing -> return ()
461447 return $ Just $ killCR $ res
462448
@@ -582,7 +568,7 @@ data Bound = FoundBound S.ByteString S.ByteString
582568 deriving (Eq, Show)
583569
584570findBound :: S.ByteString -> S.ByteString -> Bound
585−findBound b bs = handleBreak $ S.breakSubstring b bs
571+findBound b bs = handleBreak $ Search.breakOn b bs
586572 where
587573 handleBreak (h, t)
588574 | S.null t = go [lowBound..S.length bs - 1]
@@ -645,9 +631,8 @@ wrapTillBound bound src max' = do
645631 cur <- atomicModifyIORef' sref $ \ cur ->
646632 let new = cur + fromIntegral (S.length bs) in (new, new)
647633 case max' of
648− Just max'' | cur > max'' ->
649− E.throwIO $ ConnectionError (UnknownErrorCode 413) "Payload Too Large"
650− _ -> return ()
634+ Just max'' | cur > max'' -> error "Maximum size exceeded"
635+ _ -> return ()
651636 if S.null bs
652637 then do
653638 writeIORef ref $ WTBDone False
wai-extra/Network/Wai/Test.hs+35−28
@@ -39,20 +39,21 @@ import Data.Monoid (mempty, mappend)
3939
4040import Network.Wai
4141import Network.Wai.Internal (ResponseReceived (ResponseReceived))
42−import Network.Wai.Test.Internal
4342import Control.Monad.IO.Class (liftIO)
4443import Control.Monad.Trans.Class (lift)
4544import qualified Control.Monad.Trans.State as ST
46−import Control.Monad.Trans.Reader (runReaderT, ask)
45+import Control.Monad.Trans.Reader (ReaderT, runReaderT, ask)
4746import Control.Monad (unless)
4847import Control.DeepSeq (deepseq)
4948import Control.Exception (throwIO, Exception)
5049import Data.Typeable (Typeable)
50+import Data.Map (Map)
5151import qualified Data.Map as Map
5252import qualified Web.Cookie as Cookie
5353import Data.ByteString (ByteString)
5454import qualified Data.ByteString.Char8 as S8
55−import Data.ByteString.Builder (toLazyByteString)
55+import Blaze.ByteString.Builder (toLazyByteString, toByteString)
56+import qualified Blaze.ByteString.Builder as B
5657import qualified Data.ByteString.Lazy as L
5758import qualified Data.ByteString.Lazy.Char8 as L8
5859import qualified Network.HTTP.Types as H
@@ -63,6 +64,17 @@ import qualified Data.Text.Encoding as TE
6364import Data.IORef
6465import Data.Time.Clock (getCurrentTime)
6566
67+type Session = ReaderT Application (ST.StateT ClientState IO)
68+
69+-- |
70+--
71+-- Since 3.0.6
72+type ClientCookies = Map ByteString Cookie.SetCookie
73+
74+data ClientState = ClientState
75+ { clientCookies :: ClientCookies
76+ }
77+
6678-- |
6779--
6880-- Since 3.0.6
@@ -92,17 +104,15 @@ deleteClientCookie cookieName =
92104 modifyClientCookies
93105 (Map.delete cookieName)
94106
95−-- | See also: 'runSessionWith'.
107+initState :: ClientState
108+initState = ClientState Map.empty
109+
96110runSession :: Session a -> Application -> IO a
97111runSession session app = ST.evalStateT (runReaderT session app) initState
98112
99113data SRequest = SRequest
100114 { simpleRequest :: Request
101115 , simpleRequestBody :: L.ByteString
102− -- ^ Request body that will override the one set in 'simpleRequest'.
103− --
104− -- This is usually simpler than setting the body as a stateful IO-action
105− -- in 'simpleRequest'.
106116 }
107117data SResponse = SResponse
108118 { simpleStatus :: H.Status
@@ -110,22 +120,14 @@ data SResponse = SResponse
110120 , simpleBody :: L.ByteString
111121 }
112122 deriving (Show, Eq)
113−
114123request :: Request -> Session SResponse
115−request req = do
116− app <- ask
117− req' <- addCookiesToRequest req
118− response <- liftIO $ do
119− ref <- newIORef $ error "runResponse gave no result"
120− ResponseReceived <- app req' (runResponse ref)
121− readIORef ref
122− extractSetCookieFromSResponse response
124+request = srequest . flip SRequest L.empty
123125
124126-- | Set whole path (request path + query string).
125127setPath :: Request -> S8.ByteString -> Request
126128setPath req path = req {
127129 pathInfo = segments
128− , rawPathInfo = (L8.toStrict . toLazyByteString) (H.encodePathSegments segments)
130+ , rawPathInfo = B.toByteString (H.encodePathSegments segments)
129131 , queryString = query
130132 , rawQueryString = (H.renderQuery True query)
131133 }
@@ -154,7 +156,7 @@ addCookiesToRequest req = do
154156 let cookiePairs = [ (Cookie.setCookieName c, Cookie.setCookieValue c)
155157 | c <- map snd $ Map.toList cookiesForRequest
156158 ]
157− let cookieValue = L8.toStrict . toLazyByteString $ Cookie.renderCookies cookiePairs
159+ let cookieValue = toByteString $ Cookie.renderCookies cookiePairs
158160 addCookieHeader rest
159161 | null cookiePairs = rest
160162 | otherwise = ("Cookie", cookieValue) : rest
@@ -178,18 +180,22 @@ extractSetCookieFromSResponse response = do
178180 (Map.fromList [(Cookie.setCookieName c, c) | c <- newClientCookies ]))
179181 return response
180182
181−-- | Similar to 'request', but allows setting the request body as a plain
182−-- 'L.ByteString'.
183183srequest :: SRequest -> Session SResponse
184184srequest (SRequest req bod) = do
185+ app <- ask
185186 refChunks <- liftIO $ newIORef $ L.toChunks bod
186− request $
187− req
188− { requestBody = atomicModifyIORef refChunks $ \bss ->
189− case bss of
190− [] -> ([], S.empty)
191− x:y -> (y, x)
192− }
187+ let req' = req
188+ { requestBody = atomicModifyIORef refChunks $ \bss ->
189+ case bss of
190+ [] -> ([], S.empty)
191+ x:y -> (y, x)
192+ }
193+ req'' <- addCookiesToRequest req'
194+ response <- liftIO $ do
195+ ref <- newIORef $ error "runResponse gave no result"
196+ ResponseReceived <- app req'' (runResponse ref)
197+ readIORef ref
198+ extractSetCookieFromSResponse response
193199
194200runResponse :: IORef SResponse -> Response -> IO ResponseReceived
195201runResponse ref res = do
@@ -331,3 +337,4 @@ assertClientCookieValue s cookieName cookieValue = do
331337 ]
332338 )
333339 (Cookie.setCookieValue c == cookieValue)
340+
wai-extra/Network/Wai/Test/Internal.hsdeleted−35
@@ -1,35 +0,0 @@
1−module Network.Wai.Test.Internal where
2−
3−import Network.Wai
4−import qualified Control.Monad.Trans.State as ST
5−import Control.Monad.Trans.Reader (ReaderT, runReaderT)
6−import Data.Map (Map)
7−import qualified Data.Map as Map
8−import qualified Web.Cookie as Cookie
9−import Data.ByteString (ByteString)
10−
11−type Session = ReaderT Application (ST.StateT ClientState IO)
12−
13−-- |
14−--
15−-- Since 3.0.6
16−type ClientCookies = Map ByteString Cookie.SetCookie
17−
18−data ClientState = ClientState
19− { clientCookies :: ClientCookies
20− }
21−
22−-- |
23−--
24−-- Since 3.0.20.0
25−initState :: ClientState
26−initState = ClientState Map.empty
27−
28−-- | Like 'runSession', but if allows you to hand in cookies and get
29−-- the updated cookies back. One use case for this is writing tests
30−-- that address the application under test alternatingly through rest
31−-- api and through db handle.
32−--
33−-- Since 3.0.20.0
34−runSessionWith :: ClientState -> Session a -> Application -> IO (a, ClientState)
35−runSessionWith st session app = ST.runStateT (runReaderT session app) st
wai-extra/README.md+1−14
@@ -1,16 +1,3 @@
1−# wai-extra
1+## wai-extra
22
33The goal here is to provide common features without many dependencies.
4−
5−
6−## Example using Server-Sent Events ##
7−
8−There is a small example using Server-Sent Events (SSE) in the
9−`./example` directory.
10−
11−Run the commands below to start the server on http://localhost:8080
12−
13−```
14−$ stack build .
15−$ stack exec example
16−```
wai-extra/app/Main.hsnew file+55
@@ -0,0 +1,55 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+module Main where
3+
4+import Control.Monad
5+import Control.Concurrent (forkIO, threadDelay)
6+import Control.Monad.Trans (liftIO)
7+import Control.Concurrent.Chan
8+import Network.Wai.Handler.Warp (run)
9+import Network.Wai.Middleware.Gzip (gzip, def)
10+import Network.Wai
11+import Network.HTTP.Types (status200)
12+import Data.Time.Clock.POSIX
13+import Blaze.ByteString.Builder.Char.Utf8 (fromString)
14+import qualified Data.Conduit as C
15+
16+import Network.Wai.EventSource
17+
18+app :: Chan ServerEvent -> Application
19+app chan req =
20+ case pathInfo req of
21+ [] -> return $ ResponseFile status200 [("Content-Type", "text/html")] "static/index.html" Nothing
22+ ["esold"] -> eventSourceAppChan chan req
23+ ["eschan"] -> eventSourceAppChan chan req
24+ ["esio"] -> eventSourceAppIO eventIO req
25+ ["essrc"] -> eventSourceAppSource eventSource req
26+ _ -> error "unexpected pathInfo"
27+
28+eventChan :: Chan ServerEvent -> IO ()
29+eventChan chan = forever $ do
30+ threadDelay 1000000
31+ time <- getPOSIXTime
32+ writeChan chan (ServerEvent Nothing Nothing [fromString . show $ time])
33+
34+eventIO :: IO ServerEvent
35+eventIO = do
36+ threadDelay 1000000
37+ time <- getPOSIXTime
38+ return $ ServerEvent (Just $ fromString "io")
39+ Nothing
40+ [fromString . show $ time]
41+
42+eventSource :: C.Source (C.ResourceT IO) ServerEvent
43+eventSource = forever $ do
44+ time <- liftIO $ do
45+ threadDelay 1000000
46+ getPOSIXTime
47+ C.yield $ ServerEvent (Just $ fromString "source")
48+ Nothing
49+ [fromString . show $ time]
50+
51+main = do
52+ chan <- newChan
53+ _ <- forkIO . eventChan $ chan
54+ run 8080 (gzip def $ app chan)
55+
wai-extra/example/index.html → wai-extra/app/index.htmlrenamed+2−3
@@ -1,9 +1,8 @@
11<!doctype html>
22<head>
3− <title>Example</title>
4− <link rel="icon" href="data:;base64,=">
3+ <title>Hello</title>
54</head>
6−<h1>Testing Server-Sent Events</h1>
5+<h1>Testing</h1>
76
87<div id="output"></div>
98
wai-extra/example/Main.hsdeleted−62
@@ -1,62 +0,0 @@
1−{-# LANGUAGE OverloadedStrings #-}
2−module Main where
3−
4−import Data.ByteString.Builder (string8)
5−import Control.Concurrent (forkIO, threadDelay)
6−import Control.Concurrent.Chan
7−import Control.Monad
8−import Data.Time.Clock.POSIX (getPOSIXTime)
9−import Network.HTTP.Types (status200)
10−import Network.Wai (Application, Middleware, pathInfo, responseFile)
11−import Network.Wai.EventSource (ServerEvent(..), eventSourceAppChan, eventSourceAppIO)
12−import Network.Wai.Handler.Warp (run)
13−import Network.Wai.Middleware.AddHeaders (addHeaders)
14−import Network.Wai.Middleware.Gzip (gzip, def)
15−
16−
17−app :: Chan ServerEvent -> Application
18−app chan req respond =
19− case pathInfo req of
20− [] -> respond $ responseFile status200 [("Content-Type", "text/html")] "example/index.html" Nothing
21− ["esold"] -> eventSourceAppChan chan req respond
22− ["eschan"] -> eventSourceAppChan chan req respond
23− ["esio"] -> eventSourceAppIO eventIO req respond
24− _ -> error "unexpected pathInfo"
25−
26−eventChan :: Chan ServerEvent -> IO ()
27−eventChan chan = forever $ do
28− threadDelay 1000000
29− time <- getPOSIXTime
30− writeChan chan (ServerEvent Nothing Nothing [string8 . show $ time])
31−
32−eventIO :: IO ServerEvent
33−eventIO = do
34− threadDelay 1000000
35− time <- getPOSIXTime
36− return $ ServerEvent (Just $ string8 "io")
37− Nothing
38− [string8 . show $ time]
39−
40−eventRaw :: (ServerEvent -> IO ()) -> IO () -> IO ()
41−eventRaw = handle 0
42− where
43− handle counter emit flush = do
44− threadDelay 1000000
45− _ <- emit $ ServerEvent (Just $ string8 "raw")
46− Nothing
47− [string8 . show $ counter]
48− _ <- flush
49− handle (counter + 1) emit flush
50−
51−main :: IO ()
52−main = do
53− chan <- newChan
54− _ <- forkIO . eventChan $ chan
55− run 8080 (gzip def $ headers $ app chan)
56− where
57− -- headers required for SSE to work through nginx
58− -- not required if using warp directly
59− headers :: Middleware
60− headers = addHeaders [ ("X-Accel-Buffering", "no")
61− , ("Cache-Control", "no-cache")
62− ]
wai-extra/test/Network/Wai/Middleware/ForceSSLSpec.hs+5−9
@@ -8,7 +8,6 @@ import Test.Hspec
88
99import Network.Wai.Middleware.ForceSSL
1010
11−import Control.Monad
1211import Data.ByteString (ByteString)
1312import Data.Monoid ((<>))
1413import Network.HTTP.Types (methodPost, status200, status301, status307)
@@ -19,12 +18,8 @@ main :: IO ()
1918main = hspec spec
2019
2120spec :: Spec
22−spec = describe "forceSSL" (forM_ hosts $ \host -> hostSpec host)
23− where
24− hosts = ["example.com", "example.com:80", "example.com:8080"]
25−
26−hostSpec :: ByteString -> Spec
27−hostSpec host = describe ("forceSSL on host " <> show host <> "") $ do
21+spec = describe "forceSSL" $ do
22+ let host = "example.com"
2823
2924 it "redirects non-https requests to https" $ do
3025 resp <- runApp host forceSSL defaultRequest
@@ -44,7 +39,7 @@ hostSpec host = describe ("forceSSL on host " <> show host <> "") $ do
4439
4540 simpleStatus resp `shouldBe` status200
4641
47− it "preserves the original host, path, and query string" $ do
42+ it "preserves the original path and query string" $ do
4843 resp <- runApp host forceSSL defaultRequest
4944 { rawPathInfo = "/foo/bar"
5045 , rawQueryString = "?baz=bat"
@@ -55,6 +50,7 @@ hostSpec host = describe ("forceSSL on host " <> show host <> "") $ do
5550
5651runApp :: ByteString -> Middleware -> Request -> IO SResponse
5752runApp host mw req = runSession
58− (request req { requestHeaderHost = Just host }) $ mw app
53+ (request req { requestHeaderHost = Just $ host <> ":80" }) $ mw app
54+
5955 where
6056 app _ respond = respond $ responseLBS status200 [] ""
wai-extra/test/Network/Wai/Middleware/TimeoutSpec.hsdeleted−57
@@ -1,57 +0,0 @@
1−{-# LANGUAGE OverloadedStrings #-}
2−
3−module Network.Wai.Middleware.TimeoutSpec
4− ( spec
5− ) where
6−
7−import Test.Hspec
8−
9−import Control.Concurrent (threadDelay)
10−import Network.HTTP.Types (status200, status503, status504)
11−import Network.Wai
12−import Network.Wai.Middleware.Timeout
13−import Network.Wai.Test
14−
15−spec :: Spec
16−spec = do
17− describe "timeout" $ do
18− it "times out slow requests with 503" $ do
19− let app _req respond = do
20− threadDelay $ 2 * 1000000
21− respond $ responseLBS status200 [] ""
22−
23− resp <- runApp $ timeout 1 app
24−
25− simpleStatus resp `shouldBe` status503
26−
27− it "does not time out fast requests" $ do
28− let app _req respond = respond $ responseLBS status200 [] ""
29−
30− resp <- runApp $ timeout 3 app
31−
32− simpleStatus resp `shouldBe` status200
33−
34− describe "timeoutStatus" $ do
35− it "allows customizing the timeout response status" $ do
36− let app _req respond = do
37− threadDelay $ 2 * 1000000
38− respond $ responseLBS status200 [] ""
39−
40− resp <- runApp $ timeoutStatus status504 1 app
41−
42− simpleStatus resp `shouldBe` status504
43−
44− describe "timeoutAs" $ do
45− it "allows customizing the timeout response" $ do
46− let app _req respond = do
47− threadDelay $ 2 * 1000000
48− respond $ responseLBS status200 [] ""
49− timeoutResponse = responseLBS status503 [("X-Timeout", "1")] ""
50−
51− resp <- runApp $ timeoutAs timeoutResponse 1 app
52−
53− simpleStatus resp `shouldBe` status503
54− simpleHeaders resp `shouldBe` [("X-Timeout", "1")]
55−
56−runApp :: Application -> IO SResponse
57−runApp = runSession $ request defaultRequest
wai-extra/test/Network/Wai/ParseSpec.hs+5−15
@@ -13,7 +13,6 @@ import qualified Data.ByteString.Lazy as L
1313import qualified Data.Text as TS
1414import qualified Data.Text.Encoding as TE
1515import Control.Monad.Trans.Resource (withInternalState, runResourceT)
16−import Network.HTTP2( HTTP2Error (..), ErrorCodeId (..) )
1716
1817import Network.Wai
1918import Network.Wai.Test
@@ -31,7 +30,6 @@ spec = do
3130 [ ("text/plain", "text/plain", [])
3231 , ("text/plain; charset=UTF-8 ", "text/plain", [("charset", "UTF-8")])
3332 , ("text/plain; charset=UTF-8 ; boundary = foo", "text/plain", [("charset", "UTF-8"), ("boundary", "foo")])
34− , ("text/plain; charset=UTF-8 ; boundary = \"quoted\"", "text/plain", [("charset", "UTF-8"), ("boundary", "quoted")])
3533 ]
3634 it "parseHttpAccept" caseParseHttpAccept
3735 describe "parseRequestBody" $ do
@@ -95,9 +93,6 @@ caseParseRequestBody = do
9593 let expectedfile3 = [("yaml", FileInfo "README" "application/octet-stream" "Photo blog using Hack.\n")]
9694 let expected3 = (expectedsmap3, expectedfile3)
9795
98− let unknownErrorException c (ConnectionError (UnknownErrorCode code) _) = c == code
99− unknownErrorException _ _ = False
100−
10196
10297 let def = defaultParseRequestBodyOptions
10398 it "parsing actual post multipart/form-data" $ do
@@ -123,21 +118,17 @@ caseParseRequestBody = do
123118
124119 it "exceeding file size" $ do
125120 SRequest req4 _bod4 <- toRequest'' ctype3 content3
126− (parseRequestBodyEx ( setMaxRequestFileSize 2 def ) lbsBackEnd req4)
127− `shouldThrow` unknownErrorException 413
121+ (parseRequestBodyEx ( setMaxRequestFileSize 2 def ) lbsBackEnd req4) `shouldThrow` anyErrorCall
128122
129123 it "exceeding total file size" $ do
130124 SRequest req4 _bod4 <- toRequest'' ctype3 content3
131− (parseRequestBodyEx ( setMaxRequestFilesSize 20 def ) lbsBackEnd req4)
132− `shouldThrow` unknownErrorException 413
125+ (parseRequestBodyEx ( setMaxRequestFilesSize 20 def ) lbsBackEnd req4) `shouldThrow` anyErrorCall
133126 SRequest req5 _bod5 <- toRequest'' ctype3 content5
134− (parseRequestBodyEx ( setMaxRequestFilesSize 20 def ) lbsBackEnd req5)
135− `shouldThrow` unknownErrorException 413
127+ (parseRequestBodyEx ( setMaxRequestFilesSize 20 def ) lbsBackEnd req5) `shouldThrow` anyErrorCall
136128
137129 it "exceeding max parm value size" $ do
138130 SRequest req4 _bod4 <- toRequest'' ctype2 content2
139− (parseRequestBodyEx ( setMaxRequestParmsSize 10 def ) lbsBackEnd req4)
140− `shouldThrow` unknownErrorException 413
131+ (parseRequestBodyEx ( setMaxRequestParmsSize 10 def ) lbsBackEnd req4) `shouldThrow` anyErrorCall
141132
142133 it "exceeding max header lines" $ do
143134 SRequest req4 _bod4 <- toRequest'' ctype2 content2
@@ -145,8 +136,7 @@ caseParseRequestBody = do
145136
146137 it "exceeding header line size" $ do
147138 SRequest req4 _bod4 <- toRequest'' ctype3 content4
148− (parseRequestBodyEx ( setMaxHeaderLineLength 8190 def ) lbsBackEnd req4)
149− `shouldThrow` unknownErrorException 431
139+ (parseRequestBodyEx ( setMaxHeaderLineLength 8190 def ) lbsBackEnd req4) `shouldThrow` anyErrorCall
150140
151141 it "Testing parseRequestBodyEx with application/x-www-form-urlencoded" $ do
152142 let content = "thisisalongparameterkey=andthisbeanevenlongerparametervaluehelloworldhowareyou"
wai-extra/test/Network/Wai/TestSpec.hs+12−46
@@ -3,8 +3,6 @@ module Network.Wai.TestSpec (main, spec) where
33
44import Control.Monad (void)
55
6−import qualified Data.IORef as IORef
7−
86import qualified Data.Text.Encoding as TE
97
108import Data.Time.Calendar (fromGregorian)
@@ -18,17 +16,13 @@ import Network.Wai.Test
1816import Network.HTTP.Types (status200)
1917
2018import qualified Data.ByteString.Lazy.Char8 as L8
21−import Data.ByteString.Builder (Builder, toLazyByteString)
22−import Data.ByteString (ByteString)
19+import Blaze.ByteString.Builder (toByteString)
2320
2421import qualified Web.Cookie as Cookie
2522
2623main :: IO ()
2724main = hspec spec
2825
29−toByteString :: Builder -> ByteString
30−toByteString = L8.toStrict . toLazyByteString
31−
3226spec :: Spec
3327spec = do
3428 describe "setPath" $ do
@@ -55,53 +49,25 @@ spec = do
5549 it "sets rawQueryString to empty string" $ do
5650 rawQueryString (setPath defaultRequest "/foo/bar/baz") `shouldBe` ""
5751
58− describe "srequest" $ do
59−
60− let echoApp req respond = do
61− reqBody <- L8.fromStrict <$> getRequestBodyChunk req
62− let reqHeaders = requestHeaders req
63− respond $
64− responseLBS
65− status200
66− reqHeaders
67− reqBody
68−
69− it "returns the response body of an echo app" $ do
70− sresp <- flip runSession echoApp $
71− srequest $ SRequest defaultRequest "request body"
72− simpleBody sresp `shouldBe` "request body"
73−
7452 describe "request" $ do
7553
76− let echoApp req respond = do
77− reqBody <- L8.fromStrict <$> getRequestBodyChunk req
78− let reqHeaders = requestHeaders req
54+ let simpleApp _req respond =
7955 respond $
8056 responseLBS
8157 status200
82− reqHeaders
83− reqBody
58+ [("foo", "bar")]
59+ "simple"
8460
85− it "returns the status code of an echo app on default request" $ do
86− sresp <- runSession (request defaultRequest) echoApp
61+ it "returns the status code of a simple app on default request" $ do
62+ sresp <- runSession (request defaultRequest) simpleApp
8763 simpleStatus sresp `shouldBe` status200
8864
89− it "returns the response body of an echo app" $ do
90− bodyRef <- IORef.newIORef "request body"
91− let getBodyChunk = IORef.atomicModifyIORef bodyRef $ \leftover -> ("", leftover)
92− sresp <- flip runSession echoApp $
93− request $
94− defaultRequest
95− { requestBody = getBodyChunk
96− }
97− simpleBody sresp `shouldBe` "request body"
98−
99− it "returns the response headers of an echo app" $ do
100− sresp <- flip runSession echoApp $
101− request $
102− defaultRequest
103− { requestHeaders = [("foo", "bar")]
104− }
65+ it "returns the response body of a simple app on default request" $ do
66+ sresp <- runSession (request defaultRequest) simpleApp
67+ simpleBody sresp `shouldBe` "simple"
68+
69+ it "returns the response headers of a simple app on default request" $ do
70+ sresp <- runSession (request defaultRequest) simpleApp
10571 simpleHeaders sresp `shouldBe` [("foo", "bar")]
10672
10773 let cookieApp req respond =
wai-extra/wai-extra.cabal+11−33
@@ -1,5 +1,5 @@
11Name: wai-extra
2−Version: 3.0.29.1
2+Version: 3.0.16.1
33Synopsis: Provides some basic WAI handlers and middleware.
44description:
55 Provides basic WAI handler and middleware functionality:
@@ -81,41 +81,38 @@ extra-source-files:
8181 ChangeLog.md
8282 README.md
8383
84−flag build-example
85− description: Build example executable.
86− manual: True
87− default: False
88−
8984Library
90− Build-Depends: base >= 4.8 && < 5
91− , bytestring >= 0.10.4
85+ Build-Depends: base >= 4.6 && < 5
86+ , bytestring >= 0.9.1.4
9287 , wai >= 3.0.3.0 && < 3.3
9388 , old-locale >= 1.0.0.2 && < 1.1
9489 , time >= 1.1.4
9590 , network >= 2.6.1.0
9691 , directory >= 1.0.1
9792 , transformers >= 0.2.2
93+ , blaze-builder >= 0.2.1.4 && < 0.5
9894 , http-types >= 0.7
9995 , text >= 0.7
10096 , case-insensitive >= 0.2
10197 , data-default-class
102− , fast-logger >= 2.4.5
103− , wai-logger >= 2.3.2
98+ , fast-logger >= 2.4.5 && < 2.5
99+ , wai-logger >= 2.2.6 && < 2.4
104100 , ansi-terminal
105− , resourcet >= 0.4.6 && < 1.3
101+ , resourcet >= 0.4.6 && < 1.2
106102 , void >= 0.5
103+ , stringsearch >= 0.3 && < 0.4
107104 , containers
108105 , base64-bytestring
109106 , word8
107+ , lifted-base >= 0.1.2
110108 , deepseq
111− , streaming-commons >= 0.2
109+ , streaming-commons
112110 , unix-compat
113111 , cookie
114112 , vault
115113 , zlib
116114 , aeson
117115 , iproute
118− , http2
119116
120117 if os(windows)
121118 cpp-options: -DWINDOWS
@@ -147,34 +144,16 @@ Library
147144 Network.Wai.Middleware.ForceDomain
148145 Network.Wai.Middleware.ForceSSL
149146 Network.Wai.Middleware.Routed
150− Network.Wai.Middleware.Timeout
151147 Network.Wai.Parse
152148 Network.Wai.Request
153149 Network.Wai.UrlMap
154150 Network.Wai.Test
155− Network.Wai.Test.Internal
156151 Network.Wai.EventSource
157152 Network.Wai.EventSource.EventStream
158153 other-modules: Network.Wai.Middleware.RequestLogger.Internal
159154 default-language: Haskell2010
160155 ghc-options: -Wall
161156
162−executable example
163− hs-source-dirs: example
164− main-is: Main.hs
165− ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall
166− if flag(build-example)
167− build-depends: base
168− , wai-extra
169− , warp
170− , wai
171− , time
172− , http-types
173− , bytestring
174− else
175− buildable: False
176− default-language: Haskell2010
177−
178157test-suite spec
179158 type: exitcode-stdio-1.0
180159 hs-source-dirs: test
@@ -186,7 +165,6 @@ test-suite spec
186165 Network.Wai.Middleware.ForceSSLSpec
187166 Network.Wai.Middleware.RoutedSpec
188167 Network.Wai.Middleware.StripHeadersSpec
189− Network.Wai.Middleware.TimeoutSpec
190168 WaiExtraSpec
191169 build-depends: base >= 4 && < 5
192170 , wai-extra
@@ -200,10 +178,10 @@ test-suite spec
200178 , resourcet
201179 , bytestring
202180 , HUnit
181+ , blaze-builder
203182 , cookie
204183 , time
205184 , case-insensitive
206− , http2
207185 ghc-options: -Wall
208186 default-language: Haskell2010
209187
wai-frontend-monadcgi/ChangeLog.md−4
@@ -1,7 +1,3 @@
1−## 3.0.0.3
2−
3−* wai-frontend-monadcgi does not drop '?' in query string [#590](https://github.com/yesodweb/wai/issues/590)
4−
51## 3.0.0.2
62
73* Support for wai 3.2
wai-frontend-monadcgi/Network/Wai/Frontend/MonadCGI.hs+1−4
@@ -64,8 +64,5 @@ getCgiVars :: Request -> [(String, String)]
6464getCgiVars e =
6565 [ ("PATH_INFO", S8.unpack $ rawPathInfo e)
6666 , ("REQUEST_METHOD", show $ requestMethod e)
67− , ("QUERY_STRING",
68− case S8.unpack $ rawQueryString e of
69− '?':rest -> rest
70− x -> x)
67+ , ("QUERY_STRING", S8.unpack $ rawQueryString e)
7168 ]
wai-frontend-monadcgi/wai-frontend-monadcgi.cabal+1−1
@@ -1,5 +1,5 @@
11name: wai-frontend-monadcgi
2−version: 3.0.0.3
2+version: 3.0.0.2
33license: MIT
44license-file: LICENSE
55author: Michael Snoyman <michael@snoyman.com>
wai-handler-fastcgi/.gitignorenew file+4
@@ -0,0 +1,4 @@
1+/dist/
2+*.swp
3+*.hi
4+*.o
wai-handler-fastcgi/ChangeLog.mdnew file+3
@@ -0,0 +1,3 @@
1+## 3.0.0.2
2+
3+* Support wai 3.2
time-manager/LICENSE → wai-handler-fastcgi/LICENSErenamed

The content is the same.

wai-handler-fastcgi/Network/Wai/Handler/FastCGI.hscnew file+192
@@ -0,0 +1,192 @@
1+{-# LANGUAGE ForeignFunctionInterface #-}
2+{-# LANGUAGE EmptyDataDecls #-}
3+{-# LANGUAGE CPP #-}
4+-----------------------------------------------------------------------------
5+-- |
6+-- Module : Network.Wai.Handler.FastCGI
7+-- Copyright : (c) Bjorn Bringert 2004-2005, (c) Lemmih 2006, (c) Michael Snoyman 2010
8+-- License : BSD-style (see the file libraries/network/LICENSE)
9+--
10+-- Maintainer : michael@snoyman.com
11+-- Stability : experimental
12+-- Portability : non-portable (uses FFI)
13+--
14+-- Interface for FastCGI <http://fastcgi.com/>, using the fcgiapp API.
15+-- Totally ripped off by Michael Snoyman to work with Hack, then WAI.
16+--
17+-----------------------------------------------------------------------------
18+module Network.Wai.Handler.FastCGI
19+ ( run
20+ , runSendfile
21+ , runFork
22+ ) where
23+
24+import Control.Monad ( liftM, forever )
25+import Data.Word (Word8)
26+import Foreign ( Ptr, castPtr, nullPtr, peekArray0
27+ , throwIfNeg_, mallocBytes, free )
28+#ifdef GHC_7_4
29+import Foreign.C (CInt(..), CString, CStringLen)
30+#else
31+import Foreign.C (CInt, CString, CStringLen)
32+#endif
33+import Control.Exception (finally)
34+import Foreign.Storable ( Storable (..) )
35+
36+import qualified Network.Wai as W
37+import qualified Network.Wai.Handler.CGI as CGI
38+
39+import qualified Data.ByteString as S
40+import qualified Data.ByteString.Char8 as S8
41+import qualified Data.ByteString as BS
42+import qualified Data.ByteString.Internal as BSB
43+import qualified Data.ByteString.Unsafe as BSB
44+
45+import Control.Arrow ((***))
46+
47+#include <fcgiapp.h>
48+
49+------------------------------------------------------------------------
50+
51+data FCGX_Stream
52+type StreamPtr = Ptr FCGX_Stream
53+type Environ = Ptr CString
54+
55+------------------------------------------------------------------------
56+
57+foreign import ccall unsafe "fcgiapp.h FCGX_GetStr" fcgx_getStr
58+ :: CString -> CInt -> StreamPtr -> IO CInt
59+
60+foreign import ccall unsafe "fcgiapp.h FCGX_PutStr" fcgx_putStr
61+ :: CString -> CInt -> StreamPtr -> IO CInt
62+
63+
64+------------------------------------------------------------------------
65+
66+foreign import ccall unsafe "fcgiapp.h FCGX_Init" fcgx_init
67+ :: IO CInt
68+
69+runFork :: Maybe S.ByteString -> (IO () -> IO a) -> Int -> W.Application -> IO ()
70+runFork sf fork threads app = do
71+ testReturn "FCGX_Init" $ fcgx_init
72+ let oneThread = forever $ oneRequest app sf
73+ mapM_ fork $ replicate (threads - 1) oneThread
74+ oneThread
75+
76+-- | Handle FastCGI requests in an infinite loop.
77+run :: W.Application -> IO ()
78+run = runFork Nothing id 1
79+
80+-- | Handle FastCGI requests in an infinite loop. For a server which supports
81+-- the X-Sendfile header.
82+runSendfile :: S.ByteString -> W.Application -> IO ()
83+runSendfile sf = runFork (Just sf) id 1
84+
85+oneRequest :: W.Application
86+ -> Maybe S.ByteString -- X-Sendfile
87+ -> IO ()
88+oneRequest app xsendfile = withRequest $ \r -> do
89+ putStrLn "Received 1 request"
90+ env <- peekEnvp r
91+ ins <- peekIn r
92+ outs <- peekOut r
93+ handleRequest app ins outs env xsendfile
94+
95+peekIn, peekOut :: Ptr FCGX_Request -> IO (Ptr FCGX_Stream)
96+peekIn = (#peek FCGX_Request, in)
97+peekOut = (#peek FCGX_Request, out)
98+
99+peekEnvp :: Ptr FCGX_Request -> IO Environ
100+peekEnvp = (#peek FCGX_Request, envp)
101+
102+foreign import ccall unsafe "fcgiapp.h FCGX_InitRequest" fcgx_initrequest
103+ :: Ptr FCGX_Request -> CInt -> CInt -> IO CInt
104+
105+foreign import ccall safe "fcgiapp.h FCGX_Accept_r" fcgx_accept_r
106+ :: Ptr FCGX_Request -> IO CInt
107+
108+acceptRequest :: IO (Ptr FCGX_Request)
109+acceptRequest = do
110+ reqp <- mallocBytes (#size FCGX_Request)
111+ initAndAccept reqp
112+ return reqp
113+ where initAndAccept reqp = do
114+ testReturn "FCGX_InitRequest" $ fcgx_initrequest reqp 0 0
115+ testReturn "FCGX_Accept_r" $ fcgx_accept_r reqp
116+
117+withRequest :: (Ptr FCGX_Request -> IO ()) -> IO ()
118+withRequest f = do
119+ req <- acceptRequest
120+ f req `finally` finishRequest req
121+
122+foreign import ccall unsafe "fcgiapp.h FCGX_Finish_r" fcgx_finish_r
123+ :: Ptr FCGX_Request -> IO ()
124+
125+finishRequest :: Ptr FCGX_Request -> IO ()
126+finishRequest reqp = do
127+ fcgx_finish_r reqp
128+ free reqp
129+
130+handleRequest :: W.Application
131+ -> StreamPtr
132+ -> StreamPtr
133+ -> Environ
134+ -> Maybe S.ByteString -- sendfile
135+ -> IO ()
136+handleRequest f ins outs env xsendfile = do
137+ vars <- environToTable env
138+ let vars' = map (S8.unpack *** S8.unpack) vars
139+ let input = const $ sRead ins
140+ let hPut = sPutStr' outs
141+ CGI.runGeneric vars' (CGI.requestBodyFunc input) hPut xsendfile f
142+
143+data FCGX_Request
144+
145+--
146+-- * Stream IO
147+--
148+
149+sPutStr' :: StreamPtr -> BS.ByteString -> IO ()
150+sPutStr' h str =
151+ BSB.unsafeUseAsCStringLen str $ fcgxPutCStringLen h
152+
153+fcgxPutCStringLen :: StreamPtr -> CStringLen -> IO ()
154+fcgxPutCStringLen h (cs,len) =
155+ testReturn "FCGX_PutStr" $ fcgx_putStr cs (fromIntegral len) h
156+
157+sRead :: StreamPtr -> IO (Maybe BS.ByteString)
158+sRead h = buildByteString (fcgxGetBuf h) 4096
159+
160+fcgxGetBuf :: StreamPtr -> Ptr a -> Int -> IO Int
161+fcgxGetBuf h p c =
162+ liftM fromIntegral $ fcgx_getStr (castPtr p) (fromIntegral c) h
163+
164+--
165+-- * ByteString utilities
166+--
167+
168+-- | Data.ByteString.Lazy.hGetContentsN generalized to arbitrary
169+-- reading functions.
170+buildByteString :: (Ptr Word8 -> Int -> IO Int) -> Int -> IO (Maybe BS.ByteString)
171+buildByteString f k = do
172+ ps <- BSB.createAndTrim k $ \p -> f p k
173+ case BS.length ps of
174+ 0 -> return Nothing
175+ _ -> return $ Just ps
176+
177+--
178+-- * Utilities
179+--
180+
181+testReturn :: String -> IO CInt -> IO ()
182+testReturn e = throwIfNeg_ (\n -> e ++ " failed with error code: "++ show n)
183+
184+environToTable :: Environ -> IO [(S.ByteString, S.ByteString)]
185+environToTable arr = do
186+ css <- peekArray0 nullPtr arr
187+ ss <- mapM S.packCString css
188+ return $ map splitEq ss
189+ where
190+ splitEq s =
191+ let (a, b) = S.breakByte 61 s
192+ in (a, S.drop 1 b)
wai-handler-fastcgi/READMEnew file

No changes to the content.

wai-handler-fastcgi/README.mdnew file+3
@@ -0,0 +1,3 @@
1+## wai-handler-fastcgi
2+
3+Calls out to the libfcgi C library.
wai-handler-fastcgi/Setup.lhsnew file+7
@@ -0,0 +1,7 @@
1+#!/usr/bin/env runhaskell
2+
3+> module Main where
4+> import Distribution.Simple
5+
6+> main :: IO ()
7+> main = defaultMain
wai-handler-fastcgi/configurenew file+9
@@ -0,0 +1,9 @@
1+#!/bin/sh
2+#
3+
4+# subst standard header path variables
5+if test -n "$CPPFLAGS" ; then
6+ echo "Found CPPFLAGS in environment: '$CPPFLAGS'"
7+ sed 's,@CPPFLAGS@,'"$CPPFLAGS"',g;s,@LDFLAGS@,'"$LDFLAGS"',g' \
8+ < fastcgi.buildinfo.in > fastcgi.buildinfo
9+fi
wai-handler-fastcgi/fastcgi.buildinfo.innew file+3
@@ -0,0 +1,3 @@
1+ghc-options: -optc@CPPFLAGS@
2+cc-options: @CPPFLAGS@
3+ld-options: @LDFLAGS@
wai-handler-fastcgi/lighttpd.confnew file+19
@@ -0,0 +1,19 @@
1+# Run with lighttpd -D -f lighttpd.conf
2+server.port = 3000
3+server.document-root = "."
4+server.modules = ("mod_fastcgi", "mod_rewrite")
5+
6+url.rewrite-once = (
7+ "(.*)" => "/app/$1"
8+)
9+
10+fastcgi.server = (
11+ "/app" => ((
12+ "socket" => "/tmp/test.fastcgi.socket",
13+ "check-local" => "disable",
14+ "bin-path" => "./test",
15+ "min-procs" => 1,
16+ "max-procs" => 12,
17+ "idle-timeout" => 30
18+ ))
19+)
wai-handler-fastcgi/test.hsnew file+19
@@ -0,0 +1,19 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+import Network.Wai
3+import Network.Wai.Handler.FastCGI
4+import Control.Monad.IO.Class
5+import qualified Data.ByteString.Lazy as L
6+import qualified Data.ByteString.Lazy.Char8 as L8
7+import qualified Data.Enumerator as E
8+
9+main = run app
10+
11+app req
12+ | pathInfo req == "/" = return $ responseLBS status200 [("Content-Type", "text/html")] "<form method='post' action='/post'><input type='text' name='name'><input type='submit'></form>"
13+app req = do
14+ bss <- E.consume
15+ return $ responseLBS status200 [("Content-Type", "text/plain")] $ L.concat
16+ [ L8.pack $ show $ requestHeaders req
17+ , "\n"
18+ , L.fromChunks bss
19+ ]
wai-handler-fastcgi/wai-handler-fastcgi.cabalnew file+31
@@ -0,0 +1,31 @@
1+name: wai-handler-fastcgi
2+version: 3.0.0.2
3+license: MIT
4+license-file: LICENSE
5+author: Michael Snoyman <michael@snoyman.com>
6+maintainer: Michael Snoyman <michael@snoyman.com>
7+synopsis: Wai handler to fastcgi
8+description: API docs and the README are available at <http://www.stackage.org/package/wai-handler-fastcgi>.
9+category: Web
10+stability: stable
11+cabal-version: >= 1.6
12+build-type: Configure
13+extra-source-files: configure fastcgi.buildinfo.in README.md ChangeLog.md
14+homepage: http://www.yesodweb.com/book/web-application-interface
15+
16+library
17+ build-depends: base >= 4 && < 5
18+ , wai >= 3.0 && < 3.3
19+ , wai-extra >= 3.0 && < 3.1
20+ , bytestring >= 0.9.1.4
21+ exposed-modules: Network.Wai.Handler.FastCGI
22+ ghc-options: -Wall
23+ includes: fcgiapp.h
24+ extra-libraries: fcgi
25+
26+ if impl(ghc >= 7.4)
27+ cpp-options: -DGHC_7_4
28+
29+source-repository head
30+ type: git
31+ location: git://github.com/yesodweb/wai.git
wai-handler-launch/.gitignorenew file+2
@@ -0,0 +1,2 @@
1+dist/
2+*.swp
wai-handler-launch/ChangeLog.mdnew file+23
@@ -0,0 +1,23 @@
1+## 3.0.2.1
2+
3+* Relax upper bound on process
4+
5+## 3.0.2
6+
7+* Don't launch if server fails; kill server on exit [#537](https://github.com/yesodweb/wai/issues/537) [#541](https://github.com/yesodweb/wai/pull/541)
8+
9+## 3.0.1
10+
11+* make host configurable too (fixes #538) [#539](https://github.com/yesodweb/wai/pull/539)
12+
13+## 3.0.0.5
14+
15+* Support wai/warp 3.2
16+
17+## 3.0.0.3
18+
19+Allow blaze-builder 0.4
20+
21+## 3.0.0.2
22+
23+* Support for Win64
wai-handler-launch/LICENSEnew file+20
@@ -0,0 +1,20 @@
1+Copyright (c) 2012 Michael Snoyman, http://www.yesodweb.com/
2+
3+Permission is hereby granted, free of charge, to any person obtaining
4+a copy of this software and associated documentation files (the
5+"Software"), to deal in the Software without restriction, including
6+without limitation the rights to use, copy, modify, merge, publish,
7+distribute, sublicense, and/or sell copies of the Software, and to
8+permit persons to whom the Software is furnished to do so, subject to
9+the following conditions:
10+
11+The above copyright notice and this permission notice shall be
12+included in all copies or substantial portions of the Software.
13+
14+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
wai-handler-launch/Network/Wai/Handler/Launch.hsnew file+222
@@ -0,0 +1,222 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+{-# LANGUAGE ForeignFunctionInterface #-}
3+{-# LANGUAGE CPP #-}
4+module Network.Wai.Handler.Launch
5+ ( run
6+ , runUrl
7+ , runUrlPort
8+ , runHostPortUrl
9+ ) where
10+
11+import Network.Wai
12+import Network.Wai.Internal
13+import Network.HTTP.Types
14+import qualified Network.Wai.Handler.Warp as Warp
15+import Data.IORef
16+import Data.Monoid (mappend)
17+import Data.String (fromString)
18+import Control.Concurrent (forkIO, threadDelay, newEmptyMVar, putMVar, takeMVar)
19+import Control.Concurrent.Async (race)
20+import Control.Monad.IO.Class (liftIO)
21+import Control.Monad (unless)
22+import Control.Exception (throwIO)
23+import Data.Function (fix)
24+import qualified Data.ByteString as S
25+import Blaze.ByteString.Builder (fromByteString, Builder, flush)
26+import qualified Blaze.ByteString.Builder as Blaze
27+#if WINDOWS
28+import Foreign
29+import Foreign.C.String
30+#else
31+import System.Process (rawSystem)
32+#endif
33+import Data.Streaming.Blaze (newBlazeRecv, defaultStrategy)
34+import qualified Data.Streaming.Zlib as Z
35+
36+ping :: IORef Bool -> Middleware
37+ping active app req sendResponse
38+ | pathInfo req == ["_ping"] = do
39+ liftIO $ writeIORef active True
40+ sendResponse $ responseLBS status200 [] ""
41+ | otherwise = app req $ \res -> do
42+ let isHtml hs =
43+ case lookup "content-type" hs of
44+ Just ct -> "text/html" `S.isPrefixOf` ct
45+ Nothing -> False
46+ if isHtml $ responseHeaders res
47+ then do
48+ let (s, hs, withBody) = responseToStream res
49+ (isEnc, headers') = fixHeaders id hs
50+ headers'' = filter (\(x, _) -> x /= "content-length") headers'
51+ withBody $ \body ->
52+ sendResponse $ responseStream s headers'' $ \sendChunk flush ->
53+ addInsideHead sendChunk flush $ \sendChunk' flush' ->
54+ if isEnc
55+ then decode sendChunk' flush' body
56+ else body sendChunk' flush'
57+ else sendResponse res
58+
59+decode :: (Builder -> IO ()) -> IO ()
60+ -> StreamingBody
61+ -> IO ()
62+decode sendInner flushInner streamingBody = do
63+ (blazeRecv, blazeFinish) <- newBlazeRecv defaultStrategy
64+ inflate <- Z.initInflate $ Z.WindowBits 31
65+ let send builder = blazeRecv builder >>= goBuilderPopper
66+ goBuilderPopper popper = fix $ \loop -> do
67+ bs <- popper
68+ unless (S.null bs) $ do
69+ Z.feedInflate inflate bs >>= goZlibPopper
70+ loop
71+ goZlibPopper popper = fix $ \loop -> do
72+ res <- popper
73+ case res of
74+ Z.PRDone -> return ()
75+ Z.PRNext bs -> do
76+ sendInner $ fromByteString bs
77+ loop
78+ Z.PRError e -> throwIO e
79+ streamingBody send (send flush)
80+ mbs <- blazeFinish
81+ case mbs of
82+ Nothing -> return ()
83+ Just bs -> Z.feedInflate inflate bs >>= goZlibPopper
84+ Z.finishInflate inflate >>= sendInner . fromByteString
85+
86+toInsert :: S.ByteString
87+toInsert = "<script>setInterval(function(){var x;if(window.XMLHttpRequest){x=new XMLHttpRequest();}else{x=new ActiveXObject(\"Microsoft.XMLHTTP\");}x.open(\"GET\",\"/_ping\",false);x.send();},60000)</script>"
88+
89+addInsideHead :: (Builder -> IO ())
90+ -> IO ()
91+ -> StreamingBody
92+ -> IO ()
93+addInsideHead sendInner flushInner streamingBody = do
94+ (blazeRecv, blazeFinish) <- newBlazeRecv defaultStrategy
95+ ref <- newIORef $ Just (S.empty, whole)
96+ streamingBody (inner blazeRecv ref) (flush blazeRecv ref)
97+ state <- readIORef ref
98+ mbs <- blazeFinish
99+ held <- case mbs of
100+ Nothing -> return state
101+ Just bs -> push state bs
102+ case state of
103+ Nothing -> return ()
104+ Just (held, _) -> sendInner $ fromByteString held `mappend` fromByteString toInsert
105+ where
106+ whole = "<head>"
107+
108+ flush blazeRecv ref = inner blazeRecv ref Blaze.flush
109+
110+ inner blazeRecv ref builder = do
111+ state0 <- readIORef ref
112+ popper <- blazeRecv builder
113+ let loop state = do
114+ bs <- popper
115+ if S.null bs
116+ then writeIORef ref state
117+ else push state bs >>= loop
118+ loop state0
119+
120+ push Nothing x = sendInner (fromByteString x) >> return Nothing
121+ push (Just (held, atFront)) x
122+ | atFront `S.isPrefixOf` x = do
123+ let y = S.drop (S.length atFront) x
124+ sendInner $ fromByteString held
125+ `mappend` fromByteString atFront
126+ `mappend` fromByteString toInsert
127+ `mappend` fromByteString y
128+ return Nothing
129+ | whole `S.isInfixOf` x = do
130+ let (before, rest) = S.breakSubstring whole x
131+ let after = S.drop (S.length whole) rest
132+ sendInner $ fromByteString held
133+ `mappend` fromByteString before
134+ `mappend` fromByteString whole
135+ `mappend` fromByteString toInsert
136+ `mappend` fromByteString after
137+ return Nothing
138+ | x `S.isPrefixOf` atFront = do
139+ let held' = held `S.append` x
140+ atFront' = S.drop (S.length x) atFront
141+ return $ Just (held', atFront')
142+ | otherwise = do
143+ let (held', atFront', x') = getOverlap whole x
144+ sendInner $ fromByteString held `mappend` fromByteString x'
145+ return $ Just (held', atFront')
146+
147+getOverlap :: S.ByteString -> S.ByteString -> (S.ByteString, S.ByteString, S.ByteString)
148+getOverlap whole x =
149+ go whole
150+ where
151+ go piece
152+ | S.null piece = ("", whole, x)
153+ | piece `S.isSuffixOf` x =
154+ let x' = S.take (S.length x - S.length piece) x
155+ atFront = S.drop (S.length piece) whole
156+ in (piece, atFront, x')
157+ | otherwise = go $ S.init piece
158+
159+fixHeaders :: ([Header] -> [Header])
160+ -> [Header]
161+ -> (Bool, [Header])
162+fixHeaders front [] = (False, front [])
163+fixHeaders front (("content-encoding", "gzip"):rest) = (True, front rest)
164+fixHeaders front (x:xs) = fixHeaders (front . (:) x) xs
165+
166+#if WINDOWS
167+foreign import ccall "launch"
168+ launch' :: Int -> CString -> IO ()
169+#endif
170+
171+launch :: Int -> String -> IO ()
172+
173+#if WINDOWS
174+launch port s = withCString s $ launch' port
175+#else
176+launch port s = forkIO (rawSystem
177+#if MAC
178+ "open"
179+#else
180+ "xdg-open"
181+#endif
182+ ["http://127.0.0.1:" ++ show port ++ "/" ++ s] >> return ()) >> return ()
183+#endif
184+
185+run :: Application -> IO ()
186+run = runUrl ""
187+
188+runUrl :: String -> Application -> IO ()
189+runUrl = runUrlPort 4587
190+
191+runUrlPort :: Int -> String -> Application -> IO ()
192+runUrlPort = runHostPortUrl "*4"
193+
194+-- |
195+--
196+-- @since 3.0.1
197+runHostPortUrl :: String -> Int -> String -> Application -> IO ()
198+runHostPortUrl host port url app = do
199+ ready <- newEmptyMVar
200+ active <- newIORef True
201+ let settings =
202+ Warp.setPort port $
203+ Warp.setOnException (\_ _ -> return ()) $
204+ Warp.setHost (fromString host) $
205+ Warp.setBeforeMainLoop (putMVar ready ()) $
206+ Warp.defaultSettings
207+ -- Run these threads concurrently; when either one terminates or
208+ -- raises an exception, the same happens to the other.
209+ fmap (either id id) $ race
210+ -- serve app, keep updating the activity flag
211+ (Warp.runSettings settings (ping active app))
212+ -- wait for server startup, launch browser, poll until server idle
213+ (takeMVar ready >> launch port url >> loop active)
214+
215+loop :: IORef Bool -> IO ()
216+loop active = do
217+ let seconds = 120
218+ threadDelay $ 1000000 * seconds
219+ b <- readIORef active
220+ if b
221+ then writeIORef active False >> loop active
222+ else return ()
wai-handler-launch/READMEnew file

No changes to the content.

wai-handler-launch/README.mdnew file+4
@@ -0,0 +1,4 @@
1+## wai-handler-launch
2+
3+This handles cross-platform launching and inserts Javascript code to ping the
4+server. When the server no longer receives pings, it shuts down.
wai-handler-launch/Setup.lhsnew file+7
@@ -0,0 +1,7 @@
1+#!/usr/bin/env runhaskell
2+
3+> module Main where
4+> import Distribution.Simple
5+
6+> main :: IO ()
7+> main = defaultMain
wai-handler-launch/runtests.hsnew file+22
@@ -0,0 +1,22 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+import Network.Wai.Handler.Launch (insideHead)
3+import Test.Hspec
4+import Test.Hspec.HUnit
5+import Data.Enumerator hiding (map)
6+import Test.HUnit
7+import qualified Data.ByteString as S
8+
9+main :: IO ()
10+main = hspec $ describe "insideHead"
11+ [ it "handles single chunks" $ helper "bar<head>foobaz" ["bar<head>baz"]
12+ , it "handles single chunks, no <head>" $ helper "barfoo" ["bar"]
13+ , it "handles whole chunks" $ helper "bar<head>foobaz" ["bar", "<head>", "baz"]
14+ , it "handles split chunks" $ helper "bar<head>foobaz" ["bar", "<he", "ad>", "baz"]
15+ , it "handles many chunks" $ helper "bar<head>foobaz1234567890" ["bar", "<he", "ad>", "baz", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0"]
16+ , it "handles many pieces" $ helper "bar<head>foobaz" $ map S.singleton $ S.unpack "bar<head>baz"
17+ ]
18+
19+helper :: S.ByteString -> [S.ByteString] -> Assertion
20+helper res pieces = do
21+ x <- run_ $ enumList 1 pieces $$ joinI $ insideHead "foo" $$ consume
22+ S.concat x @?= res
wai-handler-launch/test.hsnew file+7
@@ -0,0 +1,7 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+import Network.Wai
3+import Network.HTTP.Types
4+import Network.Wai.Handler.Launch
5+import Network.Wai.Middleware.Gzip
6+
7+main = runUrl "FIXME" $ gzip def $ \_ f -> f $ responseLBS status200 [("Content-Type", "text/html; charset=utf8")] "<html><head></head><body>HELLO THERE"
wai-handler-launch/wai-handler-launch.cabalnew file+37
@@ -0,0 +1,37 @@
1+Name: wai-handler-launch
2+Version: 3.0.2.1
3+Synopsis: Launch a web app in the default browser.
4+description: API docs and the README are available at <http://www.stackage.org/package/wai-handler-launch>.
5+License: MIT
6+License-file: LICENSE
7+Author: Michael Snoyman
8+Maintainer: michael@snoyman.com
9+Category: Web
10+Build-type: Simple
11+Cabal-version: >=1.6
12+extra-source-files: README.md ChangeLog.md
13+
14+Library
15+ Exposed-modules: Network.Wai.Handler.Launch
16+ build-depends: base >= 4 && < 5
17+ , wai >= 3.0 && < 3.3
18+ , warp >= 3.0 && < 3.3
19+ , http-types >= 0.7
20+ , transformers >= 0.2.2
21+ , bytestring >= 0.9.1.4
22+ , blaze-builder >= 0.2.1.4 && < 0.5
23+ , streaming-commons
24+ , async
25+
26+ if os(windows)
27+ c-sources: windows.c
28+ cpp-options: -DWINDOWS
29+ extra-libraries: Shell32 msvcrt
30+ else
31+ build-depends: process >= 1.0 && < 1.5
32+ if os(darwin)
33+ cpp-options: -DMAC
34+
35+source-repository head
36+ type: git
37+ location: git://github.com/yesodweb/wai.git
wai-handler-launch/windows.cnew file+12
@@ -0,0 +1,12 @@
1+#include <windows.h>
2+#include <shellapi.h>
3+#include <stdio.h>
4+
5+void launch(int port, char *s)
6+{
7+ int len = 8 + strlen("http://127.0.0.1:") + strlen(s);
8+ char *buff = malloc(len);
9+ _snprintf(buff, len, "http://127.0.0.1:%d/%s", port, s);
10+ ShellExecute(NULL, "open", buff, NULL, NULL, SW_SHOWNORMAL);
11+ free(buff);
12+}
wai-handler-webkit/.gitignorenew file+2
@@ -0,0 +1,2 @@
1+dist
2+*.swp
wai-handler-webkit/ChangeLog.mdnew file+3
@@ -0,0 +1,3 @@
1+## 3.0.0.3
2+
3+* Support for wai/warp 3.2
wai-handler-webkit/LICENSEnew file+20
@@ -0,0 +1,20 @@
1+Copyright (c) 2012 Michael Snoyman, http://www.yesodweb.com/
2+
3+Permission is hereby granted, free of charge, to any person obtaining
4+a copy of this software and associated documentation files (the
5+"Software"), to deal in the Software without restriction, including
6+without limitation the rights to use, copy, modify, merge, publish,
7+distribute, sublicense, and/or sell copies of the Software, and to
8+permit persons to whom the Software is furnished to do so, subject to
9+the following conditions:
10+
11+The above copyright notice and this permission notice shall be
12+included in all copies or substantial portions of the Software.
13+
14+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
wai-handler-webkit/Network/Wai/Handler/Webkit.hsnew file+21
@@ -0,0 +1,21 @@
1+{-# LANGUAGE ForeignFunctionInterface #-}
2+module Network.Wai.Handler.Webkit (run) where
3+
4+import Network.Wai (Application)
5+import qualified Network.Wai.Handler.Warp as S
6+import Control.Concurrent (forkOS)
7+import Control.Concurrent.MVar
8+import Foreign.C.String (CString, withCString)
9+import Control.Exception (finally)
10+
11+run :: String -- ^ Title to show in titlebar
12+ -> Application -> IO ()
13+run title app = do
14+ mvar <- newEmptyMVar
15+ _ <- forkOS $ finally (S.run 3000 app) (putMVar mvar ())
16+ _ <- forkOS $ finally (withCString title startBrowser) (putMVar mvar ())
17+ _ <- takeMVar mvar
18+ return ()
19+
20+foreign import ccall "start_browser"
21+ startBrowser :: CString -> IO ()
wai-handler-webkit/README.mdnew file+53
@@ -0,0 +1,53 @@
1+wai-handler-webkit
2+==================
3+
4+Turn WAI applications into standalone GUIs using Qt WebKit.
5+
6+
7+Linux
8+-----
9+
10+You'll need the appropriate system libraries, on Ubuntu:
11+
12+ apt-get install libqtwebkit-dev
13+
14+On Lucid, this required adding a PPA:
15+
16+ sudo add-apt-repository ppa:kubuntu-ppa/backports
17+
18+
19+Windows
20+-------
21+
22+Install the Qt SDK from <http://qt.nokia.com/downloads/>
23+
24+Your application's Cabal file will require certain options for Windows,
25+shown below. In particular, we need to link with `g++`, so make sure
26+it's in your `PATH`. The option `-optl-mwindows` ensures that the
27+application does not open a terminal.
28+
29+ if os(windows)
30+ ghc-options: -Wall -threaded -pgml g++ -optl-static -optl-mwindows
31+ else
32+ ghc-options: -Wall
33+
34+Run `cabal-install` with the Qt `include` and `lib` directories.
35+
36+ export QT_PATH=c:/QtSDK/Desktop/Qt/4.7.3/mingw
37+
38+ cabal-dev install \
39+ --extra-include-dirs=$QT_PATH/include \
40+ --extra-include-dirs=$QT_PATH/include/QtCore \
41+ --extra-include-dirs=$QT_PATH/include/QtNetwork \
42+ --extra-include-dirs=$QT_PATH/include/QtGui \
43+ --extra-include-dirs=$QT_PATH/include/QtWebKit \
44+ --extra-lib-dirs=$QT_PATH/lib
45+
46+You'll need to include these DLLs with your application:
47+
48+ phonon4.dll
49+ libgcc_s_dw2-1.dll
50+ QtCore4.dll
51+ QtGui4.dll
52+ QtNetwork4.dll
53+ QtWebKit4.dll
wai-handler-webkit/Setup.lhsnew file+7
@@ -0,0 +1,7 @@
1+#!/usr/bin/env runhaskell
2+
3+> module Main where
4+> import Distribution.Simple
5+
6+> main :: IO ()
7+> main = defaultMain
wai-handler-webkit/sample.hsnew file+10
@@ -0,0 +1,10 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+import Network.Wai
3+import Network.Wai.Handler.Webkit
4+import Network.HTTP.Types
5+
6+main :: IO ()
7+main = run "Sample App" app
8+
9+app :: Application
10+app _ response = response $ responseLBS status200 [("Content-Type", "text/html")] "<h1>Hello World!</h1>"
wai-handler-webkit/wai-handler-webkit.cabalnew file+30
@@ -0,0 +1,30 @@
1+name: wai-handler-webkit
2+version: 3.0.0.3
3+license: MIT
4+license-file: LICENSE
5+author: Michael Snoyman <michael@snoyman.com>
6+maintainer: Michael Snoyman <michael@snoyman.com>
7+synopsis: Turn WAI applications into standalone GUIs using QtWebkit.
8+description: API docs and the README are available at <http://www.stackage.org/package/wai-handler-webkit>.
9+category: Web
10+stability: unstable
11+cabal-version: >= 1.6
12+build-type: Simple
13+homepage: https://github.com/yesodweb/wai/tree/master/wai-handler-webkit
14+extra-source-files: README.md ChangeLog.md
15+
16+library
17+ build-depends: base >= 4 && < 5
18+ , wai >= 3.0 && < 3.3
19+ , warp >= 3.0 && < 3.3
20+ ghc-options: -Wall
21+ exposed-modules: Network.Wai.Handler.Webkit
22+ c-sources: webkit.cpp
23+ if os(windows)
24+ extra-libraries: QtCore4, QtGui4, QtNetwork4, QtWebKit4
25+ else
26+ pkgconfig-depends: QtWebKit
27+
28+source-repository head
29+ type: git
30+ location: git://github.com/yesodweb/wai.git
wai-handler-webkit/webkit.cppnew file+19
@@ -0,0 +1,19 @@
1+#include <QApplication>
2+#include <QPushButton>
3+#include <QtWebKit>
4+
5+extern "C" {
6+ int start_browser(char *title)
7+ {
8+ char *argv[1];
9+ argv[0] = title;
10+ int argc = 1;
11+
12+ QApplication app(argc, argv);
13+ QWebView *view = new QWebView();
14+ view->load(QUrl("http://localhost:3000/"));
15+ view->show();
16+
17+ return app.exec();
18+ }
19+}
wai-http2-extra/Network/Wai/Middleware/Push/Referer.hs+2−4
@@ -120,12 +120,10 @@ pushOnReferer settings@Settings{..} app req sendResponse = do
120120 when (isNothing mauth
121121 || requestHeaderHost req == mauth) $ do
122122 when (path /= refPath) $ do -- just in case
123− let !path' = BS.copy path
124− !refPath' = BS.copy refPath
125− mpp <- makePushPromise refPath' path' file
123+ mpp <- makePushPromise refPath path file
126124 case mpp of
127125 Nothing -> return ()
128− Just pp -> reaperAdd reaper (refPath',pp)
126+ Just pp -> reaperAdd reaper (refPath,pp)
129127 ps -> do
130128 let !h2d = defaultHTTP2Data { http2dataPushPromise = ps}
131129 setHTTP2Data req (Just h2d)
wai-http2-extra/wai-http2-extra.cabal+2−9
@@ -1,5 +1,5 @@
11Name: wai-http2-extra
2−Version: 0.1.2
2+Version: 0.0.2
33Synopsis: WAI utilities for HTTP/2
44License: MIT
55License-file: LICENSE
@@ -8,7 +8,7 @@ Maintainer: kazu@iij.ad.jp
88Homepage: http://github.com/yesodweb/wai
99Category: Web
1010Build-Type: Simple
11−Cabal-Version: >=1.10
11+Cabal-Version: >=1.8
1212Stability: Stable
1313Description: WAI utilities for HTTP/2
1414
@@ -24,9 +24,6 @@ Library
2424 Exposed-modules: Network.Wai.Middleware.Push.Referer
2525 Other-modules: Network.Wai.Middleware.Push.Referer.LimitMultiMap
2626 Ghc-Options: -Wall
27− if impl(ghc >= 8)
28− default-extensions: Strict StrictData
29− default-language: Haskell2010
3027
3128Test-Suite doctest
3229 Type: exitcode-stdio-1.0
@@ -35,10 +32,6 @@ Test-Suite doctest
3532 Main-Is: doctests.hs
3633 Build-Depends: base
3734 , doctest >= 0.10.1
38− if impl(ghc >= 8)
39− default-extensions: Strict StrictData
40− default-language: Haskell2010
41−
4235Source-Repository head
4336 Type: git
4437 Location: git://github.com/yesodweb/wai.git
wai-websockets/ChangeLog.md−12
@@ -1,15 +1,3 @@
1−## 3.0.1.2
2−
3−* Drop unused dependency on blaze-builder
4−
5−## 3.0.1.1
6−
7−* Doc improvement
8−
9−## 3.0.1
10−
11−* Improved connection close logic
12−
131## 3.0.0.9
142
153* Clean up stream resources when websockets completes [#549](https://github.com/yesodweb/wai/pull/549)
wai-websockets/Network/Wai/Handler/WebSockets.hs+3−3
@@ -30,10 +30,10 @@ isWebSocketsReq req =
3030-- WebSocket requests.
3131--
3232-- @
33−-- websocketsOr opts ws_app backup_app = \\req respond ->
33+-- websocketsOr opts ws_app backup_app = \\req send_response ->
3434-- __case__ 'websocketsApp' opts ws_app req __of__
3535-- 'Nothing' -> backup_app req send_response
36−-- 'Just' res -> respond res
36+-- 'Just' res -> send_response res
3737-- @
3838--
3939-- For example, below is an 'Wai.Application' that sends @"Hello, client!"@ to
@@ -49,7 +49,7 @@ isWebSocketsReq req =
4949-- 'WS.sendTextData' conn ("Hello, client!" :: 'Data.Text.Text')
5050--
5151-- backupApp :: 'Wai.Application'
52−-- backupApp _ respond = respond $ 'Wai.responseLBS' 'Network.HTTP.Types.status400' [] "Not a WebSocket request"
52+-- backupApp = 'Wai.respondLBS' 'Network.HTTP.Types.status400' [] "Not a WebSocket request"
5353-- @
5454websocketsOr :: WS.ConnectionOptions
5555 -> WS.ServerApp
wai-websockets/server.lhs+3−9
@@ -8,14 +8,12 @@ this example, keep the [reference](http://jaspervdj.be/websockets/reference)
88nearby to check out the functions we use.
99
1010> {-# LANGUAGE OverloadedStrings, TemplateHaskell #-}
11−> {-# LANGUAGE CPP #-}
12−> {-# OPTIONS_GHC -Wno-unused-top-binds #-} -- for numClients
1311> import Data.Char (isPunctuation, isSpace)
1412> import Data.Monoid (mappend)
1513> import Data.Text (Text)
16−> import Control.Exception (finally)
14+> import Control.Exception (finally)
1715> import Control.Monad (forM_, forever)
18−> import Control.Concurrent (MVar, newMVar, modifyMVar_, readMVar, modifyMVar)
16+> import Control.Concurrent (MVar, newMVar, modifyMVar_, readMVar, forkIO, modifyMVar)
1917> import Control.Monad.IO.Class (liftIO)
2018> import qualified Data.Text as T
2119> import qualified Data.Text.IO as T
@@ -101,13 +99,9 @@ stays alive on some browsers.
10199
102100> application state pending = do
103101> conn <- WS.acceptRequest pending
104−#if __GLASGOW_HASKELL__ >= 806
105−> WS.withPingThread conn 30 (return ()) $ do
106−#else
107102> WS.forkPingThread conn 30
108−#endif
109103
110−When a client is successfully connected, we read the first message. This should
104+When a client is succesfully connected, we read the first message. This should
111105be in the format of "Hi! I am Jasper", where Jasper is the requested username.
112106
113107> msg <- WS.receiveData conn
wai-websockets/wai-websockets.cabal+3−2
@@ -1,5 +1,5 @@
11Name: wai-websockets
2−Version: 3.0.1.2
2+Version: 3.0.0.9
33Synopsis: Provide a bridge between WAI and the websockets package.
44License: MIT
55License-file: LICENSE
@@ -21,6 +21,7 @@ Library
2121 Build-Depends: base >= 3 && < 5
2222 , bytestring >= 0.9.1.4
2323 , wai >= 3.0 && < 3.3
24+ , blaze-builder >= 0.2.1.4 && < 0.5
2425 , case-insensitive >= 0.2
2526 , network >= 2.2.1.5
2627 , transformers >= 0.2
@@ -40,12 +41,12 @@ Executable wai-websockets-example
4041 , wai-app-static
4142 , bytestring
4243 , case-insensitive
44+ , blaze-builder
4345 , transformers
4446 , network
4547 , text
4648 , file-embed
4749 , http-types
48− other-modules: Network.Wai.Handler.WebSockets
4950 else
5051 buildable: False
5152
wai/ChangeLog.md−14
@@ -1,17 +1,3 @@
1−# ChangeLog for wai
2−
3−## 3.2.2.1
4−
5−* Fix missing reexport of `getRequestBodyChunk` [#753](https://github.com/yesodweb/wai/issues/753)
6−
7−## 3.2.2
8−
9−* Deprecate `requestBody` in favor of the more clearly named `getRequestBodyChunk`. [#726](https://github.com/yesodweb/wai/pull/726)
10−
11−## 3.2.1.2
12−
13−* Remove dependency on blaze-builder [#683](https://github.com/yesodweb/wai/pull/683)
14−
151## 3.2.1.1
162
173* Relax upper bound on bytestring-builder
wai/Network/Wai.hs+21−20
@@ -1,14 +1,15 @@
1+{-# LANGUAGE Rank2Types #-}
2+{-# LANGUAGE CPP #-}
13{-|
24
35This module defines a generic web application interface. It is a common
46protocol between web servers and web applications.
57
68The overriding design principles here are performance and generality. To
7−address performance, this library uses a streaming interface for request and
8−response bodies, paired with bytestring's 'Builder' type. The advantages of a
9−streaming API over lazy IO have been debated elsewhere and so will not be
10−addressed here. However, helper functions like 'responseLBS' allow you to
11−continue using lazy IO if you so desire.
9+address performance, this library is built on top of the conduit and
10+blaze-builder packages. The advantages of conduits over lazy IO have been
11+debated elsewhere and so will not be addressed here. However, helper functions
12+like 'responseLBS' allow you to continue using lazy IO if you so desire.
1213
1314Generality is achieved by removing many variables commonly found in similar
1415projects that are not universal to all servers. The goal is that the 'Request'
@@ -30,9 +31,9 @@ include:
3031
3132[wai-extra] <http://hackage.haskell.org/package/wai-extra>
3233
34+[wai-test] <http://hackage.haskell.org/package/wai-test>
35+
3336-}
34−-- Ignore deprecations, because this module needs to use the deprecated requestBody to construct a response.
35−{-# OPTIONS_GHC -fno-warn-deprecations #-}
3637module Network.Wai
3738 (
3839 -- * Types
@@ -53,7 +54,6 @@ module Network.Wai
5354 , remoteHost
5455 , pathInfo
5556 , queryString
56− , getRequestBodyChunk
5757 , requestBody
5858 , vault
5959 , requestBodyLength
@@ -85,8 +85,8 @@ module Network.Wai
8585 , modifyResponse
8686 ) where
8787
88−import Data.ByteString.Builder (Builder, lazyByteString)
89−import Data.ByteString.Builder (byteString)
88+import Blaze.ByteString.Builder (Builder, fromLazyByteString)
89+import Blaze.ByteString.Builder (fromByteString)
9090import Control.Monad (unless)
9191import qualified Data.ByteString as B
9292import qualified Data.ByteString.Lazy as L
@@ -94,6 +94,7 @@ import qualified Data.ByteString.Lazy.Internal as LI
9494import Data.ByteString.Lazy.Internal (defaultChunkSize)
9595import Data.ByteString.Lazy.Char8 ()
9696import Data.Function (fix)
97+import Data.Monoid (mempty)
9798import qualified Network.HTTP.Types as H
9899import Network.Socket (SockAddr (SockAddrInet))
99100import Network.Wai.Internal
@@ -121,13 +122,13 @@ responseFile = ResponseFile
121122--
122123-- A2. No. If the ByteStrings are small, then they will be copied into a larger
123124-- buffer, which should be a performance gain overall (less system calls). If
124−-- they are already large, then an insert operation is used
125−-- to avoid copying.
125+-- they are already large, then blaze-builder uses an InsertByteString
126+-- instruction to avoid copying.
126127--
127128-- Q3. Doesn't this prevent us from creating comet-style servers, since data
128129-- will be cached?
129130--
130−-- A3. You can force a Builder to output a ByteString before it is an
131+-- A3. You can force blaze-builder to output a ByteString before it is an
131132-- optimal size by sending a flush command.
132133responseBuilder :: H.Status -> H.ResponseHeaders -> Builder -> Response
133134responseBuilder = ResponseBuilder
@@ -135,7 +136,7 @@ responseBuilder = ResponseBuilder
135136-- | Creating 'Response' from 'L.ByteString'. This is a wrapper for
136137-- 'responseBuilder'.
137138responseLBS :: H.Status -> H.ResponseHeaders -> L.ByteString -> Response
138−responseLBS s h = ResponseBuilder s h . lazyByteString
139+responseLBS s h = ResponseBuilder s h . fromLazyByteString
139140
140141-- | Creating 'Response' from a stream of values.
141142--
@@ -149,9 +150,9 @@ responseLBS s h = ResponseBuilder s h . lazyByteString
149150-- (putStrLn \"Allocating scarce resource\")
150151-- (putStrLn \"Cleaning up\")
151152-- $ respond $ responseStream status200 [] $ \\write flush -> do
152−-- write $ byteString \"Hello\\n\"
153+-- write $ fromByteString \"Hello\\n\"
153154-- flush
154−-- write $ byteString \"World\\n\"
155+-- write $ fromByteString \"World\\n\"
155156-- @
156157--
157158-- Note that in some cases you can use @bracket@ from inside @responseStream@
@@ -214,7 +215,7 @@ responseToStream (ResponseFile s h fp (Just part)) =
214215 bs <- B.hGetSome handle defaultChunkSize
215216 unless (B.null bs) $ do
216217 let x = B.take remaining bs
217− sendChunk $ byteString x
218+ sendChunk $ fromByteString x
218219 loop $ remaining - B.length x
219220 loop $ fromIntegral $ filePartByteCount part
220221 )
@@ -225,7 +226,7 @@ responseToStream (ResponseFile s h fp Nothing) =
225226 withBody $ \sendChunk _flush -> fix $ \loop -> do
226227 bs <- B.hGetSome handle defaultChunkSize
227228 unless (B.null bs) $ do
228− sendChunk $ byteString bs
229+ sendChunk $ fromByteString bs
229230 loop
230231 )
231232responseToStream (ResponseBuilder s h b) =
@@ -326,7 +327,7 @@ strictRequestBody req =
326327 loop id
327328 where
328329 loop front = do
329− bs <- getRequestBodyChunk req
330+ bs <- requestBody req
330331 if B.null bs
331332 then return $ front LI.Empty
332333 else loop (front . LI.Chunk bs)
@@ -340,7 +341,7 @@ lazyRequestBody req =
340341 loop
341342 where
342343 loop = unsafeInterleaveIO $ do
343− bs <- getRequestBodyChunk req
344+ bs <- requestBody req
344345 if B.null bs
345346 then return LI.Empty
346347 else do
wai/Network/Wai/Internal.hs+7−10
@@ -1,12 +1,17 @@
11{-# OPTIONS_HADDOCK not-home #-}
2+{-# LANGUAGE DeriveDataTypeable #-}
23{-# LANGUAGE CPP #-}
4+{-# LANGUAGE RankNTypes #-}
35{-# LANGUAGE RecordWildCards #-}
46-- | Internal constructors and helper functions. Note that no guarantees are
57-- given for stability of these interfaces.
68module Network.Wai.Internal where
79
8−import Data.ByteString.Builder (Builder)
10+import Blaze.ByteString.Builder (Builder)
911import qualified Data.ByteString as B hiding (pack)
12+#if __GLASGOW_HASKELL__ < 709
13+import Data.Functor ((<$>))
14+#endif
1015import Data.Text (Text)
1116import Data.Typeable (Typeable)
1217import Data.Vault.Lazy (Vault)
@@ -17,7 +22,6 @@ import Data.List (intercalate)
1722
1823-- | Information on the request sent by the client. This abstracts away the
1924-- details of the underlying implementation.
20−{-# DEPRECATED requestBody "requestBody's name is misleading because it only gets a partial chunk of the body. Use getRequestBodyChunk instead." #-}
2125data Request = Request {
2226 -- | Request method such as GET.
2327 requestMethod :: H.Method
@@ -63,7 +67,7 @@ data Request = Request {
6367 -- | Parsed query string information.
6468 , queryString :: H.Query
6569 -- | Get the next chunk of the body. Returns 'B.empty' when the
66− -- body is fully consumed. Since 3.2.2, this is deprecated in favor of 'getRequestBodyChunk'.
70+ -- body is fully consumed.
6771 , requestBody :: IO B.ByteString
6872 -- | A location for arbitrary data to be shared by applications and middleware.
6973 , vault :: Vault
@@ -91,13 +95,6 @@ data Request = Request {
9195 }
9296 deriving (Typeable)
9397
94−-- | Get the next chunk of the body. Returns 'B.empty' when the
95−-- body is fully consumed.
96−--
97−-- @since 3.2.2
98−getRequestBodyChunk :: Request -> IO B.ByteString
99−getRequestBodyChunk = requestBody
100−
10198instance Show Request where
10299 show Request{..} = "Request {" ++ intercalate ", " [a ++ " = " ++ b | (a,b) <- fields] ++ "}"
103100 where
wai/README.md+1−1
@@ -67,7 +67,7 @@ Basic dispatching
6767An `Application` maps `Request`s to `Response`s:
6868
6969 ghci> :info Application
70− type Application = Request -> (Response -> IO ResponseReceived) -> IO ResponseReceived
70+ type Application = Request -> IO Response
7171
7272Depending on the path info provided with each `Request` we can serve different `Response`s:
7373
wai/test/Network/WaiSpec.hs+9−7
@@ -3,10 +3,12 @@ module Network.WaiSpec (spec) where
33import Test.Hspec
44import Test.Hspec.QuickCheck (prop)
55import Network.Wai
6+import Network.Wai.Internal (Request (Request))
67import Data.IORef
8+import Data.Monoid
79import qualified Data.ByteString as S
810import qualified Data.ByteString.Lazy as L
9−import Data.ByteString.Builder (Builder, toLazyByteString, word8)
11+import Blaze.ByteString.Builder (toByteString, Builder, fromWord8)
1012import Control.Monad (forM_)
1113
1214spec :: Spec
@@ -22,17 +24,17 @@ spec = do
2224 flush :: IO ()
2325 flush = return ()
2426 streamingBody add flush
25− fmap (L.toStrict . toLazyByteString) $ readIORef builderRef
27+ fmap toByteString $ readIORef builderRef
2628 prop "responseLBS" $ \bytes -> do
2729 body <- getBody $ responseLBS undefined undefined $ L.pack bytes
2830 body `shouldBe` S.pack bytes
2931 prop "responseBuilder" $ \bytes -> do
3032 body <- getBody $ responseBuilder undefined undefined
31− $ mconcat $ map word8 bytes
33+ $ mconcat $ map fromWord8 bytes
3234 body `shouldBe` S.pack bytes
3335 prop "responseStream" $ \chunks -> do
3436 body <- getBody $ responseStream undefined undefined $ \sendChunk _ ->
35− forM_ chunks $ \chunk -> sendChunk $ mconcat $ map word8 chunk
37+ forM_ chunks $ \chunk -> sendChunk $ mconcat $ map fromWord8 chunk
3638 body `shouldBe` S.concat (map S.pack chunks)
3739 it "responseFile total" $ do
3840 let fp = "wai.cabal"
@@ -55,7 +57,7 @@ spec = do
5557 describe "lazyRequestBody" $ do
5658 prop "works" $ \chunks -> do
5759 ref <- newIORef $ map S.pack $ filter (not . null) chunks
58− let req = defaultRequest
60+ let req = Request
5961 { requestBody = atomicModifyIORef ref $ \bss ->
6062 case bss of
6163 [] -> ([], S.empty)
@@ -64,7 +66,7 @@ spec = do
6466 body <- lazyRequestBody req
6567 body `shouldBe` L.fromChunks (map S.pack chunks)
6668 it "is lazy" $ do
67− let req = defaultRequest
69+ let req = Request
6870 { requestBody = error "requestBody"
6971 }
7072 _ <- lazyRequestBody req
@@ -72,7 +74,7 @@ spec = do
7274 describe "strictRequestBody" $ do
7375 prop "works" $ \chunks -> do
7476 ref <- newIORef $ map S.pack $ filter (not . null) chunks
75− let req = defaultRequest
77+ let req = Request
7678 { requestBody = atomicModifyIORef ref $ \bss ->
7779 case bss of
7880 [] -> ([], S.empty)
wai/wai.cabal+10−8
@@ -1,9 +1,8 @@
11Name: wai
2−Version: 3.2.2.1
2+Version: 3.2.1.1
33Synopsis: Web Application Interface.
44Description: Provides a common protocol for communication between web applications and web servers.
5− .
6− API docs and the README are available at <http://www.stackage.org/package/wai>.
5+description: API docs and the README are available at <http://www.stackage.org/package/wai>.
76License: MIT
87License-file: LICENSE
98Author: Michael Snoyman
@@ -20,11 +19,14 @@ Source-repository head
2019 location: git://github.com/yesodweb/wai.git
2120
2221Library
23− Build-Depends: base >= 4.8 && < 5
24− , bytestring >= 0.10.4
22+ Build-Depends: base >= 4 && < 5
23+ , bytestring >= 0.10
24+ , bytestring-builder >= 0.10.4.0 && < 0.11
25+ , blaze-builder >= 0.2.1.4 && < 0.5
2526 , network >= 2.2.1.5
2627 , http-types >= 0.7
2728 , text >= 0.7
29+ , transformers >= 0.0
2830 , vault >= 0.3 && < 0.4
2931 Exposed-modules: Network.Wai
3032 Network.Wai.Internal
@@ -34,14 +36,14 @@ test-suite test
3436 hs-source-dirs: test
3537 main-is: Spec.hs
3638 type: exitcode-stdio-1.0
37− ghc-options: -threaded -Wall
39+ ghc-options: -threaded
3840 cpp-options: -DTEST
39− build-depends: base >= 4.8 && < 5
41+ build-depends: base
4042 , wai
4143 , hspec
44+ , blaze-builder
4245 , bytestring
4346 other-modules: Network.WaiSpec
44− build-tool-depends: hspec-discover:hspec-discover
4547
4648source-repository head
4749 type: git
wai/webkit-sample/webkit-sample.hs+2−2
@@ -5,7 +5,7 @@ import Network.Wai.Handler.Webkit
55import Data.ByteString (ByteString)
66import qualified Data.ByteString.Lazy as L
77import Data.Enumerator (consume, Iteratee)
8−import Data.ByteString.Builder (lazyByteString)
8+import Blaze.ByteString.Builder (fromLazyByteString)
99
1010main :: IO ()
1111main = putStrLn "http://localhost:3000/" >> run "Webkit Sample" app
@@ -27,4 +27,4 @@ postResponse :: L.ByteString -> Iteratee ByteString IO Response
2727postResponse lbs = return $ ResponseBuilder
2828 status200
2929 [("Content-Type", "text/plain")]
30− (lazyByteString lbs)
30+ (fromLazyByteString lbs)
warp-tls/ChangeLog.md−47
@@ -1,50 +1,3 @@
1−## 3.2.11
2−
3−* Ignoring an exception from shutdown (gracefulClose).
4−
5−## 3.2.10
6−
7−* Passing client certificate, if any, to Warp
8− [#783](https://github.com/yesodweb/wai/pull/783)
9−
10−## 3.2.9
11−
12−* Cooperating setGracefulCloseTimeout1 and setGracefulCloseTimeout2 of Warp.
13− [#782](https://github.com/yesodweb/wai/pull/782)
14−
15−## 3.2.8
16−
17−* Using gracefullClose of network 3.1.1 or later if available.
18−
19−## 3.2.7
20−
21−* Relaxing version constraint.
22−
23−## 3.2.6
24−
25−* Using the Strict and StrictData language extensions for GHC >8.
26− [#752](https://github.com/yesodweb/wai/pull/752)
27−
28−## 3.2.5
29−
30−* When tls 1.5.0 is available, TLS 1.3 is automatically supported.
31−
32−## 3.2.4.3
33−
34−* Using warp >= 3.2.17.
35−
36−## 3.2.4.2
37−
38−* Ignore socket errors while sending `close_notify` [#640](https://github.com/yesodweb/wai/issues/640)
39−
40−## 3.2.4
41−
42−* Using tls-session-manager.
43−
44−## 3.2.3
45−
46−* Stop using obsoleted APIs of network.
47−
481## 3.2.2
492
503* New settting parameter: tlsServerDHEParams [#556](https://github.com/yesodweb/wai/pull/556)
warp-tls/Network/Wai/Handler/WarpTLS.hs+59−103
@@ -4,6 +4,7 @@
44{-# LANGUAGE RecordWildCards #-}
55{-# LANGUAGE DeriveDataTypeable #-}
66{-# LANGUAGE PatternGuards #-}
7+{-# LANGUAGE CPP #-}
78
89-- | HTTP over TLS support for Warp via the TLS package.
910--
@@ -30,7 +31,6 @@ module Network.Wai.Handler.WarpTLS (
3031 , tlsWantClientCert
3132 , tlsServerHooks
3233 , tlsServerDHEParams
33− , tlsSessionManagerConfig
3434 , onInsecure
3535 , OnInsecure (..)
3636 -- * Runner
@@ -42,25 +42,24 @@ module Network.Wai.Handler.WarpTLS (
4242 , DH.generateParams
4343 ) where
4444
45+#if __GLASGOW_HASKELL__ < 709
46+import Control.Applicative ((<$>))
47+#endif
4548import Control.Applicative ((<|>))
46−import Control.Exception (Exception, throwIO, bracket, finally, handle, fromException, try, IOException, onException, SomeException(..), handleJust)
49+import Control.Exception (Exception, throwIO, bracket, finally, handle, fromException, try, IOException, onException, SomeException(..))
4750import qualified Control.Exception as E
48−import Control.Monad (void, guard)
51+import Control.Monad (void)
4952import qualified Data.ByteString as S
5053import qualified Data.ByteString.Lazy as L
5154import Data.Default.Class (def)
5255import qualified Data.IORef as I
5356import Data.Streaming.Network (bindPortTCP, safeRecv)
5457import Data.Typeable (Typeable)
55−import Network.Socket (Socket, close, withSocketsDo, SockAddr, accept)
56−#if MIN_VERSION_network(3,1,1)
57−import Network.Socket (gracefulClose)
58−#endif
58+import Network.Socket (Socket, sClose, withSocketsDo, SockAddr, accept)
5959import Network.Socket.ByteString (sendAll)
6060import qualified Network.TLS as TLS
6161import qualified Crypto.PubKey.DH as DH
6262import qualified Network.TLS.Extra as TLSExtra
63−import qualified Network.TLS.SessionManager as SM
6463import Network.Wai (Application)
6564import Network.Wai.Handler.Warp
6665import Network.Wai.Handler.Warp.Internal
@@ -93,37 +92,19 @@ data TLSSettings = TLSSettings {
9392 --
9493 -- Since 1.4.0
9594 , tlsAllowedVersions :: [TLS.Version]
96−#if MIN_VERSION_tls(1,5,0)
97− -- ^ The TLS versions this server accepts.
98− --
99− -- >>> tlsAllowedVersions defaultTlsSettings
100− -- [TLS13,TLS12,TLS11,TLS10]
101− --
102− -- Since 1.4.2
103−#else
10495 -- ^ The TLS versions this server accepts.
10596 --
10697 -- >>> tlsAllowedVersions defaultTlsSettings
10798 -- [TLS12,TLS11,TLS10]
10899 --
109100 -- Since 1.4.2
110−#endif
111101 , tlsCiphers :: [TLS.Cipher]
112−#if MIN_VERSION_tls(1,5,0)
113102 -- ^ The TLS ciphers this server accepts.
114103 --
115104 -- >>> tlsCiphers defaultTlsSettings
116− -- [ECDHE-ECDSA-AES256GCM-SHA384,ECDHE-ECDSA-AES128GCM-SHA256,ECDHE-RSA-AES256GCM-SHA384,ECDHE-RSA-AES128GCM-SHA256,DHE-RSA-AES256GCM-SHA384,DHE-RSA-AES128GCM-SHA256,ECDHE-ECDSA-AES256CBC-SHA384,ECDHE-RSA-AES256CBC-SHA384,DHE-RSA-AES256-SHA256,ECDHE-ECDSA-AES256CBC-SHA,ECDHE-RSA-AES256CBC-SHA,DHE-RSA-AES256-SHA1,RSA-AES256GCM-SHA384,RSA-AES256-SHA256,RSA-AES256-SHA1,AES128GCM-SHA256,AES256GCM-SHA384]
105+ -- [ECDHE-RSA-AES128GCM-SHA256,DHE-RSA-AES128GCM-SHA256,DHE-RSA-AES256-SHA256,DHE-RSA-AES128-SHA256,DHE-RSA-AES256-SHA1,DHE-RSA-AES128-SHA1,DHE-DSA-AES128-SHA1,DHE-DSA-AES256-SHA1,RSA-aes128-sha1,RSA-aes256-sha1]
117106 --
118107 -- Since 1.4.2
119−#else
120− -- ^ The TLS ciphers this server accepts.
121− --
122− -- >>> tlsCiphers defaultTlsSettings
123− -- [ECDHE-ECDSA-AES256GCM-SHA384,ECDHE-ECDSA-AES128GCM-SHA256,ECDHE-RSA-AES256GCM-SHA384,ECDHE-RSA-AES128GCM-SHA256,DHE-RSA-AES256GCM-SHA384,DHE-RSA-AES128GCM-SHA256,ECDHE-ECDSA-AES256CBC-SHA384,ECDHE-RSA-AES256CBC-SHA384,DHE-RSA-AES256-SHA256,ECDHE-ECDSA-AES256CBC-SHA,ECDHE-RSA-AES256CBC-SHA,DHE-RSA-AES256-SHA1,RSA-AES256GCM-SHA384,RSA-AES256-SHA256,RSA-AES256-SHA1]
124− --
125− -- Since 1.4.2
126−#endif
127108 , tlsWantClientCert :: Bool
128109 -- ^ Whether or not to demand a certificate from the client. If this
129110 -- is set to True, you must handle received certificates in a server hook
@@ -148,15 +129,6 @@ data TLSSettings = TLSSettings {
148129 -- Default: Nothing
149130 --
150131 -- Since 3.2.2
151− , tlsSessionManagerConfig :: Maybe SM.Config
152− -- ^ Configuration for in-memory TLS session manager.
153− -- If Nothing, 'TLS.noSessionManager' is used.
154− -- Otherwise, an in-memory TLS session manager is created
155− -- according to 'Config'.
156− --
157− -- Default: Nothing
158− --
159− -- Since 3.2.4
160132 }
161133
162134-- | Default 'TLSSettings'. Use this to create 'TLSSettings' with the field record name (aka accessors).
@@ -170,21 +142,29 @@ defaultTlsSettings = TLSSettings {
170142 , keyMemory = Nothing
171143 , onInsecure = DenyInsecure "This server only accepts secure HTTPS connections."
172144 , tlsLogging = def
173−#if MIN_VERSION_tls(1,5,0)
174− , tlsAllowedVersions = [TLS.TLS13,TLS.TLS12,TLS.TLS11,TLS.TLS10]
175−#else
176145 , tlsAllowedVersions = [TLS.TLS12,TLS.TLS11,TLS.TLS10]
177−#endif
178146 , tlsCiphers = ciphers
179147 , tlsWantClientCert = False
180148 , tlsServerHooks = def
181149 , tlsServerDHEParams = Nothing
182− , tlsSessionManagerConfig = Nothing
183150 }
184151
185152-- taken from stunnel example in tls-extra
186153ciphers :: [TLS.Cipher]
187−ciphers = TLSExtra.ciphersuite_strong
154+ciphers =
155+ [ TLSExtra.cipher_ECDHE_RSA_AES128GCM_SHA256
156+ , TLSExtra.cipher_ECDHE_RSA_AES128CBC_SHA256
157+ , TLSExtra.cipher_ECDHE_RSA_AES128CBC_SHA
158+ , TLSExtra.cipher_DHE_RSA_AES128GCM_SHA256
159+ , TLSExtra.cipher_DHE_RSA_AES256_SHA256
160+ , TLSExtra.cipher_DHE_RSA_AES128_SHA256
161+ , TLSExtra.cipher_DHE_RSA_AES256_SHA1
162+ , TLSExtra.cipher_DHE_RSA_AES128_SHA1
163+ , TLSExtra.cipher_DHE_DSS_AES128_SHA1
164+ , TLSExtra.cipher_DHE_DSS_AES256_SHA1
165+ , TLSExtra.cipher_AES128_SHA1
166+ , TLSExtra.cipher_AES256_SHA1
167+ ]
188168
189169----------------------------------------------------------------
190170
@@ -254,7 +234,7 @@ runTLS :: TLSSettings -> Settings -> Application -> IO ()
254234runTLS tset set app = withSocketsDo $
255235 bracket
256236 (bindPortTCP (getPort set) (getHost set))
257− close
237+ sClose
258238 (\sock -> runTLSSocket tset set sock app)
259239
260240----------------------------------------------------------------
@@ -272,16 +252,13 @@ runTLSSocket tlsset@TLSSettings{..} set sock app = do
272252 key <- maybe (S.readFile keyFile) return mkey
273253 either error return $
274254 TLS.credentialLoadX509ChainFromMemory cert chainCertsMemory key
275− mgr <- case tlsSessionManagerConfig of
276− Nothing -> return TLS.noSessionManager
277− Just config -> SM.newSessionManager config
278− runTLSSocket' tlsset set credential mgr sock app
255+ runTLSSocket' tlsset set credential sock app
279256
280−runTLSSocket' :: TLSSettings -> Settings -> TLS.Credential -> TLS.SessionManager -> Socket -> Application -> IO ()
281−runTLSSocket' tlsset@TLSSettings{..} set credential mgr sock app =
257+runTLSSocket' :: TLSSettings -> Settings -> TLS.Credential -> Socket -> Application -> IO ()
258+runTLSSocket' tlsset@TLSSettings{..} set credential sock app =
282259 runSettingsConnectionMakerSecure set get app
283260 where
284− get = getter tlsset set sock params
261+ get = getter tlsset sock params
285262 params = def { -- TLS.ServerParams
286263 TLS.serverWantClientCert = tlsWantClientCert
287264 , TLS.serverCACertificates = []
@@ -289,9 +266,6 @@ runTLSSocket' tlsset@TLSSettings{..} set credential mgr sock app =
289266 , TLS.serverHooks = hooks
290267 , TLS.serverShared = shared
291268 , TLS.serverSupported = supported
292−#if MIN_VERSION_tls(1,5,0)
293− , TLS.serverEarlyDataSize = 2018
294−#endif
295269 }
296270 -- Adding alpn to user's tlsServerHooks.
297271 hooks = tlsServerHooks {
@@ -299,104 +273,91 @@ runTLSSocket' tlsset@TLSSettings{..} set credential mgr sock app =
299273 (if settingsHTTP2Enabled set then Just alpn else Nothing)
300274 }
301275 shared = def {
302− TLS.sharedCredentials = TLS.Credentials [credential]
303− , TLS.sharedSessionManager = mgr
276+ TLS.sharedCredentials = TLS.Credentials [credential]
304277 }
305278 supported = def { -- TLS.Supported
306279 TLS.supportedVersions = tlsAllowedVersions
307280 , TLS.supportedCiphers = tlsCiphers
308281 , TLS.supportedCompressions = [TLS.nullCompression]
282+ , TLS.supportedHashSignatures = [
283+ -- Safari 8 and go tls have bugs on SHA 512 and SHA 384.
284+ -- So, we don't specify them here at this moment.
285+ (TLS.HashSHA256, TLS.SignatureRSA)
286+ , (TLS.HashSHA224, TLS.SignatureRSA)
287+ , (TLS.HashSHA1, TLS.SignatureRSA)
288+ , (TLS.HashSHA1, TLS.SignatureDSS)
289+ ]
309290 , TLS.supportedSecureRenegotiation = True
310291 , TLS.supportedClientInitiatedRenegotiation = False
311292 , TLS.supportedSession = True
312293 , TLS.supportedFallbackScsv = True
313−#if MIN_VERSION_tls(1,5,0)
314− , TLS.supportedGroups = [TLS.X25519,TLS.P256,TLS.P384]
315−#endif
316294 }
317295
318296alpn :: [S.ByteString] -> IO S.ByteString
319297alpn xs
320298 | "h2" `elem` xs = return "h2"
299+ | "h2-16" `elem` xs = return "h2-16"
300+ | "h2-15" `elem` xs = return "h2-15"
301+ | "h2-14" `elem` xs = return "h2-14"
321302 | otherwise = return "http/1.1"
322303
323304----------------------------------------------------------------
324305
325−getter :: TLS.TLSParams params => TLSSettings -> Settings -> Socket -> params -> IO (IO (Connection, Transport), SockAddr)
326−getter tlsset@TLSSettings{..} set sock params = do
327−#if WINDOWS
328− (s, sa) <- windowsThreadBlockHack $ accept sock
329−#else
306+getter :: TLS.TLSParams params => TLSSettings -> Socket -> params -> IO (IO (Connection, Transport), SockAddr)
307+getter tlsset@TLSSettings{..} sock params = do
330308 (s, sa) <- accept sock
331−#endif
332− setSocketCloseOnExec s
333− return (mkConn tlsset set s params, sa)
309+ return (mkConn tlsset s params, sa)
334310
335−mkConn :: TLS.TLSParams params => TLSSettings -> Settings -> Socket -> params -> IO (Connection, Transport)
336−mkConn tlsset set s params = switch `onException` close s
311+mkConn :: TLS.TLSParams params => TLSSettings -> Socket -> params -> IO (Connection, Transport)
312+mkConn tlsset s params = switch `onException` sClose s
337313 where
338314 switch = do
339315 firstBS <- safeRecv s 4096
340316 if not (S.null firstBS) && S.head firstBS == 0x16 then
341− httpOverTls tlsset set s firstBS params
317+ httpOverTls tlsset s firstBS params
342318 else
343− plainHTTP tlsset set s firstBS
319+ plainHTTP tlsset s firstBS
344320
345321----------------------------------------------------------------
346322
347−httpOverTls :: TLS.TLSParams params => TLSSettings -> Settings -> Socket -> S.ByteString -> params -> IO (Connection, Transport)
348−httpOverTls TLSSettings{..} _set s bs0 params = do
323+httpOverTls :: TLS.TLSParams params => TLSSettings -> Socket -> S.ByteString -> params -> IO (Connection, Transport)
324+httpOverTls TLSSettings{..} s bs0 params = do
349325 recvN <- makePlainReceiveN s bs0
350326 ctx <- TLS.contextNew (backend recvN) params
351327 TLS.contextHookSetLogging ctx tlsLogging
352328 TLS.handshake ctx
353− h2 <- (== Just "h2") <$> TLS.getNegotiatedProtocol ctx
354− isH2 <- I.newIORef h2
355329 writeBuf <- allocateBuffer bufferSize
356330 -- Creating a cache for leftover input data.
357331 ref <- I.newIORef ""
358332 tls <- getTLSinfo ctx
359− return (conn ctx writeBuf ref isH2, tls)
333+ return (conn ctx writeBuf ref, tls)
360334 where
361335 backend recvN = TLS.Backend {
362336 TLS.backendFlush = return ()
363−#if MIN_VERSION_network(3,1,1)
364− , TLS.backendClose = gracefulClose s 5000 `E.catch` \(SomeException _) -> return ()
365−#else
366− , TLS.backendClose = close s
367−#endif
337+ , TLS.backendClose = sClose s
368338 , TLS.backendSend = sendAll' s
369339 , TLS.backendRecv = recvN
370340 }
371341 sendAll' sock bs = sendAll sock bs `E.catch` \(SomeException _) ->
372342 throwIO ConnectionClosedByPeer
373− conn ctx writeBuf ref isH2 = Connection {
343+ conn ctx writeBuf ref = Connection {
374344 connSendMany = TLS.sendData ctx . L.fromChunks
375345 , connSendAll = sendall
376346 , connSendFile = sendfile
377− , connClose = close'
378− , connFree = freeBuffer writeBuf
347+ , connClose = close
379348 , connRecv = recv ref
380349 , connRecvBuf = recvBuf ref
381350 , connWriteBuffer = writeBuf
382351 , connBufferSize = bufferSize
383− , connHTTP2 = isH2
384352 }
385353 where
386354 sendall = TLS.sendData ctx . L.fromChunks . return
387355 sendfile fid offset len hook headers =
388356 readSendFile writeBuf bufferSize sendall fid offset len hook headers
389357
390− close' = void (tryIO sendBye) `finally`
391− TLS.contextClose ctx
392−
393− sendBye =
394− -- It's fine if the connection was closed by the other side before
395− -- receiving close_notify, see RFC 5246 section 7.2.1.
396− handleJust
397− (\e -> guard (e == ConnectionClosedByPeer) >> return e)
398− (const (return ()))
399− (TLS.bye ctx)
358+ close = freeBuffer writeBuf `finally`
359+ void (tryIO $ TLS.bye ctx) `finally`
360+ TLS.contextClose ctx
400361
401362 -- TLS version of recv with a cache for leftover input data.
402363 -- The cache is shared with recvBuf.
@@ -465,16 +426,11 @@ getTLSinfo ctx = do
465426 TLS.TLS10 -> (3,1)
466427 TLS.TLS11 -> (3,2)
467428 TLS.TLS12 -> (3,3)
468−#if MIN_VERSION_tls(1,5,0)
469− TLS.TLS13 -> (3,4)
470−#endif
471− clientCert <- TLS.getClientCertificateChain ctx
472429 return TLS {
473430 tlsMajorVersion = major
474431 , tlsMinorVersion = minor
475432 , tlsNegotiatedProtocol = proto
476433 , tlsChiperID = TLS.cipherID infoCipher
477− , tlsClientCertificate = clientCert
478434 }
479435
480436tryIO :: IO a -> IO (Either IOException a)
@@ -482,10 +438,10 @@ tryIO = try
482438
483439----------------------------------------------------------------
484440
485−plainHTTP :: TLSSettings -> Settings -> Socket -> S.ByteString -> IO (Connection, Transport)
486−plainHTTP TLSSettings{..} set s bs0 = case onInsecure of
441+plainHTTP :: TLSSettings -> Socket -> S.ByteString -> IO (Connection, Transport)
442+plainHTTP TLSSettings{..} s bs0 = case onInsecure of
487443 AllowInsecure -> do
488− conn' <- socketConnection set s
444+ conn' <- socketConnection s
489445 cachedRef <- I.newIORef bs0
490446 let conn'' = conn'
491447 { connRecv = recvPlain cachedRef (connRecv conn')
@@ -507,7 +463,7 @@ plainHTTP TLSSettings{..} set s bs0 = case onInsecure of
507463 \r\nConnection: Upgrade\
508464 \r\nContent-Type: text/plain\r\n\r\n"
509465 mapM_ (sendAll s) $ L.toChunks lbs
510− close s
466+ sClose s
511467 throwIO InsecureConnectionDenied
512468
513469----------------------------------------------------------------
warp-tls/warp-tls.cabal+6−14
@@ -1,5 +1,5 @@
11Name: warp-tls
2−Version: 3.2.11
2+Version: 3.2.2
33Synopsis: HTTP over TLS support for Warp via the TLS package
44License: MIT
55License-file: LICENSE
@@ -8,34 +8,26 @@ Maintainer: michael@snoyman.com
88Homepage: http://github.com/yesodweb/wai
99Category: Web, Yesod
1010Build-Type: Simple
11−Cabal-Version: >= 1.10
11+Cabal-Version: >=1.6
1212Stability: Stable
13−description: SSLv1 and SSLv2 are obsoleted by IETF.
14− We should use TLS 1.2 (or TLS 1.1 or TLS 1.0 if necessary).
13+description: Support for SSL is now obsoleted.
1514 HTTP/2 can be negotiated by ALPN.
1615 API docs and the README are available at
1716 <http://www.stackage.org/package/warp-tls>.
1817extra-source-files: ChangeLog.md README.md
1918
2019Library
21− Build-Depends: base >= 4.10 && < 5
20+ Build-Depends: base >= 4 && < 5
2221 , bytestring >= 0.9
2322 , wai >= 3.2 && < 3.3
24− , warp >= 3.3.6 && < 3.4
23+ , warp >= 3.2 && < 3.3
2524 , data-default-class >= 0.0.1
26− , tls >= 1.5.3
25+ , tls >= 1.3.5
2726 , cryptonite >= 0.12
2827 , network >= 2.2.1
2928 , streaming-commons
30− , tls-session-manager >= 0.0.4
3129 Exposed-modules: Network.Wai.Handler.WarpTLS
3230 ghc-options: -Wall
33− if os(windows)
34− Cpp-Options: -DWINDOWS
35− if impl(ghc >= 8)
36− Default-Extensions: Strict StrictData
37− Default-Language: Haskell2010
38−
3931
4032source-repository head
4133 type: git
warp/ChangeLog.md−188
@@ -1,191 +1,3 @@
1−## 3.3.9
2−
3−* Don't insert Last-Modified: if exists.
4− [#791](https://github.com/yesodweb/wai/pull/791)
5−
6−## 3.3.8
7−
8−* Maximum header size is configurable.
9− [#781](https://github.com/yesodweb/wai/pull/781)
10−* Ignoring an exception from shutdown (gracefulClose).
11−
12−## 3.3.7
13−
14−* InvalidArgument (Bad file descriptor) is ignored in `receive`.
15− [#787](https://github.com/yesodweb/wai/pull/787)
16−
17−## 3.3.6
18−
19−* Fixing a bug of thread killed in the case of event source with
20− HTTP/2 (fixing #692 and #785)
21−* New APIs: clientCertificate to get client's certificate
22− [#783](https://github.com/yesodweb/wai/pull/783)
23−
24−## 3.3.5
25−
26−* New APIs: setGracefulCloseTimeout1 and setGracefulCloseTimeout2.
27− For HTTP/1.x, connections are closed immediately by default.
28− gracefullClose is used for HTTP/2 by default.
29− [#782](https://github.com/yesodweb/wai/pull/782)
30−
31−## 3.3.4
32−
33−* Setting isSecure of HTTP/2 correctly.
34−
35−## 3.3.3
36−
37−* Calling setOnException in HTTP/2.
38− [#771](https://github.com/yesodweb/wai/pull/771)
39−
40−## 3.3.2
41−
42−* Fixing a bug of HTTP/2 without fd cache.
43−
44−## 3.3.1
45−
46−* Using gracefullClose of network 3.1.1 or later if available.
47−* If the first line of an HTTP request is really invalid,
48− don't send an error response
49−
50−## 3.3.0
51−
52−* Switching from the original implementation to HTTP/2 server library.
53− [#754](https://github.com/yesodweb/wai/pull/754)
54−* Breaking change: The type of `http2dataTrailers` is now
55− `HTTP2Data -> TrailersMaker`.
56−
57−## 3.2.28
58−
59−* Using the Strict and StrictData language extensions for GHC >8.
60− [#752](https://github.com/yesodweb/wai/pull/752)
61−* System.TimeManager is now in a separate package: time-manager.
62− [#750](https://github.com/yesodweb/wai/pull/750)
63−* Fixing a bug of ALPN.
64−* Introducing the half closed state for HTTP/2.
65− [#717](https://github.com/yesodweb/wai/pull/717)
66−
67−## 3.2.27
68−
69−* Internally, use `lookupEnv` instead of `getEnvironment` to get the
70− value of the `PORT` environment variable
71− [#736](https://github.com/yesodweb/wai/pull/736)
72−* Throw 413 for too large payload
73−* Throw 431 for too large headers
74− [#741](https://github.com/yesodweb/wai/pull/741)
75−* Use exception response handler in HTTP/2 & improve connection preservation
76− in HTTP/1.x if uncaught exceptions are thrown in an `Application`.
77− [#738](https://github.com/yesodweb/wai/pull/738)
78−
79−## 3.2.26
80−
81−* Support network package version 3
82−
83−## 3.2.25
84−
85−* Removing Connection: and Transfer-Encoding: from HTTP/2
86− response header
87− [#707](https://github.com/yesodweb/wai/pull/707)
88−
89−## 3.2.24
90−
91−* Fix HTTP2 unwanted GoAways on late WindowUpdate frames.
92− [#711](https://github.com/yesodweb/wai/pull/711)
93−
94−## 3.2.23
95−
96−* Log real requsts when an app throws an error.
97− [#698](https://github.com/yesodweb/wai/pull/698)
98−
99−## 3.2.22
100−
101−* Fixing large request body in HTTP/2.
102−
103−## 3.2.21
104−
105−* Fixing HTTP/2's timeout handler in request's vault.
106−
107−## 3.2.20
108−
109−* Fixing large request body in HTTP/2
110− [#593](https://github.com/yesodweb/wai/issues/593)
111−
112−## 3.2.19
113−
114−* Fixing 0-byte request body in HTTP/2
115− [#597](https://github.com/yesodweb/wai/issues/597)
116− [#679](https://github.com/yesodweb/wai/issues/679)
117−
118−## 3.2.18.2
119−
120−* Replace dependency on `blaze-builder` with `bsb-http-chunked`
121−
122−## 3.2.18.1
123−
124−* Fix benchmark compilation [#681](https://github.com/yesodweb/wai/issues/681)
125−
126−## 3.2.18
127−
128−* Make `testWithApplicationSettings` actually use the settings passed.
129− [#677](https://github.com/yesodweb/wai/pull/677).
130−
131−## 3.2.17
132−* Add support for windows thread block hack and closeOnExec to TLS.
133− [#674](https://github.com/yesodweb/wai/pull/674).
134−
135−## 3.2.16
136−
137−* In `testWithApplication`, don't `throwTo` ignorable exceptions
138− [#671](https://github.com/yesodweb/wai/issues/671), and
139− reuse `bindRandomPortTCP`
140−
141−## 3.2.15
142−
143−* Address space leak from exception handlers
144− [#649](https://github.com/yesodweb/wai/issues/649)
145−
146−## 3.2.14
147−
148−* Support streaming-commons 0.2
149−* Warnings cleanup
150−
151−## 3.2.13
152−
153−* Tickling HTTP/2 timer. [624](https://github.com/yesodweb/wai/pull/624)
154−* Guarantee atomicity of WINDOW_UPDATE increments [622](https://github.com/yesodweb/wai/pull/622)
155−* Relax HTTP2 headers check [621](https://github.com/yesodweb/wai/pull/621)
156−
157−## 3.2.12
158−
159−* If an empty string is set by setServerName, the Server header is not included in response headers [#619](https://github.com/yesodweb/wai/issues/619)
160−
161−## 3.2.11.2
162−
163−* Don't throw exceptions when closing a keep-alive connection
164− [#618](https://github.com/yesodweb/wai/issues/618)
165−
166−## 3.2.11.1
167−
168−* Move exception handling to top of thread (fixes
169− [#613](https://github.com/yesodweb/wai/issues/613))
170−
171−## 3.2.11
172−
173−* Fixing 10 HTTP2 bugs pointed out by h2spec v2.
174−
175−## 3.2.10
176−
177−* Add `connFree` to `Connection`. Close socket connections on timeout triggered. Timeout exceptions extend from `SomeAsyncException`. [#602](https://github.com/yesodweb/wai/pull/602) [#605](https://github.com/yesodweb/wai/pull/605)
178−
179−## 3.2.9
180−
181−* Fixing a space leak. [#586](https://github.com/yesodweb/wai/pull/586)
182−
183−## 3.2.8
184−
185−* Fixing HTTP2 requestBodyLength. [#573](https://github.com/yesodweb/wai/pull/573)
186−* Making HTTP/2 :path optional for the CONNECT method. [#572](https://github.com/yesodweb/wai/pull/572)
187−* Adding new APIs for HTTP/2 trailers: http2dataTrailers and modifyHTTP2Data [#566](https://github.com/yesodweb/wai/pull/566)
188−
1891## 3.2.7
1902
1913* Adding new APIs for HTTP/2 server push: getHTTP2Data and setHTTP2Data [#510](https://github.com/yesodweb/wai/pull/510)
warp/Network/Wai/Handler/Warp.hs+8−87
@@ -72,9 +72,6 @@ module Network.Wai.Handler.Warp (
7272 , setLogger
7373 , setServerPushLogger
7474 , setGracefulShutdownTimeout
75− , setGracefulCloseTimeout1
76− , setGracefulCloseTimeout2
77− , setMaxTotalHeaderLength
7875 -- ** Getters
7976 , getPort
8077 , getHost
@@ -82,8 +79,6 @@ module Network.Wai.Handler.Warp (
8279 , getOnClose
8380 , getOnException
8481 , getGracefulShutdownTimeout
85− , getGracefulCloseTimeout1
86− , getGracefulCloseTimeout2
8782 -- ** Exception handler
8883 , defaultOnException
8984 , defaultShouldDisplayException
@@ -98,7 +93,6 @@ module Network.Wai.Handler.Warp (
9893 , pauseTimeout
9994 , FileInfo(..)
10095 , getFileInfo
101− , clientCertificate
10296 , withApplication
10397 , withApplicationSettings
10498 , testWithApplication
@@ -125,22 +119,21 @@ module Network.Wai.Handler.Warp (
125119 ) where
126120
127121import Control.Exception (SomeException, throwIO)
122+import Data.ByteString (ByteString)
123+import Data.Maybe (fromMaybe)
128124import Data.Streaming.Network (HostPreference)
129125import qualified Data.Vault.Lazy as Vault
130−import Data.X509
131126import qualified Network.HTTP.Types as H
132127import Network.Socket (SockAddr)
133128import Network.Wai (Request, Response, vault)
134−import System.TimeManager
135−
136129import Network.Wai.Handler.Warp.FileInfoCache
137−import Network.Wai.Handler.Warp.HTTP2.Request (getHTTP2Data, setHTTP2Data, modifyHTTP2Data)
138−import Network.Wai.Handler.Warp.HTTP2.Types
139−import Network.Wai.Handler.Warp.Imports
140130import Network.Wai.Handler.Warp.Request
141131import Network.Wai.Handler.Warp.Response (warpVersion)
142132import Network.Wai.Handler.Warp.Run
143133import Network.Wai.Handler.Warp.Settings
134+import Network.Wai.Handler.Warp.HTTP2.Request (getHTTP2Data, setHTTP2Data, modifyHTTP2Data)
135+import Network.Wai.Handler.Warp.HTTP2.Types
136+import Network.Wai.Handler.Warp.Timeout
144137import Network.Wai.Handler.Warp.Types hiding (getFileInfo)
145138import Network.Wai.Handler.Warp.WithApplication
146139
@@ -293,38 +286,13 @@ getGracefulShutdownTimeout = settingsGracefulShutdownTimeout
293286-- handler. The handler should call the first argument,
294287-- which closes the listen socket, at shutdown.
295288--
296−-- Example usage:
297−--
298−-- @
299−-- settings :: IO () -> 'Settings'
300−-- settings shutdownAction = 'setInstallShutdownHandler' shutdownHandler 'defaultSettings'
301−-- __where__
302−-- shutdownHandler closeSocket =
303−-- void $ 'System.Posix.Signals.installHandler' 'System.Posix.Signals.sigTERM' ('System.Posix.Signals.Catch' $ shutdownAction >> closeSocket) 'Nothing'
304−-- @
305−--
306−-- Note that by default, the graceful shutdown mode lasts indefinitely
307−-- (see 'setGracefulShutdownTimeout'). If you install a signal handler as above,
308−-- upon receiving that signal, the custon shutdown action will run /and/ all
309−-- outstanding requests will be handled.
310−--
311−-- You may instead prefer to do one or both of the following:
312−--
313−-- * Only wait a finite amount of time for outstanding requests to complete,
314−-- using 'setGracefulShutdownTimeout'.
315−-- * Only catch one signal, so the second hard-kills the Warp server, using
316−-- 'System.Posix.Signals.CatchOnce'.
317−--
318289-- Default: does not install any code.
319290--
320291-- Since 3.0.1
321292setInstallShutdownHandler :: (IO () -> IO ()) -> Settings -> Settings
322293setInstallShutdownHandler x y = y { settingsInstallShutdownHandler = x }
323294
324−-- | Default server name to be sent as the \"Server:\" header
325−-- if an application does not set one.
326−-- If an empty string is set, the \"Server:\" header is not sent.
327−-- This is true even if an application set one.
295+-- | Default server name if application does not set one.
328296--
329297-- Since 3.0.2
330298setServerName :: ByteString -> Settings -> Settings
@@ -385,7 +353,7 @@ setProxyProtocolRequired y = y { settingsProxyProtocol = ProxyProtocolRequired }
385353--
386354-- WARNING: This is contrary to the PROXY protocol specification and
387355-- using it can indicate a security problem with your
388−-- architecture if the web server is directly accessible
356+-- architecture if the web server is directly accessable
389357-- to the public, since it would allow easy IP address
390358-- spoofing. However, it can be useful in some cases,
391359-- such as if a load balancer health check uses regular
@@ -396,7 +364,7 @@ setProxyProtocolRequired y = y { settingsProxyProtocol = ProxyProtocolRequired }
396364setProxyProtocolOptional :: Settings -> Settings
397365setProxyProtocolOptional y = y { settingsProxyProtocol = ProxyProtocolOptional }
398366
399−-- | Size in bytes read to prevent Slowloris attacks. Default value: 2048
367+-- | Size in bytes read to prevent Slowloris protection. Default value: 2048
400368--
401369-- Since 3.1.2
402370setSlowlorisSize :: Int -> Settings -> Settings
@@ -428,22 +396,11 @@ setServerPushLogger lgr y = y { settingsServerPushLogger = lgr }
428396-- wait indefinitely, and a number, if provided, will be treated as seconds
429397-- to wait for requests to finish, before shutting down the server entirely.
430398--
431−-- Graceful shutdown mode is entered when the server socket is closed; see
432−-- 'setInstallShutdownHandler' for an example of how this could be done in
433−-- response to a UNIX signal.
434−--
435399-- Since 3.2.8
436400setGracefulShutdownTimeout :: Maybe Int
437401 -> Settings -> Settings
438402setGracefulShutdownTimeout time y = y { settingsGracefulShutdownTimeout = time }
439403
440−-- | Set the maximum header size that Warp will tolerate when using HTTP/1.x.
441−--
442−-- Since 3.3.8
443−setMaxTotalHeaderLength :: Int -> Settings -> Settings
444−setMaxTotalHeaderLength maxTotalHeaderLength settings = settings
445− { settingsMaxTotalHeaderLength = maxTotalHeaderLength }
446−
447404-- | Explicitly pause the slowloris timeout.
448405--
449406-- This is useful for cases where you partially consume a request body. For
@@ -471,39 +428,3 @@ pauseTimeout = fromMaybe (return ()) . Vault.lookup pauseTimeoutKey . vault
471428-- Since 3.1.10
472429getFileInfo :: Request -> FilePath -> IO FileInfo
473430getFileInfo = fromMaybe (\_ -> throwIO (userError "getFileInfo")) . Vault.lookup getFileInfoKey . vault
474−
475−-- | A timeout to limit the time (in milliseconds) waiting for
476−-- FIN for HTTP/1.x. 0 means uses immediate close.
477−-- Default: 0.
478−--
479−-- Since 3.3.5
480−setGracefulCloseTimeout1 :: Int -> Settings -> Settings
481−setGracefulCloseTimeout1 x y = y { settingsGracefulCloseTimeout1 = x }
482−
483−-- | A timeout to limit the time (in milliseconds) waiting for
484−-- FIN for HTTP/1.x. 0 means uses immediate close.
485−--
486−-- Since 3.3.5
487−getGracefulCloseTimeout1 :: Settings -> Int
488−getGracefulCloseTimeout1 = settingsGracefulCloseTimeout1
489−
490−-- | A timeout to limit the time (in milliseconds) waiting for
491−-- FIN for HTTP/2. 0 means uses immediate close.
492−-- Default: 2000.
493−--
494−-- Since 3.3.5
495−setGracefulCloseTimeout2 :: Int -> Settings -> Settings
496−setGracefulCloseTimeout2 x y = y { settingsGracefulCloseTimeout2 = x }
497−
498−-- | A timeout to limit the time (in milliseconds) waiting for
499−-- FIN for HTTP/2. 0 means uses immediate close.
500−--
501−-- Since 3.3.5
502−getGracefulCloseTimeout2 :: Settings -> Int
503−getGracefulCloseTimeout2 = settingsGracefulCloseTimeout2
504−
505−-- | Getting information of client certificate.
506−--
507−-- Since 3.3.5
508−clientCertificate :: Request -> Maybe CertificateChain
509−clientCertificate = join . Vault.lookup getClientCertificateKey . vault
warp/Network/Wai/Handler/Warp/Buffer.hs+2−4
@@ -1,4 +1,4 @@
1−{-# LANGUAGE BangPatterns #-}
1+{-# LANGUAGE BangPatterns, OverloadedStrings #-}
22
33module Network.Wai.Handler.Warp.Buffer (
44 bufferSize
@@ -13,15 +13,13 @@ module Network.Wai.Handler.Warp.Buffer (
1313 ) where
1414
1515import qualified Data.ByteString as BS
16−import Data.ByteString.Internal (memcpy)
16+import Data.ByteString.Internal (ByteString(..), memcpy)
1717import Data.ByteString.Unsafe (unsafeTake, unsafeDrop)
1818import Data.IORef (newIORef, readIORef, writeIORef)
1919import qualified Data.Streaming.ByteString.Builder.Buffer as B (Buffer (..))
2020import Foreign.ForeignPtr
2121import Foreign.Marshal.Alloc (mallocBytes, free, finalizerFree)
2222import Foreign.Ptr (castPtr, plusPtr)
23−
24−import Network.Wai.Handler.Warp.Imports
2523import Network.Wai.Handler.Warp.Types
2624
2725----------------------------------------------------------------
warp/Network/Wai/Handler/Warp/Conduit.hs+6−2
@@ -3,10 +3,14 @@
33module Network.Wai.Handler.Warp.Conduit where
44
55import Control.Exception
6+import Control.Monad (when, unless)
7+import Data.ByteString (ByteString)
68import qualified Data.ByteString as S
79import qualified Data.IORef as I
8−
9−import Network.Wai.Handler.Warp.Imports
10+#if __GLASGOW_HASKELL__ < 709
11+import Data.Word (Word)
12+#endif
13+import Data.Word (Word8)
1014import Network.Wai.Handler.Warp.Types
1115
1216----------------------------------------------------------------
warp/Network/Wai/Handler/Warp/Counter.hs+4−3
@@ -8,10 +8,11 @@ module Network.Wai.Handler.Warp.Counter (
88 , decrease
99 ) where
1010
11+#if __GLASGOW_HASKELL__ < 709
12+import Control.Applicative ((<$>))
13+#endif
1114import Control.Concurrent.STM
12−
13−import Network.Wai.Handler.Warp.Imports
14−
15+import Control.Monad (unless)
1516
1617newtype Counter = Counter (TVar Int)
1718
warp/Network/Wai/Handler/Warp/Date.hs+4−1
@@ -5,8 +5,11 @@ module Network.Wai.Handler.Warp.Date (
55 , GMTDate
66 ) where
77
8+#if __GLASGOW_HASKELL__ < 709
9+import Control.Applicative
10+#endif
811import Control.AutoUpdate (defaultUpdateSettings, updateAction, mkAutoUpdate)
9−import Data.ByteString
12+import Data.ByteString.Char8
1013import Network.HTTP.Date
1114
1215#if WINDOWS
warp/Network/Wai/Handler/Warp/FdCache.hs+27−20
@@ -14,34 +14,39 @@ module Network.Wai.Handler.Warp.FdCache (
1414 ) where
1515
1616#ifndef WINDOWS
17+#if __GLASGOW_HASKELL__ < 709
18+import Control.Applicative ((<$>), (<*>))
19+#endif
1720import Control.Exception (bracket)
21+import Network.Wai.Handler.Warp.IORef
22+import Network.Wai.Handler.Warp.MultiMap
1823import Control.Reaper
19−import Data.IORef
20−import Network.Wai.Handler.Warp.MultiMap as MM
2124import System.Posix.IO (openFd, OpenFileFlags(..), defaultFileFlags, OpenMode(ReadOnly), closeFd, FdOption(CloseOnExec), setFdOption)
2225#endif
2326import System.Posix.Types (Fd)
2427
2528----------------------------------------------------------------
2629
30+type Hash = Int
31+
2732-- | An action to activate a Fd cache entry.
2833type Refresh = IO ()
2934
30−getFdNothing :: FilePath -> IO (Maybe Fd, Refresh)
31−getFdNothing _ = return (Nothing, return ())
35+getFdNothing :: Hash -> FilePath -> IO (Maybe Fd, Refresh)
36+getFdNothing _ _ = return (Nothing, return ())
3237
3338----------------------------------------------------------------
3439
3540-- | Creating 'MutableFdCache' and executing the action in the second
3641-- argument. The first argument is a cache duration in second.
37−withFdCache :: Int -> ((FilePath -> IO (Maybe Fd, Refresh)) -> IO a) -> IO a
42+withFdCache :: Int -> ((Hash -> FilePath -> IO (Maybe Fd, Refresh)) -> IO a) -> IO a
3843#ifdef WINDOWS
3944withFdCache _ action = action getFdNothing
4045#else
4146withFdCache 0 action = action getFdNothing
4247withFdCache duration action = bracket (initialize duration)
4348 terminate
44− (action . getFd)
49+ (\mfc -> action (getFd mfc))
4550
4651----------------------------------------------------------------
4752
@@ -63,7 +68,7 @@ inactive (MutableStatus ref) = writeIORef ref Inactive
6368
6469----------------------------------------------------------------
6570
66−data FdEntry = FdEntry !Fd !MutableStatus
71+data FdEntry = FdEntry !FilePath !Fd !MutableStatus
6772
6873openFile :: FilePath -> IO Fd
6974openFile path = do
@@ -75,23 +80,25 @@ closeFile :: Fd -> IO ()
7580closeFile = closeFd
7681
7782newFdEntry :: FilePath -> IO FdEntry
78−newFdEntry path = FdEntry <$> openFile path <*> newActiveStatus
83+newFdEntry path = FdEntry path <$> openFile path <*> newActiveStatus
7984
8085setFileCloseOnExec :: Fd -> IO ()
8186setFileCloseOnExec fd = setFdOption fd CloseOnExec True
8287
8388----------------------------------------------------------------
8489
85−type FdCache = MultiMap FdEntry
90+type FdCache = MMap FdEntry
8691
8792-- | Mutable Fd cacher.
88−newtype MutableFdCache = MutableFdCache (Reaper FdCache (FilePath,FdEntry))
93+newtype MutableFdCache = MutableFdCache (Reaper FdCache (Hash, FdEntry))
8994
9095fdCache :: MutableFdCache -> IO FdCache
9196fdCache (MutableFdCache reaper) = reaperRead reaper
9297
93−look :: MutableFdCache -> FilePath -> IO (Maybe FdEntry)
94−look mfc path = MM.lookup path <$> fdCache mfc
98+look :: MutableFdCache -> FilePath -> Hash -> IO (Maybe FdEntry)
99+look mfc path key = searchWith key check <$> fdCache mfc
100+ where
101+ check (FdEntry path' _ _) = path == path'
95102
96103----------------------------------------------------------------
97104
@@ -112,7 +119,7 @@ clean old = do
112119 new <- pruneWith old prune
113120 return $ merge new
114121 where
115− prune (_,FdEntry fd mst) = status mst >>= act
122+ prune (FdEntry _ fd mst) = status mst >>= act
116123 where
117124 act Active = inactive mst >> return True
118125 act Inactive = closeFd fd >> return False
@@ -122,21 +129,21 @@ clean old = do
122129terminate :: MutableFdCache -> IO ()
123130terminate (MutableFdCache reaper) = do
124131 !t <- reaperStop reaper
125− mapM_ (closeIt . snd) $ toList t
132+ mapM_ closeIt $ toList t
126133 where
127− closeIt (FdEntry fd _) = closeFd fd
134+ closeIt (FdEntry _ fd _) = closeFd fd
128135
129136----------------------------------------------------------------
130137
131138-- | Getting 'Fd' and 'Refresh' from the mutable Fd cacher.
132−getFd :: MutableFdCache -> FilePath -> IO (Maybe Fd, Refresh)
133−getFd mfc@(MutableFdCache reaper) path = look mfc path >>= get
139+getFd :: MutableFdCache -> Hash -> FilePath -> IO (Maybe Fd, Refresh)
140+getFd mfc@(MutableFdCache reaper) h path = look mfc path h >>= get
134141 where
135142 get Nothing = do
136− ent@(FdEntry fd mst) <- newFdEntry path
137− reaperAdd reaper (path,ent)
143+ ent@(FdEntry _ fd mst) <- newFdEntry path
144+ reaperAdd reaper (h, ent)
138145 return (Just fd, refresh mst)
139− get (Just (FdEntry fd mst)) = do
146+ get (Just (FdEntry _ fd mst)) = do
140147 refresh mst
141148 return (Just fd, refresh mst)
142149#endif
warp/Network/Wai/Handler/Warp/File.hs+59−15
@@ -6,21 +6,27 @@ module Network.Wai.Handler.Warp.File (
66 RspFileInfo(..)
77 , conditionalRequest
88 , addContentHeadersForFilePart
9− , H.parseByteRanges
9+ , parseByteRanges
1010 ) where
1111
12+import Control.Applicative ((<|>))
1213import Data.Array ((!))
13−import qualified Data.ByteString.Char8 as C8 (pack)
14+import qualified Data.ByteString as B hiding (pack)
15+import qualified Data.ByteString.Char8 as B (pack, readInteger)
16+import Data.ByteString (ByteString)
17+import Data.Maybe (fromMaybe)
1418import Network.HTTP.Date
1519import qualified Network.HTTP.Types as H
1620import qualified Network.HTTP.Types.Header as H
1721import Network.Wai
18−
1922import qualified Network.Wai.Handler.Warp.FileInfoCache as I
2023import Network.Wai.Handler.Warp.Header
21−import Network.Wai.Handler.Warp.Imports
2224import Network.Wai.Handler.Warp.PackInt
25+import Numeric (showInt)
2326
27+#ifndef MIN_VERSION_http_types
28+#define MIN_VERSION_http_types(x,y,z) 1
29+#endif
2430
2531-- $setup
2632-- >>> import Test.QuickCheck
@@ -34,15 +40,12 @@ data RspFileInfo = WithoutBody H.Status
3440----------------------------------------------------------------
3541
3642conditionalRequest :: I.FileInfo
37− -> H.ResponseHeaders
38− -> IndexedHeader -- ^ Response
39− -> IndexedHeader -- ^ Request
43+ -> H.ResponseHeaders -> IndexedHeader
4044 -> RspFileInfo
41−conditionalRequest finfo hs0 rspidx reqidx = case condition of
45+conditionalRequest finfo hs0 reqidx = case condition of
4246 nobody@(WithoutBody _) -> nobody
43− WithBody s _ off len -> let !hs1 = addContentHeaders hs0 off len size
44− !hasLM = isJust $ rspidx ! fromEnum ResLastModified
45− !hs = [ (H.hLastModified,date) | not hasLM ] ++ hs1
47+ WithBody s _ off len -> let !hs = (H.hLastModified,date) :
48+ addContentHeaders hs0 off len size
4649 in WithBody s hs off len
4750 where
4851 !mtime = I.fileInfoTime finfo
@@ -96,7 +99,7 @@ unconditional reqidx size = case reqidx ! fromEnum ReqRange of
9699----------------------------------------------------------------
97100
98101parseRange :: ByteString -> Integer -> RspFileInfo
99−parseRange rng size = case H.parseByteRanges rng of
102+parseRange rng size = case parseByteRanges rng of
100103 Nothing -> WithoutBody H.requestedRangeNotSatisfiable416
101104 Just [] -> WithoutBody H.requestedRangeNotSatisfiable416
102105 Just (r:_) -> let (!beg, !end) = checkRange r size
@@ -112,14 +115,48 @@ checkRange (H.ByteRangeFrom beg) size = (beg, size - 1)
112115checkRange (H.ByteRangeFromTo beg end) size = (beg, min (size - 1) end)
113116checkRange (H.ByteRangeSuffix count) size = (max 0 (size - count), size - 1)
114117
118+-- | Parse the value of a Range header into a 'H.ByteRanges'.
119+parseByteRanges :: B.ByteString -> Maybe H.ByteRanges
120+parseByteRanges bs1 = do
121+ bs2 <- stripPrefix "bytes=" bs1
122+ (r, bs3) <- range bs2
123+ ranges (r:) bs3
124+ where
125+ range bs2 = do
126+ (i, bs3) <- B.readInteger bs2
127+ if i < 0 -- has prefix "-" ("-0" is not valid, but here treated as "0-")
128+ then Just (H.ByteRangeSuffix (negate i), bs3)
129+ else do
130+ bs4 <- stripPrefix "-" bs3
131+ case B.readInteger bs4 of
132+ Just (j, bs5) | j >= i -> Just (H.ByteRangeFromTo i j, bs5)
133+ _ -> Just (H.ByteRangeFrom i, bs4)
134+ ranges front bs3
135+ | B.null bs3 = Just (front [])
136+ | otherwise = do
137+ bs4 <- stripPrefix "," bs3
138+ (r, bs5) <- range bs4
139+ ranges (front . (r:)) bs5
140+
141+ stripPrefix x y
142+ | x `B.isPrefixOf` y = Just (B.drop (B.length x) y)
143+ | otherwise = Nothing
144+
115145----------------------------------------------------------------
116146
147+contentRange :: H.HeaderName
148+#if MIN_VERSION_http_types(0,9,0)
149+contentRange = H.hContentRange
150+#else
151+contentRange = "Content-Range"
152+#endif
153+
117154-- | @contentRangeHeader beg end total@ constructs a Content-Range 'H.Header'
118155-- for the range specified.
119156contentRangeHeader :: Integer -> Integer -> Integer -> H.Header
120−contentRangeHeader beg end total = (H.hContentRange, range)
157+contentRangeHeader beg end total = (contentRange, range)
121158 where
122− range = C8.pack
159+ range = B.pack
123160 -- building with ShowS
124161 $ 'b' : 'y': 't' : 'e' : 's' : ' '
125162 : (if beg > end then ('*':) else
@@ -129,6 +166,13 @@ contentRangeHeader beg end total = (H.hContentRange, range)
129166 ( '/'
130167 : showInt total "")
131168
169+acceptRange :: H.HeaderName
170+#if MIN_VERSION_http_types(0,9,0)
171+acceptRange = H.hAcceptRanges
172+#else
173+acceptRange = "Accept-Ranges"
174+#endif
175+
132176addContentHeaders :: H.ResponseHeaders -> Integer -> Integer -> Integer -> H.ResponseHeaders
133177addContentHeaders hs off len size
134178 | len == size = hs'
@@ -136,7 +180,7 @@ addContentHeaders hs off len size
136180 in ctrng:hs'
137181 where
138182 !lengthBS = packIntegral len
139− !hs' = (H.hContentLength, lengthBS) : (H.hAcceptRanges,"bytes") : hs
183+ !hs' = (H.hContentLength, lengthBS) : (acceptRange,"bytes") : hs
140184
141185-- |
142186--
warp/Network/Wai/Handler/Warp/FileInfoCache.hs+26−23
@@ -2,21 +2,24 @@
22
33module Network.Wai.Handler.Warp.FileInfoCache (
44 FileInfo(..)
5+ , Hash
56 , withFileInfoCache
67 , getInfo -- test purpose only
78 ) where
89
910import Control.Exception as E
11+import Control.Monad (void)
1012import Control.Reaper
13+import Data.ByteString (ByteString)
1114import Network.HTTP.Date
12−import System.PosixCompat.Files
13−
1415import Network.Wai.Handler.Warp.HashMap (HashMap)
1516import qualified Network.Wai.Handler.Warp.HashMap as M
16−import Network.Wai.Handler.Warp.Imports
17+import System.PosixCompat.Files
1718
1819----------------------------------------------------------------
1920
21+type Hash = Int
22+
2023-- | File information.
2124data FileInfo = FileInfo {
2225 fileInfoName :: !FilePath
@@ -26,8 +29,8 @@ data FileInfo = FileInfo {
2629 } deriving (Eq, Show)
2730
2831data Entry = Negative | Positive FileInfo
29−type Cache = HashMap Entry
30−type FileInfoCache = Reaper Cache (FilePath,Entry)
32+type Cache = HashMap FilePath Entry
33+type FileInfoCache = Reaper Cache (Int,FilePath,Entry)
3134
3235----------------------------------------------------------------
3336
@@ -51,29 +54,29 @@ getInfo path = do
5154 else
5255 throwIO (userError "FileInfoCache:getInfo")
5356
54−getInfoNaive :: FilePath -> IO FileInfo
55−getInfoNaive = getInfo
57+getInfoNaive :: Hash -> FilePath -> IO FileInfo
58+getInfoNaive _ = getInfo
5659
5760----------------------------------------------------------------
5861
59−getAndRegisterInfo :: FileInfoCache -> FilePath -> IO FileInfo
60−getAndRegisterInfo reaper@Reaper{..} path = do
62+getAndRegisterInfo :: FileInfoCache -> Hash -> FilePath -> IO FileInfo
63+getAndRegisterInfo reaper@Reaper{..} h path = do
6164 cache <- reaperRead
62− case M.lookup path cache of
65+ case M.lookup h path cache of
6366 Just Negative -> throwIO (userError "FileInfoCache:getAndRegisterInfo")
6467 Just (Positive x) -> return x
65− Nothing -> positive reaper path
66− `E.onException` negative reaper path
68+ Nothing -> positive reaper h path
69+ `E.onException` negative reaper h path
6770
68−positive :: FileInfoCache -> FilePath -> IO FileInfo
69−positive Reaper{..} path = do
71+positive :: FileInfoCache -> Hash -> FilePath -> IO FileInfo
72+positive Reaper{..} h path = do
7073 info <- getInfo path
71− reaperAdd (path, Positive info)
74+ reaperAdd (h, path, Positive info)
7275 return info
7376
74−negative :: FileInfoCache -> FilePath -> IO FileInfo
75−negative Reaper{..} path = do
76− reaperAdd (path, Negative)
77+negative :: FileInfoCache -> Hash -> FilePath -> IO FileInfo
78+negative Reaper{..} h path = do
79+ reaperAdd (h, path,Negative)
7780 throwIO (userError "FileInfoCache:negative")
7881
7982----------------------------------------------------------------
@@ -82,22 +85,22 @@ negative Reaper{..} path = do
8285-- and executing the action in the second argument.
8386-- The first argument is a cache duration in second.
8487withFileInfoCache :: Int
85− -> ((FilePath -> IO FileInfo) -> IO a)
88+ -> ((Hash -> FilePath -> IO FileInfo) -> IO a)
8689 -> IO a
8790withFileInfoCache 0 action = action getInfoNaive
8891withFileInfoCache duration action =
8992 E.bracket (initialize duration)
9093 terminate
91− (action . getAndRegisterInfo)
94+ (\r -> action (getAndRegisterInfo r))
9295
93−initialize :: Int -> IO FileInfoCache
96+initialize :: Hash -> IO FileInfoCache
9497initialize duration = mkReaper settings
9598 where
9699 settings = defaultReaperSettings {
97100 reaperAction = override
98101 , reaperDelay = duration
99− , reaperCons = \(path,v) -> M.insert path v
100− , reaperNull = M.isEmpty
102+ , reaperCons = \(h,k,v) -> M.insert h k v
103+ , reaperNull = M.null
101104 , reaperEmpty = M.empty
102105 }
103106
warp/Network/Wai/Handler/Warp/HTTP2.hs+56−72
@@ -1,85 +1,69 @@
1−{-# LANGUAGE RecordWildCards #-}
2−{-# LANGUAGE BangPatterns #-}
31{-# LANGUAGE OverloadedStrings #-}
4−{-# LANGUAGE PatternGuards #-}
5−{-# LANGUAGE ScopedTypeVariables #-}
2+{-# LANGUAGE RecordWildCards #-}
63
7−module Network.Wai.Handler.Warp.HTTP2 (http2) where
4+module Network.Wai.Handler.Warp.HTTP2 (isHTTP2, http2) where
85
9−import qualified Data.IORef as I
6+import Control.Concurrent (forkIO, killThread)
107import qualified Control.Exception as E
11−import qualified Network.HTTP2.Server as H2
8+import Control.Monad (when, unless, replicateM_)
9+import Data.ByteString (ByteString)
10+import Network.HTTP2
1211import Network.Socket (SockAddr)
1312import Network.Wai
14−import Network.Wai.Internal (ResponseReceived(..))
15−import qualified System.TimeManager as T
16−
17−import Network.Wai.Handler.Warp.HTTP2.File
18−import Network.Wai.Handler.Warp.HTTP2.PushPromise
13+import Network.Wai.Handler.Warp.HTTP2.EncodeFrame
14+import Network.Wai.Handler.Warp.HTTP2.Manager
15+import Network.Wai.Handler.Warp.HTTP2.Receiver
1916import Network.Wai.Handler.Warp.HTTP2.Request
20−import Network.Wai.Handler.Warp.HTTP2.Response
21−import Network.Wai.Handler.Warp.Imports
22−import qualified Network.Wai.Handler.Warp.Settings as S
17+import Network.Wai.Handler.Warp.HTTP2.Sender
18+import Network.Wai.Handler.Warp.HTTP2.Types
19+import Network.Wai.Handler.Warp.HTTP2.Worker
20+import qualified Network.Wai.Handler.Warp.Settings as S (Settings)
2321import Network.Wai.Handler.Warp.Types
2422
2523----------------------------------------------------------------
2624
27−http2 :: Connection -> Transport -> InternalInfo -> SockAddr -> S.Settings -> (BufSize -> IO ByteString) -> (ByteString -> IO ()) -> Application -> IO ()
28−http2 conn transport ii addr settings readN send app =
29− H2.run conf http2server
25+http2 :: Connection -> InternalInfo1 -> SockAddr -> Transport -> S.Settings -> (BufSize -> IO ByteString) -> Application -> IO ()
26+http2 conn ii1 addr transport settings readN app = do
27+ checkTLS
28+ ok <- checkPreface
29+ when ok $ do
30+ ctx <- newContext
31+ -- Workers, worker manager and timer manager
32+ mgr <- start settings
33+ let responder = response settings ctx mgr
34+ action = worker ctx settings app responder
35+ setAction mgr action
36+ -- The number of workers is 3.
37+ -- This was carefully chosen based on a lot of benchmarks.
38+ -- If it is 1, we cannot avoid head-of-line blocking.
39+ -- If it is large, huge memory is consumed and many
40+ -- context switches happen.
41+ replicateM_ 3 $ spawnAction mgr
42+ -- Receiver
43+ let mkreq = mkRequest ii1 settings addr
44+ tid <- forkIO $ frameReceiver ctx mkreq readN
45+ -- Sender
46+ -- frameSender is the main thread because it ensures to send
47+ -- a goway frame.
48+ frameSender ctx conn settings mgr `E.finally` do
49+ clearContext ctx
50+ stop mgr
51+ killThread tid
3052 where
31− conf = H2.Config {
32− confWriteBuffer = connWriteBuffer conn
33− , confBufferSize = connBufferSize conn
34− , confSendAll = send
35− , confReadN = readN
36− , confPositionReadMaker = pReadMaker ii
37− }
38−
39− http2server h2req aux response = do
40− req <- toWAIRequest h2req aux
41− ref <- I.newIORef Nothing
42− eResponseReceived <- E.try $ app req $ \rsp -> do
43− h2rsp <- fromResponse settings ii req rsp
44− pps <- fromPushPromises ii req
45− I.writeIORef ref $ Just (h2rsp, pps)
46− _ <- response h2rsp pps
47− return ResponseReceived
48− case eResponseReceived of
49− Right ResponseReceived -> do
50− Just (h2rsp, pps) <- I.readIORef ref
51− logResponse h2rsp req
52− mapM_ (logPushPromise req) pps
53− Left e@(E.SomeException _)
54− -- killed by the local worker manager
55− | Just E.ThreadKilled <- E.fromException e -> return ()
56− -- killed by the local timeout manager
57− | Just T.TimeoutThread <- E.fromException e -> return ()
58− | otherwise -> do
59− S.settingsOnException settings (Just req) e
60− let ersp = S.settingsOnExceptionResponse settings e
61− h2rsp' <- fromResponse settings ii req ersp
62− _ <- response h2rsp' []
63− logResponse h2rsp' req
64− return ()
53+ checkTLS = case transport of
54+ TCP -> return () -- direct
55+ tls -> unless (tls12orLater tls) $ goaway conn InadequateSecurity "Weak TLS"
56+ tls12orLater tls = tlsMajorVersion tls == 3 && tlsMinorVersion tls >= 3
57+ checkPreface = do
58+ preface <- readN connectionPrefaceLength
59+ if connectionPreface /= preface then do
60+ goaway conn ProtocolError "Preface mismatch"
61+ return False
62+ else
63+ return True
6564
66− toWAIRequest h2req aux = toRequest ii settings addr hdr bdylen bdy th transport
67− where
68− !hdr = H2.requestHeaders h2req
69− !bdy = H2.getRequestBodyChunk h2req
70− !bdylen = H2.requestBodySize h2req
71− !th = H2.auxTimeHandle aux
72−
73− logResponse h2rsp req = logger req st msiz
74− where
75− !logger = S.settingsLogger settings
76− !st = H2.responseStatus h2rsp
77− !msiz = fromIntegral <$> H2.responseBodySize h2rsp
78−
79− logPushPromise req pp = logger req path siz
80− where
81− !logger = S.settingsServerPushLogger settings
82− !path = H2.promiseRequestPath pp
83− !siz = case H2.responseBodySize $ H2.promiseResponse pp of
84− Nothing -> 0
85− Just s -> fromIntegral s
65+-- connClose must not be called here since Run:fork calls it
66+goaway :: Connection -> ErrorCodeId -> ByteString -> IO ()
67+goaway Connection{..} etype debugmsg = connSendAll bytestream
68+ where
69+ bytestream = goawayFrame 0 etype debugmsg
warp/Network/Wai/Handler/Warp/HTTP2/EncodeFrame.hsnew file+35
@@ -0,0 +1,35 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+
3+module Network.Wai.Handler.Warp.HTTP2.EncodeFrame where
4+
5+import Data.ByteString (ByteString)
6+import Network.HTTP2
7+
8+----------------------------------------------------------------
9+
10+goawayFrame :: StreamId -> ErrorCodeId -> ByteString -> ByteString
11+goawayFrame sid etype debugmsg = encodeFrame einfo frame
12+ where
13+ einfo = encodeInfo id 0
14+ frame = GoAwayFrame sid etype debugmsg
15+
16+resetFrame :: ErrorCodeId -> StreamId -> ByteString
17+resetFrame etype sid = encodeFrame einfo frame
18+ where
19+ einfo = encodeInfo id sid
20+ frame = RSTStreamFrame etype
21+
22+settingsFrame :: (FrameFlags -> FrameFlags) -> SettingsList -> ByteString
23+settingsFrame func alist = encodeFrame einfo $ SettingsFrame alist
24+ where
25+ einfo = encodeInfo func 0
26+
27+pingFrame :: ByteString -> ByteString
28+pingFrame bs = encodeFrame einfo $ PingFrame bs
29+ where
30+ einfo = encodeInfo setAck 0
31+
32+windowUpdateFrame :: StreamId -> WindowSize -> ByteString
33+windowUpdateFrame sid winsiz = encodeFrame einfo $ WindowUpdateFrame winsiz
34+ where
35+ einfo = encodeInfo id sid
warp/Network/Wai/Handler/Warp/HTTP2/File.hs+185−23
@@ -1,30 +1,192 @@
11{-# LANGUAGE CPP #-}
2+{-# LANGUAGE OverloadedStrings #-}
3+{-# LANGUAGE BangPatterns, RecordWildCards #-}
24
3−module Network.Wai.Handler.Warp.HTTP2.File where
5+module Network.Wai.Handler.Warp.HTTP2.File (
6+ RspFileInfo(..)
7+ , conditionalRequest
8+ , addContentHeadersForFilePart
9+ , parseByteRanges
10+ ) where
411
5−import Network.HTTP2.Server
12+import Control.Applicative ((<|>))
13+import qualified Data.ByteString as B hiding (pack)
14+import qualified Data.ByteString.Char8 as B (pack, readInteger)
15+import Data.ByteString (ByteString)
16+import Data.Maybe (fromMaybe)
17+import Network.HTTP.Date
18+import qualified Network.HTTP.Types as H
19+import Network.Wai
20+import qualified Network.Wai.Handler.Warp.FileInfoCache as I
21+import Network.Wai.Handler.Warp.PackInt
22+import Numeric (showInt)
23+import Network.HPACK
24+import Network.HPACK.Token
625
7−import Network.Wai.Handler.Warp.Types
26+#ifndef MIN_VERSION_http_types
27+#define MIN_VERSION_http_types(x,y,z) 1
28+#endif
29+
30+-- $setup
31+-- >>> import Test.QuickCheck
32+
33+----------------------------------------------------------------
34+
35+data RspFileInfo = WithoutBody !H.Status
36+ | WithBody !H.Status !TokenHeaderList !Integer !Integer
37+ deriving (Eq,Show)
838
9−#ifdef WINDOWS
10−pReadMaker :: InternalInfo -> PositionReadMaker
11−pReadMaker _ = defaultPositionReadMaker
12−#else
13−import Network.Wai.Handler.Warp.FdCache
14−import Network.Wai.Handler.Warp.SendFile (positionRead)
39+----------------------------------------------------------------
1540
16−pReadMaker :: InternalInfo -> PositionReadMaker
17−pReadMaker ii path = do
18− (mfd, refresh) <- getFd ii path
19− case mfd of
20− Just fd -> return (pread fd, Refresher refresh)
21− Nothing -> do
22− fd <- openFile path
23− return (pread fd, Closer $ closeFile fd)
41+conditionalRequest :: I.FileInfo
42+ -> TokenHeaderList -- Response
43+ -> ValueTable -- Request
44+ -> RspFileInfo
45+conditionalRequest (I.FileInfo _ size mtime date) ths0 reqtbl = case condition of
46+ nobody@(WithoutBody _) -> nobody
47+ WithBody s _ off len -> let !hs = (tokenLastModified,date) :
48+ addContentHeaders ths0 off len size
49+ in WithBody s hs off len
2450 where
25− pread :: Fd -> PositionRead
26− pread fd off bytes buf = fromIntegral <$> positionRead fd buf bytes' off'
27− where
28− bytes' = fromIntegral bytes
29− off' = fromIntegral off
30−#endif
51+ !mcondition = ifmodified reqtbl size mtime
52+ <|> ifunmodified reqtbl size mtime
53+ <|> ifrange reqtbl size mtime
54+ !condition = fromMaybe (unconditional reqtbl size) mcondition
55+
56+----------------------------------------------------------------
57+
58+{-# INLINE ifModifiedSince #-}
59+ifModifiedSince :: ValueTable -> Maybe HTTPDate
60+ifModifiedSince reqtbl = getHeaderValue tokenIfModifiedSince reqtbl >>= parseHTTPDate
61+
62+{-# INLINE ifUnmodifiedSince #-}
63+ifUnmodifiedSince :: ValueTable -> Maybe HTTPDate
64+ifUnmodifiedSince reqtbl = getHeaderValue tokenIfUnmodifiedSince reqtbl >>= parseHTTPDate
65+
66+{-# INLINE ifRange #-}
67+ifRange :: ValueTable -> Maybe HTTPDate
68+ifRange reqtbl = getHeaderValue tokenIfRange reqtbl >>= parseHTTPDate
69+
70+----------------------------------------------------------------
71+
72+{-# INLINE ifmodified #-}
73+ifmodified :: ValueTable -> Integer -> HTTPDate -> Maybe RspFileInfo
74+ifmodified reqtbl size mtime = do
75+ date <- ifModifiedSince reqtbl
76+ return $ if date /= mtime
77+ then unconditional reqtbl size
78+ else WithoutBody H.notModified304
79+
80+{-# INLINE ifunmodified #-}
81+ifunmodified :: ValueTable -> Integer -> HTTPDate -> Maybe RspFileInfo
82+ifunmodified reqtbl size mtime = do
83+ date <- ifUnmodifiedSince reqtbl
84+ return $ if date == mtime
85+ then unconditional reqtbl size
86+ else WithoutBody H.preconditionFailed412
87+
88+{-# INLINE ifrange #-}
89+ifrange :: ValueTable -> Integer -> HTTPDate -> Maybe RspFileInfo
90+ifrange reqtbl size mtime = do
91+ date <- ifRange reqtbl
92+ rng <- getHeaderValue tokenRange reqtbl
93+ return $ if date == mtime
94+ then parseRange rng size
95+ else WithBody H.ok200 [] 0 size
96+
97+{-# INLINE unconditional #-}
98+unconditional :: ValueTable -> Integer -> RspFileInfo
99+unconditional reqtbl size = case getHeaderValue tokenRange reqtbl of
100+ Nothing -> WithBody H.ok200 [] 0 size
101+ Just rng -> parseRange rng size
102+
103+----------------------------------------------------------------
104+
105+{-# INLINE parseRange #-}
106+parseRange :: ByteString -> Integer -> RspFileInfo
107+parseRange rng size = case parseByteRanges rng of
108+ Nothing -> WithoutBody H.requestedRangeNotSatisfiable416
109+ Just [] -> WithoutBody H.requestedRangeNotSatisfiable416
110+ Just (r:_) -> let (!beg, !end) = checkRange r size
111+ !len = end - beg + 1
112+ s = if beg == 0 && end == size - 1 then
113+ H.ok200
114+ else
115+ H.partialContent206
116+ in WithBody s [] beg len
117+
118+{-# INLINE checkRange #-}
119+checkRange :: H.ByteRange -> Integer -> (Integer, Integer)
120+checkRange (H.ByteRangeFrom beg) size = (beg, size - 1)
121+checkRange (H.ByteRangeFromTo beg end) size = (beg, min (size - 1) end)
122+checkRange (H.ByteRangeSuffix count) size = (max 0 (size - count), size - 1)
123+
124+{-# INLINE parseByteRanges #-}
125+-- | Parse the value of a Range header into a 'H.ByteRanges'.
126+parseByteRanges :: B.ByteString -> Maybe H.ByteRanges
127+parseByteRanges bs1 = do
128+ bs2 <- stripPrefix "bytes=" bs1
129+ (r, bs3) <- range bs2
130+ ranges (r:) bs3
131+ where
132+ range bs2 = do
133+ (i, bs3) <- B.readInteger bs2
134+ if i < 0 -- has prefix "-" ("-0" is not valid, but here treated as "0-")
135+ then Just (H.ByteRangeSuffix (negate i), bs3)
136+ else do
137+ bs4 <- stripPrefix "-" bs3
138+ case B.readInteger bs4 of
139+ Just (j, bs5) | j >= i -> Just (H.ByteRangeFromTo i j, bs5)
140+ _ -> Just (H.ByteRangeFrom i, bs4)
141+ ranges front bs3
142+ | B.null bs3 = Just (front [])
143+ | otherwise = do
144+ bs4 <- stripPrefix "," bs3
145+ (r, bs5) <- range bs4
146+ ranges (front . (r:)) bs5
147+
148+ stripPrefix x y
149+ | x `B.isPrefixOf` y = Just (B.drop (B.length x) y)
150+ | otherwise = Nothing
151+
152+----------------------------------------------------------------
153+
154+{-# INLINE contentRangeHeader #-}
155+-- | @contentRangeHeader beg end total@ constructs a Content-Range 'H.Header'
156+-- for the range specified.
157+contentRangeHeader :: Integer -> Integer -> Integer -> TokenHeader
158+contentRangeHeader beg end total = (tokenContentRange, range)
159+ where
160+ range = B.pack
161+ -- building with ShowS
162+ $ 'b' : 'y': 't' : 'e' : 's' : ' '
163+ : (if beg > end then ('*':) else
164+ showInt beg
165+ . ('-' :)
166+ . showInt end)
167+ ( '/'
168+ : showInt total "")
169+
170+{-# INLINE addContentHeaders #-}
171+addContentHeaders :: TokenHeaderList -> Integer -> Integer -> Integer -> TokenHeaderList
172+addContentHeaders ths off len size
173+ | len == size = ths'
174+ | otherwise = let !ctrng = contentRangeHeader off (off + len - 1) size
175+ in ctrng:ths'
176+ where
177+ !lengthBS = packIntegral len
178+ !ths' = (tokenContentLength, lengthBS) : (tokenAcceptRanges,"bytes") : ths
179+
180+{-# INLINE addContentHeadersForFilePart #-}
181+-- |
182+--
183+-- >>> addContentHeadersForFilePart [] (FilePart 2 10 16)
184+-- [(Token {ix = 20, shouldBeIndexed = True, isPseudo = False, tokenKey = "Content-Range"},"bytes 2-11/16"),(Token {ix = 18, shouldBeIndexed = False, isPseudo = False, tokenKey = "Content-Length"},"10"),(Token {ix = 8, shouldBeIndexed = True, isPseudo = False, tokenKey = "Accept-Ranges"},"bytes")]
185+-- >>> addContentHeadersForFilePart [] (FilePart 0 16 16)
186+-- [(Token {ix = 18, shouldBeIndexed = False, isPseudo = False, tokenKey = "Content-Length"},"16"),(Token {ix = 8, shouldBeIndexed = True, isPseudo = False, tokenKey = "Accept-Ranges"},"bytes")]
187+addContentHeadersForFilePart :: TokenHeaderList -> FilePart -> TokenHeaderList
188+addContentHeadersForFilePart hs part = addContentHeaders hs off len size
189+ where
190+ off = filePartOffset part
191+ len = filePartByteCount part
192+ size = filePartFileSize part
warp/Network/Wai/Handler/Warp/HTTP2/HPACK.hsnew file+99
@@ -0,0 +1,99 @@
1+{-# LANGUAGE OverloadedStrings, BangPatterns #-}
2+{-# LANGUAGE NamedFieldPuns, RecordWildCards #-}
3+
4+module Network.Wai.Handler.Warp.HTTP2.HPACK (
5+ hpackEncodeHeader
6+ , hpackEncodeHeaderLoop
7+ , hpackDecodeHeader
8+ , just
9+ , addNecessaryHeaders
10+ ) where
11+
12+import qualified Control.Exception as E
13+import Control.Monad (unless)
14+import Data.ByteString (ByteString)
15+import Network.HPACK hiding (Buffer)
16+import Network.HPACK.Token
17+import Network.HTTP2
18+import Network.Wai.Handler.Warp.HTTP2.Types
19+import Network.Wai.Handler.Warp.PackInt
20+import qualified Network.Wai.Handler.Warp.Settings as S
21+import Network.Wai.Handler.Warp.Types
22+
23+-- $setup
24+-- >>> :set -XOverloadedStrings
25+
26+----------------------------------------------------------------
27+
28+{-# INLINE addHeader #-}
29+addHeader :: Token -> ByteString -> ValueTable -> TokenHeaderList -> TokenHeaderList
30+addHeader t v tbl ths = case getHeaderValue t tbl of
31+ Nothing -> (t,v) : ths
32+ Just _ -> ths
33+
34+addNecessaryHeaders :: Context
35+ -> Rspn
36+ -> InternalInfo
37+ -> S.Settings
38+ -> IO TokenHeaderList
39+addNecessaryHeaders Context{..} rspn ii settings = do
40+ date <- getDate ii
41+ let !s = rspnStatus rspn
42+ !status = packStatus s
43+ !defServer = S.settingsServerName settings
44+ (!ths0,tbl) = rspnHeaders rspn
45+ !ths1 = addHeader tokenServer defServer tbl ths0
46+ !ths2 = addHeader tokenDate date tbl ths1
47+ !ths3 = (tokenStatus, status) : ths2
48+ return ths3
49+
50+----------------------------------------------------------------
51+
52+strategy :: EncodeStrategy
53+strategy = EncodeStrategy { compressionAlgo = Linear, useHuffman = False }
54+
55+-- Set-Cookie: contains only one cookie value.
56+-- So, we don't need to split it.
57+hpackEncodeHeader :: Context -> Buffer -> BufSize
58+ -> TokenHeaderList
59+ -> IO (TokenHeaderList, Int)
60+hpackEncodeHeader Context{..} buf siz ths =
61+ encodeTokenHeader buf siz strategy True encodeDynamicTable ths
62+
63+hpackEncodeHeaderLoop :: Context -> Buffer -> BufSize
64+ -> TokenHeaderList
65+ -> IO (TokenHeaderList, Int)
66+hpackEncodeHeaderLoop Context{..} buf siz hs =
67+ encodeTokenHeader buf siz strategy False encodeDynamicTable hs
68+
69+----------------------------------------------------------------
70+
71+hpackDecodeHeader :: HeaderBlockFragment -> Context -> IO (TokenHeaderList, ValueTable)
72+hpackDecodeHeader hdrblk Context{..} = do
73+ tbl@(_,vt) <- decodeTokenHeader decodeDynamicTable hdrblk `E.catch` handl
74+ unless (checkRequestHeader vt) $
75+ E.throwIO $ ConnectionError ProtocolError "the header key is illegal"
76+ return tbl
77+ where
78+ handl IllegalHeaderName =
79+ E.throwIO $ ConnectionError ProtocolError "the header key is illegal"
80+ handl _ =
81+ E.throwIO $ ConnectionError CompressionError "cannot decompress the header"
82+
83+{-# INLINE checkRequestHeader #-}
84+checkRequestHeader :: ValueTable -> Bool
85+checkRequestHeader reqvt
86+ | getHeaderValue tokenStatus reqvt /= Nothing = False
87+ | getHeaderValue tokenPath reqvt == Nothing = False
88+ | getHeaderValue tokenMethod reqvt == Nothing = False
89+ | getHeaderValue tokenAuthority reqvt == Nothing = False
90+ | getHeaderValue tokenConnection reqvt /= Nothing = False
91+ | just (getHeaderValue tokenTE reqvt) (/= "trailers") = False
92+ | otherwise = True
93+
94+{-# INLINE just #-}
95+just :: Maybe a -> (a -> Bool) -> Bool
96+just Nothing _ = False
97+just (Just x) p
98+ | p x = True
99+ | otherwise = False
warp/Network/Wai/Handler/Warp/HTTP2/Manager.hsnew file+97
@@ -0,0 +1,97 @@
1+{-# LANGUAGE CPP, BangPatterns #-}
2+
3+-- | A thread pool manager.
4+-- The manager has responsibility to spawn and kill
5+-- worker threads.
6+module Network.Wai.Handler.Warp.HTTP2.Manager (
7+ Manager
8+ , start
9+ , setAction
10+ , stop
11+ , spawnAction
12+ , addMyId
13+ , deleteMyId
14+ ) where
15+
16+#if __GLASGOW_HASKELL__ < 709
17+import Control.Applicative
18+#endif
19+import Control.Concurrent
20+import Control.Concurrent.STM
21+import Control.Monad (void)
22+import Data.Set (Set)
23+import qualified Data.Set as Set
24+import Data.Foldable
25+import Network.Wai.Handler.Warp.IORef
26+import Network.Wai.Handler.Warp.Settings
27+import qualified Network.Wai.Handler.Warp.Timeout as T
28+
29+----------------------------------------------------------------
30+
31+type Action = T.Manager -> IO ()
32+
33+data Command = Stop | Spawn | Add ThreadId | Delete ThreadId
34+
35+data Manager = Manager (TQueue Command) (IORef Action)
36+
37+-- | Starting a thread pool manager.
38+-- Its action is initially set to 'return ()' and should be set
39+-- by 'setAction'. This allows that the action can include
40+-- the manager itself.
41+start :: Settings -> IO Manager
42+start set = do
43+ q <- newTQueueIO
44+ ref <- newIORef (\_ -> return ())
45+ timmgr <- T.initialize $ settingsTimeout set * 1000000
46+ void $ forkIO $ go q Set.empty ref timmgr
47+ return $ Manager q ref
48+ where
49+ go q !tset0 ref timmgr = do
50+ x <- atomically $ readTQueue q
51+ case x of
52+ Stop -> kill tset0 >> T.killManager timmgr
53+ Spawn -> next tset0
54+ Add newtid -> let !tset = add newtid tset0
55+ in go q tset ref timmgr
56+ Delete oldtid -> let !tset = del oldtid tset0
57+ in go q tset ref timmgr
58+ where
59+ next tset = do
60+ action <- readIORef ref
61+ newtid <- forkIO (action timmgr)
62+ let !tset' = add newtid tset
63+ go q tset' ref timmgr
64+
65+setAction :: Manager -> Action -> IO ()
66+setAction (Manager _ ref) action = writeIORef ref action
67+
68+stop :: Manager -> IO ()
69+stop (Manager q _) = atomically $ writeTQueue q Stop
70+
71+spawnAction :: Manager -> IO ()
72+spawnAction (Manager q _) = atomically $ writeTQueue q Spawn
73+
74+addMyId :: Manager -> IO ()
75+addMyId (Manager q _) = do
76+ tid <- myThreadId
77+ atomically $ writeTQueue q $ Add tid
78+
79+deleteMyId :: Manager -> IO ()
80+deleteMyId (Manager q _) = do
81+ tid <- myThreadId
82+ atomically $ writeTQueue q $ Delete tid
83+
84+----------------------------------------------------------------
85+
86+add :: ThreadId -> Set ThreadId -> Set ThreadId
87+add tid set = set'
88+ where
89+ !set' = Set.insert tid set
90+
91+del :: ThreadId -> Set ThreadId -> Set ThreadId
92+del tid set = set'
93+ where
94+ !set' = Set.delete tid set
95+
96+kill :: Set ThreadId -> IO ()
97+kill set = traverse_ killThread set
warp/Network/Wai/Handler/Warp/HTTP2/PushPromise.hsdeleted−36
@@ -1,36 +0,0 @@
1−{-# LANGUAGE BangPatterns #-}
2−{-# LANGUAGE RecordWildCards #-}
3−{-# LANGUAGE ScopedTypeVariables #-}
4−
5−module Network.Wai.Handler.Warp.HTTP2.PushPromise where
6−
7−import qualified Control.Exception as E
8−import qualified Network.HTTP.Types as H
9−import qualified Network.HTTP2.Server as H2
10−
11−import Network.Wai
12−import Network.Wai.Handler.Warp.FileInfoCache
13−import Network.Wai.Handler.Warp.HTTP2.Request (getHTTP2Data)
14−import Network.Wai.Handler.Warp.HTTP2.Types
15−import Network.Wai.Handler.Warp.Imports
16−import Network.Wai.Handler.Warp.Types
17−
18−fromPushPromises :: InternalInfo -> Request -> IO [H2.PushPromise]
19−fromPushPromises ii req = do
20− mh2data <- getHTTP2Data req
21− let pp = case mh2data of
22− Nothing -> []
23− Just h2data -> http2dataPushPromise h2data
24− catMaybes <$> mapM (fromPushPromise ii) pp
25−
26−fromPushPromise :: InternalInfo -> PushPromise -> IO (Maybe H2.PushPromise)
27−fromPushPromise ii (PushPromise path file rsphdr w) = do
28− efinfo <- E.try $ getFileInfo ii file
29− case efinfo of
30− Left (_ex :: E.IOException) -> return Nothing
31− Right finfo -> do
32− let !siz = fromIntegral $ fileInfoSize finfo
33− !fileSpec = H2.FileSpec file 0 siz
34− !rsp = H2.responseFile H.ok200 rsphdr fileSpec
35− !pp = H2.pushPromise path rsp w
36− return $ Just pp
warp/Network/Wai/Handler/Warp/HTTP2/Receiver.hsnew file+384
@@ -0,0 +1,384 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+{-# LANGUAGE NamedFieldPuns #-}
3+{-# LANGUAGE BangPatterns #-}
4+{-# LANGUAGE CPP #-}
5+{-# LANGUAGE PatternGuards #-}
6+
7+module Network.Wai.Handler.Warp.HTTP2.Receiver (frameReceiver) where
8+
9+#if __GLASGOW_HASKELL__ < 709
10+import Control.Applicative
11+#endif
12+import Control.Concurrent
13+import Control.Concurrent.STM
14+import qualified Control.Exception as E
15+import Control.Monad (when, unless, void)
16+import Data.ByteString (ByteString)
17+import qualified Data.ByteString as BS
18+import Network.HPACK
19+import Network.HPACK.Token
20+import Network.HTTP2
21+import Network.HTTP2.Priority (toPrecedence, delete, prepare)
22+import Network.Wai.Handler.Warp.HTTP2.EncodeFrame
23+import Network.Wai.Handler.Warp.HTTP2.HPACK
24+import Network.Wai.Handler.Warp.HTTP2.Request
25+import Network.Wai.Handler.Warp.HTTP2.Types
26+import Network.Wai.Handler.Warp.IORef
27+import Network.Wai.Handler.Warp.ReadInt
28+import Network.Wai.Handler.Warp.Types
29+
30+----------------------------------------------------------------
31+
32+frameReceiver :: Context -> MkReq -> (BufSize -> IO ByteString) -> IO ()
33+frameReceiver ctx mkreq recvN = loop 0 `E.catch` sendGoaway
34+ where
35+ Context{ http2settings
36+ , streamTable
37+ , concurrency
38+ , continued
39+ , clientStreamId
40+ , inputQ
41+ , controlQ
42+ } = ctx
43+ sendGoaway e
44+ | Just (ConnectionError err msg) <- E.fromException e = do
45+ csid <- readIORef clientStreamId
46+ let !frame = goawayFrame csid err msg
47+ enqueueControl controlQ $ CGoaway frame
48+ | otherwise = return ()
49+
50+ sendReset err sid = do
51+ let !frame = resetFrame err sid
52+ enqueueControl controlQ $ CFrame frame
53+
54+ loop :: Int -> IO ()
55+ loop !n
56+ | n == 6 = do
57+ yield
58+ loop 0
59+ | otherwise = do
60+ hd <- recvN frameHeaderLength
61+ if BS.null hd then
62+ enqueueControl controlQ CFinish
63+ else do
64+ cont <- processStreamGuardingError $ decodeFrameHeader hd
65+ when cont $ loop (n + 1)
66+
67+ processStreamGuardingError (fid, FrameHeader{streamId})
68+ | isResponse streamId &&
69+ (fid `notElem` [FramePriority,FrameRSTStream,FrameWindowUpdate]) =
70+ E.throwIO $ ConnectionError ProtocolError "stream id should be odd"
71+ processStreamGuardingError (FrameUnknown _, FrameHeader{payloadLength}) = do
72+ mx <- readIORef continued
73+ case mx of
74+ Nothing -> do
75+ -- ignoring unknown frame
76+ consume payloadLength
77+ return True
78+ Just _ -> E.throwIO $ ConnectionError ProtocolError "unknown frame"
79+ processStreamGuardingError (FramePushPromise, _) =
80+ E.throwIO $ ConnectionError ProtocolError "push promise is not allowed"
81+ processStreamGuardingError typhdr@(ftyp, header@FrameHeader{payloadLength}) = do
82+ settings <- readIORef http2settings
83+ case checkFrameHeader settings typhdr of
84+ Left h2err -> case h2err of
85+ StreamError err sid -> do
86+ sendReset err sid
87+ consume payloadLength
88+ return True
89+ connErr -> E.throwIO connErr
90+ Right _ -> do
91+ ex <- E.try $ controlOrStream ftyp header
92+ case ex of
93+ Left (StreamError err sid) -> do
94+ sendReset err sid
95+ return True
96+ Left connErr -> E.throw connErr
97+ Right cont -> return cont
98+
99+ controlOrStream ftyp header@FrameHeader{streamId, payloadLength}
100+ | isControl streamId = do
101+ pl <- recvN payloadLength
102+ control ftyp header pl ctx
103+ | otherwise = do
104+ checkContinued
105+ !mstrm <- getStream
106+ pl <- recvN payloadLength
107+ case mstrm of
108+ Nothing -> do
109+ -- for h2spec only
110+ when (ftyp == FramePriority) $ do
111+ PriorityFrame newpri <- guardIt $ decodePriorityFrame header pl
112+ checkPriority newpri streamId
113+ return True -- just ignore this frame
114+ Just strm@Stream{streamState,streamPrecedence} -> do
115+ state <- readIORef streamState
116+ state' <- stream ftyp header pl ctx state strm
117+ case state' of
118+ Open (NoBody tbl@(_,reqvt) pri) -> do
119+ resetContinued
120+ let mcl = readInt <$> getHeaderValue tokenContentLength reqvt
121+ when (just mcl (== (0 :: Int))) $
122+ E.throwIO $ StreamError ProtocolError streamId
123+ writeIORef streamPrecedence $ toPrecedence pri
124+ writeIORef streamState HalfClosed
125+ (!req, !ii) <- mkreq tbl (return "")
126+ atomically $ writeTQueue inputQ $ Input strm req reqvt ii
127+ Open (HasBody tbl@(_,reqvt) pri) -> do
128+ resetContinued
129+ q <- newTQueueIO
130+ let !mcl = readInt <$> getHeaderValue tokenContentLength reqvt
131+ writeIORef streamPrecedence $ toPrecedence pri
132+ bodyLength <- newIORef 0
133+ writeIORef streamState $ Open (Body q mcl bodyLength)
134+ readQ <- newReadBody q
135+ bodySource <- mkSource readQ
136+ (!req, !ii) <- mkreq tbl (readSource bodySource)
137+ atomically $ writeTQueue inputQ $ Input strm req reqvt ii
138+ s@(Open Continued{}) -> do
139+ setContinued
140+ writeIORef streamState s
141+ s -> do -- Idle, Open Body, HalfClosed, Closed
142+ resetContinued
143+ writeIORef streamState s
144+ return True
145+ where
146+ setContinued = writeIORef continued (Just streamId)
147+ resetContinued = writeIORef continued Nothing
148+ checkContinued = do
149+ mx <- readIORef continued
150+ case mx of
151+ Nothing -> return ()
152+ Just sid
153+ | sid == streamId && ftyp == FrameContinuation -> return ()
154+ | otherwise -> E.throwIO $ ConnectionError ProtocolError "continuation frame must follow"
155+ getStream = do
156+ mstrm0 <- search streamTable streamId
157+ case mstrm0 of
158+ js@(Just strm0) -> do
159+ when (ftyp == FrameHeaders) $ do
160+ st <- readIORef $ streamState strm0
161+ when (isHalfClosed st) $ E.throwIO $ ConnectionError StreamClosed "header must not be sent to half closed"
162+ return js
163+ Nothing
164+ | isResponse streamId -> return Nothing
165+ | otherwise -> do
166+ when (ftyp `notElem` [FrameHeaders,FramePriority]) $
167+ E.throwIO $ ConnectionError ProtocolError "this frame is not allowed in an idel stream"
168+ csid <- readIORef clientStreamId
169+ when (streamId <= csid) $
170+ E.throwIO $ ConnectionError ProtocolError "stream identifier must not decrease"
171+ when (ftyp == FrameHeaders) $ do
172+ writeIORef clientStreamId streamId
173+ cnt <- readIORef concurrency
174+ -- Checking the limitation of concurrency
175+ when (cnt >= maxConcurrency) $
176+ E.throwIO $ StreamError RefusedStream streamId
177+ ws <- initialWindowSize <$> readIORef http2settings
178+ newstrm <- newStream streamId (fromIntegral ws)
179+ when (ftyp == FrameHeaders) $ opened ctx newstrm
180+ insert streamTable streamId newstrm
181+ return $ Just newstrm
182+
183+ consume = void . recvN
184+
185+maxConcurrency :: Int
186+maxConcurrency = recommendedConcurrency
187+
188+initialFrame :: ByteString
189+initialFrame = settingsFrame id [(SettingsMaxConcurrentStreams,maxConcurrency)]
190+
191+----------------------------------------------------------------
192+
193+control :: FrameTypeId -> FrameHeader -> ByteString -> Context -> IO Bool
194+control FrameSettings header@FrameHeader{flags} bs Context{http2settings, controlQ,firstSettings} = do
195+ SettingsFrame alist <- guardIt $ decodeSettingsFrame header bs
196+ case checkSettingsList alist of
197+ Just x -> E.throwIO x
198+ Nothing -> return ()
199+ -- HTTP/2 Setting from a browser
200+ unless (testAck flags) $ do
201+ modifyIORef' http2settings $ \old -> updateSettings old alist
202+ let !frame = settingsFrame setAck []
203+ sent <- readIORef firstSettings
204+ let !setframe
205+ | sent = CSettings frame alist
206+ | otherwise = CSettings0 initialFrame frame alist
207+ unless sent $ writeIORef firstSettings True
208+ enqueueControl controlQ setframe
209+ return True
210+
211+control FramePing FrameHeader{flags} bs Context{controlQ} =
212+ if testAck flags then
213+ E.throwIO $ ConnectionError ProtocolError "the ack flag of this ping frame must not be set"
214+ else do
215+ let !frame = pingFrame bs
216+ enqueueControl controlQ $ CFrame frame
217+ return True
218+
219+control FrameGoAway _ _ Context{controlQ} = do
220+ enqueueControl controlQ CFinish
221+ return False
222+
223+control FrameWindowUpdate header bs Context{connectionWindow} = do
224+ WindowUpdateFrame n <- guardIt $ decodeWindowUpdateFrame header bs
225+ !w <- (n +) <$> atomically (readTVar connectionWindow)
226+ when (isWindowOverflow w) $ E.throwIO $ ConnectionError FlowControlError "control window should be less than 2^31"
227+ atomically $ writeTVar connectionWindow w
228+ return True
229+
230+control _ _ _ _ =
231+ -- must not reach here
232+ return False
233+
234+----------------------------------------------------------------
235+
236+{-# INLINE guardIt #-}
237+guardIt :: Either HTTP2Error a -> IO a
238+guardIt x = case x of
239+ Left err -> E.throwIO err
240+ Right frame -> return frame
241+
242+
243+{-# INLINE checkPriority #-}
244+checkPriority :: Priority -> StreamId -> IO ()
245+checkPriority p me
246+ | dep == me = E.throwIO $ StreamError ProtocolError me
247+ | otherwise = return ()
248+ where
249+ dep = streamDependency p
250+
251+stream :: FrameTypeId -> FrameHeader -> ByteString -> Context -> StreamState -> Stream -> IO StreamState
252+stream FrameHeaders header@FrameHeader{flags} bs ctx (Open JustOpened) Stream{streamNumber} = do
253+ HeadersFrame mp frag <- guardIt $ decodeHeadersFrame header bs
254+ pri <- case mp of
255+ Nothing -> return defaultPriority
256+ Just p -> do
257+ checkPriority p streamNumber
258+ return p
259+ let !endOfStream = testEndStream flags
260+ !endOfHeader = testEndHeader flags
261+ if endOfHeader then do
262+ tbl <- hpackDecodeHeader frag ctx -- fixme
263+ return $ if endOfStream then
264+ Open (NoBody tbl pri)
265+ else
266+ Open (HasBody tbl pri)
267+ else do
268+ let !siz = BS.length frag
269+ return $ Open $ Continued [frag] siz 1 endOfStream pri
270+
271+stream FrameHeaders header@FrameHeader{flags} bs _ (Open (Body q _ _)) _ = do
272+ -- trailer is not supported.
273+ -- let's read and ignore it.
274+ HeadersFrame _ _ <- guardIt $ decodeHeadersFrame header bs
275+ let !endOfStream = testEndStream flags
276+ if endOfStream then do
277+ atomically $ writeTQueue q ""
278+ return HalfClosed
279+ else
280+ -- we don't support continuation here.
281+ E.throwIO $ ConnectionError ProtocolError "continuation in trailer is not supported"
282+
283+stream FrameData
284+ header@FrameHeader{flags,payloadLength,streamId}
285+ bs
286+ Context{controlQ} s@(Open (Body q mcl bodyLength))
287+ Stream{streamNumber} = do
288+ DataFrame body <- guardIt $ decodeDataFrame header bs
289+ let !endOfStream = testEndStream flags
290+ len0 <- readIORef bodyLength
291+ let !len = len0 + payloadLength
292+ writeIORef bodyLength len
293+ when (payloadLength /= 0) $ do
294+ let !frame1 = windowUpdateFrame 0 payloadLength
295+ !frame2 = windowUpdateFrame streamNumber payloadLength
296+ !frame = frame1 `BS.append` frame2
297+ enqueueControl controlQ $ CFrame frame
298+ atomically $ writeTQueue q body
299+ if endOfStream then do
300+ case mcl of
301+ Nothing -> return ()
302+ Just cl -> when (cl /= len) $ E.throwIO $ StreamError ProtocolError streamId
303+ atomically $ writeTQueue q ""
304+ return HalfClosed
305+ else
306+ return s
307+
308+stream FrameContinuation FrameHeader{flags} frag ctx (Open (Continued rfrags siz n endOfStream pri)) _ = do
309+ let !endOfHeader = testEndHeader flags
310+ !rfrags' = frag : rfrags
311+ !siz' = siz + BS.length frag
312+ !n' = n + 1
313+ when (siz' > 51200) $ -- fixme: hard coding: 50K
314+ E.throwIO $ ConnectionError EnhanceYourCalm "Header is too big"
315+ when (n' > 10) $ -- fixme: hard coding
316+ E.throwIO $ ConnectionError EnhanceYourCalm "Header is too fragmented"
317+ if endOfHeader then do
318+ let !hdrblk = BS.concat $ reverse rfrags'
319+ tbl <- hpackDecodeHeader hdrblk ctx
320+ return $ if endOfStream then
321+ Open (NoBody tbl pri)
322+ else
323+ Open (HasBody tbl pri)
324+ else
325+ return $ Open $ Continued rfrags' siz' n' endOfStream pri
326+
327+stream FrameWindowUpdate header@FrameHeader{streamId} bs _ s Stream{streamWindow} = do
328+ WindowUpdateFrame n <- guardIt $ decodeWindowUpdateFrame header bs
329+ !w <- (n +) <$> atomically (readTVar streamWindow)
330+ when (isWindowOverflow w) $
331+ E.throwIO $ StreamError FlowControlError streamId
332+ atomically $ writeTVar streamWindow w
333+ return s
334+
335+stream FrameRSTStream header bs ctx _ strm = do
336+ RSTStreamFrame e <- guardIt $ decoderstStreamFrame header bs
337+ let !cc = Reset e
338+ closed ctx strm cc
339+ return $ Closed cc -- will be written to streamState again
340+
341+stream FramePriority header bs Context{outputQ,priorityTreeSize} s Stream{streamNumber,streamPrecedence} = do
342+ PriorityFrame newpri <- guardIt $ decodePriorityFrame header bs
343+ checkPriority newpri streamNumber
344+ oldpre <- readIORef streamPrecedence
345+ let !newpre = toPrecedence newpri
346+ writeIORef streamPrecedence newpre
347+ if isIdle s then do
348+ n <- atomicModifyIORef' priorityTreeSize (\x -> (x+1,x+1))
349+ -- fixme hard coding
350+ when (n >= 20) $ E.throwIO $ ConnectionError EnhanceYourCalm "too many idle priority frames"
351+ prepare outputQ streamNumber newpri
352+ else do
353+ mx <- delete outputQ streamNumber oldpre
354+ case mx of
355+ Nothing -> return ()
356+ Just out -> enqueueOutput outputQ out
357+ return s
358+
359+-- this ordering is important
360+stream FrameContinuation _ _ _ _ _ = E.throwIO $ ConnectionError ProtocolError "continue frame cannot come here"
361+stream _ _ _ _ (Open Continued{}) _ = E.throwIO $ ConnectionError ProtocolError "an illegal frame follows header/continuation frames"
362+-- Ignore frames to streams we have just reset, per section 5.1.
363+stream _ _ _ _ st@(Closed (ResetByMe _)) _ = return st
364+stream FrameData FrameHeader{streamId} _ _ _ _ = E.throwIO $ StreamError StreamClosed streamId
365+stream _ FrameHeader{streamId} _ _ _ _ = E.throwIO $ StreamError ProtocolError streamId
366+
367+----------------------------------------------------------------
368+
369+{-# INLINE newReadBody #-}
370+newReadBody :: TQueue ByteString -> IO (IO ByteString)
371+newReadBody q = do
372+ ref <- newIORef False
373+ return $ readBody q ref
374+
375+{-# INLINE readBody #-}
376+readBody :: TQueue ByteString -> IORef Bool -> IO ByteString
377+readBody q ref = do
378+ eof <- readIORef ref
379+ if eof then
380+ return ""
381+ else do
382+ bs <- atomically $ readTQueue q
383+ when (bs == "") $ writeIORef ref True
384+ return bs
warp/Network/Wai/Handler/Warp/HTTP2/Request.hs+33−32
@@ -1,58 +1,60 @@
1+{-# LANGUAGE OverloadedStrings, CPP #-}
12{-# LANGUAGE BangPatterns #-}
23
34module Network.Wai.Handler.Warp.HTTP2.Request (
4− toRequest
5+ mkRequest
6+ , MkReq
57 , getHTTP2Data
68 , setHTTP2Data
79 , modifyHTTP2Data
810 ) where
911
12+import Control.Applicative ((<|>))
1013import Control.Arrow (first)
11−import qualified Data.ByteString.Char8 as C8
12−import Data.IORef
14+import Data.ByteString (ByteString)
15+import qualified Data.ByteString.Char8 as B8
16+import Data.Maybe (fromJust)
1317import qualified Data.Vault.Lazy as Vault
1418import Network.HPACK
1519import Network.HPACK.Token
1620import qualified Network.HTTP.Types as H
1721import Network.Socket (SockAddr)
1822import Network.Wai
19−import Network.Wai.Internal (Request(..))
20−import System.IO.Unsafe (unsafePerformIO)
21−import qualified System.TimeManager as T
22−
2323import Network.Wai.Handler.Warp.HTTP2.Types
24−import Network.Wai.Handler.Warp.Imports
25−import Network.Wai.Handler.Warp.Request (getFileInfoKey, pauseTimeoutKey, getClientCertificateKey)
24+import Network.Wai.Handler.Warp.HashMap (hashByteString)
25+import Network.Wai.Handler.Warp.IORef
26+import Network.Wai.Handler.Warp.Request (pauseTimeoutKey, getFileInfoKey)
2627import qualified Network.Wai.Handler.Warp.Settings as S (Settings, settingsNoParsePath)
28+import qualified Network.Wai.Handler.Warp.Timeout as Timeout
2729import Network.Wai.Handler.Warp.Types
30+import Network.Wai.Internal (Request(..))
31+import System.IO.Unsafe (unsafePerformIO)
2832
29−type ToReq = (TokenHeaderList,ValueTable) -> Maybe Int -> IO ByteString -> T.Handle -> Transport -> IO Request
30−
31−----------------------------------------------------------------
33+type MkReq = (TokenHeaderList,ValueTable) -> IO ByteString -> IO (Request,InternalInfo)
3234
33−toRequest :: InternalInfo -> S.Settings -> SockAddr -> ToReq
34−toRequest ii settings addr ht bodylen body th transport = do
35+mkRequest :: InternalInfo1 -> S.Settings -> SockAddr -> MkReq
36+mkRequest ii1 settings addr (reqths,reqvt) body = do
3537 ref <- newIORef Nothing
36− toRequest' ii settings addr ref ht bodylen body th transport
38+ mkRequest' ii1 settings addr ref (reqths,reqvt) body
3739
38−toRequest' :: InternalInfo -> S.Settings -> SockAddr
40+mkRequest' :: InternalInfo1 -> S.Settings -> SockAddr
3941 -> IORef (Maybe HTTP2Data)
40− -> ToReq
41−toRequest' ii settings addr ref (reqths,reqvt) bodylen body th transport = return req
42+ -> MkReq
43+mkRequest' ii1 settings addr ref (reqths,reqvt) body = return (req,ii)
4244 where
4345 !req = Request {
4446 requestMethod = colonMethod
45− , httpVersion = H.http20
47+ , httpVersion = http2ver
4648 , rawPathInfo = rawPath
4749 , pathInfo = H.decodePathSegments path
4850 , rawQueryString = query
4951 , queryString = H.parseQuery query
5052 , requestHeaders = headers
51− , isSecure = isTransportSecure transport
53+ , isSecure = True
5254 , remoteHost = addr
5355 , requestBody = body
5456 , vault = vaultValue
55− , requestBodyLength = maybe ChunkedBody (KnownLength . fromIntegral) bodylen
57+ , requestBodyLength = ChunkedBody -- fixme
5658 , requestHeaderHost = mHost <|> mAuth
5759 , requestHeaderRange = mRange
5860 , requestHeaderReferer = mReferer
@@ -65,30 +67,29 @@ toRequest' ii settings addr ref (reqths,reqvt) bodylen body th transport = retur
6567 Nothing -> case mAuth of
6668 Just auth -> (tokenHost, auth) : reqths
6769 _ -> reqths
68− !mPath = getHeaderValue tokenPath reqvt -- SHOULD
70+ !colonPath = fromJust $ getHeaderValue tokenPath reqvt -- MUST
6971 !colonMethod = fromJust $ getHeaderValue tokenMethod reqvt -- MUST
7072 !mAuth = getHeaderValue tokenAuthority reqvt -- SHOULD
7173 !mHost = getHeaderValue tokenHost reqvt
7274 !mRange = getHeaderValue tokenRange reqvt
7375 !mReferer = getHeaderValue tokenReferer reqvt
7476 !mUserAgent = getHeaderValue tokenUserAgent reqvt
75− -- CONNECT request will have ":path" omitted, use ":authority" as unparsed
76− -- path instead so that it will have consistent behavior compare to HTTP 1.0
77− (unparsedPath,query) = C8.break (=='?') $ fromJust (mPath <|> mAuth)
77+ (unparsedPath,query) = B8.break (=='?') colonPath
7878 !path = H.extractPath unparsedPath
7979 !rawPath = if S.settingsNoParsePath settings then unparsedPath else path
80− -- fixme: pauseTimeout. th is not available here.
81− !vaultValue = Vault.insert getFileInfoKey (getFileInfo ii)
80+ !h = hashByteString rawPath
81+ !ii = toInternalInfo ii1 h
82+ !th = threadHandle ii
83+ !vaultValue = Vault.insert pauseTimeoutKey (Timeout.pause th)
84+ $ Vault.insert getFileInfoKey (getFileInfo ii)
8285 $ Vault.insert getHTTP2DataKey (readIORef ref)
8386 $ Vault.insert setHTTP2DataKey (writeIORef ref)
8487 $ Vault.insert modifyHTTP2DataKey (modifyIORef' ref)
85− $ Vault.insert pauseTimeoutKey (T.pause th)
86− $ Vault.insert getClientCertificateKey (tlsClientCertificate transport)
8788 Vault.empty
8889
8990getHTTP2DataKey :: Vault.Key (IO (Maybe HTTP2Data))
9091getHTTP2DataKey = unsafePerformIO Vault.newKey
91−{-# NOINLINE getHTTP2DataKey #-}
92+{-# NOINLINE getHTTP2Data #-}
9293
9394-- | Getting 'HTTP2Data' through vault of the request.
9495-- Warp uses this to receive 'HTTP2Data' from 'Middleware'.
@@ -101,7 +102,7 @@ getHTTP2Data req = case Vault.lookup getHTTP2DataKey (vault req) of
101102
102103setHTTP2DataKey :: Vault.Key (Maybe HTTP2Data -> IO ())
103104setHTTP2DataKey = unsafePerformIO Vault.newKey
104−{-# NOINLINE setHTTP2DataKey #-}
105+{-# NOINLINE setHTTP2Data #-}
105106
106107-- | Setting 'HTTP2Data' through vault of the request.
107108-- 'Application' or 'Middleware' should use this.
@@ -114,7 +115,7 @@ setHTTP2Data req mh2d = case Vault.lookup setHTTP2DataKey (vault req) of
114115
115116modifyHTTP2DataKey :: Vault.Key ((Maybe HTTP2Data -> Maybe HTTP2Data) -> IO ())
116117modifyHTTP2DataKey = unsafePerformIO Vault.newKey
117−{-# NOINLINE modifyHTTP2DataKey #-}
118+{-# NOINLINE modifyHTTP2Data #-}
118119
119120-- | Modifying 'HTTP2Data' through vault of the request.
120121-- 'Application' or 'Middleware' should use this.
warp/Network/Wai/Handler/Warp/HTTP2/Response.hsdeleted−127
@@ -1,127 +0,0 @@
1−{-# LANGUAGE OverloadedStrings #-}
2−{-# LANGUAGE RecordWildCards #-}
3−{-# LANGUAGE BangPatterns #-}
4−{-# LANGUAGE ScopedTypeVariables #-}
5−
6−module Network.Wai.Handler.Warp.HTTP2.Response (
7− fromResponse
8− ) where
9−
10−import qualified Control.Exception as E
11−import qualified Data.ByteString.Builder as BB
12−import qualified Network.HTTP.Types as H
13−import qualified Network.HTTP2.Server as H2
14−import Network.Wai hiding (responseFile, responseBuilder, responseStream)
15−import Network.Wai.Internal (Response(..))
16−
17−import Network.Wai.Handler.Warp.File
18−import Network.Wai.Handler.Warp.HTTP2.Request (getHTTP2Data)
19−import Network.Wai.Handler.Warp.HTTP2.Types
20−import Network.Wai.Handler.Warp.Header
21−import qualified Network.Wai.Handler.Warp.Response as R
22−import qualified Network.Wai.Handler.Warp.Settings as S
23−import Network.Wai.Handler.Warp.Types
24−
25−----------------------------------------------------------------
26−
27−fromResponse :: S.Settings -> InternalInfo -> Request -> Response -> IO H2.Response
28−fromResponse settings ii req rsp = do
29− date <- getDate ii
30− h2rsp <- case rsp of
31− ResponseFile st rsphdr path mpart -> do
32− let rsphdr' = add date svr rsphdr
33− responseFile st rsphdr' isHead path mpart ii reqhdr
34− ResponseBuilder st rsphdr builder -> do
35− let rsphdr' = add date svr rsphdr
36− return $ responseBuilder st rsphdr' isHead builder
37− ResponseStream st rsphdr strmbdy -> do
38− let rsphdr' = add date svr rsphdr
39− return $ responseStream st rsphdr' isHead strmbdy
40− _ -> error "ResponseRaw is not supported in HTTP/2"
41− mh2data <- getHTTP2Data req
42− case mh2data of
43− Nothing -> return h2rsp
44− Just h2data -> do
45− let !trailers = http2dataTrailers h2data
46− return $ H2.setResponseTrailersMaker h2rsp trailers
47− where
48− !isHead = requestMethod req == H.methodHead
49− !reqhdr = requestHeaders req
50− !svr = S.settingsServerName settings
51− add date server rsphdr = (H.hDate, date) : (H.hServer, server) : rsphdr
52− -- fixme: not adding svr if already exists
53−
54−----------------------------------------------------------------
55−
56−responseFile :: H.Status -> H.ResponseHeaders -> Bool
57− -> FilePath -> Maybe FilePart -> InternalInfo -> H.RequestHeaders
58− -> IO H2.Response
59−responseFile st rsphdr _ _ _ _ _
60− | noBody st = return $ responseNoBody st rsphdr
61−
62−responseFile st rsphdr isHead path (Just fp) _ _ =
63− return $ responseFile2XX st rsphdr isHead fileSpec
64− where
65− !off' = fromIntegral $ filePartOffset fp
66− !bytes' = fromIntegral $ filePartByteCount fp
67− !fileSpec = H2.FileSpec path off' bytes'
68−
69−responseFile _ rsphdr isHead path Nothing ii reqhdr = do
70− efinfo <- E.try $ getFileInfo ii path
71− case efinfo of
72− Left (_ex :: E.IOException) -> return $ response404 rsphdr
73− Right finfo -> do
74− let reqidx = indexRequestHeader reqhdr
75− rspidx = indexResponseHeader rsphdr
76− case conditionalRequest finfo rsphdr rspidx reqidx of
77− WithoutBody s -> return $ responseNoBody s rsphdr
78− WithBody s rsphdr' off bytes -> do
79− let !off' = fromIntegral off
80− !bytes' = fromIntegral bytes
81− !fileSpec = H2.FileSpec path off' bytes'
82− return $ responseFile2XX s rsphdr' isHead fileSpec
83−
84−----------------------------------------------------------------
85−
86−responseFile2XX :: H.Status -> H.ResponseHeaders -> Bool -> H2.FileSpec -> H2.Response
87−responseFile2XX st rsphdr isHead fileSpec
88− | isHead = responseNoBody st rsphdr
89− | otherwise = H2.responseFile st rsphdr fileSpec
90−
91−----------------------------------------------------------------
92−
93−responseBuilder :: H.Status -> H.ResponseHeaders -> Bool
94− -> BB.Builder
95− -> H2.Response
96−responseBuilder st rsphdr isHead builder
97− | noBody st = responseNoBody st rsphdr
98− | isHead = responseNoBody st rsphdr
99− | otherwise = H2.responseBuilder st rsphdr builder
100−
101−----------------------------------------------------------------
102−
103−responseStream :: H.Status -> H.ResponseHeaders -> Bool
104− -> StreamingBody
105− -> H2.Response
106−responseStream st rsphdr isHead strmbdy
107− | noBody st = responseNoBody st rsphdr
108− | isHead = responseNoBody st rsphdr
109− | otherwise = H2.responseStreaming st rsphdr strmbdy
110−
111−----------------------------------------------------------------
112−
113−responseNoBody :: H.Status -> H.ResponseHeaders -> H2.Response
114−responseNoBody st rsphdr = H2.responseNoBody st rsphdr
115−
116−----------------------------------------------------------------
117−
118−response404 :: H.ResponseHeaders -> H2.Response
119−response404 rsphdr = H2.responseBuilder H.notFound404 rsphdr' body
120− where
121− !rsphdr' = R.replaceHeader H.hContentType "text/plain; charset=utf-8" rsphdr
122− !body = BB.byteString "File not found"
123−
124−----------------------------------------------------------------
125−
126−noBody :: H.Status -> Bool
127−noBody = not . R.hasBody
warp/Network/Wai/Handler/Warp/HTTP2/Sender.hsnew file+541
@@ -0,0 +1,541 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+{-# LANGUAGE BangPatterns, CPP #-}
3+{-# LANGUAGE NamedFieldPuns #-}
4+
5+module Network.Wai.Handler.Warp.HTTP2.Sender (frameSender) where
6+
7+#if __GLASGOW_HASKELL__ < 709
8+import Control.Applicative
9+#endif
10+import Control.Concurrent.STM
11+import qualified Control.Exception as E
12+import Control.Monad (void, when)
13+import Data.Bits
14+import qualified Data.ByteString as BS
15+import Data.ByteString.Builder (Builder)
16+import qualified Data.ByteString.Builder.Extra as B
17+import Data.Maybe (isNothing)
18+import Data.Word (Word8, Word32)
19+import Foreign.Ptr (Ptr, plusPtr)
20+import Foreign.Storable (poke)
21+import Network.HPACK (setLimitForEncoding, toHeaderTable)
22+import Network.HTTP2
23+import Network.HTTP2.Priority (isEmptySTM, dequeueSTM, Precedence)
24+import Network.Wai
25+import Network.Wai.Handler.Warp.Buffer
26+import Network.Wai.Handler.Warp.HTTP2.EncodeFrame
27+import Network.Wai.Handler.Warp.HTTP2.HPACK
28+import Network.Wai.Handler.Warp.HTTP2.Manager (Manager)
29+import Network.Wai.Handler.Warp.HTTP2.Types
30+import Network.Wai.Handler.Warp.IORef
31+import qualified Network.Wai.Handler.Warp.Settings as S
32+import Network.Wai.Handler.Warp.Types
33+
34+#ifdef WINDOWS
35+import qualified System.IO as IO
36+#else
37+import Network.Wai.Handler.Warp.FdCache
38+import Network.Wai.Handler.Warp.SendFile (positionRead)
39+import qualified Network.Wai.Handler.Warp.Timeout as T
40+#endif
41+
42+----------------------------------------------------------------
43+
44+data Leftover = LZero
45+ | LOne B.BufferWriter
46+ | LTwo BS.ByteString B.BufferWriter
47+
48+----------------------------------------------------------------
49+
50+{-# INLINE getStreamWindowSize #-}
51+getStreamWindowSize :: Stream -> IO WindowSize
52+getStreamWindowSize Stream{streamWindow} = atomically $ readTVar streamWindow
53+
54+{-# INLINE waitStreamWindowSize #-}
55+waitStreamWindowSize :: Stream -> IO ()
56+waitStreamWindowSize Stream{streamWindow} = atomically $ do
57+ w <- readTVar streamWindow
58+ check (w > 0)
59+
60+{-# INLINE waitStreaming #-}
61+waitStreaming :: TBQueue a -> IO ()
62+waitStreaming tbq = atomically $ do
63+ isEmpty <- isEmptyTBQueue tbq
64+ check (isEmpty == False)
65+
66+data Switch = C Control
67+ | O (StreamId,Precedence,Output)
68+ | Flush
69+
70+frameSender :: Context -> Connection -> S.Settings -> Manager -> IO ()
71+frameSender ctx@Context{outputQ,controlQ,connectionWindow,encodeDynamicTable}
72+ conn@Connection{connWriteBuffer,connBufferSize,connSendAll}
73+ settings mgr = loop 0 `E.catch` ignore
74+ where
75+ dequeue off = do
76+ isEmpty <- isEmptyTQueue controlQ
77+ if isEmpty then do
78+ w <- readTVar connectionWindow
79+ check (w > 0)
80+ emp <- isEmptySTM outputQ
81+ if emp then
82+ if off /= 0 then return Flush else retry
83+ else
84+ O <$> dequeueSTM outputQ
85+ else
86+ C <$> readTQueue controlQ
87+
88+ loop off = do
89+ x <- atomically $ dequeue off
90+ case x of
91+ C ctl -> do
92+ when (off /= 0) $ flushN off
93+ off' <- control ctl off
94+ when (off' >= 0) $ loop off'
95+ O (_,pre,out) -> do
96+ let strm = outputStream out
97+ writeIORef (streamPrecedence strm) pre
98+ off' <- outputOrEnqueueAgain out off
99+ case off' of
100+ 0 -> loop 0
101+ _ | off' > 15872 -> flushN off' >> loop 0 -- fixme: hard-coding
102+ | otherwise -> loop off'
103+ Flush -> flushN off >> loop 0
104+
105+ control CFinish _ = return (-1)
106+ control (CGoaway frame) _ = connSendAll frame >> return (-1)
107+ control (CFrame frame) _ = connSendAll frame >> return 0
108+ control (CSettings frame alist) _ = do
109+ connSendAll frame
110+ setLimit alist
111+ return 0
112+ control (CSettings0 frame1 frame2 alist) off = do -- off == 0, just in case
113+ let !buf = connWriteBuffer `plusPtr` off
114+ !off' = off + BS.length frame1 + BS.length frame2
115+ buf' <- copy buf frame1
116+ void $ copy buf' frame2
117+ setLimit alist
118+ return off'
119+
120+ {-# INLINE setLimit #-}
121+ setLimit alist = case lookup SettingsHeaderTableSize alist of
122+ Nothing -> return ()
123+ Just siz -> setLimitForEncoding siz encodeDynamicTable
124+
125+ output out@(Output strm _ _ tell getH2D (ONext curr)) off0 lim = do
126+ -- Data frame payload
127+ let !buf = connWriteBuffer `plusPtr` off0
128+ !siz = connBufferSize - off0
129+ Next datPayloadLen mnext <- curr buf siz lim
130+ off <- fillDataHeader strm off0 datPayloadLen mnext tell getH2D
131+ maybeEnqueueNext out mnext
132+ return off
133+
134+ output out@(Output strm rspn ii tell getH2D ORspn) off0 lim = do
135+ -- Header frame and Continuation frame
136+ let !sid = streamNumber strm
137+ !endOfStream = case rspn of
138+ RspnNobody _ _ -> True
139+ _ -> False
140+ ths <- addNecessaryHeaders ctx rspn ii settings
141+ kvlen <- headerContinue sid ths endOfStream off0
142+ off <- sendHeadersIfNecessary $ off0 + frameHeaderLength + kvlen
143+ case rspn of
144+ RspnNobody _ _ -> do
145+ closed ctx strm Finished
146+ return off
147+ RspnFile _ _ path mpart -> do
148+ -- Data frame payload
149+ let payloadOff = off + frameHeaderLength
150+ Next datPayloadLen mnext <-
151+ fillFileBodyGetNext conn ii payloadOff lim path mpart
152+ off' <- fillDataHeader strm off datPayloadLen mnext tell getH2D
153+ maybeEnqueueNext out mnext
154+ return off'
155+ RspnBuilder _ _ builder -> do
156+ -- Data frame payload
157+ let payloadOff = off + frameHeaderLength
158+ Next datPayloadLen mnext <-
159+ fillBuilderBodyGetNext conn ii payloadOff lim builder
160+ off' <- fillDataHeader strm off datPayloadLen mnext tell getH2D
161+ maybeEnqueueNext out mnext
162+ return off'
163+ RspnStreaming _ _ tbq -> do
164+ let payloadOff = off + frameHeaderLength
165+ Next datPayloadLen mnext <-
166+ fillStreamBodyGetNext conn payloadOff lim tbq strm
167+ off' <- fillDataHeader strm off datPayloadLen mnext tell getH2D
168+ maybeEnqueueNext out mnext
169+ return off'
170+
171+ output out@(Output strm _ _ _ _ (OPush ths pid)) off0 lim = do
172+ -- Creating a push promise header
173+ -- Frame id should be associated stream id from the client.
174+ let !sid = streamNumber strm
175+ len <- pushPromise pid sid ths off0
176+ off <- sendHeadersIfNecessary $ off0 + frameHeaderLength + len
177+ output out{ outputType = ORspn } off lim
178+
179+ output _ _ _ = undefined -- never reach
180+
181+ outputOrEnqueueAgain out off = E.handle resetStream $ do
182+ state <- readIORef $ streamState strm
183+ if isClosed state then
184+ return off
185+ else case out of
186+ Output _ _ _ wait _ OWait -> do
187+ -- Checking if all push are done.
188+ let out' = out {
189+ outputHook = return ()
190+ , outputType = ORspn
191+ }
192+ forkAndEnqueueWhenReady wait outputQ out' mgr
193+ return off
194+ _ -> case mtbq of
195+ Just tbq -> checkStreaming tbq
196+ _ -> checkStreamWindowSize
197+ where
198+ strm = outputStream out
199+ mtbq = outputMaybeTBQueue out
200+ checkStreaming tbq = do
201+ isEmpty <- atomically $ isEmptyTBQueue tbq
202+ if isEmpty then do
203+ forkAndEnqueueWhenReady (waitStreaming tbq) outputQ out mgr
204+ return off
205+ else
206+ checkStreamWindowSize
207+ checkStreamWindowSize = do
208+ sws <- getStreamWindowSize strm
209+ if sws == 0 then do
210+ forkAndEnqueueWhenReady (waitStreamWindowSize strm) outputQ out mgr
211+ return off
212+ else do
213+ cws <- atomically $ readTVar connectionWindow -- not 0
214+ let !lim = min cws sws
215+ output out off lim
216+ resetStream e = do
217+ closed ctx strm (ResetByMe e)
218+ let !rst = resetFrame InternalError $ streamNumber strm
219+ enqueueControl controlQ $ CFrame rst
220+ return off
221+
222+ {-# INLINE flushN #-}
223+ -- Flush the connection buffer to the socket, where the first 'n' bytes of
224+ -- the buffer are filled.
225+ flushN :: Int -> IO ()
226+ flushN n = bufferIO connWriteBuffer n connSendAll
227+
228+ headerContinue sid ths endOfStream off = do
229+ let !offkv = off + frameHeaderLength
230+ let !bufkv = connWriteBuffer `plusPtr` offkv
231+ !limkv = connBufferSize - offkv
232+ (hs,kvlen) <- hpackEncodeHeader ctx bufkv limkv ths
233+ let flag0 = case hs of
234+ [] -> setEndHeader defaultFlags
235+ _ -> defaultFlags
236+ flag = if endOfStream then setEndStream flag0 else flag0
237+ let buf = connWriteBuffer `plusPtr` off
238+ fillFrameHeader FrameHeaders kvlen sid flag buf
239+ continue sid kvlen hs
240+
241+ !bufHeaderPayload = connWriteBuffer `plusPtr` frameHeaderLength
242+ !headerPayloadLim = connBufferSize - frameHeaderLength
243+
244+ continue _ kvlen [] = return kvlen
245+ continue sid kvlen ths = do
246+ flushN $ kvlen + frameHeaderLength
247+ -- Now off is 0
248+ (ths', kvlen') <- hpackEncodeHeaderLoop ctx bufHeaderPayload headerPayloadLim ths
249+ when (ths == ths') $ E.throwIO $ ConnectionError CompressionError "cannot compress the header"
250+ let flag = case ths' of
251+ [] -> setEndHeader defaultFlags
252+ _ -> defaultFlags
253+ fillFrameHeader FrameContinuation kvlen' sid flag connWriteBuffer
254+ continue sid kvlen' ths'
255+
256+ {-# INLINE maybeEnqueueNext #-}
257+ -- Re-enqueue the stream in the output queue.
258+ maybeEnqueueNext :: Output -> Maybe DynaNext -> IO ()
259+ maybeEnqueueNext _ Nothing = return ()
260+ maybeEnqueueNext out (Just next) = enqueueOutput outputQ out'
261+ where
262+ !out' = out { outputType = ONext next }
263+
264+ {-# INLINE sendHeadersIfNecessary #-}
265+ -- Send headers if there is not room for a 1-byte data frame, and return
266+ -- the offset of the next frame's first header byte.
267+ sendHeadersIfNecessary off
268+ -- True if the connection buffer has room for a 1-byte data frame.
269+ | off + frameHeaderLength < connBufferSize = return off
270+ | otherwise = do
271+ flushN off
272+ return 0
273+
274+ fillDataHeader strm@Stream{streamWindow,streamNumber}
275+ off datPayloadLen mnext tell getH2D = do
276+ -- Data frame header
277+ mh2d <- getH2D
278+ let (!trailers,!noTrailers) = case http2dataTrailers <$> mh2d of
279+ Nothing -> ([], True)
280+ Just ts -> (ts, null ts)
281+ !buf = connWriteBuffer `plusPtr` off
282+ !off' = off + frameHeaderLength + datPayloadLen
283+ !noMoreBody = isNothing mnext
284+ flag | noMoreBody && noTrailers = setEndStream defaultFlags
285+ | otherwise = defaultFlags
286+ fillFrameHeader FrameData datPayloadLen streamNumber flag buf
287+ off'' <- handleEndOfBody noMoreBody off' noTrailers trailers
288+ atomically $ modifyTVar' connectionWindow (subtract datPayloadLen)
289+ atomically $ modifyTVar' streamWindow (subtract datPayloadLen)
290+ return off''
291+ where
292+ handleTrailers True off0 _ = return off0
293+ handleTrailers _ off0 trailers = do
294+ (ths,_) <- toHeaderTable trailers
295+ kvlen <- headerContinue streamNumber ths True off0
296+ sendHeadersIfNecessary $ off0 + frameHeaderLength + kvlen
297+ handleEndOfBody True off0 noTrailers trailers = do
298+ off1 <- handleTrailers noTrailers off0 trailers
299+ void $ tell
300+ closed ctx strm Finished
301+ return off1
302+ handleEndOfBody False off0 _ _ = return off0
303+
304+
305+ pushPromise pid sid ths off = do
306+ let !offsid = off + frameHeaderLength
307+ !bufsid = connWriteBuffer `plusPtr` offsid
308+ poke32 bufsid $ fromIntegral sid
309+ let !offkv = offsid + 4
310+ !bufkv = connWriteBuffer `plusPtr` offkv
311+ !limkv = connBufferSize - offkv
312+ (_,kvlen) <- hpackEncodeHeader ctx bufkv limkv ths
313+ let !flag = setEndHeader defaultFlags -- No EndStream flag
314+ !buf = connWriteBuffer `plusPtr` off
315+ !len = kvlen + 4
316+ fillFrameHeader FramePushPromise len pid flag buf
317+ return len
318+
319+ {-# INLINE fillFrameHeader #-}
320+ fillFrameHeader ftyp len sid flag buf = encodeFrameHeaderBuf ftyp hinfo buf
321+ where
322+ hinfo = FrameHeader len flag sid
323+
324+ {-# INLINE ignore #-}
325+ ignore :: E.SomeException -> IO ()
326+ ignore _ = return ()
327+
328+----------------------------------------------------------------
329+
330+{-
331+ResponseFile Status ResponseHeaders FilePath (Maybe FilePart)
332+ResponseBuilder Status ResponseHeaders Builder
333+ResponseStream Status ResponseHeaders StreamingBody
334+ResponseRaw (IO ByteString -> (ByteString -> IO ()) -> IO ()) Response
335+-}
336+
337+fillBuilderBodyGetNext :: Connection -> InternalInfo -> Int -> WindowSize -> Builder -> IO Next
338+fillBuilderBodyGetNext Connection{connWriteBuffer,connBufferSize}
339+ _ off lim bb = do
340+ let datBuf = connWriteBuffer `plusPtr` off
341+ room = min (connBufferSize - off) lim
342+ (len, signal) <- B.runBuilder bb datBuf room
343+ return $ nextForBuilder len signal
344+
345+fillFileBodyGetNext :: Connection -> InternalInfo -> Int -> WindowSize -> FilePath -> Maybe FilePart -> IO Next
346+#ifdef WINDOWS
347+fillFileBodyGetNext Connection{connWriteBuffer,connBufferSize}
348+ _ off lim path mpart = do
349+ let datBuf = connWriteBuffer `plusPtr` off
350+ room = min (connBufferSize - off) lim
351+ (start, bytes) <- fileStartEnd path mpart
352+ -- fixme: how to close Handle? GC does it at this moment.
353+ hdl <- IO.openBinaryFile path IO.ReadMode
354+ IO.hSeek hdl IO.AbsoluteSeek start
355+ len <- IO.hGetBufSome hdl datBuf (mini room bytes)
356+ let bytes' = bytes - fromIntegral len
357+ -- fixme: connWriteBuffer connBufferSize
358+ return $ nextForFile len hdl bytes' (return ())
359+#else
360+fillFileBodyGetNext Connection{connWriteBuffer,connBufferSize}
361+ ii off lim path mpart = do
362+ (mfd, refresh') <- getFd ii path
363+ (fd, refresh) <- case mfd of
364+ Nothing -> do
365+ fd' <- openFile path
366+ th <- T.register (timeoutManager ii) (closeFile fd')
367+ return (fd', T.tickle th)
368+ Just fd -> return (fd, refresh')
369+ let datBuf = connWriteBuffer `plusPtr` off
370+ room = min (connBufferSize - off) lim
371+ (start, bytes) <- fileStartEnd path mpart
372+ len <- positionRead fd datBuf (mini room bytes) start
373+ refresh
374+ let len' = fromIntegral len
375+ return $ nextForFile len fd (start + len') (bytes - len') refresh
376+#endif
377+
378+fileStartEnd :: FilePath -> Maybe FilePart -> IO (Integer, Integer)
379+fileStartEnd _ (Just part) =
380+ return (filePartOffset part, filePartByteCount part)
381+fileStartEnd _ _ = error "fileStartEnd"
382+
383+----------------------------------------------------------------
384+
385+fillStreamBodyGetNext :: Connection -> Int -> WindowSize -> TBQueue Sequence -> Stream -> IO Next
386+fillStreamBodyGetNext Connection{connWriteBuffer,connBufferSize}
387+ off lim sq strm = do
388+ let datBuf = connWriteBuffer `plusPtr` off
389+ room = min (connBufferSize - off) lim
390+ (leftover, cont, len) <- runStreamBuilder datBuf room sq
391+ return $ nextForStream sq strm leftover cont len
392+
393+----------------------------------------------------------------
394+
395+fillBufBuilder :: Leftover -> DynaNext
396+fillBufBuilder leftover buf0 siz0 lim = do
397+ let payloadBuf = buf0 `plusPtr` frameHeaderLength
398+ room = min (siz0 - frameHeaderLength) lim
399+ case leftover of
400+ LZero -> error "fillBufBuilder: LZero"
401+ LOne writer -> do
402+ (len, signal) <- writer payloadBuf room
403+ getNext len signal
404+ LTwo bs writer
405+ | BS.length bs <= room -> do
406+ buf1 <- copy payloadBuf bs
407+ let len1 = BS.length bs
408+ (len2, signal) <- writer buf1 (room - len1)
409+ getNext (len1 + len2) signal
410+ | otherwise -> do
411+ let (bs1,bs2) = BS.splitAt room bs
412+ void $ copy payloadBuf bs1
413+ getNext room (B.Chunk bs2 writer)
414+ where
415+ getNext l s = return $ nextForBuilder l s
416+
417+nextForBuilder :: BytesFilled -> B.Next -> Next
418+nextForBuilder len B.Done
419+ = Next len Nothing
420+nextForBuilder len (B.More _ writer)
421+ = Next len $ Just (fillBufBuilder (LOne writer))
422+nextForBuilder len (B.Chunk bs writer)
423+ = Next len $ Just (fillBufBuilder (LTwo bs writer))
424+
425+----------------------------------------------------------------
426+
427+runStreamBuilder :: Buffer -> BufSize -> TBQueue Sequence
428+ -> IO (Leftover, Bool, BytesFilled)
429+runStreamBuilder buf0 room0 sq = loop buf0 room0 0
430+ where
431+ loop !buf !room !total = do
432+ mbuilder <- atomically $ tryReadTBQueue sq
433+ case mbuilder of
434+ Nothing -> return (LZero, True, total)
435+ Just (SBuilder builder) -> do
436+ (len, signal) <- B.runBuilder builder buf room
437+ let !total' = total + len
438+ case signal of
439+ B.Done -> loop (buf `plusPtr` len) (room - len) total'
440+ B.More _ writer -> return (LOne writer, True, total')
441+ B.Chunk bs writer -> return (LTwo bs writer, True, total')
442+ Just SFlush -> return (LZero, True, total)
443+ Just SFinish -> return (LZero, False, total)
444+
445+fillBufStream :: Leftover -> TBQueue Sequence -> Stream -> DynaNext
446+fillBufStream leftover0 sq strm buf0 siz0 lim0 = do
447+ let payloadBuf = buf0 `plusPtr` frameHeaderLength
448+ room0 = min (siz0 - frameHeaderLength) lim0
449+ case leftover0 of
450+ LZero -> do
451+ (leftover, cont, len) <- runStreamBuilder payloadBuf room0 sq
452+ getNext leftover cont len
453+ LOne writer -> write writer payloadBuf room0 0
454+ LTwo bs writer
455+ | BS.length bs <= room0 -> do
456+ buf1 <- copy payloadBuf bs
457+ let len = BS.length bs
458+ write writer buf1 (room0 - len) len
459+ | otherwise -> do
460+ let (bs1,bs2) = BS.splitAt room0 bs
461+ void $ copy payloadBuf bs1
462+ getNext (LTwo bs2 writer) True room0
463+ where
464+ getNext l b r = return $ nextForStream sq strm l b r
465+ write writer1 buf room sofar = do
466+ (len, signal) <- writer1 buf room
467+ case signal of
468+ B.Done -> do
469+ (leftover, cont, extra) <- runStreamBuilder (buf `plusPtr` len) (room - len) sq
470+ let !total = sofar + len + extra
471+ getNext leftover cont total
472+ B.More _ writer -> do
473+ let !total = sofar + len
474+ getNext (LOne writer) True total
475+ B.Chunk bs writer -> do
476+ let !total = sofar + len
477+ getNext (LTwo bs writer) True total
478+
479+nextForStream :: TBQueue Sequence -> Stream
480+ -> Leftover -> Bool -> BytesFilled
481+ -> Next
482+nextForStream _ _ _ False len = Next len Nothing
483+nextForStream sq strm leftOrZero True len =
484+ Next len $ Just (fillBufStream leftOrZero sq strm)
485+
486+----------------------------------------------------------------
487+
488+#ifdef WINDOWS
489+fillBufFile :: IO.Handle -> Integer -> IO () -> DynaNext
490+fillBufFile h bytes refresh buf siz lim = do
491+ let payloadBuf = buf `plusPtr` frameHeaderLength
492+ room = min (siz - frameHeaderLength) lim
493+ len <- IO.hGetBufSome h payloadBuf room
494+ refresh
495+ let bytes' = bytes - fromIntegral len
496+ return $ nextForFile len h bytes' refresh
497+
498+nextForFile :: BytesFilled -> IO.Handle -> Integer -> IO () -> Next
499+nextForFile 0 _ _ _ = Next 0 Nothing
500+nextForFile len _ 0 _ = Next len Nothing
501+nextForFile len h bytes refresh =
502+ Next len $ Just (fillBufFile h bytes refresh)
503+#else
504+fillBufFile :: Fd -> Integer -> Integer -> IO () -> DynaNext
505+fillBufFile fd start bytes refresh buf siz lim = do
506+ let payloadBuf = buf `plusPtr` frameHeaderLength
507+ room = min (siz - frameHeaderLength) lim
508+ len <- positionRead fd payloadBuf (mini room bytes) start
509+ let len' = fromIntegral len
510+ refresh
511+ return $ nextForFile len fd (start + len') (bytes - len') refresh
512+
513+nextForFile :: BytesFilled -> Fd -> Integer -> Integer -> IO () -> Next
514+nextForFile 0 _ _ _ _ = Next 0 Nothing
515+nextForFile len _ _ 0 _ = Next len Nothing
516+nextForFile len fd start bytes refresh =
517+ Next len $ Just (fillBufFile fd start bytes refresh)
518+#endif
519+
520+{-# INLINE mini #-}
521+mini :: Int -> Integer -> Int
522+mini i n
523+ | fromIntegral i < n = i
524+ | otherwise = fromIntegral n
525+
526+
527+----------------------------------------------------------------
528+
529+poke32 :: Ptr Word8 -> Word32 -> IO ()
530+poke32 ptr i = do
531+ poke ptr w0
532+ poke8 ptr 1 w1
533+ poke8 ptr 2 w2
534+ poke8 ptr 3 w3
535+ where
536+ w0 = fromIntegral ((i `shiftR` 24) .&. 0xff)
537+ w1 = fromIntegral ((i `shiftR` 16) .&. 0xff)
538+ w2 = fromIntegral ((i `shiftR` 8) .&. 0xff)
539+ w3 = fromIntegral (i .&. 0xff)
540+ poke8 :: Ptr Word8 -> Int -> Word8 -> IO ()
541+ poke8 ptr0 n w = poke (ptr0 `plusPtr` n) w
warp/Network/Wai/Handler/Warp/HTTP2/Types.hs+267−16
@@ -1,26 +1,281 @@
1−{-# LANGUAGE NamedFieldPuns #-}
2−{-# LANGUAGE OverloadedStrings #-}
3−{-# LANGUAGE RecordWildCards #-}
1+{-# LANGUAGE OverloadedStrings, CPP #-}
2+{-# LANGUAGE NamedFieldPuns, RecordWildCards #-}
3+{-# LANGUAGE BangPatterns #-}
44
55module Network.Wai.Handler.Warp.HTTP2.Types where
66
7+import Data.ByteString.Builder (Builder)
8+#if __GLASGOW_HASKELL__ < 709
9+import Control.Applicative ((<$>),(<*>))
10+#endif
11+import Control.Concurrent (forkIO)
12+import Control.Concurrent.STM
13+import Control.Exception (SomeException, bracket)
14+import Control.Monad (void)
15+import Data.ByteString (ByteString)
716import qualified Data.ByteString as BS
17+import Data.IntMap.Strict (IntMap, IntMap)
18+import qualified Data.IntMap.Strict as M
819import qualified Network.HTTP.Types as H
9−import Network.HTTP2
10−import qualified Network.HTTP2.Server as H2
11−
12−import Network.Wai.Handler.Warp.Imports
20+import Network.Wai (Request, FilePart)
21+import Network.Wai.Handler.Warp.HTTP2.Manager
22+import Network.Wai.Handler.Warp.IORef
1323import Network.Wai.Handler.Warp.Types
1424
25+import Network.HTTP2
26+import Network.HTTP2.Priority
27+import Network.HPACK hiding (Buffer)
28+
1529----------------------------------------------------------------
1630
31+http2ver :: H.HttpVersion
32+http2ver = H.HttpVersion 2 0
33+
1734isHTTP2 :: Transport -> Bool
1835isHTTP2 TCP = False
1936isHTTP2 tls = useHTTP2
2037 where
2138 useHTTP2 = case tlsNegotiatedProtocol tls of
2239 Nothing -> False
23− Just proto -> "h2" `BS.isPrefixOf` proto
40+ Just proto -> "h2-" `BS.isPrefixOf` proto
41+
42+----------------------------------------------------------------
43+
44+data Input = Input Stream Request ValueTable InternalInfo
45+
46+----------------------------------------------------------------
47+
48+type DynaNext = Buffer -> BufSize -> WindowSize -> IO Next
49+
50+type BytesFilled = Int
51+
52+data Next = Next !BytesFilled (Maybe DynaNext)
53+
54+data Rspn = RspnNobody H.Status (TokenHeaderList, ValueTable)
55+ | RspnStreaming H.Status (TokenHeaderList, ValueTable) (TBQueue Sequence)
56+ | RspnBuilder H.Status (TokenHeaderList, ValueTable) Builder
57+ | RspnFile H.Status (TokenHeaderList, ValueTable) FilePath (Maybe FilePart)
58+
59+rspnStatus :: Rspn -> H.Status
60+rspnStatus (RspnNobody s _) = s
61+rspnStatus (RspnStreaming s _ _) = s
62+rspnStatus (RspnBuilder s _ _) = s
63+rspnStatus (RspnFile s _ _ _ ) = s
64+
65+rspnHeaders :: Rspn -> (TokenHeaderList, ValueTable)
66+rspnHeaders (RspnNobody _ t) = t
67+rspnHeaders (RspnStreaming _ t _) = t
68+rspnHeaders (RspnBuilder _ t _) = t
69+rspnHeaders (RspnFile _ t _ _ ) = t
70+
71+data Output = Output {
72+ outputStream :: !Stream
73+ , outputRspn :: !Rspn
74+ , outputII :: !InternalInfo
75+ , outputHook :: IO () -- OPush: wait for done, O*: telling done
76+ , outputH2Data :: IO (Maybe HTTP2Data)
77+ , outputType :: !OutputType
78+ }
79+
80+data OutputType = ORspn
81+ | OWait
82+ | OPush !TokenHeaderList !StreamId -- associated stream id from client
83+ | ONext !DynaNext
84+
85+outputMaybeTBQueue :: Output -> Maybe (TBQueue Sequence)
86+outputMaybeTBQueue (Output _ (RspnStreaming _ _ tbq) _ _ _ _) = Just tbq
87+outputMaybeTBQueue _ = Nothing
88+
89+data Control = CFinish
90+ | CGoaway !ByteString
91+ | CFrame !ByteString
92+ | CSettings !ByteString !SettingsList
93+ | CSettings0 !ByteString !ByteString !SettingsList
94+
95+----------------------------------------------------------------
96+
97+data Sequence = SFinish
98+ | SFlush
99+ | SBuilder Builder
100+
101+----------------------------------------------------------------
102+
103+-- | The context for HTTP/2 connection.
104+data Context = Context {
105+ -- HTTP/2 settings received from a browser
106+ http2settings :: !(IORef Settings)
107+ , firstSettings :: !(IORef Bool)
108+ , streamTable :: !StreamTable
109+ , concurrency :: !(IORef Int)
110+ , priorityTreeSize :: !(IORef Int)
111+ -- | RFC 7540 says "Other frames (from any stream) MUST NOT
112+ -- occur between the HEADERS frame and any CONTINUATION
113+ -- frames that might follow". This field is used to implement
114+ -- this requirement.
115+ , continued :: !(IORef (Maybe StreamId))
116+ , clientStreamId :: !(IORef StreamId)
117+ , serverStreamId :: !(IORef StreamId)
118+ , inputQ :: !(TQueue Input)
119+ , outputQ :: !(PriorityTree Output)
120+ , controlQ :: !(TQueue Control)
121+ , encodeDynamicTable :: !DynamicTable
122+ , decodeDynamicTable :: !DynamicTable
123+ -- the connection window for data from a server to a browser.
124+ , connectionWindow :: !(TVar WindowSize)
125+ }
126+
127+----------------------------------------------------------------
128+
129+newContext :: IO Context
130+newContext = Context <$> newIORef defaultSettings
131+ <*> newIORef False
132+ <*> newStreamTable
133+ <*> newIORef 0
134+ <*> newIORef 0
135+ <*> newIORef Nothing
136+ <*> newIORef 0
137+ <*> newIORef 0
138+ <*> newTQueueIO
139+ <*> newPriorityTree
140+ <*> newTQueueIO
141+ <*> newDynamicTableForEncoding defaultDynamicTableSize
142+ <*> newDynamicTableForDecoding defaultDynamicTableSize 4096
143+ <*> newTVarIO defaultInitialWindowSize
144+
145+clearContext :: Context -> IO ()
146+clearContext _ctx = return ()
147+
148+----------------------------------------------------------------
149+
150+data OpenState =
151+ JustOpened
152+ | Continued [HeaderBlockFragment]
153+ !Int -- Total size
154+ !Int -- The number of continuation frames
155+ !Bool -- End of stream
156+ !Priority
157+ | NoBody (TokenHeaderList,ValueTable) !Priority
158+ | HasBody (TokenHeaderList,ValueTable) !Priority
159+ | Body !(TQueue ByteString)
160+ !(Maybe Int) -- received Content-Length
161+ -- compared the body length for error checking
162+ !(IORef Int) -- actual body length
163+
164+data ClosedCode = Finished
165+ | Killed
166+ | Reset !ErrorCodeId
167+ | ResetByMe SomeException
168+ deriving Show
169+
170+data StreamState =
171+ Idle
172+ | Open !OpenState
173+ | HalfClosed
174+ | Closed !ClosedCode
175+ | Reserved
176+
177+isIdle :: StreamState -> Bool
178+isIdle Idle = True
179+isIdle _ = False
180+
181+isOpen :: StreamState -> Bool
182+isOpen Open{} = True
183+isOpen _ = False
184+
185+isHalfClosed :: StreamState -> Bool
186+isHalfClosed HalfClosed = True
187+isHalfClosed _ = False
188+
189+isClosed :: StreamState -> Bool
190+isClosed Closed{} = True
191+isClosed _ = False
192+
193+instance Show StreamState where
194+ show Idle = "Idle"
195+ show Open{} = "Open"
196+ show HalfClosed = "HalfClosed"
197+ show (Closed e) = "Closed: " ++ show e
198+ show Reserved = "Reserved"
199+
200+----------------------------------------------------------------
201+
202+data Stream = Stream {
203+ streamNumber :: !StreamId
204+ , streamState :: !(IORef StreamState)
205+ , streamWindow :: !(TVar WindowSize)
206+ , streamPrecedence :: !(IORef Precedence)
207+ }
208+
209+instance Show Stream where
210+ show s = show (streamNumber s)
211+
212+newStream :: StreamId -> WindowSize -> IO Stream
213+newStream sid win = Stream sid <$> newIORef Idle
214+ <*> newTVarIO win
215+ <*> newIORef defaultPrecedence
216+
217+newPushStream :: Context -> WindowSize -> Precedence -> IO Stream
218+newPushStream Context{serverStreamId} win pre = do
219+ sid <- atomicModifyIORef' serverStreamId inc2
220+ Stream sid <$> newIORef Reserved
221+ <*> newTVarIO win
222+ <*> newIORef pre
223+ where
224+ inc2 x = let !x' = x + 2 in (x', x')
225+
226+----------------------------------------------------------------
227+
228+opened :: Context -> Stream -> IO ()
229+opened Context{concurrency} Stream{streamState} = do
230+ atomicModifyIORef' concurrency (\x -> (x+1,()))
231+ writeIORef streamState (Open JustOpened)
232+
233+closed :: Context -> Stream -> ClosedCode -> IO ()
234+closed Context{concurrency,streamTable} Stream{streamState,streamNumber} cc = do
235+ remove streamTable streamNumber
236+ atomicModifyIORef' concurrency (\x -> (x-1,()))
237+ writeIORef streamState (Closed cc) -- anyway
238+
239+----------------------------------------------------------------
240+
241+newtype StreamTable = StreamTable (IORef (IntMap Stream))
242+
243+newStreamTable :: IO StreamTable
244+newStreamTable = StreamTable <$> newIORef M.empty
245+
246+insert :: StreamTable -> M.Key -> Stream -> IO ()
247+insert (StreamTable ref) k v = atomicModifyIORef' ref $ \m ->
248+ let !m' = M.insert k v m
249+ in (m', ())
250+
251+remove :: StreamTable -> M.Key -> IO ()
252+remove (StreamTable ref) k = atomicModifyIORef' ref $ \m ->
253+ let !m' = M.delete k m
254+ in (m', ())
255+
256+search :: StreamTable -> M.Key -> IO (Maybe Stream)
257+search (StreamTable ref) k = M.lookup k <$> readIORef ref
258+
259+{-# INLINE forkAndEnqueueWhenReady #-}
260+forkAndEnqueueWhenReady :: IO () -> PriorityTree Output -> Output -> Manager -> IO ()
261+forkAndEnqueueWhenReady wait outQ out mgr = bracket setup teardown $ \_ ->
262+ void . forkIO $ do
263+ wait
264+ enqueueOutput outQ out
265+ where
266+ setup = addMyId mgr
267+ teardown _ = deleteMyId mgr
268+
269+{-# INLINE enqueueOutput #-}
270+enqueueOutput :: PriorityTree Output -> Output -> IO ()
271+enqueueOutput outQ out = do
272+ let Stream{..} = outputStream out
273+ pre <- readIORef streamPrecedence
274+ enqueue outQ streamNumber pre out
275+
276+{-# INLINE enqueueControl #-}
277+enqueueControl :: TQueue Control -> Control -> IO ()
278+enqueueControl ctlQ ctl = atomically $ writeTQueue ctlQ ctl
24279
25280----------------------------------------------------------------
26281
@@ -32,21 +287,17 @@ data HTTP2Data = HTTP2Data {
32287 --
33288 -- Since: 3.2.7
34289 http2dataPushPromise :: [PushPromise]
35− -- | Accessor for 'H2.TrailersMaker' in 'HTTP2Data'.
36− --
37− -- Since: 3.2.8 but the type changed in 3.3.0
38− , http2dataTrailers :: H2.TrailersMaker
39− }
290+ -- Since: 3.2.8
291+ , http2dataTrailers :: H.ResponseHeaders
292+ } deriving (Eq,Show)
40293
41294-- | Default HTTP/2 specific data.
42295--
43296-- Since: 3.2.7
44297defaultHTTP2Data :: HTTP2Data
45−defaultHTTP2Data = HTTP2Data [] H2.defaultTrailersMaker
298+defaultHTTP2Data = HTTP2Data [] []
46299
47300-- | HTTP/2 push promise or sever push.
48−-- This allows files only for backward-compatibility
49−-- while the HTTP/2 library supports other types.
50301--
51302-- Since: 3.2.7
52303data PushPromise = PushPromise {
warp/Network/Wai/Handler/Warp/HTTP2/Worker.hsnew file+319
@@ -0,0 +1,319 @@
1+{-# LANGUAGE NamedFieldPuns #-}
2+{-# LANGUAGE PatternGuards #-}
3+{-# LANGUAGE CPP #-}
4+{-# LANGUAGE ScopedTypeVariables #-}
5+{-# LANGUAGE OverloadedStrings #-}
6+{-# LANGUAGE BangPatterns #-}
7+
8+module Network.Wai.Handler.Warp.HTTP2.Worker (
9+ Responder
10+ , response
11+ , worker
12+ ) where
13+
14+#if __GLASGOW_HASKELL__ < 709
15+import Control.Applicative
16+import Data.Monoid (mempty)
17+#endif
18+import Control.Applicative ((<|>))
19+import Data.Maybe (fromJust)
20+import Control.Concurrent.STM
21+import Control.Exception (SomeException(..), AsyncException(..))
22+import qualified Control.Exception as E
23+import Control.Monad (when)
24+import Data.ByteString.Builder (byteString)
25+import qualified Network.HTTP.Types as H
26+import Network.HTTP2
27+import Network.HTTP2.Priority
28+import Network.HPACK
29+import Network.HPACK.Token
30+import Network.Wai
31+import Network.Wai.Handler.Warp.FileInfoCache
32+import Network.Wai.Handler.Warp.HTTP2.EncodeFrame
33+import Network.Wai.Handler.Warp.HTTP2.File
34+import Network.Wai.Handler.Warp.HTTP2.Manager
35+import Network.Wai.Handler.Warp.HTTP2.Types
36+import Network.Wai.Handler.Warp.HTTP2.Request
37+import Network.Wai.Handler.Warp.IORef
38+import qualified Network.Wai.Handler.Warp.Response as R
39+import qualified Network.Wai.Handler.Warp.Settings as S
40+import qualified Network.Wai.Handler.Warp.Timeout as T
41+import Network.Wai.Handler.Warp.Types
42+import Network.Wai.Internal (Response(..), ResponseReceived(..), ResponseReceived(..))
43+
44+----------------------------------------------------------------
45+
46+-- | The wai definition is 'type Application = Request -> (Response -> IO ResponseReceived) -> IO ResponseReceived'.
47+-- This type implements the second argument (Response -> IO ResponseReceived)
48+-- with extra arguments.
49+type Responder = InternalInfo
50+ -> ValueTable -- for Request
51+ -> ThreadContinue
52+ -> Stream
53+ -> Request
54+ -> Response
55+ -> IO ResponseReceived
56+
57+pushStream :: Context -> S.Settings
58+ -> StreamId -> ValueTable -> Request -> InternalInfo
59+ -> Maybe HTTP2Data
60+ -> IO (OutputType, IO ())
61+pushStream _ _ _ _ _ _ Nothing = return (ORspn, return ())
62+pushStream ctx@Context{http2settings,outputQ,streamTable}
63+ settings pid reqvt req ii (Just h2d)
64+ | len == 0 = return (ORspn, return ())
65+ | otherwise = do
66+ pushable <- enablePush <$> readIORef http2settings
67+ if pushable then do
68+ tvar <- newTVarIO 0
69+ lim <- push tvar pps0 0
70+ if lim == 0 then
71+ return (ORspn, return ())
72+ else
73+ return (OWait, waiter lim tvar)
74+ else
75+ return (ORspn, return ())
76+ where
77+ !pps0 = http2dataPushPromise h2d
78+ !len = length pps0
79+ !pushLogger = S.settingsServerPushLogger settings
80+ increment tvar = atomically $ modifyTVar' tvar (+1)
81+ waiter lim tvar = atomically $ do
82+ n <- readTVar tvar
83+ check (n >= lim)
84+ !h2data = getHTTP2Data req
85+ push _ [] !n = return (n :: Int)
86+ push tvar (pp:pps) !n = do
87+ let !file = promisedFile pp
88+ efinfo <- E.try $ getFileInfo ii file
89+ case efinfo of
90+ Left (_ex :: E.IOException) -> push tvar pps n
91+ Right (FileInfo _ size _ date) -> do
92+ ws <- initialWindowSize <$> readIORef http2settings
93+ let !w = promisedWeight pp
94+ !pri = defaultPriority { weight = w }
95+ !pre = toPrecedence pri
96+ strm <- newPushStream ctx ws pre
97+ let !sid = streamNumber strm
98+ insert streamTable sid strm
99+ (ths0, vt) <- toHeaderTable (promisedResponseHeaders pp)
100+ let !scheme = fromJust $ getHeaderValue tokenScheme reqvt
101+ -- fixme: this value can be Nothing
102+ !auth = fromJust (getHeaderValue tokenHost reqvt
103+ <|> getHeaderValue tokenAuthority reqvt)
104+ !path = promisedPath pp
105+ !promisedRequest = [(tokenMethod, H.methodGet)
106+ ,(tokenScheme, scheme)
107+ ,(tokenAuthority, auth)
108+ ,(tokenPath, path)]
109+ !part = FilePart 0 size size
110+ !rsp = RspnFile H.ok200 (ths,vt) file (Just part)
111+ !ths = (tokenLastModified,date) :
112+ addContentHeadersForFilePart ths0 part
113+ pushLogger req path size
114+ let !ot = OPush promisedRequest pid
115+ !out = Output strm rsp ii (increment tvar) h2data ot
116+ enqueueOutput outputQ out
117+ push tvar pps (n + 1)
118+
119+
120+-- | This function is passed to workers.
121+-- They also pass 'Response's from 'Application's to this function.
122+-- This function enqueues commands for the HTTP/2 sender.
123+response :: S.Settings -> Context -> Manager -> Responder
124+response settings ctx@Context{outputQ} mgr ii reqvt tconf strm req rsp = case rsp of
125+ ResponseStream s0 hs0 strmbdy
126+ | noBody s0 -> responseNoBody s0 hs0
127+ | isHead -> responseNoBody s0 hs0
128+ | otherwise -> getHTTP2Data req
129+ >>= pushStream ctx settings sid reqvt req ii
130+ >>= responseStreaming s0 hs0 strmbdy
131+ ResponseBuilder s0 hs0 b
132+ | noBody s0 -> responseNoBody s0 hs0
133+ | isHead -> responseNoBody s0 hs0
134+ | otherwise -> getHTTP2Data req
135+ >>= pushStream ctx settings sid reqvt req ii
136+ >>= responseBuilderBody s0 hs0 b
137+ ResponseFile s0 hs0 p mp
138+ | noBody s0 -> responseNoBody s0 hs0
139+ | otherwise -> getHTTP2Data req
140+ >>= pushStream ctx settings sid reqvt req ii
141+ >>= responseFileXXX s0 hs0 p mp
142+ ResponseRaw _ _ -> error "HTTP/2 does not support ResponseRaw"
143+ where
144+ noBody = not . R.hasBody
145+ !isHead = requestMethod req == H.methodHead
146+ !logger = S.settingsLogger settings
147+ !th = threadHandle ii
148+ sid = streamNumber strm
149+ !h2data = getHTTP2Data req
150+
151+ -- Ideally, log messages should be written when responses are
152+ -- actually sent. But there is no way to keep good memory usage
153+ -- (resist to Request leak) and throughput. By compromise,
154+ -- log message are written here even the window size of streams
155+ -- is 0.
156+
157+ responseNoBody s hs0 = toHeaderTable hs0 >>= responseNoBody' s
158+
159+ responseNoBody' s tbl = do
160+ logger req s Nothing
161+ setThreadContinue tconf True
162+ let !rspn = RspnNobody s tbl
163+ !out = Output strm rspn ii (return ()) h2data ORspn
164+ enqueueOutput outputQ out
165+ return ResponseReceived
166+
167+ responseBuilderBody s hs0 bdy (rspnOrWait,tell) = do
168+ logger req s Nothing
169+ setThreadContinue tconf True
170+ tbl <- toHeaderTable hs0
171+ let !rspn = RspnBuilder s tbl bdy
172+ !out = Output strm rspn ii tell h2data rspnOrWait
173+ enqueueOutput outputQ out
174+ return ResponseReceived
175+
176+ responseFileXXX _ hs0 path Nothing aux = do
177+ efinfo <- E.try $ getFileInfo ii path
178+ case efinfo of
179+ Left (_ex :: E.IOException) -> response404 hs0
180+ Right finfo -> do
181+ (rspths0,vt) <- toHeaderTable hs0
182+ case conditionalRequest finfo rspths0 reqvt of
183+ WithoutBody s -> responseNoBody s hs0
184+ WithBody s rspths beg len -> responseFile2XX s (rspths,vt) path (Just (FilePart beg len (fileInfoSize finfo))) aux
185+
186+ responseFileXXX s0 hs0 path mpart aux = do
187+ tbl <- toHeaderTable hs0
188+ responseFile2XX s0 tbl path mpart aux
189+
190+ responseFile2XX s tbl path mpart (rspnOrWait,tell)
191+ | isHead = do
192+ logger req s Nothing
193+ responseNoBody' s tbl
194+ | otherwise = do
195+ logger req s (filePartByteCount <$> mpart)
196+ setThreadContinue tconf True
197+ let !rspn = RspnFile s tbl path mpart
198+ !out = Output strm rspn ii tell h2data rspnOrWait
199+ enqueueOutput outputQ out
200+ return ResponseReceived
201+
202+ response404 hs0 = responseBuilderBody s hs body (ORspn, return ())
203+ where
204+ s = H.notFound404
205+ hs = R.replaceHeader H.hContentType "text/plain; charset=utf-8" hs0
206+ body = byteString "File not found"
207+
208+ responseStreaming s0 hs0 strmbdy (rspnOrWait,tell) = do
209+ logger req s0 Nothing
210+ -- We must not exit this WAI application.
211+ -- If the application exits, streaming would be also closed.
212+ -- So, this work occupies this thread.
213+ --
214+ -- We need to increase the number of workers.
215+ spawnAction mgr
216+ -- After this work, this thread stops to decease
217+ -- the number of workers.
218+ setThreadContinue tconf False
219+ -- Since 'StreamingBody' is loop, we cannot control it.
220+ -- So, let's serialize 'Builder' with a designated queue.
221+ tbq <- newTBQueueIO 10 -- fixme: hard coding: 10
222+ tbl <- toHeaderTable hs0
223+ let !rspn = RspnStreaming s0 tbl tbq
224+ !out = Output strm rspn ii tell h2data rspnOrWait
225+ enqueueOutput outputQ out
226+ let push b = do
227+ atomically $ writeTBQueue tbq (SBuilder b)
228+ T.tickle th
229+ flush = atomically $ writeTBQueue tbq SFlush
230+ _ <- strmbdy push flush
231+ atomically $ writeTBQueue tbq SFinish
232+ deleteMyId mgr
233+ return ResponseReceived
234+
235+worker :: Context -> S.Settings -> Application -> Responder -> T.Manager -> IO ()
236+worker ctx@Context{inputQ,controlQ} set app responder tm = do
237+ sinfo <- newStreamInfo
238+ tcont <- newThreadContinue
239+ E.bracket (T.registerKillThread tm) T.cancel $ go sinfo tcont
240+ where
241+ go sinfo tcont th = do
242+ setThreadContinue tcont True
243+ ex <- E.try $ do
244+ T.pause th
245+ inp@(Input strm req reqvt ii) <- atomically $ readTQueue inputQ
246+ setStreamInfo sinfo inp
247+ T.resume th
248+ T.tickle th
249+ app req $ responder ii reqvt tcont strm req
250+ cont1 <- case ex of
251+ Right ResponseReceived -> return True
252+ Left e@(SomeException _)
253+ -- killed by the local worker manager
254+ | Just ThreadKilled <- E.fromException e -> return False
255+ -- killed by the local timeout manager
256+ | Just T.TimeoutThread <- E.fromException e -> do
257+ cleanup sinfo Nothing
258+ return True
259+ | otherwise -> do
260+ cleanup sinfo $ Just e
261+ return True
262+ cont2 <- getThreadContinue tcont
263+ clearStreamInfo sinfo
264+ when (cont1 && cont2) $ go sinfo tcont th
265+ cleanup sinfo me = do
266+ minp <- getStreamInfo sinfo
267+ case minp of
268+ Nothing -> return ()
269+ Just (Input strm req _reqvt _ii) -> do
270+ closed ctx strm Killed
271+ let !frame = resetFrame InternalError (streamNumber strm)
272+ enqueueControl controlQ $ CFrame frame
273+ case me of
274+ Nothing -> return ()
275+ Just e -> S.settingsOnException set (Just req) e
276+
277+----------------------------------------------------------------
278+
279+-- | It would nice if responders could return values to workers.
280+-- Unfortunately, 'ResponseReceived' is already defined in WAI 2.0.
281+-- It is not wise to change this type.
282+-- So, a reference is shared by a responder and its worker.
283+-- The reference refers a value of this type as a return value.
284+-- If 'True', the worker continue to serve requests.
285+-- Otherwise, the worker get finished.
286+newtype ThreadContinue = ThreadContinue (IORef Bool)
287+
288+{-# INLINE newThreadContinue #-}
289+newThreadContinue :: IO ThreadContinue
290+newThreadContinue = ThreadContinue <$> newIORef True
291+
292+{-# INLINE setThreadContinue #-}
293+setThreadContinue :: ThreadContinue -> Bool -> IO ()
294+setThreadContinue (ThreadContinue ref) x = writeIORef ref x
295+
296+{-# INLINE getThreadContinue #-}
297+getThreadContinue :: ThreadContinue -> IO Bool
298+getThreadContinue (ThreadContinue ref) = readIORef ref
299+
300+----------------------------------------------------------------
301+
302+-- | The type to store enough information for 'settingsOnException'.
303+newtype StreamInfo = StreamInfo (IORef (Maybe Input))
304+
305+{-# INLINE newStreamInfo #-}
306+newStreamInfo :: IO StreamInfo
307+newStreamInfo = StreamInfo <$> newIORef Nothing
308+
309+{-# INLINE clearStreamInfo #-}
310+clearStreamInfo :: StreamInfo -> IO ()
311+clearStreamInfo (StreamInfo ref) = writeIORef ref Nothing
312+
313+{-# INLINE setStreamInfo #-}
314+setStreamInfo :: StreamInfo -> Input -> IO ()
315+setStreamInfo (StreamInfo ref) inp = writeIORef ref $ Just inp
316+
317+{-# INLINE getStreamInfo #-}
318+getStreamInfo :: StreamInfo -> IO (Maybe Input)
319+getStreamInfo (StreamInfo ref) = readIORef ref
warp/Network/Wai/Handler/Warp/HashMap.hs+16−26
@@ -1,7 +1,6 @@
1−{-# LANGUAGE BangPatterns #-}
2−
31module Network.Wai.Handler.Warp.HashMap where
42
3+import Data.ByteString (ByteString)
54import Data.Hashable (hash)
65import Data.IntMap.Strict (IntMap)
76import qualified Data.IntMap.Strict as I
@@ -9,34 +8,25 @@ import Data.Map.Strict (Map)
98import qualified Data.Map.Strict as M
109import Prelude hiding (lookup)
1110
12−----------------------------------------------------------------
13−
14−-- | 'HashMap' is used for cache of file information.
15−-- Hash values of file pathes are used as outer keys.
16−-- Because negative entries are also contained,
17−-- a bad guy can intentionally cause the hash collison.
18−-- So, 'Map' is used internally to prevent
19−-- the hash collision attack.
20−newtype HashMap v = HashMap (IntMap (Map FilePath v))
11+type Hash = Int
12+newtype HashMap k v = HashMap (IntMap (Map k v))
2113
22−----------------------------------------------------------------
14+hashByteString :: ByteString -> Hash
15+hashByteString = hash
2316
24−empty :: HashMap v
25−empty = HashMap I.empty
17+empty :: HashMap k v
18+empty = HashMap $ I.empty
2619
27−isEmpty :: HashMap v -> Bool
28−isEmpty (HashMap hm) = I.null hm
20+null :: HashMap k v -> Bool
21+null (HashMap hm) = I.null hm
2922
30−----------------------------------------------------------------
31−
32−insert :: FilePath -> v -> HashMap v -> HashMap v
33−insert path v (HashMap hm) = HashMap $ I.insertWith f h m hm
23+insert :: Ord k => Hash -> k -> v -> HashMap k v -> HashMap k v
24+insert h k v (HashMap hm) = HashMap $ I.insertWith f h m hm
3425 where
35− !h = hash path
36− !m = M.singleton path v
26+ m = M.singleton k v
3727 f = M.union -- fimxe
28+{-# SPECIALIZE insert :: Hash -> String -> v -> HashMap String v -> HashMap String v #-}
3829
39−lookup :: FilePath -> HashMap v -> Maybe v
40−lookup path (HashMap hm) = I.lookup h hm >>= M.lookup path
41− where
42− !h = hash path
30+lookup :: Ord k => Hash -> k -> HashMap k v -> Maybe v
31+lookup h k (HashMap hm) = I.lookup h hm >>= M.lookup k
32+{-# SPECIALIZE lookup :: Hash -> String -> HashMap String v -> Maybe v #-}
warp/Network/Wai/Handler/Warp/Header.hs−3
@@ -7,7 +7,6 @@ import Data.Array.ST
77import qualified Data.ByteString as BS
88import Data.CaseInsensitive (foldedCase)
99import Network.HTTP.Types
10−
1110import Network.Wai.Handler.Warp.Types
1211
1312----------------------------------------------------------------
@@ -69,7 +68,6 @@ indexResponseHeader hdr = traverseHeader hdr responseMaxIndex responseKeyIndex
6968data ResponseHeaderIndex = ResContentLength
7069 | ResServer
7170 | ResDate
72− | ResLastModified
7371 deriving (Enum,Bounded)
7472
7573-- | The size for 'IndexedHeader' for HTTP Response.
@@ -80,7 +78,6 @@ responseKeyIndex :: HeaderName -> Int
8078responseKeyIndex hn = case BS.length bs of
8179 4 -> if bs == "date" then fromEnum ResDate else -1
8280 6 -> if bs == "server" then fromEnum ResServer else -1
83− 13 -> if bs == "last-modified" then fromEnum ResLastModified else -1
8481 14 -> if bs == "content-length" then fromEnum ResContentLength else -1
8582 _ -> -1
8683 where
warp/Network/Wai/Handler/Warp/IO.hs+1−2
@@ -3,11 +3,10 @@
33
44module Network.Wai.Handler.Warp.IO where
55
6+import Data.ByteString (ByteString)
67import Data.ByteString.Builder (Builder)
78import Data.ByteString.Builder.Extra (runBuilder, Next(Done, More, Chunk))
8−
99import Network.Wai.Handler.Warp.Buffer
10−import Network.Wai.Handler.Warp.Imports
1110import Network.Wai.Handler.Warp.Types
1211
1312toBufIOWith :: Buffer -> BufSize -> (ByteString -> IO ()) -> Builder -> IO ()
warp/Network/Wai/Handler/Warp/IORef.hsnew file+26
@@ -0,0 +1,26 @@
1+{-# LANGUAGE CPP #-}
2+
3+#ifndef MIN_VERSION_base
4+#define MIN_VERSION_base(x,y,z) 1
5+#endif
6+
7+module Network.Wai.Handler.Warp.IORef (
8+ module Data.IORef
9+#if !MIN_VERSION_base(4,6,0)
10+ , atomicModifyIORef'
11+#endif
12+ ) where
13+
14+import Data.IORef
15+
16+#if !MIN_VERSION_base(4,6,0)
17+-- | Strict version of 'atomicModifyIORef'. This forces both the value stored
18+-- in the 'IORef' as well as the value returned.
19+atomicModifyIORef' :: IORef a -> (a -> (a,b)) -> IO b
20+atomicModifyIORef' ref f = do
21+ c <- atomicModifyIORef ref
22+ (\x -> let (a, b) = f x -- Lazy application of "f"
23+ in (a, a `seq` b)) -- Lazy application of "seq"
24+ -- The following forces "a `seq` b", so it also forces "f x".
25+ c `seq` return c
26+#endif
warp/Network/Wai/Handler/Warp/Imports.hsdeleted−27
@@ -1,27 +0,0 @@
1−module Network.Wai.Handler.Warp.Imports (
2− ByteString(..)
3− , NonEmpty(..)
4− , module Control.Applicative
5− , module Control.Monad
6− , module Data.Bits
7− , module Data.List
8− , module Data.Int
9− , module Data.Monoid
10− , module Data.Ord
11− , module Data.Word
12− , module Data.Maybe
13− , module Numeric
14− ) where
15−
16−import Control.Applicative
17−import Control.Monad
18−import Data.Bits
19−import Data.ByteString.Internal (ByteString(..))
20−import Data.Int
21−import Data.List
22−import Data.List.NonEmpty (NonEmpty(..))
23−import Data.Maybe
24−import Data.Monoid
25−import Data.Ord
26−import Data.Word
27−import Numeric
warp/Network/Wai/Handler/Warp/Internal.hs+2−7
@@ -53,7 +53,7 @@ module Network.Wai.Handler.Warp.Internal (
5353 -- resumed as soon as we return from user code.
5454 --
5555 -- * Every time data is successfully sent to the client, the timeout is tickled.
56− , module System.TimeManager
56+ , module Network.Wai.Handler.Warp.Timeout
5757 -- * File descriptor cache
5858 , module Network.Wai.Handler.Warp.FdCache
5959 -- * File information cache
@@ -64,13 +64,8 @@ module Network.Wai.Handler.Warp.Internal (
6464 , Source
6565 , recvRequest
6666 , sendResponse
67− -- * Platform dependent helper functions
68− , setSocketCloseOnExec
69− , windowsThreadBlockHack
7067 ) where
7168
72−import System.TimeManager
73−
7469import Network.Wai.Handler.Warp.Buffer
7570import Network.Wai.Handler.Warp.Date
7671import Network.Wai.Handler.Warp.FdCache
@@ -82,5 +77,5 @@ import Network.Wai.Handler.Warp.Response
8277import Network.Wai.Handler.Warp.Run
8378import Network.Wai.Handler.Warp.SendFile
8479import Network.Wai.Handler.Warp.Settings
80+import Network.Wai.Handler.Warp.Timeout
8581import Network.Wai.Handler.Warp.Types
86−import Network.Wai.Handler.Warp.Windows
warp/Network/Wai/Handler/Warp/MultiMap.hs+43−64
@@ -1,111 +1,90 @@
1−{-# LANGUAGE BangPatterns #-}
1+{-# LANGUAGE CPP, BangPatterns #-}
22
33module Network.Wai.Handler.Warp.MultiMap (
4− MultiMap
4+ MMap
55 , isEmpty
66 , empty
77 , singleton
88 , insert
9− , Network.Wai.Handler.Warp.MultiMap.lookup
9+ , search
10+ , searchWith
1011 , pruneWith
1112 , toList
1213 , merge
1314 ) where
1415
15−import Data.Hashable (hash)
16+#if __GLASGOW_HASKELL__ < 709
17+import Control.Applicative ((<$>))
18+#endif
1619import Data.IntMap.Strict (IntMap)
1720import qualified Data.IntMap.Strict as I
18−import Data.Semigroup
19−import Prelude -- Silence redundant import warnings
21+import qualified Network.Wai.Handler.Warp.Some as S
2022
2123----------------------------------------------------------------
2224
23−-- | 'MultiMap' is used for cache of file descriptors.
24−-- Since multiple threads would open file descriptors for
25−-- the same file simultaneously, multiple entries must
26−-- be contained for the file.
27−-- Since hash values of file pathes are used as outer keys,
28−-- collison would happen for multiple file pathes.
29−-- Becase only positive entries are contained,
30−-- a bad guy cannot be cause the hash collision intentinally.
31−-- So, lists are good enough.
32−newtype MultiMap v = MultiMap (IntMap [(FilePath,v)])
25+type MMap v = IntMap (S.Some v)
3326
3427----------------------------------------------------------------
3528
3629-- | O(1)
37−empty :: MultiMap v
38−empty = MultiMap $ I.empty
30+isEmpty :: MMap v -> Bool
31+isEmpty = I.null
3932
4033-- | O(1)
41−isEmpty :: MultiMap v -> Bool
42−isEmpty (MultiMap mm) = I.null mm
34+empty :: MMap v
35+empty = I.empty
4336
4437----------------------------------------------------------------
4538
4639-- | O(1)
47−singleton :: FilePath -> v -> MultiMap v
48−singleton path v = MultiMap mm
49− where
50− !h = hash path
51− !mm = I.singleton h [(path,v)]
40+singleton :: Int -> v -> MMap v
41+singleton k v = I.singleton k (S.singleton v)
5242
5343----------------------------------------------------------------
5444
55−-- | O(N)
56−lookup :: FilePath -> MultiMap v -> Maybe v
57−lookup path (MultiMap mm) = case I.lookup h mm of
45+-- | O(log n)
46+search :: Int -> MMap v -> Maybe v
47+search k m = case I.lookup k m of
5848 Nothing -> Nothing
59− Just s -> Prelude.lookup path s
60− where
61− !h = hash path
62−
63−----------------------------------------------------------------
49+ Just s -> Just $! S.top s
6450
6551-- | O(log n)
66−insert :: FilePath -> v -> MultiMap v -> MultiMap v
67−insert path v (MultiMap mm) = MultiMap mm'
68− where
69− !h = hash path
70− !mm' = I.insertWith (<>) h [(path,v)] mm
52+searchWith :: Int -> (v -> Bool) -> MMap v -> Maybe v
53+searchWith k f m = case I.lookup k m of
54+ Nothing -> Nothing
55+ Just s -> S.lookupWith f s
7156
7257----------------------------------------------------------------
7358
74−-- | O(n)
75−toList :: MultiMap v -> [(FilePath,v)]
76−toList (MultiMap mm) = concatMap snd $ I.toAscList mm
59+-- | O(log n)
60+insert :: Int -> v -> MMap v -> MMap v
61+insert k v m = I.insertWith S.union k (S.singleton v) m
7762
7863----------------------------------------------------------------
7964
8065-- | O(n)
81−pruneWith :: MultiMap v
82− -> ((FilePath,v) -> IO Bool)
83− -> IO (MultiMap v)
84−pruneWith (MultiMap mm) action = MultiMap <$> mm'
66+toList :: MMap v -> [v]
67+toList m = concatMap f $ I.toAscList m
8568 where
86− !mm' = I.fromAscList <$> go (I.toDescList mm) []
87− go [] !acc = return acc
88− go ((h,s):kss) !acc = do
89− rs <- prune action s
90− case rs of
91− [] -> go kss acc
92− _ -> go kss ((h,rs) : acc)
69+ f (_,s) = S.toList s
9370
9471----------------------------------------------------------------
9572
96−-- O(n + m) where N is the size of the second argument
97−merge :: MultiMap v -> MultiMap v -> MultiMap v
98−merge (MultiMap m1) (MultiMap m2) = MultiMap mm
73+-- | O(n)
74+pruneWith :: MMap v
75+ -> (v -> IO Bool)
76+ -> IO (MMap v)
77+pruneWith m action = I.fromAscList <$> go (I.toDescList m) []
9978 where
100− !mm = I.unionWith (<>) m1 m2
79+ go [] acc = return acc
80+ go ((k,s):kss) acc = do
81+ mt <- S.prune action s
82+ case mt of
83+ Nothing -> go kss acc
84+ Just t -> go kss ((k,t) : acc)
10185
10286----------------------------------------------------------------
10387
104−prune :: ((FilePath,v) -> IO Bool) -> [(FilePath,v)] -> IO [(FilePath,v)]
105−prune action xs0 = go xs0
106− where
107− go [] = return []
108− go (x:xs) = do
109− keep <- action x
110− rs <- go xs
111− return $ if keep then x:rs else rs
88+-- O(n + m) where N is the size of the second argument
89+merge :: MMap v -> MMap v -> MMap v
90+merge m1 m2 = I.unionWith S.union m1 m2
warp/Network/Wai/Handler/Warp/PackInt.hs+6−6
@@ -2,21 +2,21 @@
22
33module Network.Wai.Handler.Warp.PackInt where
44
5−import Data.ByteString.Internal (unsafeCreate)
5+import Control.Monad (when)
6+import Data.ByteString.Internal (ByteString(..), unsafeCreate)
7+import Data.Word8 (Word8)
68import Foreign.Ptr (Ptr, plusPtr)
79import Foreign.Storable (poke)
810import qualified Network.HTTP.Types as H
911
10−import Network.Wai.Handler.Warp.Imports
11−
1212-- $setup
13−-- >>> import Data.ByteString.Char8 as C8
13+-- >>> import Data.ByteString.Char8 as B
1414-- >>> import Test.QuickCheck (Large(..))
1515
1616-- |
1717--
18−-- prop> packIntegral (abs n) == C8.pack (show (abs n))
19−-- prop> \(Large n) -> let n' = fromIntegral (abs n :: Int) in packIntegral n' == C8.pack (show n')
18+-- prop> packIntegral (abs n) == B.pack (show (abs n))
19+-- prop> \(Large n) -> let n' = fromIntegral (abs n :: Int) in packIntegral n' == B.pack (show n')
2020
2121packIntegral :: Integral a => a -> ByteString
2222packIntegral 0 = "0"
warp/Network/Wai/Handler/Warp/ReadInt.hs+2−2
@@ -13,13 +13,13 @@ module Network.Wai.Handler.Warp.ReadInt (
1313-- This function lives in its own file because the MagicHash pragma interacts
1414-- poorly with the CPP pragma.
1515
16+import Data.ByteString (ByteString)
1617import qualified Data.ByteString as S
18+import Data.Int (Int64)
1719import GHC.Prim
1820import GHC.Types
1921import GHC.Word
2022
21−import Network.Wai.Handler.Warp.Imports hiding (readInt)
22−
2323{-# INLINE readInt #-}
2424readInt :: Integral a => ByteString -> a
2525readInt bs = fromIntegral $ readInt64 bs
warp/Network/Wai/Handler/Warp/Recv.hs+17−44
@@ -9,27 +9,23 @@ module Network.Wai.Handler.Warp.Recv (
99 , spell
1010 ) where
1111
12+#if __GLASGOW_HASKELL__ < 709
13+import Control.Applicative ((<$>))
14+#endif
1215import qualified Control.Exception as E
1316import qualified Data.ByteString as BS
14−import Data.IORef
17+import Data.ByteString.Internal (ByteString(..))
18+import Data.Word (Word8)
1519import Foreign.C.Error (eAGAIN, getErrno, throwErrno)
1620import Foreign.C.Types
1721import Foreign.ForeignPtr (withForeignPtr)
1822import Foreign.Ptr (Ptr, castPtr, plusPtr)
1923import GHC.Conc (threadWaitRead)
20−import qualified GHC.IO.Exception as E
21−import Network.Socket (Socket)
22−import qualified System.IO.Error as E
23−#if MIN_VERSION_network(3,1,0)
24−import Network.Socket (withFdSocket)
25−#else
26−import Network.Socket (fdSocket)
27−#endif
28−import System.Posix.Types (Fd(..))
29−
24+import Network.Socket (Socket, fdSocket)
3025import Network.Wai.Handler.Warp.Buffer
31−import Network.Wai.Handler.Warp.Imports
26+import Network.Wai.Handler.Warp.IORef
3227import Network.Wai.Handler.Warp.Types
28+import System.Posix.Types (Fd(..))
3329
3430#ifdef mingw32_HOST_OS
3531import GHC.IO.FD (FD(..), readRawBufferPtr)
@@ -96,45 +92,24 @@ spell init0 siz0 recv recvBuf
9692 siz' = siz - len
9793 loop bss' siz'
9894
99−-- The timeout manager may close the socket.
100−-- In that case, an error of "Bad file descriptor" occurs.
101−-- We ignores it because we expect TimeoutThread.
10295receive :: Socket -> BufferPool -> Recv
103−receive sock pool = E.handle handler $ withBufferPool pool $ \ (ptr, size) -> do
104−#if MIN_VERSION_network(3,1,0)
105− withFdSocket sock $ \fd -> do
106−#elif MIN_VERSION_network(3,0,0)
107− fd <- fdSocket sock
108−#else
109− let fd = fdSocket sock
110−#endif
111− let size' = fromIntegral size
112− fromIntegral <$> receiveloop fd ptr size'
113− where
114− handler :: E.IOException -> IO ByteString
115− handler e
116− | E.ioeGetErrorType e == E.InvalidArgument = return ""
117− | otherwise = E.throwIO e
96+receive sock pool = withBufferPool pool $ \ (ptr, size) -> do
97+ let sock' = fdSocket sock
98+ size' = fromIntegral size
99+ fromIntegral <$> receiveloop sock' ptr size'
118100
119101receiveBuf :: Socket -> RecvBuf
120−receiveBuf sock buf0 siz0 = do
121−#if MIN_VERSION_network(3,1,0)
122− withFdSocket sock $ \fd -> do
123−#elif MIN_VERSION_network(3,0,0)
124− fd <- fdSocket sock
125−#else
126− let fd = fdSocket sock
127−#endif
128− loop fd buf0 siz0
102+receiveBuf sock buf0 siz0 = loop buf0 siz0
129103 where
130− loop _ _ 0 = return True
131− loop fd buf siz = do
104+ loop _ 0 = return True
105+ loop buf siz = do
132106 n <- fromIntegral <$> receiveloop fd buf (fromIntegral siz)
133107 -- fixme: what should we do in the case of n == 0
134108 if n == 0 then
135109 return False
136110 else
137− loop fd (buf `plusPtr` n) (siz - n)
111+ loop (buf `plusPtr` n) (siz - n)
112+ fd = fdSocket sock
138113
139114receiveloop :: CInt -> Ptr Word8 -> CSize -> IO CInt
140115receiveloop sock ptr size = do
@@ -153,8 +128,6 @@ receiveloop sock ptr size = do
153128 else
154129 return bytes
155130
156−#ifndef mingw32_HOST_OS
157131-- fixme: the type of the return value
158132foreign import ccall unsafe "recv"
159133 c_recv :: CInt -> Ptr CChar -> CSize -> CInt -> IO CInt
160−#endif
warp/Network/Wai/Handler/Warp/Request.hs+38−48
@@ -1,7 +1,6 @@
11{-# LANGUAGE BangPatterns #-}
22{-# LANGUAGE OverloadedStrings #-}
33{-# LANGUAGE CPP #-}
4−{-# LANGUAGE DeriveDataTypeable #-}
54{-# OPTIONS_GHC -fno-warn-deprecations #-}
65
76module Network.Wai.Handler.Warp.Request (
@@ -9,60 +8,61 @@ module Network.Wai.Handler.Warp.Request (
98 , headerLines
109 , pauseTimeoutKey
1110 , getFileInfoKey
12− , getClientCertificateKey
13− , NoKeepAliveRequest (..)
1411 ) where
1512
1613import qualified Control.Concurrent as Conc (yield)
17−import Control.Exception (throwIO, Exception)
14+import Control.Exception (throwIO)
1815import Data.Array ((!))
16+import Data.ByteString (ByteString)
1917import qualified Data.ByteString as S
2018import qualified Data.ByteString.Unsafe as SU
2119import qualified Data.CaseInsensitive as CI
2220import qualified Data.IORef as I
23−import Data.Typeable (Typeable)
24−import qualified Data.Vault.Lazy as Vault
25−import Data.X509
2621import qualified Network.HTTP.Types as H
2722import Network.Socket (SockAddr)
2823import Network.Wai
29−import Network.Wai.Handler.Warp.Types
30−import Network.Wai.Internal
31−import Prelude hiding (lines)
32−import System.IO.Unsafe (unsafePerformIO)
33−import qualified System.TimeManager as Timeout
34−
3524import Network.Wai.Handler.Warp.Conduit
3625import Network.Wai.Handler.Warp.FileInfoCache
26+import Network.Wai.Handler.Warp.HashMap (hashByteString)
3727import Network.Wai.Handler.Warp.Header
38−import Network.Wai.Handler.Warp.Imports hiding (readInt, lines)
3928import Network.Wai.Handler.Warp.ReadInt
4029import Network.Wai.Handler.Warp.RequestHeader
41−import Network.Wai.Handler.Warp.Settings (Settings, settingsNoParsePath, settingsMaxTotalHeaderLength)
30+import Network.Wai.Handler.Warp.Settings (Settings, settingsNoParsePath)
31+import qualified Network.Wai.Handler.Warp.Timeout as Timeout
32+import Network.Wai.Handler.Warp.Types
33+import Network.Wai.Internal
34+import Prelude hiding (lines)
35+import Control.Monad (when)
36+import qualified Data.Vault.Lazy as Vault
37+import System.IO.Unsafe (unsafePerformIO)
38+
39+----------------------------------------------------------------
40+
41+-- FIXME come up with good values here
42+maxTotalHeaderLength :: Int
43+maxTotalHeaderLength = 50 * 1024
4244
4345----------------------------------------------------------------
4446
4547-- | Receiving a HTTP request from 'Connection' and parsing its header
4648-- to create 'Request'.
47−recvRequest :: Bool -- ^ first request on this connection?
48− -> Settings
49+recvRequest :: Settings
4950 -> Connection
50− -> InternalInfo
51− -> Timeout.Handle
51+ -> InternalInfo1
5252 -> SockAddr -- ^ Peer's address.
5353 -> Source -- ^ Where HTTP request comes from.
54− -> Transport
5554 -> IO (Request
5655 ,Maybe (I.IORef Int)
5756 ,IndexedHeader
58− ,IO ByteString) -- ^
57+ ,IO ByteString
58+ ,InternalInfo) -- ^
5959 -- 'Request' passed to 'Application',
6060 -- how many bytes remain to be consumed, if known
6161 -- 'IndexedHeader' of HTTP request for internal use,
6262 -- Body producing action used for flushing the request body
6363
64−recvRequest firstRequest settings conn ii th addr src transport = do
65− hdrlines <- headerLines (settingsMaxTotalHeaderLength settings) firstRequest src
64+recvRequest settings conn ii1 addr src = do
65+ hdrlines <- headerLines src
6666 (method, unparsedPath, path, query, httpversion, hdr) <- parseHeaderLines hdrlines
6767 let idxhdr = indexRequestHeader hdr
6868 expect = idxhdr ! fromEnum ReqExpect
@@ -70,9 +70,11 @@ recvRequest firstRequest settings conn ii th addr src transport = do
7070 te = idxhdr ! fromEnum ReqTransferEncoding
7171 handle100Continue = handleExpect conn httpversion expect
7272 rawPath = if settingsNoParsePath settings then unparsedPath else path
73+ h = hashByteString rawPath
74+ ii = toInternalInfo ii1 h
75+ th = threadHandle ii
7376 vaultValue = Vault.insert pauseTimeoutKey (Timeout.pause th)
7477 $ Vault.insert getFileInfoKey (getFileInfo ii)
75− $ Vault.insert getClientCertificateKey (tlsClientCertificate transport)
7678 Vault.empty
7779 (rbody, remainingRef, bodyLength) <- bodyAndSource src cl te
7880 -- body producing function which will produce '100-continue', if needed
@@ -87,7 +89,7 @@ recvRequest firstRequest settings conn ii th addr src transport = do
8789 , rawQueryString = query
8890 , queryString = H.parseQuery query
8991 , requestHeaders = hdr
90− , isSecure = isTransportSecure transport
92+ , isSecure = False
9193 , remoteHost = addr
9294 , requestBody = rbody'
9395 , vault = vaultValue
@@ -97,24 +99,16 @@ recvRequest firstRequest settings conn ii th addr src transport = do
9799 , requestHeaderReferer = idxhdr ! fromEnum ReqReferer
98100 , requestHeaderUserAgent = idxhdr ! fromEnum ReqUserAgent
99101 }
100− return (req, remainingRef, idxhdr, rbodyFlush)
102+ return (req, remainingRef, idxhdr, rbodyFlush, ii)
101103
102104----------------------------------------------------------------
103105
104−headerLines :: Int -> Bool -> Source -> IO [ByteString]
105−headerLines maxTotalHeaderLength firstRequest src = do
106+headerLines :: Source -> IO [ByteString]
107+headerLines src = do
106108 bs <- readSource src
107109 if S.null bs
108− -- When we're working on a keep-alive connection and trying to
109− -- get the second or later request, we don't want to treat the
110− -- lack of data as a real exception. See the http1 function in
111− -- the Run module for more details.
112− then if firstRequest then throwIO ConnectionClosedByPeer else throwIO NoKeepAliveRequest
113− else push maxTotalHeaderLength src (THStatus 0 id id) bs
114−
115−data NoKeepAliveRequest = NoKeepAliveRequest
116− deriving (Show, Typeable)
117−instance Exception NoKeepAliveRequest
110+ then throwIO ConnectionClosedByPeer
111+ else push src (THStatus 0 id id) bs
118112
119113----------------------------------------------------------------
120114
@@ -220,8 +214,8 @@ close :: Sink ByteString IO a
220214close = throwIO IncompleteHeaders
221215-}
222216
223−push :: Int -> Source -> THStatus -> ByteString -> IO [ByteString]
224−push maxTotalHeaderLength src (THStatus len lines prepend) bs'
217+push :: Source -> THStatus -> ByteString -> IO [ByteString]
218+push src (THStatus len lines prepend) bs'
225219 -- Too many bytes
226220 | len > maxTotalHeaderLength = throwIO OverLargeHeader
227221 | otherwise = push' mnl
@@ -249,13 +243,13 @@ push maxTotalHeaderLength src (THStatus len lines prepend) bs'
249243 push' Nothing = do
250244 bst <- readSource' src
251245 when (S.null bst) $ throwIO IncompleteHeaders
252− push maxTotalHeaderLength src status bst
246+ push src status bst
253247 where
254248 len' = len + bsLen
255249 prepend' = S.append bs
256250 status = THStatus len' lines prepend'
257251 -- Found a newline, but next line continues as a multiline header
258− push' (Just (end, True)) = push maxTotalHeaderLength src status rest
252+ push' (Just (end, True)) = push src status rest
259253 where
260254 rest = S.drop (end + 1) bs
261255 prepend' = S.append (SU.unsafeTake (checkCR bs end) bs)
@@ -274,12 +268,12 @@ push maxTotalHeaderLength src (THStatus len lines prepend) bs'
274268 in if start < bsLen then
275269 -- more bytes in this chunk, push again
276270 let bs'' = SU.unsafeDrop start bs
277− in push maxTotalHeaderLength src status bs''
271+ in push src status bs''
278272 else do
279273 -- no more bytes in this chunk, ask for more
280274 bst <- readSource' src
281275 when (S.null bs) $ throwIO IncompleteHeaders
282− push maxTotalHeaderLength src status bst
276+ push src status bst
283277 where
284278 start = end + 1 -- start of next chunk
285279 line = SU.unsafeTake (checkCR bs end) bs
@@ -297,7 +291,3 @@ pauseTimeoutKey = unsafePerformIO Vault.newKey
297291getFileInfoKey :: Vault.Key (FilePath -> IO FileInfo)
298292getFileInfoKey = unsafePerformIO Vault.newKey
299293{-# NOINLINE getFileInfoKey #-}
300−
301−getClientCertificateKey :: Vault.Key (Maybe CertificateChain)
302−getClientCertificateKey = unsafePerformIO Vault.newKey
303−{-# NOINLINE getClientCertificateKey #-}
warp/Network/Wai/Handler/Warp/RequestHeader.hs+6−5
@@ -1,3 +1,4 @@
1+{-# LANGUAGE OverloadedStrings #-}
12{-# LANGUAGE BangPatterns #-}
23
34module Network.Wai.Handler.Warp.RequestHeader (
@@ -5,16 +6,16 @@ module Network.Wai.Handler.Warp.RequestHeader (
56 ) where
67
78import Control.Exception (throwIO)
9+import Control.Monad (when)
810import qualified Data.ByteString as S
9−import qualified Data.ByteString.Char8 as C8 (unpack)
10−import Data.ByteString.Internal (memchr)
11+import qualified Data.ByteString.Char8 as B (unpack)
12+import Data.ByteString.Internal (ByteString(..), memchr)
1113import qualified Data.CaseInsensitive as CI
14+import Data.Word (Word8)
1215import Foreign.ForeignPtr (withForeignPtr)
1316import Foreign.Ptr (Ptr, plusPtr, minusPtr, nullPtr)
1417import Foreign.Storable (peek)
1518import qualified Network.HTTP.Types as H
16−
17−import Network.Wai.Handler.Warp.Imports
1819import Network.Wai.Handler.Warp.Types
1920
2021-- $setup
@@ -88,7 +89,7 @@ parseRequestLine requestLine@(PS fptr off len) = withForeignPtr fptr $ \ptr -> d
8889
8990 return (method,path,query,hv)
9091 where
91− baderr = BadFirstLine $ C8.unpack requestLine
92+ baderr = BadFirstLine $ B.unpack requestLine
9293 check :: Ptr Word8 -> Int -> Word8 -> IO ()
9394 check p n w = do
9495 w0 <- peek $ p `plusPtr` n
warp/Network/Wai/Handler/Warp/Response.hs+64−41
@@ -1,8 +1,8 @@
11{-# LANGUAGE OverloadedStrings #-}
22{-# LANGUAGE ScopedTypeVariables #-}
3+{-# LANGUAGE TupleSections #-}
34{-# LANGUAGE RankNTypes #-}
45{-# LANGUAGE CPP #-}
5−{-# LANGUAGE BangPatterns #-}
66
77module Network.Wai.Handler.Warp.Response (
88 sendResponse
@@ -10,37 +10,64 @@ module Network.Wai.Handler.Warp.Response (
1010 , warpVersion
1111 , hasBody
1212 , replaceHeader
13− , addServer -- testing
1413 ) where
1514
16−import Data.ByteString.Builder.HTTP.Chunked (chunkedTransferEncoding, chunkedTransferTerminator)
15+#ifndef MIN_VERSION_base
16+#define MIN_VERSION_base(x,y,z) 1
17+#endif
18+
19+#ifndef MIN_VERSION_http_types
20+#define MIN_VERSION_http_types(x,y,z) 1
21+#endif
22+
23+import Blaze.ByteString.Builder.HTTP (chunkedTransferEncoding, chunkedTransferTerminator)
24+#if __GLASGOW_HASKELL__ < 709
25+import Control.Applicative
26+#endif
1727import qualified Control.Exception as E
28+import Control.Monad (unless, when)
1829import Data.Array ((!))
30+import Data.ByteString (ByteString)
1931import qualified Data.ByteString as S
32+import qualified Data.ByteString.Char8 as S8
2033import Data.ByteString.Builder (byteString, Builder)
2134import Data.ByteString.Builder.Extra (flush)
22−import qualified Data.ByteString.Char8 as C8
2335import qualified Data.CaseInsensitive as CI
2436import Data.Function (on)
25−import Data.Streaming.ByteString.Builder (newByteStringBuilderRecv, reuseBufferStrategy)
37+import Data.List (deleteBy)
38+import Data.Maybe
39+#if MIN_VERSION_base(4,5,0)
40+# if __GLASGOW_HASKELL__ < 709
41+import Data.Monoid (mempty)
42+# endif
43+import Data.Monoid ((<>))
44+#else
45+import Data.Monoid (mappend, mempty)
46+#endif
47+import Data.Streaming.Blaze (newBlazeRecv, reuseBufferStrategy)
2648import Data.Version (showVersion)
2749import Data.Word8 (_cr, _lf)
2850import qualified Network.HTTP.Types as H
51+#if MIN_VERSION_http_types(0,9,0)
2952import qualified Network.HTTP.Types.Header as H
53+#endif
3054import Network.Wai
31−import Network.Wai.Internal
32−import qualified Paths_warp
33−import qualified System.TimeManager as T
34−
3555import Network.Wai.Handler.Warp.Buffer (toBuilderBuffer)
3656import qualified Network.Wai.Handler.Warp.Date as D
3757import Network.Wai.Handler.Warp.File
3858import Network.Wai.Handler.Warp.Header
3959import Network.Wai.Handler.Warp.IO (toBufIOWith)
40−import Network.Wai.Handler.Warp.Imports
4160import Network.Wai.Handler.Warp.ResponseHeader
4261import Network.Wai.Handler.Warp.Settings
62+import qualified Network.Wai.Handler.Warp.Timeout as T
4363import Network.Wai.Handler.Warp.Types
64+import Network.Wai.Internal
65+import qualified Paths_warp
66+
67+#if !MIN_VERSION_base(4,5,0)
68+(<>) :: Monoid m => m -> m -> m
69+(<>) = mappend
70+#endif
4471
4572-- $setup
4673-- >>> :set -XOverloadedStrings
@@ -101,13 +128,12 @@ import Network.Wai.Handler.Warp.Types
101128sendResponse :: Settings
102129 -> Connection
103130 -> InternalInfo
104− -> T.Handle
105131 -> Request -- ^ HTTP request.
106132 -> IndexedHeader -- ^ Indexed header of HTTP request.
107133 -> IO ByteString -- ^ source from client, for raw response
108134 -> Response -- ^ HTTP response including status code and response header.
109135 -> IO Bool -- ^ Returing True if the connection is persistent.
110−sendResponse settings conn ii th req reqidxhdr src response = do
136+sendResponse settings conn ii req reqidxhdr src response = do
111137 hs <- addServerAndDate hs0
112138 if hasBody s then do
113139 -- The response to HEAD does not have body.
@@ -116,14 +142,14 @@ sendResponse settings conn ii th req reqidxhdr src response = do
116142 -- and status, the response to HEAD is processed here.
117143 --
118144 -- See definition of rsp below for proper body stripping.
119− (ms, mlen) <- sendRsp conn ii ver s hs rspidxhdr rsp
145+ (ms, mlen) <- sendRsp conn ii ver s hs rsp
120146 case ms of
121147 Nothing -> return ()
122148 Just realStatus -> logger req realStatus mlen
123149 T.tickle th
124150 return ret
125151 else do
126− _ <- sendRsp conn ii ver s hs rspidxhdr RspNoBody
152+ _ <- sendRsp conn ii ver s hs RspNoBody
127153 logger req s Nothing
128154 T.tickle th
129155 return isPersist
@@ -134,6 +160,7 @@ sendResponse settings conn ii th req reqidxhdr src response = do
134160 s = responseStatus response
135161 hs0 = sanitizeHeaders $ responseHeaders response
136162 rspidxhdr = indexResponseHeader hs0
163+ th = threadHandle ii
137164 getdate = getDate ii
138165 addServerAndDate = addDate getdate rspidxhdr . addServer defServer rspidxhdr
139166 (isPersist,isChunked0) = infoFromRequest req reqidxhdr
@@ -149,8 +176,7 @@ sendResponse settings conn ii th req reqidxhdr src response = do
149176 | isHead -> RspNoBody
150177 | otherwise -> RspStream fb needsChunked th
151178 ResponseRaw raw _ -> RspRaw raw src (T.tickle th)
152− -- Make sure we don't hang on to 'response' (avoid space leak)
153− !ret = case response of
179+ ret = case response of
154180 ResponseFile {} -> isPersist
155181 ResponseBuilder {} -> isKeepAlive
156182 ResponseStream {} -> isKeepAlive
@@ -171,11 +197,11 @@ containsNewlines = S.any (\w -> w == _cr || w == _lf)
171197
172198{-# INLINE sanitizeHeaderValue #-}
173199sanitizeHeaderValue :: ByteString -> ByteString
174−sanitizeHeaderValue v = case C8.lines $ S.filter (/= _cr) v of
200+sanitizeHeaderValue v = case S8.lines $ S.filter (/= _cr) v of
175201 [] -> ""
176− x : xs -> C8.intercalate "\r\n" (x : mapMaybe addSpaceIfMissing xs)
202+ x : xs -> S8.intercalate "\r\n" (x : mapMaybe addSpaceIfMissing xs)
177203 where
178− addSpaceIfMissing line = case C8.uncons line of
204+ addSpaceIfMissing line = case S8.uncons line of
179205 Nothing -> Nothing
180206 Just (first, _)
181207 | first == ' ' || first == '\t' -> Just line
@@ -196,13 +222,12 @@ sendRsp :: Connection
196222 -> H.HttpVersion
197223 -> H.Status
198224 -> H.ResponseHeaders
199− -> IndexedHeader -- Response
200225 -> Rsp
201226 -> IO (Maybe H.Status, Maybe Integer)
202227
203228----------------------------------------------------------------
204229
205−sendRsp conn _ ver s hs _ RspNoBody = do
230+sendRsp conn _ ver s hs RspNoBody = do
206231 -- Not adding Content-Length.
207232 -- User agents treats it as Content-Length: 0.
208233 composeHeader ver s hs >>= connSendAll conn
@@ -210,7 +235,7 @@ sendRsp conn _ ver s hs _ RspNoBody = do
210235
211236----------------------------------------------------------------
212237
213−sendRsp conn _ ver s hs _ (RspBuilder body needsChunked) = do
238+sendRsp conn _ ver s hs (RspBuilder body needsChunked) = do
214239 header <- composeHeaderBuilder ver s hs needsChunked
215240 let hdrBdy
216241 | needsChunked = header <> chunkedTransferEncoding body
@@ -223,9 +248,9 @@ sendRsp conn _ ver s hs _ (RspBuilder body needsChunked) = do
223248
224249----------------------------------------------------------------
225250
226−sendRsp conn _ ver s hs _ (RspStream streamingBody needsChunked th) = do
251+sendRsp conn _ ver s hs (RspStream streamingBody needsChunked th) = do
227252 header <- composeHeaderBuilder ver s hs needsChunked
228− (recv, finish) <- newByteStringBuilderRecv $ reuseBufferStrategy
253+ (recv, finish) <- newBlazeRecv $ reuseBufferStrategy
229254 $ toBuilderBuffer (connWriteBuffer conn) (connBufferSize conn)
230255 let send builder = do
231256 popper <- recv builder
@@ -247,7 +272,7 @@ sendRsp conn _ ver s hs _ (RspStream streamingBody needsChunked th) = do
247272
248273----------------------------------------------------------------
249274
250−sendRsp conn _ _ _ _ _ (RspRaw withApp src tickle) = do
275+sendRsp conn _ _ _ _ (RspRaw withApp src tickle) = do
251276 withApp recv send
252277 return (Nothing, Nothing)
253278 where
@@ -261,8 +286,8 @@ sendRsp conn _ _ _ _ _ (RspRaw withApp src tickle) = do
261286
262287-- Sophisticated WAI applications.
263288-- We respect s0. s0 MUST be a proper value.
264−sendRsp conn ii ver s0 hs0 rspidxhdr (RspFile path (Just part) _ isHead hook) =
265− sendRspFile2XX conn ii ver s0 hs rspidxhdr path beg len isHead hook
289+sendRsp conn ii ver s0 hs0 (RspFile path (Just part) _ isHead hook) =
290+ sendRspFile2XX conn ii ver s0 hs path beg len isHead hook
266291 where
267292 beg = filePartOffset part
268293 len = filePartByteCount part
@@ -272,17 +297,17 @@ sendRsp conn ii ver s0 hs0 rspidxhdr (RspFile path (Just part) _ isHead hook) =
272297
273298-- Simple WAI applications.
274299-- Status is ignored
275−sendRsp conn ii ver _ hs0 rspidxhdr (RspFile path Nothing reqidxhdr isHead hook) = do
300+sendRsp conn ii ver _ hs0 (RspFile path Nothing idxhdr isHead hook) = do
276301 efinfo <- E.try $ getFileInfo ii path
277302 case efinfo of
278303 Left (_ex :: E.IOException) ->
279304#ifdef WARP_DEBUG
280305 print _ex >>
281306#endif
282− sendRspFile404 conn ii ver hs0 rspidxhdr
283− Right finfo -> case conditionalRequest finfo hs0 rspidxhdr reqidxhdr of
284− WithoutBody s -> sendRsp conn ii ver s hs0 rspidxhdr RspNoBody
285− WithBody s hs beg len -> sendRspFile2XX conn ii ver s hs rspidxhdr path beg len isHead hook
307+ sendRspFile404 conn ii ver hs0
308+ Right finfo -> case conditionalRequest finfo hs0 idxhdr of
309+ WithoutBody s -> sendRsp conn ii ver s hs0 RspNoBody
310+ WithBody s hs beg len -> sendRspFile2XX conn ii ver s hs path beg len isHead hook
286311
287312----------------------------------------------------------------
288313
@@ -291,15 +316,14 @@ sendRspFile2XX :: Connection
291316 -> H.HttpVersion
292317 -> H.Status
293318 -> H.ResponseHeaders
294− -> IndexedHeader
295319 -> FilePath
296320 -> Integer
297321 -> Integer
298322 -> Bool
299323 -> IO ()
300324 -> IO (Maybe H.Status, Maybe Integer)
301−sendRspFile2XX conn ii ver s hs rspidxhdr path beg len isHead hook
302− | isHead = sendRsp conn ii ver s hs rspidxhdr RspNoBody
325+sendRspFile2XX conn ii ver s hs path beg len isHead hook
326+ | isHead = sendRsp conn ii ver s hs RspNoBody
303327 | otherwise = do
304328 lheader <- composeHeader ver s hs
305329 (mfd, fresher) <- getFd ii path
@@ -312,9 +336,8 @@ sendRspFile404 :: Connection
312336 -> InternalInfo
313337 -> H.HttpVersion
314338 -> H.ResponseHeaders
315− -> IndexedHeader
316339 -> IO (Maybe H.Status, Maybe Integer)
317−sendRspFile404 conn ii ver hs0 rspidxhdr = sendRsp conn ii ver s hs rspidxhdr (RspBuilder body True)
340+sendRspFile404 conn ii ver hs0 = sendRsp conn ii ver s hs (RspBuilder body True)
318341 where
319342 s = H.notFound404
320343 hs = replaceHeader H.hContentType "text/plain; charset=utf-8" hs0
@@ -385,7 +408,11 @@ hasBody s = sc /= 204
385408----------------------------------------------------------------
386409
387410addTransferEncoding :: H.ResponseHeaders -> H.ResponseHeaders
411+#if MIN_VERSION_http_types(0,9,0)
388412addTransferEncoding hdrs = (H.hTransferEncoding, "chunked") : hdrs
413+#else
414+addTransferEncoding hdrs = ("transfer-encoding", "chunked") : hdrs
415+#endif
389416
390417addDate :: IO D.GMTDate -> IndexedHeader -> H.ResponseHeaders -> IO H.ResponseHeaders
391418addDate getdate rspidxhdr hdrs = case rspidxhdr ! fromEnum ResDate of
@@ -400,11 +427,7 @@ addDate getdate rspidxhdr hdrs = case rspidxhdr ! fromEnum ResDate of
400427warpVersion :: String
401428warpVersion = showVersion Paths_warp.version
402429
403−{-# INLINE addServer #-}
404430addServer :: HeaderValue -> IndexedHeader -> H.ResponseHeaders -> H.ResponseHeaders
405−addServer "" rspidxhdr hdrs = case rspidxhdr ! fromEnum ResServer of
406− Nothing -> hdrs
407− _ -> filter ((/= H.hServer) . fst) hdrs
408431addServer serverName rspidxhdr hdrs = case rspidxhdr ! fromEnum ResServer of
409432 Nothing -> (H.hServer, serverName) : hdrs
410433 _ -> hdrs
warp/Network/Wai/Handler/Warp/ResponseHeader.hs+5−3
@@ -3,15 +3,17 @@
33
44module Network.Wai.Handler.Warp.ResponseHeader (composeHeader) where
55
6+import Control.Monad
7+import Data.ByteString (ByteString)
68import qualified Data.ByteString as S
79import Data.ByteString.Internal (create)
810import qualified Data.CaseInsensitive as CI
11+import Data.List (foldl')
12+import Data.Word (Word8)
913import Foreign.Ptr
1014import GHC.Storable
1115import qualified Network.HTTP.Types as H
12−
1316import Network.Wai.Handler.Warp.Buffer (copy)
14−import Network.Wai.Handler.Warp.Imports
1517
1618----------------------------------------------------------------
1719
@@ -22,7 +24,7 @@ composeHeader !httpversion !status !responseHeaders = create len $ \ptr -> do
2224 void $ copyCRLF ptr2
2325 where
2426 !len = 17 + slen + foldl' fieldLength 0 responseHeaders
25− fieldLength !l (!k,!v) = l + S.length (CI.original k) + S.length v + 4
27+ fieldLength !l !(k,v) = l + S.length (CI.original k) + S.length v + 4
2628 !slen = S.length $ H.statusMessage status
2729
2830httpVer11 :: ByteString
warp/Network/Wai/Handler/Warp/Run.hs+95−188
@@ -3,53 +3,49 @@
33{-# LANGUAGE OverloadedStrings #-}
44{-# LANGUAGE PackageImports #-}
55{-# LANGUAGE PatternGuards #-}
6−{-# LANGUAGE RecordWildCards #-}
76{-# LANGUAGE ScopedTypeVariables #-}
87{-# LANGUAGE TupleSections #-}
9−{-# LANGUAGE ViewPatterns #-}
108{-# OPTIONS_GHC -fno-warn-deprecations #-}
119
1210module Network.Wai.Handler.Warp.Run where
1311
14−import "iproute" Data.IP (toHostAddress, toHostAddress6)
12+#if __GLASGOW_HASKELL__ < 709
13+import Control.Applicative ((<$>))
14+#endif
1515import Control.Arrow (first)
1616import qualified Control.Concurrent as Conc (yield)
1717import Control.Exception as E
18+import Control.Monad (when, unless, void)
19+import Data.ByteString (ByteString)
1820import qualified Data.ByteString as S
1921import Data.Char (chr)
22+import "iproute" Data.IP (toHostAddress, toHostAddress6)
2023import Data.IORef (IORef, newIORef, readIORef, writeIORef)
2124import Data.Streaming.Network (bindPortTCP)
2225import Foreign.C.Error (Errno(..), eCONNABORTED)
2326import GHC.IO.Exception (IOException(..))
24−import qualified Network.HTTP2 as H2
25−import Network.Socket (Socket, close, accept, withSocketsDo, SockAddr(SockAddrInet, SockAddrInet6), setSocketOption, SocketOption(..))
26−#if MIN_VERSION_network(3,1,1)
27−import Network.Socket (gracefulClose)
28−#endif
27+import Network (sClose, Socket)
28+import Network.Socket (accept, withSocketsDo, SockAddr(SockAddrInet, SockAddrInet6), setSocketOption, SocketOption(..))
2929import qualified Network.Socket.ByteString as Sock
3030import Network.Wai
31−import Network.Wai.Internal (ResponseReceived (ResponseReceived))
32−import System.Environment (lookupEnv)
33−import qualified System.TimeManager as T
34−import System.Timeout (timeout)
35−
3631import Network.Wai.Handler.Warp.Buffer
3732import Network.Wai.Handler.Warp.Counter
3833import qualified Network.Wai.Handler.Warp.Date as D
3934import qualified Network.Wai.Handler.Warp.FdCache as F
4035import qualified Network.Wai.Handler.Warp.FileInfoCache as I
41−import Network.Wai.Handler.Warp.HTTP2 (http2)
42−import Network.Wai.Handler.Warp.HTTP2.Types (isHTTP2)
36+import Network.Wai.Handler.Warp.HTTP2 (http2, isHTTP2)
4337import Network.Wai.Handler.Warp.Header
44−import Network.Wai.Handler.Warp.Imports hiding (readInt)
4538import Network.Wai.Handler.Warp.ReadInt
4639import Network.Wai.Handler.Warp.Recv
4740import Network.Wai.Handler.Warp.Request
4841import Network.Wai.Handler.Warp.Response
4942import Network.Wai.Handler.Warp.SendFile
5043import Network.Wai.Handler.Warp.Settings
44+import qualified Network.Wai.Handler.Warp.Timeout as T
5145import Network.Wai.Handler.Warp.Types
52−
46+import Network.Wai.Internal (ResponseReceived (ResponseReceived))
47+import System.Environment (getEnvironment)
48+import System.Timeout (timeout)
5349
5450#if WINDOWS
5551import Network.Wai.Handler.Warp.Windows
@@ -58,40 +54,27 @@ import Network.Socket (fdSocket)
5854#endif
5955
6056-- | Creating 'Connection' for plain HTTP based on a given socket.
61−socketConnection :: Settings -> Socket -> IO Connection
62−#if MIN_VERSION_network(3,1,1)
63−socketConnection set s = do
64−#else
65−socketConnection _ s = do
66−#endif
57+socketConnection :: Socket -> IO Connection
58+socketConnection s = do
6759 bufferPool <- newBufferPool
6860 writeBuf <- allocateBuffer bufferSize
6961 let sendall = Sock.sendAll s
70− isH2 <- newIORef False -- HTTP/1.x
7162 return Connection {
7263 connSendMany = Sock.sendMany s
7364 , connSendAll = sendall
7465 , connSendFile = sendFile s writeBuf bufferSize sendall
75−#if MIN_VERSION_network(3,1,1)
76− , connClose = do
77− h2 <- readIORef isH2
78− let tm = if h2 then settingsGracefulCloseTimeout2 set
79− else settingsGracefulCloseTimeout1 set
80− if tm == 0 then
81− close s
82− else
83− gracefulClose s tm `E.catch` \(E.SomeException _) -> return ()
84−#else
85− , connClose = close s
86−#endif
87− , connFree = freeBuffer writeBuf
66+ , connClose = sClose s >> freeBuffer writeBuf
8867 , connRecv = receive s bufferPool
8968 , connRecvBuf = receiveBuf s
9069 , connWriteBuffer = writeBuf
9170 , connBufferSize = bufferSize
92− , connHTTP2 = isH2
9371 }
9472
73+#if __GLASGOW_HASKELL__ < 702
74+allowInterrupt :: IO ()
75+allowInterrupt = unblock $ return ()
76+#endif
77+
9578-- | Run an 'Application' on the given port.
9679-- This calls 'runSettings' with 'defaultSettings'.
9780run :: Port -> Application -> IO ()
@@ -104,7 +87,7 @@ run p = runSettings defaultSettings { settingsPort = p }
10487-- Since 3.0.9
10588runEnv :: Port -> Application -> IO ()
10689runEnv p app = do
107− mp <- lookupEnv "PORT"
90+ mp <- lookup "PORT" <$> getEnvironment
10891
10992 maybe (run p app) runReadPort mp
11093
@@ -121,7 +104,7 @@ runSettings :: Settings -> Application -> IO ()
121104runSettings set app = withSocketsDo $
122105 bracket
123106 (bindPortTCP (settingsPort set) (settingsHost set))
124− close
107+ sClose
125108 (\socket -> do
126109 setSocketCloseOnExec socket
127110 runSettingsSocket set socket app)
@@ -151,10 +134,10 @@ runSettingsSocket set socket app = do
151134 setSocketCloseOnExec s
152135 -- NoDelay causes an error for AF_UNIX.
153136 setSocketOption s NoDelay 1 `E.catch` \(E.SomeException _) -> return ()
154− conn <- socketConnection set s
137+ conn <- socketConnection s
155138 return (conn, sa)
156139
157− closeListenSocket = close socket
140+ closeListenSocket = sClose socket
158141
159142-- | The connection setup action would be expensive. A good example
160143-- is initialization of TLS.
@@ -192,15 +175,15 @@ runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport),
192175runSettingsConnectionMakerSecure set getConnMaker app = do
193176 settingsBeforeMainLoop set
194177 counter <- newCounter
195− withII $ acceptConnection set getConnMaker app counter
178+ withII0 $ acceptConnection set getConnMaker app counter
196179 where
197− withII action =
180+ withII0 action =
198181 withTimeoutManager $ \tm ->
199182 D.withDateCache $ \dc ->
200183 F.withFdCache fdCacheDurationInSeconds $ \fdc ->
201184 I.withFileInfoCache fdFileInfoDurationInSeconds $ \fic -> do
202− let ii = InternalInfo tm dc fdc fic
203− action ii
185+ let ii0 = InternalInfo0 tm dc fdc fic
186+ action ii0
204187
205188 !fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
206189 !fdFileInfoDurationInSeconds = settingsFileInfoCacheDuration set * 1000000
@@ -229,18 +212,13 @@ acceptConnection :: Settings
229212 -> IO (IO (Connection, Transport), SockAddr)
230213 -> Application
231214 -> Counter
232− -> InternalInfo
215+ -> InternalInfo0
233216 -> IO ()
234−acceptConnection set getConnMaker app counter ii = do
217+acceptConnection set getConnMaker app counter ii0 = do
235218 -- First mask all exceptions in acceptLoop. This is necessary to
236219 -- ensure that no async exception is throw between the call to
237220 -- acceptNewConnection and the registering of connClose.
238− --
239− -- acceptLoop can be broken by closing the listing socket.
240221 void $ mask_ acceptLoop
241− -- In some cases, we want to stop Warp here without graceful shutdown.
242− -- So, async exceptions are allowed here.
243− -- That's why `finally` is not used.
244222 gracefulShutdown set counter
245223 where
246224 acceptLoop = do
@@ -258,7 +236,7 @@ acceptConnection set getConnMaker app counter ii = do
258236 case mx of
259237 Nothing -> return ()
260238 Just (mkConn, addr) -> do
261− fork set mkConn addr app counter ii
239+ fork set mkConn addr app counter ii0
262240 acceptLoop
263241
264242 acceptNewConnection = do
@@ -281,55 +259,54 @@ fork :: Settings
281259 -> SockAddr
282260 -> Application
283261 -> Counter
284− -> InternalInfo
262+ -> InternalInfo0
285263 -> IO ()
286−fork set mkConn addr app counter ii = settingsFork set $ \unmask ->
287− -- Call the user-supplied on exception code if any
288− -- exceptions are thrown.
289− handle (settingsOnException set Nothing) $
290− -- Run the connection maker to get a new connection, and ensure
291− -- that the connection is closed. If the mkConn call throws an
292− -- exception, we will leak the connection. If the mkConn call is
293− -- vulnerable to attacks (e.g., Slowloris), we do nothing to
294− -- protect the server. It is therefore vital that mkConn is well
295− -- vetted.
296− --
297− -- We grab the connection before registering timeouts since the
298− -- timeouts will be useless during connection creation, due to the
299− -- fact that async exceptions are still masked.
300− bracket mkConn cleanUp (serve unmask)
301− where
302− cleanUp (conn, _) = connClose conn `finally` connFree conn
264+fork set mkConn addr app counter ii0 = settingsFork set $ \ unmask ->
265+ -- Run the connection maker to get a new connection, and ensure
266+ -- that the connection is closed. If the mkConn call throws an
267+ -- exception, we will leak the connection. If the mkConn call is
268+ -- vulnerable to attacks (e.g., Slowloris), we do nothing to
269+ -- protect the server. It is therefore vital that mkConn is well
270+ -- vetted.
271+ --
272+ -- We grab the connection before registering timeouts since the
273+ -- timeouts will be useless during connection creation, due to the
274+ -- fact that async exceptions are still masked.
275+ bracket mkConn closeConn $ \(conn, transport) ->
303276
304277 -- We need to register a timeout handler for this thread, and
305278 -- cancel that handler as soon as we exit.
306− serve unmask (conn, transport) = bracket register cancel $ \th -> do
307− -- We now have fully registered a connection close handler in
308− -- the case of all exceptions, so it is safe to once again
309− -- allow async exceptions.
310− unmask .
311− -- Call the user-supplied code for connection open and
312− -- close events
313− bracket (onOpen addr) (onClose addr) $ \goingon ->
314− -- Actually serve this connection. bracket with closeConn
315− -- above ensures the connection is closed.
316− when goingon $ serveConnection conn ii th addr transport set app
317− where
318− register = T.registerKillThread (timeoutManager ii) (connClose conn)
319− cancel = T.cancel
279+ bracket (T.registerKillThread (timeoutManager0 ii0)) T.cancel $ \th ->
280+
281+ let ii1 = toInternalInfo1 ii0 th
282+ -- We now have fully registered a connection close handler
283+ -- in the case of all exceptions, so it is safe to one
284+ -- again allow async exceptions.
285+ in unmask .
286+ -- Call the user-supplied on exception code if any
287+ -- exceptions are thrown.
288+ handle (settingsOnException set Nothing) .
289+
290+ -- Call the user-supplied code for connection open and close events
291+ bracket (onOpen addr) (onClose addr) $ \goingon ->
292+
293+ -- Actually serve this connection.
294+ -- bracket with closeConn above ensures the connection is closed.
295+ when goingon $ serveConnection conn ii1 addr transport set app
296+ where
297+ closeConn (conn, _transport) = connClose conn
320298
321299 onOpen adr = increase counter >> settingsOnOpen set adr
322300 onClose adr _ = decrease counter >> settingsOnClose set adr
323301
324302serveConnection :: Connection
325− -> InternalInfo
326− -> T.Handle
303+ -> InternalInfo1
327304 -> SockAddr
328305 -> Transport
329306 -> Settings
330307 -> Application
331308 -> IO ()
332−serveConnection conn ii th origAddr transport settings app = do
309+serveConnection conn ii1 origAddr transport settings app = do
333310 -- fixme: Upgrading to HTTP/2 should be supported.
334311 (h2,bs) <- if isHTTP2 transport then
335312 return (True, "")
@@ -339,39 +316,19 @@ serveConnection conn ii th origAddr transport settings app = do
339316 return (True, bs0)
340317 else
341318 return (False, bs0)
342− istatus <- newIORef False
343319 if settingsHTTP2Enabled settings && h2 then do
344− rawRecvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn)
345− -- This thread becomes the sender in http2 library.
346− -- In the case of event source, one request comes and one
347− -- worker gets busy. But it is likely that the receiver does
348− -- not receive any data at all while the sender is sending
349− -- output data from the worker. It's not good enough to tickle
350− -- the time handler in the receiver only. So, we should tickle
351− -- the time handler in both the receiver and the sender.
352− let recvN = wrappedRecvN th istatus (settingsSlowlorisSize settings) rawRecvN
353− sendBS x = connSendAll conn x >> T.tickle th
320+ recvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn)
354321 -- fixme: origAddr
355− checkTLS
356− setConnHTTP2 conn True
357− http2 conn transport ii origAddr settings recvN sendBS app
322+ http2 conn ii1 origAddr transport settings recvN app
358323 else do
324+ istatus <- newIORef False
359325 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
360326 writeIORef istatus True
361327 leftoverSource src bs
362328 addr <- getProxyProtocolAddr src
363− http1 True addr istatus src `E.catch` \e ->
364− case () of
365− ()
366− -- See comment below referencing
367− -- https://github.com/yesodweb/wai/issues/618
368− | Just NoKeepAliveRequest <- fromException e -> return ()
369− -- No valid request
370− | Just (BadFirstLine _) <- fromException e -> return ()
371− | otherwise -> do
372− _ <- sendErrorResponse (dummyreq addr) istatus e
373− throwIO e
374−
329+ http1 addr istatus src `E.catch` \e -> do
330+ sendErrorResponse addr istatus e
331+ throwIO (e :: SomeException)
375332 where
376333 getProxyProtocolAddr src =
377334 case settingsProxyProtocol settings of
@@ -413,40 +370,36 @@ serveConnection conn ii th origAddr transport settings app = do
413370
414371 decodeAscii = map (chr . fromEnum) . S.unpack
415372
373+ th = threadHandle1 ii1
374+
416375 shouldSendErrorResponse se
417376 | Just ConnectionClosedByPeer <- fromException se = False
418377 | otherwise = True
419378
420− sendErrorResponse req istatus e = do
379+ sendErrorResponse addr istatus e = do
421380 status <- readIORef istatus
422− if shouldSendErrorResponse e && status
423− then do
424− sendResponse settings conn ii th req defaultIndexRequestHeader (return S.empty) (errorResponse e)
425− else return False
381+ when (shouldSendErrorResponse e && status) $ do
382+ let ii = toInternalInfo ii1 0 -- dummy
383+ dreq = dummyreq addr
384+ void $ sendResponse settings conn ii dreq defaultIndexRequestHeader (return S.empty) (errorResponse e)
426385
427386 dummyreq addr = defaultRequest { remoteHost = addr }
428387
429388 errorResponse e = settingsOnExceptionResponse settings e
430389
431− http1 firstRequest addr istatus src = do
432− (req, mremainingRef, idxhdr, nextBodyFlush) <- recvRequest firstRequest settings conn ii th addr src transport
433− keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
390+ http1 addr istatus src = do
391+ (req', mremainingRef, idxhdr, nextBodyFlush, ii) <- recvRequest settings conn ii1 addr src
392+ let req = req' { isSecure = isTransportSecure transport }
393+ keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush ii
434394 `E.catch` \e -> do
395+ -- Call the user-supplied exception handlers, passing the request.
396+ sendErrorResponse addr istatus e
435397 settingsOnException settings (Just req) e
436398 -- Don't throw the error again to prevent calling settingsOnException twice.
437399 return False
400+ when keepAlive $ http1 addr istatus src
438401
439− -- When doing a keep-alive connection, the other side may just
440− -- close the connection. We don't want to treat that as an
441− -- exceptional situation, so we pass in False to http1 (which
442− -- in turn passes in False to recvRequest), indicating that
443− -- this is not the first request. If, when trying to read the
444− -- request headers, no data is available, recvRequest will
445− -- throw a NoKeepAliveRequest exception, which we catch here
446− -- and ignore. See: https://github.com/yesodweb/wai/issues/618
447− when keepAlive $ http1 False addr istatus src
448−
449− processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
402+ processRequest istatus src req mremainingRef idxhdr nextBodyFlush ii = do
450403 -- Let the application run for as long as it wants
451404 T.pause th
452405
@@ -454,38 +407,30 @@ serveConnection conn ii th origAddr transport settings app = do
454407 -- creating the request, we need to make sure that we don't get
455408 -- an async exception before calling the ResponseSource.
456409 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
457− r <- E.try $ app req $ \res -> do
410+ _ <- app req $ \res -> do
458411 T.resume th
459412 -- FIXME consider forcing evaluation of the res here to
460413 -- send more meaningful error messages to the user.
461414 -- However, it may affect performance.
462415 writeIORef istatus False
463− keepAlive <- sendResponse settings conn ii th req idxhdr (readSource src) res
416+ keepAlive <- sendResponse settings conn ii req idxhdr (readSource src) res
464417 writeIORef keepAliveRef keepAlive
465418 return ResponseReceived
466− case r of
467− Right ResponseReceived -> return ()
468− Left e@(SomeException _)
469− | Just (ExceptionInsideResponseBody e') <- fromException e -> throwIO e'
470− | otherwise -> do
471− keepAlive <- sendErrorResponse req istatus e
472− settingsOnException settings (Just req) e
473− writeIORef keepAliveRef keepAlive
474−
475419 keepAlive <- readIORef keepAliveRef
476420
477421 -- We just send a Response and it takes a time to
478422 -- receive a Request again. If we immediately call recv,
479− -- it is likely to fail and cause the IO manager to do some work.
480− -- It is very costly, so we yield to another Haskell
423+ -- it is likely to fail and the IO manager works.
424+ -- It is very costly. So, we yield to another Haskell
481425 -- thread hoping that the next Request will arrive
482426 -- when this Haskell thread will be re-scheduled.
483427 -- This improves performance at least when
484428 -- the number of cores is small.
485429 Conc.yield
486430
487− if keepAlive
488− then
431+ if not keepAlive then
432+ return False
433+ else
489434 -- If there is an unknown or large amount of data to still be read
490435 -- from the request body, simple drop this connection instead of
491436 -- reading it all in to satisfy a keep-alive request.
@@ -511,21 +456,6 @@ serveConnection conn ii th origAddr transport settings app = do
511456 else
512457 return False
513458 Nothing -> tryKeepAlive
514− else
515− return False
516−
517− checkTLS = case transport of
518− TCP -> return () -- direct
519− tls -> unless (tls12orLater tls) $ goaway conn H2.InadequateSecurity "Weak TLS"
520− tls12orLater tls = tlsMajorVersion tls == 3 && tlsMinorVersion tls >= 3
521−
522−-- connClose must not be called here since Run:fork calls it
523−goaway :: Connection -> H2.ErrorCodeId -> ByteString -> IO ()
524−goaway Connection{..} etype debugmsg = connSendAll bytestream
525− where
526− einfo = H2.encodeInfo id 0
527− frame = H2.GoAwayFrame 0 etype debugmsg
528− bytestream = H2.encodeFrame einfo frame
529459
530460flushEntireBody :: IO ByteString -> IO ()
531461flushEntireBody src =
@@ -558,35 +488,12 @@ wrappedRecv Connection { connRecv = recv } th istatus slowlorisSize = do
558488 when (S.length bs >= slowlorisSize) $ T.tickle th
559489 return bs
560490
561−wrappedRecvN :: T.Handle -> IORef Bool -> Int -> (BufSize -> IO ByteString) -> (BufSize -> IO ByteString)
562−wrappedRecvN th istatus slowlorisSize readN bufsize = do
563− bs <- readN bufsize
564− unless (S.null bs) $ do
565− writeIORef istatus True
566− -- TODO: think about the slowloris protection in HTTP2: current code
567− -- might open a slow-loris attack vector. Rather than timing we should
568− -- consider limiting the per-client connections assuming that in HTTP2
569− -- we should allow only few connections per host (real-world
570− -- deployments with large NATs may be trickier).
571− when (S.length bs >= slowlorisSize || bufsize <= slowlorisSize) $ T.tickle th
572− return bs
573−
574−-- | Set flag FileCloseOnExec flag on a socket (on Unix)
575−--
576491-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs
577−--
578−-- @since 3.2.17
579492setSocketCloseOnExec :: Socket -> IO ()
580493#if WINDOWS
581494setSocketCloseOnExec _ = return ()
582495#else
583−setSocketCloseOnExec socket = do
584−#if MIN_VERSION_network(3,0,0)
585− fd <- fdSocket socket
586−#else
587− let fd = fdSocket socket
588−#endif
589− F.setFileCloseOnExec $ fromIntegral fd
496+setSocketCloseOnExec socket = F.setFileCloseOnExec $ fromIntegral $ fdSocket socket
590497#endif
591498
592499gracefulShutdown :: Settings -> Counter -> IO ()
warp/Network/Wai/Handler/Warp/SendFile.hs+8−4
@@ -9,14 +9,22 @@ module Network.Wai.Handler.Warp.SendFile (
99#endif
1010 ) where
1111
12+import Control.Monad (void, when)
13+import Data.ByteString (ByteString)
1214import qualified Data.ByteString as BS
1315import Network.Socket (Socket)
16+import Network.Wai.Handler.Warp.Buffer
17+import Network.Wai.Handler.Warp.Types
1418
1519#ifdef WINDOWS
20+import Data.ByteString.Internal (ByteString(..))
1621import Foreign.ForeignPtr (newForeignPtr_)
1722import Foreign.Ptr (plusPtr)
1823import qualified System.IO as IO
1924#else
25+# if __GLASGOW_HASKELL__ < 709
26+import Control.Applicative ((<$>))
27+# endif
2028import Control.Exception
2129import Foreign.C.Error (throwErrno)
2230import Foreign.C.Types
@@ -26,10 +34,6 @@ import Network.Wai.Handler.Warp.FdCache (openFile, closeFile)
2634import System.Posix.Types
2735#endif
2836
29−import Network.Wai.Handler.Warp.Buffer
30−import Network.Wai.Handler.Warp.Imports
31−import Network.Wai.Handler.Warp.Types
32−
3337----------------------------------------------------------------
3438
3539-- | Function to send a file based on sendfile() for Linux\/Mac\/FreeBSD.
warp/Network/Wai/Handler/Warp/Settings.hs+19−60
@@ -6,25 +6,26 @@ module Network.Wai.Handler.Warp.Settings where
66
77import Control.Concurrent (forkIOWithUnmask)
88import Control.Exception
9+import Control.Monad (when, void)
10+import Data.ByteString (ByteString)
11+import qualified Data.ByteString.Char8 as S8
912import Data.ByteString.Builder (byteString)
10−import qualified Data.ByteString.Char8 as C8
11−import Data.ByteString.Lazy (fromStrict)
13+#if __GLASGOW_HASKELL__ < 709
14+import Data.Monoid (mappend)
15+#endif
1216import Data.Streaming.Network (HostPreference)
1317import qualified Data.Text as T
1418import qualified Data.Text.IO as TIO
1519import Data.Version (showVersion)
1620import GHC.IO.Exception (IOErrorType(..))
1721import qualified Network.HTTP.Types as H
18−import Network.HTTP2( HTTP2Error (..), ErrorCodeId (..) )
1922import Network.Socket (SockAddr)
2023import Network.Wai
24+import Network.Wai.Handler.Warp.Timeout
25+import Network.Wai.Handler.Warp.Types
2126import qualified Paths_warp
2227import System.IO (stderr)
2328import System.IO.Error (ioeGetErrorType)
24−import System.TimeManager
25−
26−import Network.Wai.Handler.Warp.Imports
27−import Network.Wai.Handler.Warp.Types
2829
2930-- | Various Warp server settings. This is purposely kept as an abstract data
3031-- type so that new settings can be added without breaking backwards
@@ -76,13 +77,6 @@ data Settings = Settings
7677 --
7778 -- Since 2.0.3
7879 , settingsInstallShutdownHandler :: IO () -> IO ()
79− -- ^ An action to install a handler (e.g. Unix signal handler)
80− -- to close a listen socket.
81− -- The first argument is an action to close the listen socket.
82− --
83− -- Default: no action
84− --
85− -- Since 3.0.1
8680 , settingsServerName :: ByteString
8781 -- ^ Default server name if application does not set one.
8882 --
@@ -94,44 +88,28 @@ data Settings = Settings
9488 , settingsProxyProtocol :: ProxyProtocol
9589 -- ^ Specify usage of the PROXY protocol.
9690 --
97− -- Since 3.0.5
91+ -- Since 3.0.5.
9892 , settingsSlowlorisSize :: Int
9993 -- ^ Size of bytes read to prevent Slowloris protection. Default value: 2048
10094 --
101− -- Since 3.1.2
95+ -- Since 3.1.2.
10296 , settingsHTTP2Enabled :: Bool
10397 -- ^ Whether to enable HTTP2 ALPN/upgrades. Default: True
10498 --
105− -- Since 3.1.7
99+ -- Since 3.1.7.
106100 , settingsLogger :: Request -> H.Status -> Maybe Integer -> IO ()
107101 -- ^ A log function. Default: no action.
108102 --
109− -- Since 3.1.10
103+ -- Since 3.X.X.
110104 , settingsServerPushLogger :: Request -> ByteString -> Integer -> IO ()
111105 -- ^ A HTTP/2 server push log function. Default: no action.
112106 --
113− -- Since 3.2.7
107+ -- Since 3.X.X.
114108 , settingsGracefulShutdownTimeout :: Maybe Int
115109 -- ^ An optional timeout to limit the time (in seconds) waiting for
116110 -- a graceful shutdown of the web server.
117111 --
118112 -- Since 3.2.8
119− , settingsGracefulCloseTimeout1 :: Int
120− -- ^ A timeout to limit the time (in milliseconds) waiting for
121− -- FIN for HTTP/1.x. 0 means uses immediate close.
122− -- Default: 0.
123− --
124− -- Since 3.3.5
125− , settingsGracefulCloseTimeout2 :: Int
126− -- ^ A timeout to limit the time (in milliseconds) waiting for
127− -- FIN for HTTP/2. 0 means uses immediate close.
128− -- Default: 2000.
129− --
130− -- Since 3.3.5
131− , settingsMaxTotalHeaderLength :: Int
132− -- ^ Determines the maximum header size that Warp will tolerate when using HTTP/1.x.
133− --
134− -- Since 3.3.8
135113 }
136114
137115-- | Specify usage of the PROXY protocol.
@@ -160,7 +138,7 @@ defaultSettings = Settings
160138 , settingsFork = void . forkIOWithUnmask
161139 , settingsNoParsePath = False
162140 , settingsInstallShutdownHandler = const $ return ()
163− , settingsServerName = C8.pack $ "Warp/" ++ showVersion Paths_warp.version
141+ , settingsServerName = S8.pack $ "Warp/" ++ showVersion Paths_warp.version
164142 , settingsMaximumBodyFlush = Just 8192
165143 , settingsProxyProtocol = ProxyProtocolNone
166144 , settingsSlowlorisSize = 2048
@@ -168,9 +146,6 @@ defaultSettings = Settings
168146 , settingsLogger = \_ _ _ -> return ()
169147 , settingsServerPushLogger = \_ _ _ -> return ()
170148 , settingsGracefulShutdownTimeout = Nothing
171− , settingsGracefulCloseTimeout1 = 0
172− , settingsGracefulCloseTimeout2 = 2000
173− , settingsMaxTotalHeaderLength = 50 * 1024
174149 }
175150
176151-- | Apply the logic provided by 'defaultOnException' to determine if an
@@ -196,29 +171,13 @@ defaultOnException _ e =
196171 when (defaultShouldDisplayException e)
197172 $ TIO.hPutStrLn stderr $ T.pack $ show e
198173
199−-- | Sending 400 for bad requests.
200−-- Sending 500 for internal server errors.
174+-- | Sending 400 for bad requests. Sending 500 for internal server errors.
175+--
201176-- Since: 3.1.0
202−-- Sending 413 for too large payload.
203−-- Sending 431 for too large headers.
204−-- Since 3.2.27
205177defaultOnExceptionResponse :: SomeException -> Response
206178defaultOnExceptionResponse e
207− | Just (_ :: InvalidRequest) <-
208− fromException e = responseLBS H.badRequest400
209− [(H.hContentType, "text/plain; charset=utf-8")]
210− "Bad Request"
211− | Just (ConnectionError (UnknownErrorCode 413) t) <-
212− fromException e = responseLBS H.status413
213− [(H.hContentType, "text/plain; charset=utf-8")]
214− (fromStrict t)
215− | Just (ConnectionError (UnknownErrorCode 431) t) <-
216− fromException e = responseLBS H.status431
217− [(H.hContentType, "text/plain; charset=utf-8")]
218− (fromStrict t)
219− | otherwise = responseLBS H.internalServerError500
220− [(H.hContentType, "text/plain; charset=utf-8")]
221− "Something went wrong"
179+ | Just (_ :: InvalidRequest) <- fromException e = responseLBS H.badRequest400 [(H.hContentType, "text/plain; charset=utf-8")] "Bad Request"
180+ | otherwise = responseLBS H.internalServerError500 [(H.hContentType, "text/plain; charset=utf-8")] "Something went wrong"
222181
223182-- | Exception handler for the debugging purpose.
224183-- 500, text/plain, a showed exception.
@@ -228,4 +187,4 @@ exceptionResponseForDebug :: SomeException -> Response
228187exceptionResponseForDebug e =
229188 responseBuilder H.internalServerError500
230189 [(H.hContentType, "text/plain; charset=utf-8")]
231− $ byteString . C8.pack $ "Exception: " ++ show e
190+ $ byteString . S8.pack $ "Exception: " ++ show e
warp/Network/Wai/Handler/Warp/Some.hsnew file+73
@@ -0,0 +1,73 @@
1+{-# LANGUAGE BangPatterns #-}
2+
3+module Network.Wai.Handler.Warp.Some (
4+ Some
5+ , singleton
6+ , top
7+ , lookupWith
8+ , union
9+ , toList
10+ , prune
11+ ) where
12+
13+----------------------------------------------------------------
14+
15+-- | One ore more list to implement multimap.
16+data Some a = One !a
17+ | Tom !a !(Some a) -- Two or more
18+ deriving (Eq,Show)
19+
20+{-# INLINE singleton #-}
21+singleton :: a -> Some a
22+singleton x = One x
23+
24+{-# INLINE top #-}
25+top :: Some a -> a
26+top (One x) = x
27+top (Tom x _) = x
28+
29+{-# INLINE lookupWith #-}
30+lookupWith :: (a -> Bool) -> Some a -> Maybe a
31+lookupWith f s = go s
32+ where
33+ go (One x)
34+ | f x = Just x
35+ | otherwise = Nothing
36+ go (Tom x xs)
37+ | f x = Just x
38+ | otherwise = go xs
39+
40+{-# INLINE union #-}
41+union :: Some a -> Some a -> Some a
42+union s t = go s t
43+ where
44+ go (One x) u = Tom x u
45+ go (Tom x xs) u = go xs (Tom x u)
46+
47+{-# INLINE toList #-}
48+toList :: Some a -> [a]
49+toList s = go s []
50+ where
51+ go (One x) !acc = x : acc
52+ go (Tom x xs) !acc = go xs (x : acc)
53+
54+{-# INLINE prune #-}
55+prune :: (a -> IO Bool) -> Some a -> IO (Maybe (Some a))
56+prune act s = go s
57+ where
58+ go (One x) = do
59+ keep <- act x
60+ return $ if keep then
61+ Just (One x)
62+ else
63+ Nothing
64+ go (Tom x xs) = do
65+ keep <- act x
66+ mys <- go xs
67+ return $ if keep then
68+ case mys of
69+ Nothing -> Just (One x)
70+ Just ys -> Just (Tom x ys)
71+ else
72+ mys
73+
time-manager/System/TimeManager.hs → warp/Network/Wai/Handler/Warp/Timeout.hsrenamed+8−11
@@ -1,6 +1,6 @@
11{-# LANGUAGE DeriveDataTypeable #-}
22
3−module System.TimeManager (
3+module Network.Wai.Handler.Warp.Timeout (
44 -- ** Types
55 Manager
66 , TimeoutAction
@@ -26,8 +26,8 @@ import Control.Concurrent (myThreadId)
2626import qualified Control.Exception as E
2727import Control.Reaper
2828import Data.Typeable (Typeable)
29−import Data.IORef (IORef)
30−import qualified Data.IORef as I
29+import Network.Wai.Handler.Warp.IORef (IORef)
30+import qualified Network.Wai.Handler.Warp.IORef as I
3131
3232----------------------------------------------------------------
3333
@@ -97,24 +97,21 @@ register mgr onTimeout = do
9797 return h
9898
9999-- | Registering a timeout action of killing this thread.
100−registerKillThread :: Manager -> TimeoutAction -> IO Handle
101−registerKillThread m onTimeout = do
100+registerKillThread :: Manager -> IO Handle
101+registerKillThread m = do
102102 -- If we hold ThreadId, the stack and data of the thread is leaked.
103103 -- If we hold Weak ThreadId, the stack is released. However, its
104104 -- data is still leaked probably because of a bug of GHC.
105105 -- So, let's just use ThreadId and release ThreadId by
106106 -- overriding the timeout action by "cancel".
107107 tid <- myThreadId
108− -- First run the timeout action in case the child thread is masked.
109− register m $ onTimeout `E.finally` E.throwTo tid TimeoutThread
108+ register m $ E.throwTo tid TimeoutThread
110109
111110data TimeoutThread = TimeoutThread
112111 deriving Typeable
113−instance E.Exception TimeoutThread where
114− toException = E.asyncExceptionToException
115− fromException = E.asyncExceptionFromException
112+instance E.Exception TimeoutThread
116113instance Show TimeoutThread where
117− show TimeoutThread = "Thread killed by timeout manager"
114+ show TimeoutThread = "Thread killed by Warp's timeout reaper"
118115
119116----------------------------------------------------------------
120117
warp/Network/Wai/Handler/Warp/Types.hs+34−34
@@ -5,18 +5,17 @@
55module Network.Wai.Handler.Warp.Types where
66
77import Control.Exception
8+import Data.ByteString (ByteString)
89import qualified Data.ByteString as S
910import Data.IORef (IORef, readIORef, writeIORef, newIORef)
1011import Data.Typeable (Typeable)
11−import Data.X509
12+import Data.Word (Word16, Word8)
1213import Foreign.Ptr (Ptr)
13−import System.Posix.Types (Fd)
14−import qualified System.TimeManager as T
15−
1614import qualified Network.Wai.Handler.Warp.Date as D
1715import qualified Network.Wai.Handler.Warp.FdCache as F
1816import qualified Network.Wai.Handler.Warp.FileInfoCache as I
19−import Network.Wai.Handler.Warp.Imports
17+import qualified Network.Wai.Handler.Warp.Timeout as T
18+import System.Posix.Types (Fd)
2019
2120----------------------------------------------------------------
2221
@@ -53,20 +52,6 @@ instance Exception InvalidRequest
5352
5453----------------------------------------------------------------
5554
56−-- | Exception thrown if something goes wrong while in the midst of
57−-- sending a response, since the status code can't be altered at that
58−-- point.
59−--
60−-- Used to determine whether keeping the HTTP1.1 connection / HTTP2 stream alive is safe
61−-- or irrecoverable.
62−
63−newtype ExceptionInsideResponseBody = ExceptionInsideResponseBody SomeException
64− deriving (Show, Typeable)
65−
66−instance Exception ExceptionInsideResponseBody
67−
68−----------------------------------------------------------------
69−
7055-- | Data type to abstract file identifiers.
7156-- On Unix, a file descriptor would be specified to make use of
7257-- the file descriptor cache.
@@ -107,13 +92,8 @@ data Connection = Connection {
10792 , connSendAll :: ByteString -> IO ()
10893 -- | The sending function for files in HTTP/1.1.
10994 , connSendFile :: SendFile
110− -- | The connection closing function. Warp guarantees it will only be
111− -- called once. Other functions (like 'connRecv') may be called after
112− -- 'connClose' is called.
95+ -- | The connection closing function.
11396 , connClose :: IO ()
114− -- | Free any buffers allocated. Warp guarantees it will only be
115− -- called once, and no other functions will be called after it.
116− , connFree :: IO ()
11797 -- | The connection receiving function. This returns "" for EOF.
11898 , connRecv :: Recv
11999 -- | The connection receiving function. This tries to fill the buffer.
@@ -123,25 +103,46 @@ data Connection = Connection {
123103 , connWriteBuffer :: Buffer
124104 -- | The size of the write buffer.
125105 , connBufferSize :: BufSize
126− -- | Is this connection HTTP/2?
127− , connHTTP2 :: IORef Bool
128106 }
129107
130−getConnHTTP2 :: Connection -> IO Bool
131−getConnHTTP2 conn = readIORef (connHTTP2 conn)
108+----------------------------------------------------------------
132109
133−setConnHTTP2 :: Connection -> Bool -> IO ()
134−setConnHTTP2 conn b = writeIORef (connHTTP2 conn) b
110+type Hash = Int
135111
136−----------------------------------------------------------------
112+
113+data InternalInfo0 =
114+ InternalInfo0 T.Manager
115+ (IO D.GMTDate)
116+ (Hash -> FilePath -> IO (Maybe F.Fd, F.Refresh))
117+ (Hash -> FilePath -> IO I.FileInfo)
118+
119+timeoutManager0 :: InternalInfo0 -> T.Manager
120+timeoutManager0 (InternalInfo0 tm _ _ _) = tm
121+
122+data InternalInfo1 =
123+ InternalInfo1 T.Handle
124+ T.Manager
125+ (IO D.GMTDate)
126+ (Hash -> FilePath -> IO (Maybe F.Fd, F.Refresh))
127+ (Hash -> FilePath -> IO I.FileInfo)
128+
129+toInternalInfo1 :: InternalInfo0 -> T.Handle -> InternalInfo1
130+toInternalInfo1 (InternalInfo0 b c d e) a = InternalInfo1 a b c d e
131+
132+threadHandle1 :: InternalInfo1 -> T.Handle
133+threadHandle1 (InternalInfo1 th _ _ _ _) = th
137134
138135data InternalInfo = InternalInfo {
139− timeoutManager :: T.Manager
136+ threadHandle :: T.Handle
137+ , timeoutManager :: T.Manager
140138 , getDate :: IO D.GMTDate
141139 , getFd :: FilePath -> IO (Maybe F.Fd, F.Refresh)
142140 , getFileInfo :: FilePath -> IO I.FileInfo
143141 }
144142
143+toInternalInfo :: InternalInfo1 -> Hash -> InternalInfo
144+toInternalInfo (InternalInfo1 a b c d e) h = InternalInfo a b c (d h) (e h)
145+
145146----------------------------------------------------------------
146147
147148-- | Type for input streaming.
@@ -180,7 +181,6 @@ data Transport = TCP -- ^ Plain channel: TCP
180181 , tlsMinorVersion :: Int
181182 , tlsNegotiatedProtocol :: Maybe ByteString -- ^ The result of Application Layer Protocol Negociation in RFC 7301
182183 , tlsChiperID :: Word16
183− , tlsClientCertificate :: Maybe CertificateChain
184184 } -- ^ Encrypted channel: TLS or SSL
185185
186186isTransportSecure :: Transport -> Bool
warp/Network/Wai/Handler/Warp/Windows.hs+1−5
@@ -7,12 +7,8 @@ module Network.Wai.Handler.Warp.Windows
77import Control.Exception
88import Control.Concurrent.MVar
99import Control.Concurrent
10+import Control.Monad
1011
11−import Network.Wai.Handler.Warp.Imports
12−
13−-- | Allow main socket listening thread to be interrupted on Windows platform
14−--
15−-- @since 3.2.17
1612windowsThreadBlockHack :: IO a -> IO a
1713windowsThreadBlockHack act = do
1814 var <- newEmptyMVar :: IO (MVar (Either SomeException a))
warp/Network/Wai/Handler/Warp/WithApplication.hs+12−10
@@ -1,4 +1,4 @@
1−{-# LANGUAGE OverloadedStrings #-}
1+
22module Network.Wai.Handler.Warp.WithApplication (
33 withApplication,
44 withApplicationSettings,
@@ -11,8 +11,6 @@ module Network.Wai.Handler.Warp.WithApplication (
1111import Control.Concurrent
1212import Control.Concurrent.Async
1313import Control.Exception
14−import Control.Monad (when)
15−import Data.Streaming.Network (bindRandomPortTCP)
1614import Network.Socket
1715import Network.Wai
1816import Network.Wai.Handler.Warp.Run
@@ -68,16 +66,14 @@ testWithApplication = testWithApplicationSettings defaultSettings
6866--
6967-- @since 3.2.7
7068testWithApplicationSettings :: Settings -> IO Application -> (Port -> IO a) -> IO a
71−testWithApplicationSettings settings mkApp action = do
69+testWithApplicationSettings _settings mkApp action = do
7270 callingThread <- myThreadId
7371 app <- mkApp
7472 let wrappedApp request respond =
7573 app request respond `catch` \ e -> do
76− when
77− (defaultShouldDisplayException e)
78− (throwTo callingThread e)
74+ throwTo callingThread (e :: SomeException)
7975 throwIO e
80− withApplicationSettings settings (return wrappedApp) action
76+ withApplication (return wrappedApp) action
8177
8278data Waiter a
8379 = Waiter {
@@ -88,7 +84,7 @@ data Waiter a
8884mkWaiter :: IO (Waiter a)
8985mkWaiter = do
9086 mvar <- newEmptyMVar
91− return Waiter {
87+ return $ Waiter {
9288 notify = putMVar mvar,
9389 waitFor = readMVar mvar
9490 }
@@ -97,7 +93,13 @@ mkWaiter = do
9793--
9894-- @since 3.2.4
9995openFreePort :: IO (Port, Socket)
100−openFreePort = bindRandomPortTCP "127.0.0.1"
96+openFreePort = do
97+ s <- socket AF_INET Stream defaultProtocol
98+ localhost <- inet_addr "127.0.0.1"
99+ bind s (SockAddrInet aNY_PORT localhost)
100+ listen s 1
101+ port <- socketPort s
102+ return (fromIntegral port, s)
101103
102104-- | Like 'openFreePort' but closes the socket before exiting.
103105withFreePort :: ((Port, Socket) -> IO a) -> IO a
warp/bench/Parser.hs+10−15
@@ -1,4 +1,3 @@
1−{-# LANGUAGE CPP #-}
21{-# LANGUAGE OverloadedStrings #-}
32{-# LANGUAGE BangPatterns #-}
43
@@ -19,11 +18,7 @@ import Foreign.ForeignPtr
1918import Foreign.Ptr
2019import Foreign.Storable
2120
22−#if MIN_VERSION_gauge(0, 2, 0)
23−import Gauge
24−#else
25−import Gauge.Main
26−#endif
21+import Criterion.Main
2722
2823-- $setup
2924-- >>> :set -XOverloadedStrings
@@ -68,15 +63,15 @@ parseRequestLine3 :: ByteString
6863 ,H.HttpVersion)
6964parseRequestLine3 requestLine = ret
7065 where
71− (!method,!rest) = S.break (== 32) requestLine -- ' '
66+ (!method,!rest) = S.breakByte 32 requestLine -- ' '
7267 (!pathQuery,!httpVer')
7368 | rest == "" = throw badmsg
74− | otherwise = S.break (== 32) (S.drop 1 rest) -- ' '
75− (!path,!query) = S.break (== 63) pathQuery -- '?'
69+ | otherwise = S.breakByte 32 (S.drop 1 rest) -- ' '
70+ (!path,!query) = S.breakByte 63 pathQuery -- '?'
7671 !httpVer = S.drop 1 httpVer'
7772 (!http,!ver)
7873 | httpVer == "" = throw badmsg
79− | otherwise = S.break (== 47) httpVer -- '/'
74+ | otherwise = S.breakByte 47 httpVer -- '/'
8075 !hv | http /= "HTTP" = throw NonHttp
8176 | ver == "/1.1" = H.http11
8277 | otherwise = H.http10
@@ -174,13 +169,13 @@ parseRequestLine1 :: ByteString
174169 ,ByteString -- Query
175170 ,H.HttpVersion)
176171parseRequestLine1 requestLine = do
177− let (!method,!rest) = S.break (== 32) requestLine -- ' '
178− (!pathQuery,!httpVer') = S.break (== 32) (S.drop 1 rest) -- ' '
172+ let (!method,!rest) = S.breakByte 32 requestLine -- ' '
173+ (!pathQuery,!httpVer') = S.breakByte 32 (S.drop 1 rest) -- ' '
179174 !httpVer = S.drop 1 httpVer'
180175 when (rest == "" || httpVer == "") $
181176 throwIO $ BadFirstLine $ B.unpack requestLine
182− let (!path,!query) = S.break (== 63) pathQuery -- '?'
183− (!http,!ver) = S.break (== 47) httpVer -- '/'
177+ let (!path,!query) = S.breakByte 63 pathQuery -- '?'
178+ (!http,!ver) = S.breakByte 47 httpVer -- '/'
184179 when (http /= "HTTP") $ throwIO NonHttp
185180 let !hv | ver == "/1.1" = H.http11
186181 | otherwise = H.http10
@@ -210,7 +205,7 @@ parseRequestLine0 s =
210205 !http' = S.concat http''
211206 (!hfirst, !hsecond) = S.splitAt 5 http'
212207 if hfirst == "HTTP/"
213− then let (!rpath, !qstring) = S.break (== 63) query -- '?'
208+ then let (!rpath, !qstring) = S.breakByte 63 query -- '?'
214209 !hv =
215210 case hsecond of
216211 "1.1" -> H.http11
warp/test/ExceptionSpec.hs+13−13
@@ -7,14 +7,14 @@ import Control.Applicative
77#endif
88import Control.Monad
99import Network.HTTP.Types hiding (Header)
10−import Network.Wai hiding (Response, responseStatus)
10+import Network.Wai hiding (Response)
1111import Network.Wai.Internal (Request(..))
1212import Network.Wai.Handler.Warp
1313import Test.Hspec
1414import Control.Exception
1515import qualified Data.Streaming.Network as N
1616import Control.Concurrent.Async (withAsync)
17−import Network.Socket (close)
17+import Network.Socket (sClose)
1818
1919import HTTP
2020
@@ -24,7 +24,7 @@ main = hspec spec
2424withTestServer :: (Int -> IO a) -> IO a
2525withTestServer inner = bracket
2626 (N.bindRandomPortTCP "127.0.0.1")
27− (close . snd)
27+ (sClose . snd)
2828 $ \(prt, lsocket) -> do
2929 withAsync (runSettingsSocket defaultSettings lsocket testApp)
3030 $ \_ -> inner prt
@@ -49,18 +49,18 @@ spec :: Spec
4949spec = describe "responds even if there is an exception" $ do
5050 {- Disabling these tests. We can consider forcing evaluation in Warp.
5151 it "statusError" $ do
52− sc <- responseStatus <$> sendGET "http://127.0.0.1:2345/statusError"
53− sc `shouldBe` internalServerError500
52+ sc <- rspCode <$> sendGET "http://127.0.0.1:2345/statusError"
53+ sc `shouldBe` (5,0,0)
5454 it "headersError" $ do
55− sc <- responseStatus <$> sendGET "http://127.0.0.1:2345/headersError"
56− sc `shouldBe` internalServerError500
55+ sc <- rspCode <$> sendGET "http://127.0.0.1:2345/headersError"
56+ sc `shouldBe` (5,0,0)
5757 it "headerError" $ do
58− sc <- responseStatus <$> sendGET "http://127.0.0.1:2345/headerError"
59− sc `shouldBe` internalServerError500
58+ sc <- rspCode <$> sendGET "http://127.0.0.1:2345/headerError"
59+ sc `shouldBe` (5,0,0)
6060 it "bodyError" $ do
61− sc <- responseStatus <$> sendGET "http://127.0.0.1:2345/bodyError"
62− sc `shouldBe` internalServerError500
61+ sc <- rspCode <$> sendGET "http://127.0.0.1:2345/bodyError"
62+ sc `shouldBe` (5,0,0)
6363 -}
6464 it "ioException" $ withTestServer $ \prt -> do
65− sc <- responseStatus <$> sendGET ("http://127.0.0.1:" ++ show prt ++ "/ioException")
66− sc `shouldBe` internalServerError500
65+ sc <- rspCode <$> sendGET ("http://127.0.0.1:" ++ show prt ++ "/ioException")
66+ sc `shouldBe` (5,0,0)
warp/test/FdCacheSpec.hs+1−1
@@ -17,7 +17,7 @@ spec = describe "withFdCache" $ do
1717 it "clean up Fd" $ do
1818 ref <- newIORef (Fd (-1))
1919 withFdCache 30000000 $ \getFd -> do
20− (Just fd,_) <- getFd "warp.cabal"
20+ (Just fd,_) <- getFd 0 "warp.cabal"
2121 writeIORef ref fd
2222 nfd <- readIORef ref
2323 fdRead nfd 1 `shouldThrow` anyIOException
warp/test/FileSpec.hs+1−1
@@ -21,7 +21,7 @@ testFileRange desc reqhs file ans = it desc $ do
2121 let WithBody s hs off len = ans
2222 hs' = ("Last-Modified",fileInfoDate finfo) : hs
2323 ans' = WithBody s hs' off len
24− conditionalRequest finfo [] (indexResponseHeader hs) (indexRequestHeader reqhs) `shouldBe` ans'
24+ conditionalRequest finfo [] (indexRequestHeader reqhs) `shouldBe` ans'
2525
2626spec :: Spec
2727spec = do
warp/test/HTTP.hs+28−26
@@ -1,41 +1,43 @@
1+{-# LANGUAGE StandaloneDeriving #-}
2+{-# OPTIONS_GHC -fno-warn-orphans #-}
13module HTTP (
24 sendGET
35 , sendGETwH
46 , sendHEAD
57 , sendHEADwH
6− , responseBody
7− , responseStatus
8− , responseHeaders
8+ , rspBody
9+ , rspCode
10+ , rspHeaders
911 , getHeaderValue
10− , HeaderName
12+ , HeaderName(..)
13+ , mkHeader
1114 ) where
1215
13−import Network.HTTP.Client
14−import Network.HTTP.Types
15−import Data.ByteString
16−import qualified Data.ByteString.Lazy as BL
16+import Network.HTTP
17+import Network.Stream
1718
18−sendGET :: String -> IO (Response BL.ByteString)
19+sendGET :: String -> IO (Response String)
1920sendGET url = sendGETwH url []
2021
21−sendGETwH :: String -> [Header] -> IO (Response BL.ByteString)
22−sendGETwH url hdr = do
23− manager <- newManager defaultManagerSettings
24− request <- parseRequest url
25− let request' = request { requestHeaders = hdr }
26− response <- httpLbs request' manager
27− return response
22+sendGETwH :: String -> [Header] -> IO (Response String)
23+sendGETwH url hdr = unResult $ simpleHTTP $ (getRequest url) { rqHeaders = hdr }
2824
29−sendHEAD :: String -> IO (Response BL.ByteString)
25+sendHEAD :: String -> IO (Response String)
3026sendHEAD url = sendHEADwH url []
3127
32−sendHEADwH :: String -> [Header] -> IO (Response BL.ByteString)
33−sendHEADwH url hdr = do
34− manager <- newManager defaultManagerSettings
35− request <- parseRequest url
36− let request' = request { requestHeaders = hdr, method = methodHead }
37− response <- httpLbs request' manager
38− return response
28+sendHEADwH :: String -> [Header] -> IO (Response String)
29+sendHEADwH url hdr = unResult $ simpleHTTP $ (headRequest url) { rqHeaders = hdr }
3930
40−getHeaderValue :: HeaderName -> [Header] -> Maybe ByteString
41−getHeaderValue = lookup
31+unResult :: IO (Result (Response String)) -> IO (Response String)
32+unResult action = do
33+ res <- action
34+ case res of
35+ Right rsp -> return rsp
36+ Left _ -> error "Connection error"
37+
38+getHeaderValue :: HasHeaders a => HeaderName -> a -> Maybe String
39+getHeaderValue key r = case retrieveHeaders key r of
40+ [] -> Nothing
41+ x:_ -> Just $ hdrValue x
42+
43+deriving instance Eq Header
warp/test/RequestSpec.hs+7−11
@@ -7,7 +7,6 @@ module RequestSpec (main, spec) where
77import Network.Wai.Handler.Warp.File (parseByteRanges)
88import Network.Wai.Handler.Warp.Request
99import Network.Wai.Handler.Warp.Types
10−import Network.Wai.Handler.Warp.Settings (settingsMaxTotalHeaderLength, defaultSettings)
1110import Test.Hspec
1211import Test.Hspec.QuickCheck
1312import qualified Data.ByteString as S
@@ -18,9 +17,6 @@ import Data.IORef
1817main :: IO ()
1918main = hspec spec
2019
21−defaultMaxTotalHeaderLength :: Int
22−defaultMaxTotalHeaderLength = settingsMaxTotalHeaderLength defaultSettings
23−
2420spec :: Spec
2521spec = do
2622 describe "headerLines" $ do
@@ -67,29 +63,29 @@ spec = do
6763 describe "headerLines" $ do
6864 it "can handle a nomarl case" $ do
6965 src <- mkSourceFunc ["Status: 200\r\nContent-Type: text/plain\r\n\r\n"] >>= mkSource
70− x <- headerLines defaultMaxTotalHeaderLength True src
66+ x <- headerLines src
7167 x `shouldBe` ["Status: 200", "Content-Type: text/plain"]
7268
7369 it "can handle a nasty case (1)" $ do
7470 src <- mkSourceFunc ["Status: 200", "\r\nContent-Type: text/plain", "\r\n\r\n"] >>= mkSource
75− x <- headerLines defaultMaxTotalHeaderLength True src
71+ x <- headerLines src
7672 x `shouldBe` ["Status: 200", "Content-Type: text/plain"]
7773
7874 it "can handle a nasty case (1)" $ do
7975 src <- mkSourceFunc ["Status: 200", "\r", "\nContent-Type: text/plain", "\r", "\n\r\n"] >>= mkSource
80− x <- headerLines defaultMaxTotalHeaderLength True src
76+ x <- headerLines src
8177 x `shouldBe` ["Status: 200", "Content-Type: text/plain"]
8278
8379 it "can handle a nasty case (1)" $ do
8480 src <- mkSourceFunc ["Status: 200", "\r", "\n", "Content-Type: text/plain", "\r", "\n", "\r", "\n"] >>= mkSource
85− x <- headerLines defaultMaxTotalHeaderLength True src
81+ x <- headerLines src
8682 x `shouldBe` ["Status: 200", "Content-Type: text/plain"]
8783
8884 it "can handle an illegal case (1)" $ do
8985 src <- mkSourceFunc ["\nStatus:", "\n 200", "\nContent-Type: text/plain", "\r\n\r\n"] >>= mkSource
90− x <- headerLines defaultMaxTotalHeaderLength True src
86+ x <- headerLines src
9187 x `shouldBe` []
92− y <- headerLines defaultMaxTotalHeaderLength True src
88+ y <- headerLines src
9389 y `shouldBe` ["Status: 200", "Content-Type: text/plain"]
9490
9591 where
@@ -115,7 +111,7 @@ headerLinesList' orig = do
115111 writeIORef ref z
116112 return y
117113 src' <- mkSource src
118− res <- headerLines defaultMaxTotalHeaderLength True src'
114+ res <- headerLines src'
119115 return (res, src')
120116
121117consumeLen :: Int -> Source -> IO S8.ByteString
warp/test/ResponseHeaderSpec.hs+5−25
@@ -5,44 +5,24 @@ module ResponseHeaderSpec (main, spec) where
55import Data.ByteString
66import qualified Network.HTTP.Types as H
77import Network.Wai.Handler.Warp.ResponseHeader
8−import Network.Wai.Handler.Warp.Response
9−import Network.Wai.Handler.Warp.Header
108import Test.Hspec
119
1210main :: IO ()
1311main = hspec spec
1412
1513spec :: Spec
16−spec = do
17− describe "composeHeader" $ do
18− it "composes a HTTP header" $
19− composeHeader H.http11 H.ok200 headers `shouldReturn` composedHeader
20− describe "addServer" $ do
21− it "adds Server if not exist" $ do
22− let hdrs = []
23− rspidxhdr = indexResponseHeader hdrs
24− addServer "MyServer" rspidxhdr hdrs `shouldBe` [("Server","MyServer")]
25− it "does not add Server if exists" $ do
26− let hdrs = [("Server","MyServer")]
27− rspidxhdr = indexResponseHeader hdrs
28− addServer "MyServer2" rspidxhdr hdrs `shouldBe` hdrs
29− it "does not add Server if empty" $ do
30− let hdrs = []
31− rspidxhdr = indexResponseHeader hdrs
32− addServer "" rspidxhdr hdrs `shouldBe` hdrs
33− it "deletes Server " $ do
34− let hdrs = [("Server","MyServer")]
35− rspidxhdr = indexResponseHeader hdrs
36− addServer "" rspidxhdr hdrs `shouldBe` []
14+spec = describe "composeHeader" $ do
15+ it "composes a HTTP header" $
16+ composeHeader H.http11 H.ok200 headers `shouldReturn` composedHeader
3717
3818headers :: H.ResponseHeaders
3919headers = [
4020 ("Date", "Mon, 13 Aug 2012 04:22:55 GMT")
41− , ("Content-Length", "151")
21+ , ("Content-Lenght", "151")
4222 , ("Server", "Mighttpd/2.5.8")
4323 , ("Last-Modified", "Fri, 22 Jun 2012 01:18:08 GMT")
4424 , ("Content-Type", "text/html")
4525 ]
4626
4727composedHeader :: ByteString
48−composedHeader = "HTTP/1.1 200 OK\r\nDate: Mon, 13 Aug 2012 04:22:55 GMT\r\nContent-Length: 151\r\nServer: Mighttpd/2.5.8\r\nLast-Modified: Fri, 22 Jun 2012 01:18:08 GMT\r\nContent-Type: text/html\r\n\r\n"
28+composedHeader = "HTTP/1.1 200 OK\r\nDate: Mon, 13 Aug 2012 04:22:55 GMT\r\nContent-Lenght: 151\r\nServer: Mighttpd/2.5.8\r\nLast-Modified: Fri, 22 Jun 2012 01:18:08 GMT\r\nContent-Type: text/html\r\n\r\n"
warp/test/ResponseSpec.hs+23−15
@@ -6,13 +6,17 @@ import Control.Concurrent (threadDelay)
66import qualified Data.ByteString as S
77import qualified Data.ByteString.Char8 as S8
88import Data.Maybe (mapMaybe)
9+import Network (connectTo, PortID (PortNumber))
910import Network.HTTP.Types
10−import Network.Wai hiding (responseHeaders)
11+import Network.Wai
1112import Network.Wai.Handler.Warp
1213import Network.Wai.Handler.Warp.Response
13−import RunSpec (withApp, msWrite, msRead, withMySocket)
14+import RunSpec (withApp)
15+import System.IO (hClose, hFlush)
1416import Test.Hspec
1517
18+import HTTP
19+
1620main :: IO ()
1721main = hspec spec
1822
@@ -20,13 +24,16 @@ testRange :: S.ByteString -- ^ range value
2024 -> String -- ^ expected output
2125 -> Maybe String -- ^ expected content-range value
2226 -> Spec
23−testRange range out crange = it title $ withApp defaultSettings app $ withMySocket $ \ms -> do
24− msWrite ms "GET / HTTP/1.0\r\n"
25− msWrite ms "Range: bytes="
26− msWrite ms range
27− msWrite ms "\r\n\r\n"
27+testRange range out crange = it title $ withApp defaultSettings app $ \port -> do
28+ handle <- connectTo "127.0.0.1" $ PortNumber $ fromIntegral port
29+ S.hPutStr handle "GET / HTTP/1.0\r\n"
30+ S.hPutStr handle "Range: bytes="
31+ S.hPutStr handle range
32+ S.hPutStr handle "\r\n\r\n"
33+ hFlush handle
2834 threadDelay 10000
29− bss <- fmap (lines . filter (/= '\r') . S8.unpack) $ msRead ms 1024
35+ bss <- fmap (lines . filter (/= '\r') . S8.unpack) $ S.hGetSome handle 1024
36+ hClose handle
3037 last bss `shouldBe` out
3138 let hs = mapMaybe toHeader bss
3239 lookup "Content-Range" hs `shouldBe` fmap ("bytes " ++) crange
@@ -44,10 +51,13 @@ testPartial :: Integer -- ^ file size
4451 -> Integer -- ^ byte count
4552 -> String -- ^ expected output
4653 -> Spec
47−testPartial size offset count out = it title $ withApp defaultSettings app $ withMySocket $ \ms -> do
48− msWrite ms "GET / HTTP/1.0\r\n\r\n"
54+testPartial size offset count out = it title $ withApp defaultSettings app $ \port -> do
55+ handle <- connectTo "127.0.0.1" $ PortNumber $ fromIntegral port
56+ S.hPutStr handle "GET / HTTP/1.0\r\n\r\n"
57+ hFlush handle
4958 threadDelay 10000
50− bss <- fmap (lines . filter (/= '\r') . S8.unpack) $ msRead ms 1024
59+ bss <- fmap (lines . filter (/= '\r') . S8.unpack) $ S.hGetSome handle 1024
60+ hClose handle
5161 out `shouldBe` last bss
5262 let hs = mapMaybe toHeader bss
5363 lookup "Content-Length" hs `shouldBe` Just (show $ length $ last bss)
@@ -63,15 +73,13 @@ testPartial size offset count out = it title $ withApp defaultSettings app $ wit
6373
6474spec :: Spec
6575spec = do
66−{- http-client does not support this.
6776 describe "preventing response splitting attack" $ do
6877 it "sanitizes header values" $ do
6978 let app _ respond = respond $ responseLBS status200 [("foo", "foo\r\nbar")] "Hello"
7079 withApp defaultSettings app $ \port -> do
7180 res <- sendGET $ "http://127.0.0.1:" ++ show port
72− getHeaderValue "foo" (responseHeaders res) `shouldBe`
81+ getHeaderValue (HdrCustom "foo") res `shouldBe`
7382 Just "foo bar" -- HTTP inserts two spaces for \r\n.
74−-}
7583
7684 describe "sanitizeHeaderValue" $ do
7785 it "doesn't alter valid multiline header values" $ do
@@ -83,7 +91,7 @@ spec = do
8391 it "discards empty lines" $ do
8492 sanitizeHeaderValue "foo\r\n\r\nbar" `shouldBe` "foo\r\n bar"
8593
86− context "when sanitizing single occurrences of \n" $ do
94+ context "when sanitizing single occurences of \n" $ do
8795 it "replaces \n with \r\n" $ do
8896 sanitizeHeaderValue "foo\n bar" `shouldBe` "foo\r\n bar"
8997
warp/test/RunSpec.hs+86−136
@@ -1,28 +1,29 @@
1+{-# LANGUAGE CPP #-}
12{-# LANGUAGE OverloadedStrings #-}
23{-# LANGUAGE ScopedTypeVariables #-}
34
4−module RunSpec (main, spec, withApp, MySocket, msWrite, msRead, withMySocket) where
5+module RunSpec (main, spec, withApp) where
56
67import Control.Concurrent (forkIO, killThread, threadDelay)
78import Control.Concurrent.MVar (newEmptyMVar, takeMVar, putMVar)
8−import Control.Concurrent.STM
99import qualified Control.Exception as E
1010import Control.Exception.Lifted (bracket, try, IOException, onException)
1111import Control.Monad (forM_, replicateM_, unless)
1212import Control.Monad.IO.Class (MonadIO, liftIO)
13−import Data.ByteString (ByteString)
13+import Data.ByteString (ByteString, hPutStr, hGetSome)
1414import qualified Data.ByteString as S
1515import Data.ByteString.Builder (byteString)
1616import qualified Data.ByteString.Char8 as S8
1717import qualified Data.ByteString.Lazy as L
1818import qualified Data.IORef as I
1919import Data.Streaming.Network (bindPortTCP, getSocketTCP, safeRecv)
20+import Network (connectTo, PortID (PortNumber))
2021import Network.HTTP.Types
21−import Network.Socket
22+import Network.Socket (sClose)
2223import Network.Socket.ByteString (sendAll)
23−import Network.Wai hiding (responseHeaders)
24−import Network.Wai.Internal (getRequestBodyChunk)
24+import Network.Wai
2525import Network.Wai.Handler.Warp
26+import System.IO (hFlush, hClose)
2627import System.IO.Unsafe (unsafePerformIO)
2728import System.Timeout (timeout)
2829import Test.Hspec
@@ -35,52 +36,6 @@ main = hspec spec
3536type Counter = I.IORef (Either String Int)
3637type CounterApplication = Counter -> Application
3738
38−data MySocket = MySocket
39− { msSocket :: !Socket
40− , msBuffer :: !(I.IORef ByteString)
41− }
42−
43−msWrite :: MySocket -> ByteString -> IO ()
44−msWrite ms bs = sendAll (msSocket ms) bs
45−
46−msRead :: MySocket -> Int -> IO ByteString
47−msRead (MySocket s ref) expected = do
48− bs <- I.readIORef ref
49− inner (bs:) (S.length bs)
50− where
51− inner front total =
52− case compare total expected of
53− EQ -> do
54− I.writeIORef ref mempty
55− pure $ S.concat $ front []
56− GT -> do
57− let bs = S.concat $ front []
58− (x, y) = S.splitAt expected bs
59− I.writeIORef ref y
60− pure x
61− LT -> do
62− bs <- safeRecv s 4096
63− if S.null bs
64− then do
65− I.writeIORef ref mempty
66− pure $ S.concat $ front []
67− else inner (front . (bs:)) (total + S.length bs)
68−
69−msClose :: MySocket -> IO ()
70−msClose = Network.Socket.close . msSocket
71−
72−connectTo :: Int -> IO MySocket
73−connectTo port = do
74− s <- fst <$> getSocketTCP "127.0.0.1" port
75− ref <- I.newIORef mempty
76− return MySocket {
77− msSocket = s
78− , msBuffer = ref
79− }
80−
81−withMySocket :: (MySocket -> IO a) -> Int -> IO a
82−withMySocket body port = bracket (connectTo port) msClose body
83−
8439incr :: MonadIO m => Counter -> m ()
8540incr icount = liftIO $ I.atomicModifyIORef icount $ \ecount ->
8641 ((case ecount of
@@ -92,7 +47,7 @@ err icount msg = liftIO $ I.writeIORef icount $ Left $ show msg
9247
9348readBody :: CounterApplication
9449readBody icount req f = do
95− body <- consumeBody $ getRequestBodyChunk req
50+ body <- consumeBody $ requestBody req
9651 case () of
9752 ()
9853 | pathInfo req == ["hello"] && L.fromChunks body /= "Hello"
@@ -113,8 +68,8 @@ ignoreBody icount req f = do
11368
11469doubleConnect :: CounterApplication
11570doubleConnect icount req f = do
116− _ <- consumeBody $ getRequestBodyChunk req
117− _ <- consumeBody $ getRequestBodyChunk req
71+ _ <- consumeBody $ requestBody req
72+ _ <- consumeBody $ requestBody req
11873 incr icount
11974 f $ responseLBS status200 [] "double connect"
12075
@@ -128,8 +83,8 @@ getPort = do
12883 esocket <- try $ bindPortTCP port "127.0.0.1"
12984 case esocket of
13085 Left (_ :: IOException) -> RunSpec.getPort
131− Right sock -> do
132− close sock
86+ Right socket -> do
87+ sClose socket
13388 return port
13489
13590withApp :: Settings -> Application -> (Int -> IO a) -> IO a
@@ -143,13 +98,7 @@ withApp settings app f = do
14398 bracket
14499 (forkIO $ runSettings settings' app `onException` putMVar baton ())
145100 killThread
146− (const $ do
147− takeMVar baton
148− -- use timeout to make sure we don't take too long
149− mres <- timeout (60 * 1000 * 1000) (f port)
150− case mres of
151− Nothing -> error "Timeout triggered, too slow!"
152− Just a -> pure a)
101+ (const $ takeMVar baton >> f port)
153102
154103runTest :: Int -- ^ expected number of requests
155104 -> CounterApplication
@@ -157,9 +106,10 @@ runTest :: Int -- ^ expected number of requests
157106 -> IO ()
158107runTest expected app chunks = do
159108 ref <- I.newIORef (Right 0)
160− withApp defaultSettings (app ref) $ withMySocket $ \ms -> do
161− forM_ chunks $ \chunk -> msWrite ms chunk
162− _ <- timeout 100000 $ replicateM_ expected $ msRead ms 4096
109+ withApp defaultSettings (app ref) $ \port -> do
110+ handle <- connectTo "127.0.0.1" $ PortNumber $ fromIntegral port
111+ forM_ chunks $ \chunk -> hPutStr handle chunk >> hFlush handle
112+ _ <- timeout 100000 $ replicateM_ expected $ hGetSome handle 4096
163113 res <- I.readIORef ref
164114 case res of
165115 Left s -> error s
@@ -174,9 +124,11 @@ runTerminateTest :: InvalidRequest
174124runTerminateTest expected input = do
175125 ref <- I.newIORef Nothing
176126 let onExc _ = I.writeIORef ref . Just
177− withApp (setOnException onExc defaultSettings) dummyApp $ withMySocket $ \ms -> do
178− msWrite ms input
179− msClose ms -- explicitly
127+ withApp (setOnException onExc defaultSettings) dummyApp $ \port -> do
128+ handle <- connectTo "127.0.0.1" $ PortNumber $ fromIntegral port
129+ hPutStr handle input
130+ hFlush handle
131+ hClose handle
180132 threadDelay 1000
181133 res <- I.readIORef ref
182134 show res `shouldBe` show (Just expected)
@@ -247,11 +199,14 @@ spec = do
247199 let app req f = do
248200 liftIO $ I.writeIORef iheaders $ requestHeaders req
249201 f $ responseLBS status200 [] ""
250− withApp defaultSettings app $ withMySocket $ \ms -> do
202+ withApp defaultSettings app $ \port -> do
203+ handle <- connectTo "127.0.0.1" $ PortNumber $ fromIntegral port
251204 let input = S.concat
252205 [ "GET / HTTP/1.1\r\nfoo: bar\r\n baz\r\n\tbin\r\n\r\n"
253206 ]
254− msWrite ms input
207+ hPutStr handle input
208+ hFlush handle
209+ hClose handle
255210 threadDelay 1000
256211 headers <- I.readIORef iheaders
257212 headers `shouldBe`
@@ -262,11 +217,14 @@ spec = do
262217 let app req f = do
263218 liftIO $ I.writeIORef iheaders $ requestHeaders req
264219 f $ responseLBS status200 [] ""
265− withApp defaultSettings app $ withMySocket $ \ms -> do
220+ withApp defaultSettings app $ \port -> do
221+ handle <- connectTo "127.0.0.1" $ PortNumber $ fromIntegral port
266222 let input = S.concat
267223 [ "GET / HTTP/1.1\r\nfoo:bar\r\n\r\n"
268224 ]
269− msWrite ms input
225+ hPutStr handle input
226+ hFlush handle
227+ hClose handle
270228 threadDelay 1000
271229 headers <- I.readIORef iheaders
272230 headers `shouldBe`
@@ -275,24 +233,23 @@ spec = do
275233
276234 describe "chunked bodies" $ do
277235 it "works" $ do
278− countVar <- newTVarIO (0 :: Int)
279236 ifront <- I.newIORef id
280237 let app req f = do
281− bss <- consumeBody $ getRequestBodyChunk req
238+ bss <- consumeBody $ requestBody req
282239 liftIO $ I.atomicModifyIORef ifront $ \front -> (front . (S.concat bss:), ())
283− atomically $ modifyTVar countVar (+ 1)
284240 f $ responseLBS status200 [] ""
285− withApp defaultSettings app $ withMySocket $ \ms -> do
241+ withApp defaultSettings app $ \port -> do
242+ handle <- connectTo "127.0.0.1" $ PortNumber $ fromIntegral port
286243 let input = S.concat
287244 [ "POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"
288245 , "c\r\nHello World\n\r\n3\r\nBye\r\n0\r\n\r\n"
289246 , "POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"
290247 , "b\r\nHello World\r\n0\r\n\r\n"
291248 ]
292− msWrite ms input
293− atomically $ do
294− count <- readTVar countVar
295− check $ count == 2
249+ hPutStr handle input
250+ hFlush handle
251+ hClose handle
252+ threadDelay 1000
296253 front <- I.readIORef ifront
297254 front [] `shouldBe`
298255 [ "Hello World\nBye"
@@ -300,44 +257,38 @@ spec = do
300257 ]
301258 it "lots of chunks" $ do
302259 ifront <- I.newIORef id
303− countVar <- newTVarIO (0 :: Int)
304260 let app req f = do
305− bss <- consumeBody $ getRequestBodyChunk req
261+ bss <- consumeBody $ requestBody req
306262 I.atomicModifyIORef ifront $ \front -> (front . (S.concat bss:), ())
307− atomically $ modifyTVar countVar (+ 1)
308263 f $ responseLBS status200 [] ""
309− withApp defaultSettings app $ withMySocket $ \ms -> do
264+ withApp defaultSettings app $ \port -> do
265+ handle <- connectTo "127.0.0.1" $ PortNumber $ fromIntegral port
310266 let input = concat $ replicate 2 $
311267 ["POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"] ++
312268 (replicate 50 "5\r\n12345\r\n") ++
313269 ["0\r\n\r\n"]
314− mapM_ (msWrite ms) input
315− atomically $ do
316− count <- readTVar countVar
317− check $ count == 2
270+ mapM_ (\bs -> hPutStr handle bs >> hFlush handle) input
271+ hClose handle
272+ threadDelay 100000 -- FIXME why does this delay need to be so high?
318273 front <- I.readIORef ifront
319274 front [] `shouldBe` replicate 2 (S.concat $ replicate 50 "12345")
320−-- For some reason, the following test on Windows causes the socket
321−-- to be killed prematurely. Worth investigating in the future if possible.
322275 it "in chunks" $ do
323276 ifront <- I.newIORef id
324− countVar <- newTVarIO (0 :: Int)
325277 let app req f = do
326− bss <- consumeBody $ getRequestBodyChunk req
278+ bss <- consumeBody $ requestBody req
327279 liftIO $ I.atomicModifyIORef ifront $ \front -> (front . (S.concat bss:), ())
328− atomically $ modifyTVar countVar (+ 1)
329280 f $ responseLBS status200 [] ""
330− withApp defaultSettings app $ withMySocket $ \ms -> do
281+ withApp defaultSettings app $ \port -> do
282+ handle <- connectTo "127.0.0.1" $ PortNumber $ fromIntegral port
331283 let input = S.concat
332284 [ "POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"
333285 , "c\r\nHello World\n\r\n3\r\nBye\r\n0\r\n"
334286 , "POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"
335287 , "b\r\nHello World\r\n0\r\n\r\n"
336288 ]
337− mapM_ (msWrite ms) $ map S.singleton $ S.unpack input
338− atomically $ do
339− count <- readTVar countVar
340− check $ count == 2
289+ mapM_ (\bs -> hPutStr handle bs >> hFlush handle) $ map S.singleton $ S.unpack input
290+ hClose handle
291+ threadDelay 1000
341292 front <- I.readIORef ifront
342293 front [] `shouldBe`
343294 [ "Hello World\nBye"
@@ -346,7 +297,7 @@ spec = do
346297 it "timeout in request body" $ do
347298 ifront <- I.newIORef id
348299 let app req f = do
349− bss <- (consumeBody $ getRequestBodyChunk req) `onException`
300+ bss <- (consumeBody $ requestBody req) `onException`
350301 liftIO (I.atomicModifyIORef ifront (\front -> (front . ("consume interrupted":), ())))
351302 liftIO $ threadDelay 4000000 `E.catch` \e -> do
352303 I.atomicModifyIORef ifront (\front ->
@@ -355,18 +306,20 @@ spec = do
355306 E.throwIO (e :: E.SomeException)
356307 liftIO $ I.atomicModifyIORef ifront $ \front -> (front . (S.concat bss:), ())
357308 f $ responseLBS status200 [] ""
358− withApp (setTimeout 1 defaultSettings) app $ withMySocket $ \ms -> do
309+ withApp (setTimeout 1 defaultSettings) app $ \port -> do
359310 let bs1 = S.replicate 2048 88
360311 bs2 = "This is short"
361312 bs = S.append bs1 bs2
362− msWrite ms "POST / HTTP/1.1\r\n"
363− msWrite ms "content-length: "
364− msWrite ms $ S8.pack $ show $ S.length bs
365− msWrite ms "\r\n\r\n"
313+ handle <- connectTo "127.0.0.1" $ PortNumber $ fromIntegral port
314+ hPutStr handle "POST / HTTP/1.1\r\n"
315+ hPutStr handle "content-length: "
316+ hPutStr handle $ S8.pack $ show $ S.length bs
317+ hPutStr handle "\r\n\r\n"
366318 threadDelay 100000
367− msWrite ms bs1
319+ hPutStr handle bs1
368320 threadDelay 100000
369− msWrite ms bs2
321+ hPutStr handle bs2
322+ hClose handle
370323 threadDelay 5000000
371324 front <- I.readIORef ifront
372325 S.concat (front []) `shouldBe` bs
@@ -382,42 +335,39 @@ spec = do
382335 loop
383336 loop
384337 doubleBS = S.concatMap $ \w -> S.pack [w, w]
385− withApp defaultSettings app $ withMySocket $ \ms -> do
386− msWrite ms "POST / HTTP/1.1\r\n\r\n12345"
387− timeout 100000 (msRead ms 10) >>= (`shouldBe` Just "1122334455")
388− msWrite ms "67890"
389− timeout 100000 (msRead ms 10) >>= (`shouldBe` Just "6677889900")
338+ withApp defaultSettings app $ \port -> do
339+ handle <- connectTo "127.0.0.1" $ PortNumber $ fromIntegral port
340+ hPutStr handle "POST / HTTP/1.1\r\n\r\n12345"
341+ hFlush handle
342+ timeout 100000 (S.hGet handle 10) >>= (`shouldBe` Just "1122334455")
343+ hPutStr handle "67890"
344+ hFlush handle
345+ timeout 100000 (S.hGet handle 10) >>= (`shouldBe` Just "6677889900")
346+
390347 it "only one date and server header" $ do
391348 let app _ f = f $ responseLBS status200
392349 [ ("server", "server")
393350 , ("date", "date")
394351 ] ""
395− getValues key = map snd
396− . filter (\(key', _) -> key == key')
397− . responseHeaders
398352 withApp defaultSettings app $ \port -> do
399353 res <- sendGET $ "http://127.0.0.1:" ++ show port
400− getValues hServer res `shouldBe` ["server"]
401− getValues hDate res `shouldBe` ["date"]
354+ getHeaderValue HdrServer res `shouldBe` Just "server"
355+ getHeaderValue HdrDate res `shouldBe` Just "date"
402356
403357 it "streaming echo #249" $ do
404− countVar <- newTVarIO (0 :: Int)
405358 let app req f = f $ responseStream status200 [] $ \write _ -> do
406− let loop = do
407− bs <- getRequestBodyChunk req
359+ let loop = do
360+ bs <- requestBody req
408361 unless (S.null bs) $ do
409362 write $ byteString bs
410− atomically $ modifyTVar countVar (+ 1)
411363 loop
412− loop
413− withApp defaultSettings app $ withMySocket $ \ms -> do
414− msWrite ms "POST / HTTP/1.1\r\ntransfer-encoding: chunked\r\n\r\n"
364+ loop
365+ withApp defaultSettings app $ \port -> do
366+ (socket, _addr) <- getSocketTCP "127.0.0.1" port
367+ sendAll socket "POST / HTTP/1.1\r\ntransfer-encoding: chunked\r\n\r\n"
415368 threadDelay 10000
416− msWrite ms "5\r\nhello\r\n0\r\n\r\n"
417− atomically $ do
418− count <- readTVar countVar
419− check $ count >= 1
420− bs <- safeRecv (msSocket ms) 4096 -- must not use msRead
369+ sendAll socket "5\r\nhello\r\n0\r\n\r\n"
370+ bs <- safeRecv socket 4096
421371 S.takeWhile (/= 13) bs `shouldBe` "HTTP/1.1 200 OK"
422372
423373 it "streaming response with length" $ do
@@ -425,7 +375,7 @@ spec = do
425375 replicateM_ 4 $ write $ byteString "Hello"
426376 withApp defaultSettings app $ \port -> do
427377 res <- sendGET $ "http://127.0.0.1:" ++ show port
428− responseBody res `shouldBe` "HelloHelloHelloHello"
378+ rspBody res `shouldBe` "HelloHelloHelloHello"
429379
430380 describe "head requests" $ do
431381 let fp = "test/head-response"
@@ -438,19 +388,19 @@ spec = do
438388 _ -> error "invalid path"
439389 it "builder" $ withApp defaultSettings app $ \port -> do
440390 res <- sendHEAD $ concat ["http://127.0.0.1:", show port, "/builder"]
441− responseBody res `shouldBe` ""
391+ rspBody res `shouldBe` ""
442392 it "streaming" $ withApp defaultSettings app $ \port -> do
443393 res <- sendHEAD $ concat ["http://127.0.0.1:", show port, "/streaming"]
444− responseBody res `shouldBe` ""
394+ rspBody res `shouldBe` ""
445395 it "file, no range" $ withApp defaultSettings app $ \port -> do
446396 bs <- S.readFile fp
447397 res <- sendHEAD $ concat ["http://127.0.0.1:", show port, "/file"]
448− getHeaderValue hContentLength (responseHeaders res) `shouldBe` Just (S8.pack $ show $ S.length bs)
398+ getHeaderValue HdrContentLength res `shouldBe` Just (show $ S.length bs)
449399 it "file, with range" $ withApp defaultSettings app $ \port -> do
450400 res <- sendHEADwH
451401 (concat ["http://127.0.0.1:", show port, "/file"])
452− [(hRange, "bytes=0-1")]
453− getHeaderValue hContentLength (responseHeaders res) `shouldBe` Just "2"
402+ [mkHeader HdrRange "bytes=0-1"]
403+ getHeaderValue HdrContentLength res `shouldBe` Just "2"
454404
455405consumeBody :: IO ByteString -> IO [ByteString]
456406consumeBody body =
warp/test/WithApplicationSpec.hs+16−16
@@ -2,10 +2,13 @@
22
33module WithApplicationSpec where
44
5+import Control.Concurrent
56import Control.Exception
67import Network.HTTP.Types
8+import Network.Socket
79import Network.Wai
8−import System.Environment
10+import System.IO
11+import System.IO.Silently
912import System.Process
1013import Test.Hspec
1114
@@ -13,9 +16,6 @@ import Network.Wai.Handler.Warp.WithApplication
1316
1417spec :: Spec
1518spec = do
16− runIO $ do
17− unsetEnv "http_proxy"
18− unsetEnv "https_proxy"
1919 describe "withApplication" $ do
2020 it "runs a wai Application while executing the given action" $ do
2121 let mkApp = return $ \ _request respond -> respond $ responseLBS ok200 [] "foo"
@@ -23,23 +23,23 @@ spec = do
2323 output <- readProcess "curl" ["-s", "localhost:" ++ show port] ""
2424 output `shouldBe` "foo"
2525
26− it "does not propagate exceptions from the server to the executing thread" $ do
27− let mkApp = return $ \ _request _respond -> throwIO $ ErrorCall "foo"
28− withApplication mkApp $ \ port -> do
29− output <- readProcess "curl" ["-s", "localhost:" ++ show port] ""
30− output `shouldContain` "Something went wron"
26+ it "does not propagate exceptions from the server to the executing thread" $
27+ hSilence [stderr] $ do
28+ let mkApp = return $ \ _request _respond -> throwIO $ ErrorCall "foo"
29+ withApplication mkApp $ \ port -> do
30+ output <- readProcess "curl" ["-s", "localhost:" ++ show port] ""
31+ output `shouldContain` "Something went wron"
3132
3233 describe "testWithApplication" $ do
33− it "propagates exceptions from the server to the executing thread" $ do
34− let mkApp = return $ \ _request _respond -> throwIO $ ErrorCall "foo"
35− (testWithApplication mkApp $ \ port -> do
36− readProcess "curl" ["-s", "localhost:" ++ show port] "")
37− `shouldThrow` (errorCall "foo")
34+ it "propagates exceptions from the server to the executing thread" $
35+ hSilence [stderr] $ do
36+ let mkApp = return $ \ _request _respond -> throwIO $ ErrorCall "foo"
37+ (testWithApplication mkApp $ \ port -> do
38+ readProcess "curl" ["-s", "localhost:" ++ show port] "")
39+ `shouldThrow` (errorCall "foo")
3840
39−{- The future netwrok library will not export MkSocket.
4041 describe "withFreePort" $ do
4142 it "closes the socket before exiting" $ do
4243 MkSocket _ _ _ _ statusMVar <- withFreePort $ \ (_, sock) -> do
4344 return sock
4445 readMVar statusMVar `shouldReturn` Closed
45−-}
warp/warp.cabal+51−113
@@ -1,5 +1,5 @@
11Name: warp
2−Version: 3.3.9
2+Version: 3.2.7
33Synopsis: A fast, light-weight web server for WAI applications.
44License: MIT
55License-file: LICENSE
@@ -8,7 +8,7 @@ Maintainer: michael@snoyman.com
88Homepage: http://github.com/yesodweb/wai
99Category: Web, Yesod
1010Build-Type: Simple
11−Cabal-Version: >= 1.10
11+Cabal-Version: >=1.8
1212Stability: Stable
1313description: HTTP\/1.0, HTTP\/1.1 and HTTP\/2 are supported.
1414 For HTTP\/2, Warp supports direct and ALPN (in TLS)
@@ -33,32 +33,29 @@ Flag warp-debug
3333 Default: False
3434
3535Library
36− Build-Depends: base >= 4.8 && < 5
36+ Build-Depends: base >= 3 && < 5
3737 , array
3838 , async
3939 , auto-update >= 0.1.3 && < 0.2
40− , bsb-http-chunked < 0.1
40+ , blaze-builder >= 0.4
4141 , bytestring >= 0.9.1.4
42+ , bytestring-builder
4243 , case-insensitive >= 0.2
4344 , containers
4445 , ghc-prim
45− , hashable
46− , http-date
47− , http-types >= 0.12
48− , http2 >= 2.0 && < 2.1
46+ , http-types >= 0.8.5
4947 , iproute >= 1.3.1
48+ , http2 >= 1.6 && < 1.7
5049 , simple-sendfile >= 0.2.7 && < 0.3
51− , stm >= 2.3
52− , streaming-commons >= 0.1.10
53− , text
54− , time-manager
5550 , unix-compat >= 0.2
56− , vault >= 0.3
5751 , wai >= 3.2 && < 3.3
52+ , text
53+ , streaming-commons >= 0.1.10
54+ , vault >= 0.3
55+ , stm >= 2.3
5856 , word8
59− , x509
60− if impl(ghc < 8)
61− Build-Depends: semigroups
57+ , hashable
58+ , http-date
6259 if flag(network-bytestring)
6360 Build-Depends: network >= 2.2.1.5 && < 2.2.3
6461 , network-bytestring >= 0.1.3 && < 0.1.4
@@ -75,14 +72,18 @@ Library
7572 Network.Wai.Handler.Warp.FileInfoCache
7673 Network.Wai.Handler.Warp.HashMap
7774 Network.Wai.Handler.Warp.HTTP2
75+ Network.Wai.Handler.Warp.HTTP2.EncodeFrame
7876 Network.Wai.Handler.Warp.HTTP2.File
79− Network.Wai.Handler.Warp.HTTP2.PushPromise
77+ Network.Wai.Handler.Warp.HTTP2.HPACK
78+ Network.Wai.Handler.Warp.HTTP2.Manager
79+ Network.Wai.Handler.Warp.HTTP2.Receiver
8080 Network.Wai.Handler.Warp.HTTP2.Request
81− Network.Wai.Handler.Warp.HTTP2.Response
81+ Network.Wai.Handler.Warp.HTTP2.Sender
8282 Network.Wai.Handler.Warp.HTTP2.Types
83+ Network.Wai.Handler.Warp.HTTP2.Worker
8384 Network.Wai.Handler.Warp.Header
8485 Network.Wai.Handler.Warp.IO
85− Network.Wai.Handler.Warp.Imports
86+ Network.Wai.Handler.Warp.IORef
8687 Network.Wai.Handler.Warp.PackInt
8788 Network.Wai.Handler.Warp.ReadInt
8889 Network.Wai.Handler.Warp.Recv
@@ -93,6 +94,8 @@ Library
9394 Network.Wai.Handler.Warp.Run
9495 Network.Wai.Handler.Warp.SendFile
9596 Network.Wai.Handler.Warp.Settings
97+ Network.Wai.Handler.Warp.Some
98+ Network.Wai.Handler.Warp.Timeout
9699 Network.Wai.Handler.Warp.Types
97100 Network.Wai.Handler.Warp.Windows
98101 Network.Wai.Handler.Warp.WithApplication
@@ -109,23 +112,14 @@ Library
109112 else
110113 Build-Depends: unix
111114 Other-modules: Network.Wai.Handler.Warp.MultiMap
112− if impl(ghc >= 8)
113− Default-Extensions: Strict StrictData
114− Default-Language: Haskell2010
115115
116116Test-Suite doctest
117− buildable: False
118117 Type: exitcode-stdio-1.0
119118 HS-Source-Dirs: test
120119 Ghc-Options: -threaded -Wall
121120 Main-Is: doctests.hs
122− Build-Depends: base >= 4.8 && < 5
121+ Build-Depends: base
123122 , doctest >= 0.10.1
124− if os(windows)
125− Buildable: False
126− if impl(ghc >= 8)
127− Default-Extensions: Strict StrictData
128− Default-Language: Haskell2010
129123
130124Test-Suite spec
131125 Main-Is: Spec.hs
@@ -142,128 +136,72 @@ Test-Suite spec
142136 SendFileSpec
143137 WithApplicationSpec
144138 HTTP
145− Network.Wai.Handler.Warp
146− Network.Wai.Handler.Warp.Buffer
147− Network.Wai.Handler.Warp.Conduit
148− Network.Wai.Handler.Warp.Counter
149− Network.Wai.Handler.Warp.Date
150− Network.Wai.Handler.Warp.FdCache
151− Network.Wai.Handler.Warp.File
152− Network.Wai.Handler.Warp.FileInfoCache
153− Network.Wai.Handler.Warp.HTTP2
154− Network.Wai.Handler.Warp.HTTP2.File
155− Network.Wai.Handler.Warp.HTTP2.PushPromise
156− Network.Wai.Handler.Warp.HTTP2.Request
157− Network.Wai.Handler.Warp.HTTP2.Response
158− Network.Wai.Handler.Warp.HTTP2.Types
159− Network.Wai.Handler.Warp.HashMap
160− Network.Wai.Handler.Warp.Header
161− Network.Wai.Handler.Warp.IO
162− Network.Wai.Handler.Warp.Imports
163− Network.Wai.Handler.Warp.MultiMap
164− Network.Wai.Handler.Warp.PackInt
165− Network.Wai.Handler.Warp.ReadInt
166− Network.Wai.Handler.Warp.Recv
167− Network.Wai.Handler.Warp.Request
168− Network.Wai.Handler.Warp.RequestHeader
169− Network.Wai.Handler.Warp.Response
170− Network.Wai.Handler.Warp.ResponseHeader
171− Network.Wai.Handler.Warp.Run
172− Network.Wai.Handler.Warp.SendFile
173− Network.Wai.Handler.Warp.Settings
174− Network.Wai.Handler.Warp.Types
175− Network.Wai.Handler.Warp.Windows
176− Network.Wai.Handler.Warp.WithApplication
177− Paths_warp
178−
179139 Hs-Source-Dirs: test, .
180140 Type: exitcode-stdio-1.0
181141
182− Ghc-Options: -Wall -threaded
183− Build-Depends: base >= 4.8 && < 5
184− , HUnit
185− , QuickCheck
142+ Ghc-Options: -Wall
143+ Build-Depends: base >= 4 && < 5
186144 , array
187− , async
188145 , auto-update
189− , bsb-http-chunked < 0.1
146+ , blaze-builder >= 0.4
190147 , bytestring >= 0.9.1.4
148+ , bytestring-builder
191149 , case-insensitive >= 0.2
192− , containers
193− , directory
194150 , ghc-prim
195− , hashable
196− , hspec >= 1.3
197− , http-client
198− , http-date
199− , http-types >= 0.12
200− , http2 >= 2.0 && < 2.1
151+ , HTTP
152+ , http-types >= 0.8.5
201153 , iproute >= 1.3.1
202154 , lifted-base >= 0.1
203− , network
204− , process
205155 , simple-sendfile >= 0.2.4 && < 0.3
206− , stm >= 2.3
207− , streaming-commons >= 0.1.10
208− , text
209− , time
210− , time-manager
156+ , transformers >= 0.2.2
211157 , unix-compat >= 0.2
212− , vault
213158 , wai >= 3.2 && < 3.3
159+ , network
160+ , HUnit
161+ , QuickCheck
162+ , hspec >= 1.3
163+ , time
164+ , text
165+ , streaming-commons >= 0.1.10
166+ , silently
167+ , async
168+ , vault
169+ , stm >= 2.3
170+ , directory
171+ , process
172+ , containers
173+ , http2 >= 1.6 && < 1.7
214174 , word8
215− , x509
216− -- Build-Tool-Depends: hspec-discover:hspec-discover
217− if impl(ghc < 8)
218− Build-Depends: semigroups
219− , transformers
175+ , hashable
176+ , http-date
220177
221178 if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd)
222179 Cpp-Options: -DSENDFILEFD
223180 Build-Depends: unix
224181 if os(windows)
225− Cpp-Options: -DWINDOWS
226− Build-Depends: time
227− if impl(ghc >= 8)
228− Default-Extensions: Strict StrictData
229− Default-Language: Haskell2010
182+ Cpp-Options: -DWINDOWS
230183
231184Benchmark parser
232185 Type: exitcode-stdio-1.0
233186 Main-Is: Parser.hs
234− other-modules: Network.Wai.Handler.Warp.Date
235− Network.Wai.Handler.Warp.FdCache
236− Network.Wai.Handler.Warp.FileInfoCache
237− Network.Wai.Handler.Warp.HashMap
238− Network.Wai.Handler.Warp.Imports
239− Network.Wai.Handler.Warp.MultiMap
240− Network.Wai.Handler.Warp.Types
241187 HS-Source-Dirs: bench .
242− Build-Depends: base >= 4.8 && < 5
188+ Build-Depends: base
243189 , auto-update
244190 , bytestring
245191 , containers
246− , gauge
192+ , criterion >= 1
247193 , hashable
248194 , http-date
249195 , http-types
250196 , network
251197 , network
252− , time-manager
253198 , unix-compat
254− , x509
255− if impl(ghc < 8)
256− Build-Depends: semigroups
257199
258200 if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd)
259201 Cpp-Options: -DSENDFILEFD
260202 Build-Depends: unix
261203 if os(windows)
262− Cpp-Options: -DWINDOWS
263− Build-Depends: time
264− if impl(ghc >= 8)
265− Default-Extensions: Strict StrictData
266− Default-Language: Haskell2010
204+ Cpp-Options: -DWINDOWS
267205
268206Source-Repository head
269207 Type: git