on e7232dc help sign in
139 files changed+3960−2486
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 .gitignore−2 .travis.yml+215 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+52 hcar-warp.tex+30 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+11−7 time-manager/time-manager.cabal−19 wai-app-static/ChangeLog.md−20 wai-app-static/Network/Wai/Application/Static.hs+10−12 wai-app-static/WaiAppStatic/CmdLine.hs+1−7 wai-app-static/WaiAppStatic/Listing.hs+1−1 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/WaiAppStaticTest.hs+9−9 wai-app-static/wai-app-static.cabal+6−5 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−59 wai-extra/Network/Wai/EventSource.hs+1−19 wai-extra/Network/Wai/EventSource/EventStream.hs+10−9 wai-extra/Network/Wai/Handler/CGI.hs+25−16 wai-extra/Network/Wai/Header.hs+1−1 wai-extra/Network/Wai/Middleware/Gzip.hs+12−6 wai-extra/Network/Wai/Middleware/Jsonp.hs+7−7 wai-extra/Network/Wai/Middleware/RequestLogger.hs+13−63 wai-extra/Network/Wai/Middleware/RequestLogger/JSON.hs+10−48 wai-extra/Network/Wai/Middleware/Rewrite.hs+1−17 wai-extra/Network/Wai/Middleware/Timeout.hs−33 wai-extra/Network/Wai/Parse.hs+9−23 wai-extra/Network/Wai/Test.hs+18−25 wai-extra/example/Main.hs+4−15 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−11 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+31 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−4 wai-websockets/server.lhs+1−7 wai-websockets/wai-websockets.cabal+3−2 wai/ChangeLog.md+1−11 wai/Network/Wai.hs+13−15 wai/Network/Wai/Internal.hs+1−9 wai/test/Network/WaiSpec.hs+1 wai/wai.cabal+4−5 wai/webkit-sample/webkit-sample.hs+2−2 warp-tls/ChangeLog.md+1−44 warp-tls/Network/Wai/Handler/WarpTLS.hs+15−58 warp-tls/warp-tls.cabal+6−9 warp/ChangeLog.md−125 warp/Network/Wai/Handler/Warp.hs+2−68 warp/Network/Wai/Handler/Warp/FdCache.hs+22−18 warp/Network/Wai/Handler/Warp/File.hs+4−7 warp/Network/Wai/Handler/Warp/FileInfoCache.hs+22−19 warp/Network/Wai/Handler/Warp/HTTP2.hs+54−70 warp/Network/Wai/Handler/Warp/HTTP2/EncodeFrame.hs+34 warp/Network/Wai/Handler/Warp/HTTP2/File.hs+150−23 warp/Network/Wai/Handler/Warp/HTTP2/HPACK.hs+112 warp/Network/Wai/Handler/Warp/HTTP2/Manager.hs+95 warp/Network/Wai/Handler/Warp/HTTP2/PushPromise.hs−36 warp/Network/Wai/Handler/Warp/HTTP2/Receiver.hs+397 warp/Network/Wai/Handler/Warp/HTTP2/Request.hs+20−18 warp/Network/Wai/Handler/Warp/HTTP2/Response.hs−127 warp/Network/Wai/Handler/Warp/HTTP2/Sender.hs+536 warp/Network/Wai/Handler/Warp/HTTP2/Types.hs+265−13 warp/Network/Wai/Handler/Warp/HTTP2/Worker.hs+315 warp/Network/Wai/Handler/Warp/HashMap.hs+15−24 warp/Network/Wai/Handler/Warp/Header.hs−2 warp/Network/Wai/Handler/Warp/Internal.hs+2−3 warp/Network/Wai/Handler/Warp/MultiMap.hs+44−56 warp/Network/Wai/Handler/Warp/Recv.hs+10−40 warp/Network/Wai/Handler/Warp/Request.hs+28−26 warp/Network/Wai/Handler/Warp/Response.hs+20−23 warp/Network/Wai/Handler/Warp/Run.hs+69−124 warp/Network/Wai/Handler/Warp/Settings.hs+10−54 time-manager/System/TimeManager.hs → warp/Network/Wai/Handler/Warp/Timeout.hs+3−2 warp/Network/Wai/Handler/Warp/Types.hs+30−25 warp/test/FdCacheSpec.hs+1−1 warp/test/FileSpec.hs+1−1 warp/test/RequestSpec.hs+7−11 warp/test/ResponseHeaderSpec.hs+30−2 warp/test/ResponseSpec.hs+21−11 warp/test/RunSpec.hs+82−125 warp/test/WithApplicationSpec.hs+16−10 warp/warp.cabal+49−62
.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'
.gitignore−2
@@ -8,5 +8,3 @@ tarballs/
88.cabal-sandbox/
99cabal.sandbox.config
1010.stack-work/
11−*~
12−stack*.yaml.lock
.travis.ymlnew file+215
@@ -0,0 +1,215 @@
1+# This is the complex Travis 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/travis_ci/
7+#
8+# Copy these contents into the root directory of your Github project in a file
9+# named .travis.yml
10+
11+# Use new container infrastructure to enable caching
12+sudo: false
13+
14+# Choose a lightweight base image; we provide our own build tools.
15+language: c
16+
17+# Caching so the next build will be fast too.
18+cache:
19+ directories:
20+ - $HOME/.ghc
21+ - $HOME/.cabal
22+ - $HOME/.stack
23+
24+# The different configurations we want to test. We have BUILD=cabal which uses
25+# cabal-install, and BUILD=stack which uses Stack. More documentation on each
26+# of those below.
27+#
28+# We set the compiler values here to tell Travis to use a different
29+# cache file per set of arguments.
30+#
31+# If you need to have different apt packages for each combination in the
32+# matrix, you can use a line such as:
33+# addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
34+matrix:
35+ include:
36+ - env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22 HAPPYVER=1.19.5 ALEXVER=3.1.7
37+ compiler: ": #GHC 7.10.3"
38+ addons: {apt: {packages: [libfcgi-dev,cabal-install-1.22,ghc-7.10.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
39+ - env: BUILD=cabal GHCVER=8.0.2 CABALVER=1.24 HAPPYVER=1.19.5 ALEXVER=3.1.7
40+ compiler: ": #GHC 8.0.2"
41+ addons: {apt: {packages: [libfcgi-dev,cabal-install-1.24,ghc-8.0.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
42+ - env: BUILD=cabal GHCVER=8.2.2 CABALVER=1.24 HAPPYVER=1.19.5 ALEXVER=3.1.7
43+ compiler: ": #GHC 8.2.2"
44+ addons: {apt: {packages: [libfcgi-dev,cabal-install-1.24,ghc-8.2.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
45+
46+ # Build with the newest GHC and cabal-install. This is an accepted failure,
47+ # see below.
48+ - env: BUILD=cabal GHCVER=head CABALVER=head HAPPYVER=1.19.5 ALEXVER=3.1.7
49+ compiler: ": #GHC HEAD"
50+ addons: {apt: {packages: [libfcgi-dev,cabal-install-head,ghc-head,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
51+
52+ # The Stack builds. We can pass in arbitrary Stack arguments via the ARGS
53+ # variable, such as using --stack-yaml to point to a different file.
54+ #- env: BUILD=stack ARGS=""
55+ # compiler: ": #stack default"
56+ # addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
57+
58+ #- env: BUILD=stack ARGS="--resolver lts-2"
59+ # compiler: ": #stack 7.8.4"
60+ # addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
61+
62+ #- env: BUILD=stack ARGS="--resolver lts-3"
63+ # compiler: ": #stack 7.10.2"
64+ # addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
65+
66+ - env: BUILD=stack ARGS="--resolver lts-6"
67+ compiler: ": #stack 7.10.3"
68+ addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
69+
70+ #- env: BUILD=stack ARGS="--resolver lts-7"
71+ # compiler: ": #stack 8.0.1"
72+ # addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
73+
74+ - env: BUILD=stack ARGS="--resolver lts-9"
75+ compiler: ": #stack 8.0.2"
76+ addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
77+
78+ - env: BUILD=stack ARGS="--resolver lts-10"
79+ compiler: ": #stack 8.2.2"
80+ addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
81+
82+ # Nightly builds are allowed to fail
83+ - env: BUILD=stack ARGS="--resolver nightly"
84+ compiler: ": #stack nightly"
85+ addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
86+
87+ # Build on OS X in addition to Linux
88+ #- env: BUILD=stack ARGS=""
89+ # compiler: ": #stack default osx"
90+ # os: osx
91+
92+ # Travis includes an OS X which is incompatible with GHC 7.8.4
93+ #- env: BUILD=stack ARGS="--resolver lts-2"
94+ # compiler: ": #stack 7.8.4 osx"
95+ # os: osx
96+
97+ #- env: BUILD=stack ARGS="--resolver lts-3"
98+ # compiler: ": #stack 7.10.2 osx"
99+ # os: osx
100+
101+ - env: BUILD=stack ARGS="--resolver lts-6"
102+ compiler: ": #stack 7.10.3 osx"
103+ os: osx
104+
105+ #- env: BUILD=stack ARGS="--resolver lts-7"
106+ # compiler: ": #stack 8.0.1 osx"
107+ # os: osx
108+
109+ - env: BUILD=stack ARGS="--resolver lts-9"
110+ compiler: ": #stack 8.0.2 osx"
111+ os: osx
112+
113+ - env: BUILD=stack ARGS="--resolver lts-10"
114+ compiler: ": #stack 8.2.2 osx"
115+ os: osx
116+
117+ - env: BUILD=stack ARGS="--resolver nightly"
118+ compiler: ": #stack nightly osx"
119+ os: osx
120+
121+ allow_failures:
122+ - env: BUILD=cabal GHCVER=head CABALVER=head HAPPYVER=1.19.5 ALEXVER=3.1.7
123+ - env: BUILD=stack ARGS="--resolver nightly"
124+
125+before_install:
126+# Using compiler above sets CC to an invalid value, so unset it
127+- unset CC
128+
129+# We want to always allow newer versions of packages when building on GHC HEAD
130+- CABALARGS=""
131+- if [ "x$GHCVER" = "xhead" ]; then CABALARGS=--allow-newer; fi
132+
133+# Download and unpack the stack executable
134+- 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
135+- mkdir -p ~/.local/bin
136+- |
137+ if [ `uname` = "Darwin" ]
138+ then
139+ travis_retry curl --insecure -L https://www.stackage.org/stack/osx-x86_64 | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin
140+
141+ # brew no longer has fcgi
142+ # brew install fcgi
143+ grep -v wai-handler-fastcgi < stack.yaml > tmp
144+ mv tmp stack.yaml
145+ else
146+ travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
147+ fi
148+
149+ # Use the more reliable S3 mirror of Hackage
150+ mkdir -p $HOME/.cabal
151+ echo 'remote-repo: hackage.haskell.org:http://hackage.fpcomplete.com/' > $HOME/.cabal/config
152+ echo 'remote-repo-cache: $HOME/.cabal/packages' >> $HOME/.cabal/config
153+
154+ if [ "$CABALVER" != "1.16" ]
155+ then
156+ echo 'jobs: $ncpus' >> $HOME/.cabal/config
157+ fi
158+
159+install:
160+- echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
161+- if [ -f configure.ac ]; then autoreconf -i; fi
162+- |
163+ set -ex
164+ case "$BUILD" in
165+ stack)
166+ # Avoid out of memory condition
167+ stack --no-terminal --install-ghc $ARGS build Cabal
168+
169+ stack --no-terminal --install-ghc $ARGS test --only-dependencies
170+ ;;
171+ cabal)
172+ cabal --version
173+ travis_retry cabal update
174+
175+ # Get the list of packages from the stack.yaml file
176+ PACKAGES=$(stack --install-ghc query locals | grep '^ *path' | sed 's@^ *path:@@')
177+
178+ # Due to dependency on wai-logger (which depends on some packages here),
179+ # we can't build just dependencies
180+ #
181+ # cabal install --only-dependencies --enable-tests --force-reinstalls --ghc-options=-O0 --max-backjumps=-1 $CABALARGS $PACKAGES
182+ cabal install hspec-discover
183+ ;;
184+ esac
185+ set +ex
186+
187+script:
188+- |
189+ set -ex
190+ case "$BUILD" in
191+ stack)
192+ stack --no-terminal $ARGS test --haddock --no-haddock-deps
193+ ;;
194+ cabal)
195+ cabal install --enable-tests --force-reinstalls --ghc-options=-O0 --max-backjumps=-1 $CABALARGS $PACKAGES
196+
197+ ORIGDIR=$(pwd)
198+ for dir in $PACKAGES
199+ do
200+ cd $dir
201+ cabal check || [ "$CABALVER" == "1.16" ]
202+ # Takes too long, see https://github.com/yesodweb/wai/issues/665
203+ #cabal sdist
204+ #PKGVER=$(cabal info . | awk '{print $2;exit}')
205+ #SRC_TGZ=$PKGVER.tar.gz
206+ #cd dist
207+ #tar zxfv "$SRC_TGZ"
208+ #cd "$PKGVER"
209+ #cabal configure --enable-tests
210+ #cabal build
211+ cd $ORIGDIR
212+ done
213+ ;;
214+ esac
215+ set +ex
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+52
@@ -0,0 +1,52 @@
1+% WAI-KW.tex
2+\begin{hcarentry}{WAI}
3+\label{wai}
4+\report{Kazu Yamamoto}%11/17
5+\participants{Michael Snoyman, Greg Weber}
6+\status{stable}
7+\makeheader
8+
9+WAI (Web Application Interface) is an application interface between web
10+applications and handlers in Haskell. The \texttt{Application} data type is
11+defined as follows:
12+
13+\begin{verbatim}
14+type Application
15+ = Request
16+ -> (Response -> IO ResponseReceived)
17+ -> IO ResponseReceived
18+\end{verbatim}
19+
20+That is, a WAI application takes two arguments: a \texttt{Request} and a
21+function to send a \texttt{Response}. So, the typical behavior of WAI
22+application is processing a request, generating a response and passing the
23+response to the function.
24+
25+Historically speaking, this interface made possible to develop handlers other
26+than HTTP. The WAI applications can run through FastCGI
27+(wai-handler-fastcgi), run as stand-alone (wai-handler-webkit), etc. But the
28+most popular handler is based on HTTP, of course. The major HTTP handler for
29+WAI is Warp which now provides both HTTP/1.1 and HTTP/2. TLS (warp-tls) is
30+also available. New transports such as WebSocket (wai-websocket) and Event
31+Source (wai-extra) can be implemented, too.
32+
33+It is possible to develop WAI applications directly. For instance, Hoogle and
34+Mighttpd2 take this way. However, you may want to use web application
35+frameworks such as Apiary, MFlow, rest, Servant, Scotty, Spock, Yesod, etc.
36+
37+WAI also provides \texttt{Middleware}:
38+
39+\begin{verbatim}
40+type Middleware = Application -> Application
41+\end{verbatim}
42+
43+WAI middleware can inspect and transform a request, for example by
44+automatically gzipping a response or logging a request (wai-extra).
45+
46+Since the last HCAR, no major changes were made.
47+
48+\FurtherReading
49+\begin{compactitem}
50+\item\url{https://groups.google.com/d/forum/haskell-wai}
51+\end{compactitem}
52+\end{hcarentry}
hcar-warp.texnew file+30
@@ -0,0 +1,30 @@
1+% Warp-KW.tex
2+\begin{hcarentry}[updated]{Warp}
3+\label{warp}
4+\report{Kazu Yamamoto}%11/17
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, some bugs of Warp have been fixed.
13+Also, Warp TLS incorporated the tls-session-manager package
14+which enables TLS session cache in the server side.
15+
16+\FurtherReading
17+\begin{compactitem}
18+\item``Warp: A Haskell Web Server''
19+ \begin{compactitem}
20+ \item the May/June 2011 issue of IEEE Internet Computing
21+ \item Issue page: \url{http://www.computer.org/portal/web/csdl/abs/mags/ic/2011/03/mic201103toc.htm}
22+ \item PDF: \url{http://steve.vinoski.net/pdf/IC-Warp\_a\_Haskell\_Web\_Server.pdf}
23+ \end{compactitem}
24+\item ``Warp''
25+ \begin{compactitem}
26+ \item The Performance of Open Source Applications
27+ \item HTML: \url{http://www.aosabook.org/en/posa/warp.html}
28+ \end{compactitem}
29+\end{compactitem}
30+\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+11−7
@@ -1,4 +1,4 @@
1−resolver: lts-14.22
1+resolver: lts-10.0
22packages:
33- ./auto-update
44- ./mime-types
@@ -7,19 +7,23 @@ packages:
77- ./warp
88- ./warp-tls
99- ./wai-app-static
10+- ./wai-handler-fastcgi
1011- ./wai-websockets
1112- ./wai-conduit
12−- ./time-manager
1313flags:
1414 wai-extra:
1515 build-example: true
16+extra-deps:
17+- tls-session-manager-0.0.0.2
18+- psqueues-0.2.4.0
1619nix:
1720 enable: false
1821 packages:
1922 - fcgi
2023 - 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
24+image:
25+ containers:
26+ - base: "fpco/pid1"
27+ name: "yesodweb/warp"
28+ executables:
29+ - warp
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−20
@@ -1,23 +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−
211## 3.1.6.1
222
233* Add `<>` import
wai-app-static/Network/Wai/Application/Static.hs+10−12
@@ -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
@@ -164,13 +164,11 @@ serveFile StaticSettings {..} req file
164164 -- Didn't match, but we have a hash value. Send the file contents
165165 -- with an ETag header.
166166 --
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.
167+ -- Note: It would be arguably better to next check
168+ -- if-modified-since and return a 304 if that indicates a match as
169+ -- well. However, the circumstances under which such a situation
170+ -- could arise would be very anomolous, and should likely warrant a
171+ -- new file being sent anyway.
174172 (Just hash, _) -> respond [("ETag", hash)]
175173
176174 -- No hash value available, fall back to last modified support.
@@ -245,7 +243,7 @@ staticAppPieces ss rawPieces req sendResponse = liftIO $ do
245243 response :: StaticResponse -> IO W.ResponseReceived
246244 response (FileResponse file ch) = do
247245 mimetype <- ssGetMimeType ss file
248− -- let filesize = fileGetSize file
246+ let filesize = fileGetSize file
249247 let headers = ("Content-Type", mimetype)
250248 -- Let Warp provide the content-length, since it takes
251249 -- range requests into account
@@ -264,18 +262,18 @@ staticAppPieces ss rawPieces req sendResponse = liftIO $ do
264262 ] lbs
265263
266264 response (Redirect pieces' mHash) = do
267− let loc = ssMkRedirect ss pieces' $ L.toStrict $ toLazyByteString (H.encodePathSegments $ map fromPiece pieces')
265+ let loc = (ssMkRedirect ss) pieces' $ toByteString (H.encodePathSegments $ map fromPiece pieces')
268266 let qString = case mHash of
269267 Just hash -> replace "etag" (Just hash) (W.queryString req)
270268 Nothing -> remove "etag" (W.queryString req)
271269
272− sendResponse $ W.responseLBS H.status302
270+ sendResponse $ W.responseLBS H.status301
273271 [ ("Content-Type", "text/plain")
274272 , ("Location", S8.append loc $ H.renderQuery True qString)
275273 ] "Redirect"
276274
277275 response (RawRedirect path) =
278− sendResponse $ W.responseLBS H.status302
276+ sendResponse $ W.responseLBS H.status301
279277 [ ("Content-Type", "text/plain")
280278 , ("Location", path)
281279 ] "Redirect"
wai-app-static/WaiAppStatic/CmdLine.hs+1−7
@@ -39,7 +39,6 @@ data Args = Args
3939 }
4040
4141#if MIN_VERSION_optparse_applicative(0, 10, 0)
42−option' :: Mod OptionFields Int -> Parser Int
4342option' = option auto
4443#else
4544option' = option
@@ -94,7 +93,7 @@ args = Args
9493-- Since 2.0.1
9594runCommandLine :: (Args -> Middleware) -> IO ()
9695runCommandLine middleware = do
97− args@Args {..} <- execParser $ info (helperOption <*> args) fullDesc
96+ args@Args {..} <- execParser $ info (helper <*> args) fullDesc
9897 let mime' = map (pack *** S8.pack) mime
9998 let mimeMap = Map.fromList mime' `Map.union` defaultMimeMap
10099 docroot' <- canonicalizePath docroot
@@ -111,8 +110,3 @@ runCommandLine middleware = do
111110 { ssIndices = if noindex then [] else mapMaybe (toPiece . pack) index
112111 , ssGetMimeType = return . mimeByExt mimeMap defaultMimeType . fromPiece . fileName
113112 }
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+1−1
@@ -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/WaiAppStaticTest.hs+9−9
@@ -57,22 +57,22 @@ spec = do
5757 assertStatus 200 =<<
5858 request (setRawPathInfo defRequest path)
5959
60− it "404 for non-existent files" $ webApp $
60+ it "404 for non-existant files" $ webApp $
6161 assertStatus 404 =<<
6262 request (setRawPathInfo defRequest "doesNotExist")
6363
64− it "302 redirect when multiple slashes" $ webApp $ do
64+ it "301 redirect when multiple slashes" $ webApp $ do
6565 req <- request (setRawPathInfo defRequest "a//b/c")
66− assertStatus 302 req
66+ assertStatus 301 req
6767 assertHeader "Location" "../../a/b/c" req
6868
6969 let absoluteApp = flip runSession $ staticApp $ (defaultWebAppSettings "test") {
7070 ssMkRedirect = \_ u -> S8.append "http://www.example.com" u
7171 }
72− it "302 redirect when multiple slashes" $ absoluteApp $
72+ it "301 redirect when multiple slashes" $ absoluteApp $
7373 flip mapM_ ["/a//b/c", "a//b/c"] $ \path -> do
7474 req <- request (setRawPathInfo defRequest path)
75− assertStatus 302 req
75+ assertStatus 301 req
7676 assertHeader "Location" "http://www.example.com/a/b/c" req
7777
7878 describe "webApp when requesting a static asset" $ do
@@ -131,10 +131,10 @@ spec = do
131131 assertStatus 304 req
132132 assertNoHeader "Cache-Control" req
133133
134− context "302 redirect to add a trailing slash on directories if missing" $ do
134+ context "301 redirect to add a trailing slash on directories if missing" $ do
135135 it "works at the root" $ fileServerApp $ do
136136 req <- request (setRawPathInfo defRequest "/a")
137− assertStatus 302 req
137+ assertStatus 301 req
138138 assertHeader "Location" "/a/" req
139139
140140 it "works when an index.html is delivered" $ do
@@ -144,7 +144,7 @@ spec = do
144144 inTempDirectory $ fileServerAppWithSettings settings $ do
145145 liftIO $ touch "foo/index.html"
146146 req <- request (setRawPathInfo defRequest "/foo")
147− assertStatus 302 req
147+ assertStatus 301 req
148148 assertHeader "Location" "/foo/" req
149149
150150 let urlMapApp = flip runSession $ \req send ->
@@ -158,7 +158,7 @@ spec = do
158158 "urlMapApp: only works at subPath"
159159 it "works with subpath at the root of the file server" $ urlMapApp $ do
160160 req <- request (setRawPathInfo defRequest "/subPath")
161− assertStatus 302 req
161+ assertStatus 301 req
162162 assertHeader "Location" "/subPath/" req
163163
164164 context "with defaultWebAppSettings" $ do
wai-app-static/wai-app-static.cabal+6−5
@@ -1,5 +1,5 @@
11name: wai-app-static
2−version: 3.1.7.1
2+version: 3.1.6.1
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
@@ -102,7 +103,7 @@ test-suite runtests
102103 , temporary
103104 , mockery
104105 -- , containers
105− ghc-options: -Wall
106+ ghc-options: -Wall
106107
107108source-repository head
108109 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−59
@@ -1,62 +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−
601## 3.0.22.0
612
623* Support for streaming-commons 0.2
wai-extra/Network/Wai/EventSource.hs+1−19
@@ -5,14 +5,11 @@
55 headers:
66
77 > [ ("X-Accel-Buffering", "no"), ("Cache-Control", "no-cache")]
8−
9− There is a small example using these functions in the @example@ directory.
108-}
119module Network.Wai.EventSource (
1210 ServerEvent(..),
1311 eventSourceAppChan,
14− eventSourceAppIO,
15− eventStreamAppRaw
12+ eventSourceAppIO
1613 ) where
1714
1815import Data.Function (fix)
@@ -42,18 +39,3 @@ eventSourceAppIO src _ sendResponse =
4239 case eventToBuilder se of
4340 Nothing -> return ()
4441 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+25−16
@@ -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)
@@ -30,7 +30,12 @@ import qualified Data.CaseInsensitive as CI
3030import Data.Monoid (mconcat, mempty, mappend)
3131#endif
3232
33−import qualified Data.Streaming.ByteString.Builder as Builder
33+#if MIN_VERSION_streaming_commons(0, 2, 0)
34+import qualified Data.Streaming.ByteString.Builder as Blaze
35+#else
36+import qualified Data.Streaming.Blaze as Blaze
37+#endif
38+
3439import Data.Function (fix)
3540import Control.Monad (unless, void)
3641
@@ -131,7 +136,11 @@ runGeneric vars inputH outputH xsendfile app = do
131136 return ResponseReceived
132137 _ -> do
133138 let (s, hs, wb) = responseToStream res
134− (blazeRecv, blazeFinish) <- Builder.newBuilderRecv Builder.defaultStrategy
139+#if MIN_VERSION_streaming_commons(0, 2, 0)
140+ (blazeRecv, blazeFinish) <- Blaze.newBuilderRecv Blaze.defaultStrategy
141+#else
142+ (blazeRecv, blazeFinish) <- Blaze.newBlazeRecv Blaze.defaultStrategy
143+#endif
135144 wb $ \b -> do
136145 let sendBuilder builder = do
137146 popper <- blazeRecv builder
@@ -140,30 +149,30 @@ runGeneric vars inputH outputH xsendfile app = do
140149 unless (B.null bs) $ do
141150 outputH bs
142151 loop
143− sendBuilder $ headers s hs `mappend` char7 '\n'
152+ sendBuilder $ headers s hs `mappend` fromChar '\n'
144153 b sendBuilder (sendBuilder flush)
145154 blazeFinish >>= maybe (return ()) outputH
146155 return ResponseReceived
147156 where
148157 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
158+ status (Status i m) = (fromByteString "Status", mconcat
159+ [ fromString $ show i
160+ , fromChar ' '
161+ , fromByteString m
153162 ])
154− header' (x, y) = (byteString $ CI.original x, byteString y)
163+ header' (x, y) = (fromByteString $ CI.original x, fromByteString y)
155164 header (x, y) = mconcat
156165 [ x
157− , byteString ": "
166+ , fromByteString ": "
158167 , y
159− , char7 '\n'
168+ , fromChar '\n'
160169 ]
161170 sfBuilder s hs sf fp = mconcat
162171 [ headers s hs
163− , header $ (byteString sf, string8 fp)
164− , char7 '\n'
165− , byteString sf
166− , byteString " not supported"
172+ , header $ (fromByteString sf, fromString fp)
173+ , fromChar '\n'
174+ , fromByteString sf
175+ , fromByteString " not supported"
167176 ]
168177 fixHeaders h =
169178 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/Gzip.hs+12−6
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
12{-# LANGUAGE Rank2Types, ScopedTypeVariables #-}
23---------------------------------------------------------
34-- |
@@ -30,14 +31,18 @@ import Data.Default.Class
3031import Network.HTTP.Types ( Status, Header, hContentEncoding, hUserAgent
3132 , hContentType, hContentLength)
3233import System.Directory (doesFileExist, createDirectoryIfMissing)
33−import Data.ByteString.Builder (byteString)
34−import qualified Data.ByteString.Builder.Extra as Blaze (flush)
34+import Blaze.ByteString.Builder (fromByteString)
3535import Control.Exception (try, SomeException)
3636import qualified Data.Set as Set
3737import Network.Wai.Header
3838import Network.Wai.Internal
39+#if MIN_VERSION_streaming_commons(0, 2, 0)
3940import qualified Data.Streaming.ByteString.Builder as B
41+#else
42+import qualified Data.Streaming.Blaze as B
43+#endif
4044import qualified Data.Streaming.Zlib as Z
45+import qualified Blaze.ByteString.Builder as Blaze
4146import Control.Monad (unless)
4247import Data.Function (fix)
4348import Control.Exception (throwIO)
@@ -89,9 +94,6 @@ defaultCheckMime bs =
8994-- if gzip is supported.
9095--
9196-- 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'.
9597gzip :: GzipSettings -> Middleware
9698gzip set app env sendResponse = app env $ \res ->
9799 case res of
@@ -185,7 +187,11 @@ compressE set res sendResponse =
185187 Just m | gzipCheckMime set m ->
186188 let hs' = fixHeaders hs
187189 in wb $ \body -> sendResponse $ responseStream s hs' $ \sendChunk flush -> do
190+#if MIN_VERSION_streaming_commons(0, 2, 0)
188191 (blazeRecv, _) <- B.newBuilderRecv B.defaultStrategy
192+#else
193+ (blazeRecv, _) <- B.newBlazeRecv B.defaultStrategy
194+#endif
189195 deflate <- Z.initDeflate 1 (Z.WindowBits 31)
190196 let sendBuilder builder = do
191197 popper <- blazeRecv builder
@@ -204,7 +210,7 @@ compressE set res sendResponse =
204210 case result of
205211 Z.PRDone -> return ()
206212 Z.PRNext bs' -> do
207− sendChunk $ byteString bs'
213+ sendChunk $ fromByteString bs'
208214 loop
209215 Z.PRError e -> throwIO e
210216
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/RequestLogger.hs+13−63
@@ -14,14 +14,13 @@ 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
2625import Data.ByteString.Char8 (pack)
2726import Control.Monad (when)
@@ -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
@@ -137,9 +108,6 @@ mkRequestLogger RequestLoggerSettings{..} = do
137108 CustomOutputFormatWithDetails formatter -> do
138109 getdate <- getDateGetter flusher
139110 return $ customMiddlewareWithDetails callbackAndFlush getdate formatter
140− CustomOutputFormatWithDetailsAndHeaders formatter -> do
141− getdate <- getDateGetter flusher
142− return $ customMiddlewareWithDetailsAndHeaders callbackAndFlush getdate formatter
143111
144112apacheMiddleware :: ApacheLoggerActions -> Middleware
145113apacheMiddleware ala app req sendResponse = app req $ \res -> do
@@ -150,8 +118,8 @@ apacheMiddleware ala app req sendResponse = app req $ \res -> do
150118customMiddleware :: Callback -> IO ZonedDate -> OutputFormatter -> Middleware
151119customMiddleware cb getdate formatter app req sendResponse = app req $ \res -> do
152120 date <- liftIO getdate
153− let msize = contentLength (responseHeaders res)
154− liftIO $ cb $ formatter date req (responseStatus res) msize
121+ -- We use Nothing for the response size since we generally don't know it
122+ liftIO $ cb $ formatter date req (responseStatus res) Nothing
155123 sendResponse res
156124
157125customMiddlewareWithDetails :: Callback -> IO ZonedDate -> OutputFormatterWithDetails -> Middleware
@@ -161,33 +129,15 @@ customMiddlewareWithDetails cb getdate formatter app req sendResponse = do
161129 app req' $ \res -> do
162130 t1 <- getCurrentTime
163131 date <- liftIO getdate
164− let msize = contentLength (responseHeaders res)
165− builderIO <- newIORef $ B.byteString ""
132+ -- We use Nothing for the response size since we generally don't know it
133+ builderIO <- newIORef $ B.fromByteString ""
166134 res' <- recordChunks builderIO res
167135 rspRcv <- sendResponse res'
168136 _ <- liftIO . cb .
169− formatter date req' (responseStatus res') msize (t1 `diffUTCTime` t0) reqBody =<<
137+ formatter date req' (responseStatus res') Nothing (t1 `diffUTCTime` t0) reqBody =<<
170138 readIORef builderIO
171139 return rspRcv
172140
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
191141-- | Production request logger middleware.
192142--
193143-- 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+1−17
@@ -27,7 +27,6 @@ module Network.Wai.Middleware.Rewrite
2727 -- ** Recommended functions
2828 , rewriteWithQueries
2929 , rewritePureWithQueries
30− , rewriteRoot
3130
3231 -- ** Deprecated
3332 , rewrite
@@ -169,7 +168,7 @@ import Control.Applicative
169168--
170169-- as the following example demonstrates.
171170--
172−-- Old versions of the library could only handle path pieces, not queries.
171+-- Old versions of the libary could only handle path pieces, not queries.
173172-- This could have been supplied to 'rewritePure'.
174173--
175174-- @
@@ -264,21 +263,6 @@ rewritePureWithQueries :: (PathsAndQueries -> H.RequestHeaders -> PathsAndQuerie
264263 -> Middleware
265264rewritePureWithQueries convert app req = app $ rewriteRequestPure convert req
266265
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−
282266--------------------------------------------------
283267-- * Modifying 'Request's directly
284268--------------------------------------------------
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+9−23
@@ -48,7 +48,7 @@ module Network.Wai.Parse
4848#endif
4949 ) where
5050
51−import qualified Control.Exception as E
51+import qualified Data.ByteString.Search as Search
5252import qualified Data.ByteString as S
5353import qualified Data.ByteString.Lazy as L
5454import qualified Data.ByteString.Char8 as S8
@@ -59,16 +59,13 @@ import Data.List (sortBy)
5959import Data.Function (on, fix)
6060import System.Directory (removeFile, getTemporaryDirectory)
6161import System.IO (hClose, openBinaryTempFile)
62−import System.IO.Error (isDoesNotExistError)
6362import Network.Wai
6463import qualified Network.HTTP.Types as H
6564import Control.Applicative ((<$>))
66−import Control.Exception (catchJust)
67−import Control.Monad (when, unless, guard)
65+import Control.Monad (when, unless)
6866import Control.Monad.Trans.Resource (allocate, release, register, InternalState, runInternalState)
6967import Data.IORef
7068import Network.HTTP.Types (hContentType)
71−import Network.HTTP2( HTTP2Error (..), ErrorCodeId (..) )
7269import Data.CaseInsensitive (mk)
7370
7471import Prelude hiding (lines)
@@ -131,7 +128,7 @@ tempFileBackEndOpts :: IO FilePath -- ^ get temporary directory
131128 -> IO FilePath
132129tempFileBackEndOpts getTmpDir pattrn internalState _ _ popper = do
133130 (key, (fp, h)) <- flip runInternalState internalState $ allocate it (hClose . snd)
134− _ <- runInternalState (register $ removeFileQuiet fp) internalState
131+ _ <- runInternalState (register $ removeFile fp) internalState
135132 fix $ \loop -> do
136133 bs <- popper
137134 unless (S.null bs) $ do
@@ -143,9 +140,6 @@ tempFileBackEndOpts getTmpDir pattrn internalState _ _ popper = do
143140 it = do
144141 tempDir <- getTmpDir
145142 openBinaryTempFile tempDir pattrn
146− removeFileQuiet fp = catchJust (guard . isDoesNotExistError)
147− (removeFile fp)
148− (const $ return ())
149143
150144-- | A data structure that describes the behavior of
151145-- the parseRequestBodyEx function.
@@ -337,9 +331,6 @@ parseContentType a = do
337331 semicolon = 59
338332 equals = 61
339333 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
343334 goAttrs front bs
344335 | S.null bs = front []
345336 | otherwise =
@@ -348,7 +339,7 @@ parseContentType a = do
348339 goAttr bs =
349340 let (k, v') = S.break (== equals) bs
350341 v = S.drop 1 v'
351− in (strip k, dq $ strip v)
342+ in (strip k, strip v)
352343 strip = S.dropWhile (== space) . fst . S.breakEnd (/= space)
353344
354345-- | Parse the body of an HTTP request.
@@ -428,8 +419,6 @@ conduitRequestBodyEx o backend (Multipart bound) rbody add =
428419
429420
430421-- | Take one header or subheader line.
431−-- Since: 3.0.26
432−-- Throw 431 if headers too large.
433422takeLine :: Maybe Int -> Source -> IO (Maybe S.ByteString)
434423takeLine maxlen src =
435424 go ""
@@ -438,8 +427,7 @@ takeLine maxlen src =
438427 bs <- readSource src
439428 case maxlen of
440429 Just maxlen' -> when (S.length front > maxlen') $
441− E.throwIO $ ConnectionError (UnknownErrorCode 431)
442− "Request Header Fields Too Large"
430+ error "Header line length exceeds allowed maximum."
443431 Nothing -> return ()
444432 if S.null bs
445433 then close front
@@ -455,8 +443,7 @@ takeLine maxlen src =
455443 let res = front `S.append` x
456444 case maxlen of
457445 Just maxlen' -> when (S.length res > maxlen') $
458− E.throwIO $ ConnectionError (UnknownErrorCode 431)
459− "Request Header Fields Too Large"
446+ error "Header line length exceeds allowed maximum."
460447 Nothing -> return ()
461448 return $ Just $ killCR $ res
462449
@@ -582,7 +569,7 @@ data Bound = FoundBound S.ByteString S.ByteString
582569 deriving (Eq, Show)
583570
584571findBound :: S.ByteString -> S.ByteString -> Bound
585−findBound b bs = handleBreak $ S.breakSubstring b bs
572+findBound b bs = handleBreak $ Search.breakOn b bs
586573 where
587574 handleBreak (h, t)
588575 | S.null t = go [lowBound..S.length bs - 1]
@@ -645,9 +632,8 @@ wrapTillBound bound src max' = do
645632 cur <- atomicModifyIORef' sref $ \ cur ->
646633 let new = cur + fromIntegral (S.length bs) in (new, new)
647634 case max' of
648− Just max'' | cur > max'' ->
649− E.throwIO $ ConnectionError (UnknownErrorCode 413) "Payload Too Large"
650− _ -> return ()
635+ Just max'' | cur > max'' -> error "Maximum size exceeded"
636+ _ -> return ()
651637 if S.null bs
652638 then do
653639 writeIORef ref $ WTBDone False
wai-extra/Network/Wai/Test.hs+18−25
@@ -52,7 +52,8 @@ import 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
@@ -99,10 +100,6 @@ runSession session app = ST.evalStateT (runReaderT session app) initState
99100data SRequest = SRequest
100101 { simpleRequest :: Request
101102 , 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'.
106103 }
107104data SResponse = SResponse
108105 { simpleStatus :: H.Status
@@ -110,22 +107,14 @@ data SResponse = SResponse
110107 , simpleBody :: L.ByteString
111108 }
112109 deriving (Show, Eq)
113−
114110request :: 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
111+request = srequest . flip SRequest L.empty
123112
124113-- | Set whole path (request path + query string).
125114setPath :: Request -> S8.ByteString -> Request
126115setPath req path = req {
127116 pathInfo = segments
128− , rawPathInfo = (L8.toStrict . toLazyByteString) (H.encodePathSegments segments)
117+ , rawPathInfo = B.toByteString (H.encodePathSegments segments)
129118 , queryString = query
130119 , rawQueryString = (H.renderQuery True query)
131120 }
@@ -154,7 +143,7 @@ addCookiesToRequest req = do
154143 let cookiePairs = [ (Cookie.setCookieName c, Cookie.setCookieValue c)
155144 | c <- map snd $ Map.toList cookiesForRequest
156145 ]
157− let cookieValue = L8.toStrict . toLazyByteString $ Cookie.renderCookies cookiePairs
146+ let cookieValue = toByteString $ Cookie.renderCookies cookiePairs
158147 addCookieHeader rest
159148 | null cookiePairs = rest
160149 | otherwise = ("Cookie", cookieValue) : rest
@@ -178,18 +167,22 @@ extractSetCookieFromSResponse response = do
178167 (Map.fromList [(Cookie.setCookieName c, c) | c <- newClientCookies ]))
179168 return response
180169
181−-- | Similar to 'request', but allows setting the request body as a plain
182−-- 'L.ByteString'.
183170srequest :: SRequest -> Session SResponse
184171srequest (SRequest req bod) = do
172+ app <- ask
185173 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− }
174+ let req' = req
175+ { requestBody = atomicModifyIORef refChunks $ \bss ->
176+ case bss of
177+ [] -> ([], S.empty)
178+ x:y -> (y, x)
179+ }
180+ req'' <- addCookiesToRequest req'
181+ response <- liftIO $ do
182+ ref <- newIORef $ error "runResponse gave no result"
183+ ResponseReceived <- app req'' (runResponse ref)
184+ readIORef ref
185+ extractSetCookieFromSResponse response
193186
194187runResponse :: IORef SResponse -> Response -> IO ResponseReceived
195188runResponse ref res = do
wai-extra/example/Main.hs+4−15
@@ -1,7 +1,7 @@
11{-# LANGUAGE OverloadedStrings #-}
22module Main where
33
4−import Data.ByteString.Builder (string8)
4+import Blaze.ByteString.Builder.Char.Utf8 (fromString)
55import Control.Concurrent (forkIO, threadDelay)
66import Control.Concurrent.Chan
77import Control.Monad
@@ -27,26 +27,15 @@ eventChan :: Chan ServerEvent -> IO ()
2727eventChan chan = forever $ do
2828 threadDelay 1000000
2929 time <- getPOSIXTime
30− writeChan chan (ServerEvent Nothing Nothing [string8 . show $ time])
30+ writeChan chan (ServerEvent Nothing Nothing [fromString . show $ time])
3131
3232eventIO :: IO ServerEvent
3333eventIO = do
3434 threadDelay 1000000
3535 time <- getPOSIXTime
36− return $ ServerEvent (Just $ string8 "io")
36+ return $ ServerEvent (Just $ fromString "io")
3737 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
38+ [fromString . show $ time]
5039
5140main :: IO ()
5241main = do
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−11
@@ -1,5 +1,5 @@
11Name: wai-extra
2−Version: 3.0.29.1
2+Version: 3.0.22.0
33Synopsis: Provides some basic WAI handlers and middleware.
44description:
55 Provides basic WAI handler and middleware functionality:
@@ -87,35 +87,37 @@ flag build-example
8787 default: False
8888
8989Library
90− Build-Depends: base >= 4.8 && < 5
91− , bytestring >= 0.10.4
90+ Build-Depends: base >= 4.6 && < 5
91+ , bytestring >= 0.9.1.4
9292 , wai >= 3.0.3.0 && < 3.3
9393 , old-locale >= 1.0.0.2 && < 1.1
9494 , time >= 1.1.4
9595 , network >= 2.6.1.0
9696 , directory >= 1.0.1
9797 , transformers >= 0.2.2
98+ , blaze-builder >= 0.2.1.4 && < 0.5
9899 , http-types >= 0.7
99100 , text >= 0.7
100101 , case-insensitive >= 0.2
101102 , data-default-class
102− , fast-logger >= 2.4.5
103− , wai-logger >= 2.3.2
103+ , fast-logger >= 2.4.5 && < 2.5
104+ , wai-logger >= 2.2.6 && < 2.4
104105 , ansi-terminal
105106 , resourcet >= 0.4.6 && < 1.3
106107 , void >= 0.5
108+ , stringsearch >= 0.3 && < 0.4
107109 , containers
108110 , base64-bytestring
109111 , word8
112+ , lifted-base >= 0.1.2
110113 , deepseq
111− , streaming-commons >= 0.2
114+ , streaming-commons
112115 , unix-compat
113116 , cookie
114117 , vault
115118 , zlib
116119 , aeson
117120 , iproute
118− , http2
119121
120122 if os(windows)
121123 cpp-options: -DWINDOWS
@@ -147,7 +149,6 @@ Library
147149 Network.Wai.Middleware.ForceDomain
148150 Network.Wai.Middleware.ForceSSL
149151 Network.Wai.Middleware.Routed
150− Network.Wai.Middleware.Timeout
151152 Network.Wai.Parse
152153 Network.Wai.Request
153154 Network.Wai.UrlMap
@@ -170,7 +171,7 @@ executable example
170171 , wai
171172 , time
172173 , http-types
173− , bytestring
174+ , blaze-builder
174175 else
175176 buildable: False
176177 default-language: Haskell2010
@@ -186,7 +187,6 @@ test-suite spec
186187 Network.Wai.Middleware.ForceSSLSpec
187188 Network.Wai.Middleware.RoutedSpec
188189 Network.Wai.Middleware.StripHeadersSpec
189− Network.Wai.Middleware.TimeoutSpec
190190 WaiExtraSpec
191191 build-depends: base >= 4 && < 5
192192 , wai-extra
@@ -200,10 +200,10 @@ test-suite spec
200200 , resourcet
201201 , bytestring
202202 , HUnit
203+ , blaze-builder
203204 , cookie
204205 , time
205206 , case-insensitive
206− , http2
207207 ghc-options: -Wall
208208 default-language: Haskell2010
209209
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+31
@@ -0,0 +1,31 @@
1+## 3.0.2.3
2+
3+* `process` package bump
4+
5+## 3.0.2.2
6+
7+* Improvements to ping's javascript script. [#494](https://github.com/yesodweb/wai/pull/494)
8+
9+## 3.0.2.1
10+
11+* Relax upper bound on process
12+
13+## 3.0.2
14+
15+* 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)
16+
17+## 3.0.1
18+
19+* make host configurable too (fixes #538) [#539](https://github.com/yesodweb/wai/pull/539)
20+
21+## 3.0.0.5
22+
23+* Support wai/warp 3.2
24+
25+## 3.0.0.3
26+
27+Allow blaze-builder 0.4
28+
29+## 3.0.0.2
30+
31+* 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?\" + (new Date()).getTime(),true);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.3
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.7
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.1.0
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−4
@@ -1,7 +1,3 @@
1−## 3.0.1.2
2−
3−* Drop unused dependency on blaze-builder
4−
51## 3.0.1.1
62
73* Doc improvement
wai-websockets/server.lhs+1−7
@@ -8,8 +8,6 @@ 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)
@@ -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.1.1
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+1−11
@@ -1,16 +1,6 @@
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−
111## 3.2.1.2
122
13−* Remove dependency on blaze-builder [#683](https://github.com/yesodweb/wai/pull/683)
3+* Drop dependency on blaze-builder
144
155## 3.2.1.1
166
wai/Network/Wai.hs+13−15
@@ -4,11 +4,10 @@ This module defines a generic web application interface. It is a common
44protocol between web servers and web applications.
55
66The 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.
7+address performance, this library is built on top of the conduit and
8+blaze-builder packages. The advantages of conduits over lazy IO have been
9+debated elsewhere and so will not be addressed here. However, helper functions
10+like 'responseLBS' allow you to continue using lazy IO if you so desire.
1211
1312Generality is achieved by removing many variables commonly found in similar
1413projects that are not universal to all servers. The goal is that the 'Request'
@@ -30,9 +29,9 @@ include:
3029
3130[wai-extra] <http://hackage.haskell.org/package/wai-extra>
3231
32+[wai-test] <http://hackage.haskell.org/package/wai-test>
33+
3334-}
34−-- Ignore deprecations, because this module needs to use the deprecated requestBody to construct a response.
35−{-# OPTIONS_GHC -fno-warn-deprecations #-}
3635module Network.Wai
3736 (
3837 -- * Types
@@ -53,7 +52,6 @@ module Network.Wai
5352 , remoteHost
5453 , pathInfo
5554 , queryString
56− , getRequestBodyChunk
5755 , requestBody
5856 , vault
5957 , requestBodyLength
@@ -85,8 +83,7 @@ module Network.Wai
8583 , modifyResponse
8684 ) where
8785
88−import Data.ByteString.Builder (Builder, lazyByteString)
89−import Data.ByteString.Builder (byteString)
86+import Data.ByteString.Builder (Builder, byteString, lazyByteString)
9087import Control.Monad (unless)
9188import qualified Data.ByteString as B
9289import qualified Data.ByteString.Lazy as L
@@ -94,6 +91,7 @@ import qualified Data.ByteString.Lazy.Internal as LI
9491import Data.ByteString.Lazy.Internal (defaultChunkSize)
9592import Data.ByteString.Lazy.Char8 ()
9693import Data.Function (fix)
94+import Data.Monoid (mempty)
9795import qualified Network.HTTP.Types as H
9896import Network.Socket (SockAddr (SockAddrInet))
9997import Network.Wai.Internal
@@ -121,13 +119,13 @@ responseFile = ResponseFile
121119--
122120-- A2. No. If the ByteStrings are small, then they will be copied into a larger
123121-- 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.
122+-- they are already large, then blaze-builder uses an InsertByteString
123+-- instruction to avoid copying.
126124--
127125-- Q3. Doesn't this prevent us from creating comet-style servers, since data
128126-- will be cached?
129127--
130−-- A3. You can force a Builder to output a ByteString before it is an
128+-- A3. You can force blaze-builder to output a ByteString before it is an
131129-- optimal size by sending a flush command.
132130responseBuilder :: H.Status -> H.ResponseHeaders -> Builder -> Response
133131responseBuilder = ResponseBuilder
@@ -326,7 +324,7 @@ strictRequestBody req =
326324 loop id
327325 where
328326 loop front = do
329− bs <- getRequestBodyChunk req
327+ bs <- requestBody req
330328 if B.null bs
331329 then return $ front LI.Empty
332330 else loop (front . LI.Chunk bs)
@@ -340,7 +338,7 @@ lazyRequestBody req =
340338 loop
341339 where
342340 loop = unsafeInterleaveIO $ do
343− bs <- getRequestBodyChunk req
341+ bs <- requestBody req
344342 if B.null bs
345343 then return LI.Empty
346344 else do
wai/Network/Wai/Internal.hs+1−9
@@ -17,7 +17,6 @@ import Data.List (intercalate)
1717
1818-- | Information on the request sent by the client. This abstracts away the
1919-- 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." #-}
2120data Request = Request {
2221 -- | Request method such as GET.
2322 requestMethod :: H.Method
@@ -63,7 +62,7 @@ data Request = Request {
6362 -- | Parsed query string information.
6463 , queryString :: H.Query
6564 -- | 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'.
65+ -- body is fully consumed.
6766 , requestBody :: IO B.ByteString
6867 -- | A location for arbitrary data to be shared by applications and middleware.
6968 , vault :: Vault
@@ -91,13 +90,6 @@ data Request = Request {
9190 }
9291 deriving (Typeable)
9392
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−
10193instance Show Request where
10294 show Request{..} = "Request {" ++ intercalate ", " [a ++ " = " ++ b | (a,b) <- fields] ++ "}"
10395 where
wai/test/Network/WaiSpec.hs+1
@@ -4,6 +4,7 @@ import Test.Hspec
44import Test.Hspec.QuickCheck (prop)
55import Network.Wai
66import Data.IORef
7+import Data.Monoid
78import qualified Data.ByteString as S
89import qualified Data.ByteString.Lazy as L
910import Data.ByteString.Builder (Builder, toLazyByteString, word8)
wai/wai.cabal+4−5
@@ -1,9 +1,8 @@
11Name: wai
2−Version: 3.2.2.1
2+Version: 3.2.1.2
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
@@ -21,10 +20,11 @@ Source-repository head
2120
2221Library
2322 Build-Depends: base >= 4.8 && < 5
24− , bytestring >= 0.10.4
23+ , bytestring >= 0.10.2
2524 , network >= 2.2.1.5
2625 , http-types >= 0.7
2726 , text >= 0.7
27+ , transformers >= 0.0
2828 , vault >= 0.3 && < 0.4
2929 Exposed-modules: Network.Wai
3030 Network.Wai.Internal
@@ -41,7 +41,6 @@ test-suite test
4141 , hspec
4242 , bytestring
4343 other-modules: Network.WaiSpec
44− build-tool-depends: hspec-discover:hspec-discover
4544
4645source-repository head
4746 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+1−44
@@ -1,50 +1,7 @@
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
1+## 3.2.4.1
372
383* Ignore socket errors while sending `close_notify` [#640](https://github.com/yesodweb/wai/issues/640)
394
40−## 3.2.4
41−
42−* Using tls-session-manager.
43−
44−## 3.2.3
45−
46−* Stop using obsoleted APIs of network.
47−
485## 3.2.2
496
507* New settting parameter: tlsServerDHEParams [#556](https://github.com/yesodweb/wai/pull/556)
warp-tls/Network/Wai/Handler/WarpTLS.hs+15−58
@@ -53,9 +53,6 @@ import qualified Data.IORef as I
5353import Data.Streaming.Network (bindPortTCP, safeRecv)
5454import Data.Typeable (Typeable)
5555import Network.Socket (Socket, close, withSocketsDo, SockAddr, accept)
56−#if MIN_VERSION_network(3,1,1)
57−import Network.Socket (gracefulClose)
58−#endif
5956import Network.Socket.ByteString (sendAll)
6057import qualified Network.TLS as TLS
6158import qualified Crypto.PubKey.DH as DH
@@ -93,37 +90,19 @@ data TLSSettings = TLSSettings {
9390 --
9491 -- Since 1.4.0
9592 , 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
10493 -- ^ The TLS versions this server accepts.
10594 --
10695 -- >>> tlsAllowedVersions defaultTlsSettings
10796 -- [TLS12,TLS11,TLS10]
10897 --
10998 -- Since 1.4.2
110−#endif
11199 , tlsCiphers :: [TLS.Cipher]
112−#if MIN_VERSION_tls(1,5,0)
113− -- ^ The TLS ciphers this server accepts.
114− --
115− -- >>> 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]
117− --
118− -- Since 1.4.2
119−#else
120100 -- ^ The TLS ciphers this server accepts.
121101 --
122102 -- >>> tlsCiphers defaultTlsSettings
123103 -- [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]
124104 --
125105 -- Since 1.4.2
126−#endif
127106 , tlsWantClientCert :: Bool
128107 -- ^ Whether or not to demand a certificate from the client. If this
129108 -- is set to True, you must handle received certificates in a server hook
@@ -170,11 +149,7 @@ defaultTlsSettings = TLSSettings {
170149 , keyMemory = Nothing
171150 , onInsecure = DenyInsecure "This server only accepts secure HTTPS connections."
172151 , tlsLogging = def
173−#if MIN_VERSION_tls(1,5,0)
174− , tlsAllowedVersions = [TLS.TLS13,TLS.TLS12,TLS.TLS11,TLS.TLS10]
175−#else
176152 , tlsAllowedVersions = [TLS.TLS12,TLS.TLS11,TLS.TLS10]
177−#endif
178153 , tlsCiphers = ciphers
179154 , tlsWantClientCert = False
180155 , tlsServerHooks = def
@@ -281,7 +256,7 @@ runTLSSocket' :: TLSSettings -> Settings -> TLS.Credential -> TLS.SessionManager
281256runTLSSocket' tlsset@TLSSettings{..} set credential mgr sock app =
282257 runSettingsConnectionMakerSecure set get app
283258 where
284− get = getter tlsset set sock params
259+ get = getter tlsset sock params
285260 params = def { -- TLS.ServerParams
286261 TLS.serverWantClientCert = tlsWantClientCert
287262 , TLS.serverCACertificates = []
@@ -289,9 +264,6 @@ runTLSSocket' tlsset@TLSSettings{..} set credential mgr sock app =
289264 , TLS.serverHooks = hooks
290265 , TLS.serverShared = shared
291266 , TLS.serverSupported = supported
292−#if MIN_VERSION_tls(1,5,0)
293− , TLS.serverEarlyDataSize = 2018
294−#endif
295267 }
296268 -- Adding alpn to user's tlsServerHooks.
297269 hooks = tlsServerHooks {
@@ -310,9 +282,6 @@ runTLSSocket' tlsset@TLSSettings{..} set credential mgr sock app =
310282 , TLS.supportedClientInitiatedRenegotiation = False
311283 , TLS.supportedSession = True
312284 , TLS.supportedFallbackScsv = True
313−#if MIN_VERSION_tls(1,5,0)
314− , TLS.supportedGroups = [TLS.X25519,TLS.P256,TLS.P384]
315−#endif
316285 }
317286
318287alpn :: [S.ByteString] -> IO S.ByteString
@@ -322,55 +291,49 @@ alpn xs
322291
323292----------------------------------------------------------------
324293
325−getter :: TLS.TLSParams params => TLSSettings -> Settings -> Socket -> params -> IO (IO (Connection, Transport), SockAddr)
326−getter tlsset@TLSSettings{..} set sock params = do
294+getter :: TLS.TLSParams params => TLSSettings -> Socket -> params -> IO (IO (Connection, Transport), SockAddr)
295+getter tlsset@TLSSettings{..} sock params = do
327296#if WINDOWS
328297 (s, sa) <- windowsThreadBlockHack $ accept sock
329298#else
330299 (s, sa) <- accept sock
331300#endif
332301 setSocketCloseOnExec s
333− return (mkConn tlsset set s params, sa)
302+ return (mkConn tlsset s params, sa)
334303
335−mkConn :: TLS.TLSParams params => TLSSettings -> Settings -> Socket -> params -> IO (Connection, Transport)
336−mkConn tlsset set s params = switch `onException` close s
304+mkConn :: TLS.TLSParams params => TLSSettings -> Socket -> params -> IO (Connection, Transport)
305+mkConn tlsset s params = switch `onException` close s
337306 where
338307 switch = do
339308 firstBS <- safeRecv s 4096
340309 if not (S.null firstBS) && S.head firstBS == 0x16 then
341− httpOverTls tlsset set s firstBS params
310+ httpOverTls tlsset s firstBS params
342311 else
343− plainHTTP tlsset set s firstBS
312+ plainHTTP tlsset s firstBS
344313
345314----------------------------------------------------------------
346315
347−httpOverTls :: TLS.TLSParams params => TLSSettings -> Settings -> Socket -> S.ByteString -> params -> IO (Connection, Transport)
348−httpOverTls TLSSettings{..} _set s bs0 params = do
316+httpOverTls :: TLS.TLSParams params => TLSSettings -> Socket -> S.ByteString -> params -> IO (Connection, Transport)
317+httpOverTls TLSSettings{..} s bs0 params = do
349318 recvN <- makePlainReceiveN s bs0
350319 ctx <- TLS.contextNew (backend recvN) params
351320 TLS.contextHookSetLogging ctx tlsLogging
352321 TLS.handshake ctx
353− h2 <- (== Just "h2") <$> TLS.getNegotiatedProtocol ctx
354− isH2 <- I.newIORef h2
355322 writeBuf <- allocateBuffer bufferSize
356323 -- Creating a cache for leftover input data.
357324 ref <- I.newIORef ""
358325 tls <- getTLSinfo ctx
359− return (conn ctx writeBuf ref isH2, tls)
326+ return (conn ctx writeBuf ref, tls)
360327 where
361328 backend recvN = TLS.Backend {
362329 TLS.backendFlush = return ()
363−#if MIN_VERSION_network(3,1,1)
364− , TLS.backendClose = gracefulClose s 5000 `E.catch` \(SomeException _) -> return ()
365−#else
366330 , TLS.backendClose = close s
367−#endif
368331 , TLS.backendSend = sendAll' s
369332 , TLS.backendRecv = recvN
370333 }
371334 sendAll' sock bs = sendAll sock bs `E.catch` \(SomeException _) ->
372335 throwIO ConnectionClosedByPeer
373− conn ctx writeBuf ref isH2 = Connection {
336+ conn ctx writeBuf ref = Connection {
374337 connSendMany = TLS.sendData ctx . L.fromChunks
375338 , connSendAll = sendall
376339 , connSendFile = sendfile
@@ -380,7 +343,6 @@ httpOverTls TLSSettings{..} _set s bs0 params = do
380343 , connRecvBuf = recvBuf ref
381344 , connWriteBuffer = writeBuf
382345 , connBufferSize = bufferSize
383− , connHTTP2 = isH2
384346 }
385347 where
386348 sendall = TLS.sendData ctx . L.fromChunks . return
@@ -465,16 +427,11 @@ getTLSinfo ctx = do
465427 TLS.TLS10 -> (3,1)
466428 TLS.TLS11 -> (3,2)
467429 TLS.TLS12 -> (3,3)
468−#if MIN_VERSION_tls(1,5,0)
469− TLS.TLS13 -> (3,4)
470−#endif
471− clientCert <- TLS.getClientCertificateChain ctx
472430 return TLS {
473431 tlsMajorVersion = major
474432 , tlsMinorVersion = minor
475433 , tlsNegotiatedProtocol = proto
476434 , tlsChiperID = TLS.cipherID infoCipher
477− , tlsClientCertificate = clientCert
478435 }
479436
480437tryIO :: IO a -> IO (Either IOException a)
@@ -482,10 +439,10 @@ tryIO = try
482439
483440----------------------------------------------------------------
484441
485−plainHTTP :: TLSSettings -> Settings -> Socket -> S.ByteString -> IO (Connection, Transport)
486−plainHTTP TLSSettings{..} set s bs0 = case onInsecure of
442+plainHTTP :: TLSSettings -> Socket -> S.ByteString -> IO (Connection, Transport)
443+plainHTTP TLSSettings{..} s bs0 = case onInsecure of
487444 AllowInsecure -> do
488− conn' <- socketConnection set s
445+ conn' <- socketConnection s
489446 cachedRef <- I.newIORef bs0
490447 let conn'' = conn'
491448 { connRecv = recvPlain cachedRef (connRecv conn')
warp-tls/warp-tls.cabal+6−9
@@ -1,5 +1,5 @@
11Name: warp-tls
2−Version: 3.2.11
2+Version: 3.2.4.2
33Synopsis: HTTP over TLS support for Warp via the TLS package
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.6
1212Stability: Stable
1313description: SSLv1 and SSLv2 are obsoleted by IETF.
1414 We should use TLS 1.2 (or TLS 1.1 or TLS 1.0 if necessary).
@@ -18,23 +18,20 @@ description: SSLv1 and SSLv2 are obsoleted by IETF.
1818extra-source-files: ChangeLog.md README.md
1919
2020Library
21− Build-Depends: base >= 4.10 && < 5
21+ Build-Depends: base >= 4.8 && < 5
2222 , bytestring >= 0.9
2323 , wai >= 3.2 && < 3.3
24− , warp >= 3.3.6 && < 3.4
24+ , warp >= 3.2.10 && < 3.3
2525 , data-default-class >= 0.0.1
26− , tls >= 1.5.3
26+ , tls >= 1.3.10
2727 , cryptonite >= 0.12
2828 , network >= 2.2.1
2929 , streaming-commons
30− , tls-session-manager >= 0.0.4
30+ , tls-session-manager >= 0.0.0.1
3131 Exposed-modules: Network.Wai.Handler.WarpTLS
3232 ghc-options: -Wall
3333 if os(windows)
3434 Cpp-Options: -DWINDOWS
35− if impl(ghc >= 8)
36− Default-Extensions: Strict StrictData
37− Default-Language: Haskell2010
3835
3936
4037source-repository head
warp/ChangeLog.md−125
@@ -1,124 +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−
1221## 3.2.18.1
1232
1243* Fix benchmark compilation [#681](https://github.com/yesodweb/wai/issues/681)
@@ -128,10 +7,6 @@
1287* Make `testWithApplicationSettings` actually use the settings passed.
1298 [#677](https://github.com/yesodweb/wai/pull/677).
1309
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−
13510## 3.2.16
13611
13712* In `testWithApplication`, don't `throwTo` ignorable exceptions
warp/Network/Wai/Handler/Warp.hs+2−68
@@ -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
@@ -127,11 +121,9 @@ module Network.Wai.Handler.Warp (
127121import Control.Exception (SomeException, throwIO)
128122import Data.Streaming.Network (HostPreference)
129123import qualified Data.Vault.Lazy as Vault
130−import Data.X509
131124import qualified Network.HTTP.Types as H
132125import Network.Socket (SockAddr)
133126import Network.Wai (Request, Response, vault)
134−import System.TimeManager
135127
136128import Network.Wai.Handler.Warp.FileInfoCache
137129import Network.Wai.Handler.Warp.HTTP2.Request (getHTTP2Data, setHTTP2Data, modifyHTTP2Data)
@@ -141,6 +133,7 @@ import Network.Wai.Handler.Warp.Request
141133import Network.Wai.Handler.Warp.Response (warpVersion)
142134import Network.Wai.Handler.Warp.Run
143135import Network.Wai.Handler.Warp.Settings
136+import Network.Wai.Handler.Warp.Timeout
144137import Network.Wai.Handler.Warp.Types hiding (getFileInfo)
145138import Network.Wai.Handler.Warp.WithApplication
146139
@@ -303,18 +296,6 @@ getGracefulShutdownTimeout = settingsGracefulShutdownTimeout
303296-- void $ 'System.Posix.Signals.installHandler' 'System.Posix.Signals.sigTERM' ('System.Posix.Signals.Catch' $ shutdownAction >> closeSocket) 'Nothing'
304297-- @
305298--
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−--
318299-- Default: does not install any code.
319300--
320301-- Since 3.0.1
@@ -385,7 +366,7 @@ setProxyProtocolRequired y = y { settingsProxyProtocol = ProxyProtocolRequired }
385366--
386367-- WARNING: This is contrary to the PROXY protocol specification and
387368-- using it can indicate a security problem with your
388−-- architecture if the web server is directly accessible
369+-- architecture if the web server is directly accessable
389370-- to the public, since it would allow easy IP address
390371-- spoofing. However, it can be useful in some cases,
391372-- such as if a load balancer health check uses regular
@@ -428,22 +409,11 @@ setServerPushLogger lgr y = y { settingsServerPushLogger = lgr }
428409-- wait indefinitely, and a number, if provided, will be treated as seconds
429410-- to wait for requests to finish, before shutting down the server entirely.
430411--
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−--
435412-- Since 3.2.8
436413setGracefulShutdownTimeout :: Maybe Int
437414 -> Settings -> Settings
438415setGracefulShutdownTimeout time y = y { settingsGracefulShutdownTimeout = time }
439416
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−
447417-- | Explicitly pause the slowloris timeout.
448418--
449419-- This is useful for cases where you partially consume a request body. For
@@ -471,39 +441,3 @@ pauseTimeout = fromMaybe (return ()) . Vault.lookup pauseTimeoutKey . vault
471441-- Since 3.1.10
472442getFileInfo :: Request -> FilePath -> IO FileInfo
473443getFileInfo = 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/FdCache.hs+22−18
@@ -17,24 +17,26 @@ module Network.Wai.Handler.Warp.FdCache (
1717import Control.Exception (bracket)
1818import Control.Reaper
1919import Data.IORef
20−import Network.Wai.Handler.Warp.MultiMap as MM
20+import Network.Wai.Handler.Warp.MultiMap
2121import System.Posix.IO (openFd, OpenFileFlags(..), defaultFileFlags, OpenMode(ReadOnly), closeFd, FdOption(CloseOnExec), setFdOption)
2222#endif
2323import System.Posix.Types (Fd)
2424
2525----------------------------------------------------------------
2626
27+type Hash = Int
28+
2729-- | An action to activate a Fd cache entry.
2830type Refresh = IO ()
2931
30−getFdNothing :: FilePath -> IO (Maybe Fd, Refresh)
31−getFdNothing _ = return (Nothing, return ())
32+getFdNothing :: Hash -> FilePath -> IO (Maybe Fd, Refresh)
33+getFdNothing _ _ = return (Nothing, return ())
3234
3335----------------------------------------------------------------
3436
3537-- | Creating 'MutableFdCache' and executing the action in the second
3638-- argument. The first argument is a cache duration in second.
37−withFdCache :: Int -> ((FilePath -> IO (Maybe Fd, Refresh)) -> IO a) -> IO a
39+withFdCache :: Int -> ((Hash -> FilePath -> IO (Maybe Fd, Refresh)) -> IO a) -> IO a
3840#ifdef WINDOWS
3941withFdCache _ action = action getFdNothing
4042#else
@@ -63,7 +65,7 @@ inactive (MutableStatus ref) = writeIORef ref Inactive
6365
6466----------------------------------------------------------------
6567
66−data FdEntry = FdEntry !Fd !MutableStatus
68+data FdEntry = FdEntry !FilePath !Fd !MutableStatus
6769
6870openFile :: FilePath -> IO Fd
6971openFile path = do
@@ -75,23 +77,25 @@ closeFile :: Fd -> IO ()
7577closeFile = closeFd
7678
7779newFdEntry :: FilePath -> IO FdEntry
78−newFdEntry path = FdEntry <$> openFile path <*> newActiveStatus
80+newFdEntry path = FdEntry path <$> openFile path <*> newActiveStatus
7981
8082setFileCloseOnExec :: Fd -> IO ()
8183setFileCloseOnExec fd = setFdOption fd CloseOnExec True
8284
8385----------------------------------------------------------------
8486
85−type FdCache = MultiMap FdEntry
87+type FdCache = MMap FdEntry
8688
8789-- | Mutable Fd cacher.
88−newtype MutableFdCache = MutableFdCache (Reaper FdCache (FilePath,FdEntry))
90+newtype MutableFdCache = MutableFdCache (Reaper FdCache (Hash, FdEntry))
8991
9092fdCache :: MutableFdCache -> IO FdCache
9193fdCache (MutableFdCache reaper) = reaperRead reaper
9294
93−look :: MutableFdCache -> FilePath -> IO (Maybe FdEntry)
94−look mfc path = MM.lookup path <$> fdCache mfc
95+look :: MutableFdCache -> FilePath -> Hash -> IO (Maybe FdEntry)
96+look mfc path key = searchWith key check <$> fdCache mfc
97+ where
98+ check (FdEntry path' _ _) = path == path'
9599
96100----------------------------------------------------------------
97101
@@ -112,7 +116,7 @@ clean old = do
112116 new <- pruneWith old prune
113117 return $ merge new
114118 where
115− prune (_,FdEntry fd mst) = status mst >>= act
119+ prune (FdEntry _ fd mst) = status mst >>= act
116120 where
117121 act Active = inactive mst >> return True
118122 act Inactive = closeFd fd >> return False
@@ -122,21 +126,21 @@ clean old = do
122126terminate :: MutableFdCache -> IO ()
123127terminate (MutableFdCache reaper) = do
124128 !t <- reaperStop reaper
125− mapM_ (closeIt . snd) $ toList t
129+ mapM_ closeIt $ toList t
126130 where
127− closeIt (FdEntry fd _) = closeFd fd
131+ closeIt (FdEntry _ fd _) = closeFd fd
128132
129133----------------------------------------------------------------
130134
131135-- | 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
136+getFd :: MutableFdCache -> Hash -> FilePath -> IO (Maybe Fd, Refresh)
137+getFd mfc@(MutableFdCache reaper) h path = look mfc path h >>= get
134138 where
135139 get Nothing = do
136− ent@(FdEntry fd mst) <- newFdEntry path
137− reaperAdd reaper (path,ent)
140+ ent@(FdEntry _ fd mst) <- newFdEntry path
141+ reaperAdd reaper (h, ent)
138142 return (Just fd, refresh mst)
139− get (Just (FdEntry fd mst)) = do
143+ get (Just (FdEntry _ fd mst)) = do
140144 refresh mst
141145 return (Just fd, refresh mst)
142146#endif
warp/Network/Wai/Handler/Warp/File.hs+4−7
@@ -34,15 +34,12 @@ data RspFileInfo = WithoutBody H.Status
3434----------------------------------------------------------------
3535
3636conditionalRequest :: I.FileInfo
37− -> H.ResponseHeaders
38− -> IndexedHeader -- ^ Response
39− -> IndexedHeader -- ^ Request
37+ -> H.ResponseHeaders -> IndexedHeader
4038 -> RspFileInfo
41−conditionalRequest finfo hs0 rspidx reqidx = case condition of
39+conditionalRequest finfo hs0 reqidx = case condition of
4240 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
41+ WithBody s _ off len -> let !hs = (H.hLastModified,date) :
42+ addContentHeaders hs0 off len size
4643 in WithBody s hs off len
4744 where
4845 !mtime = I.fileInfoTime finfo
warp/Network/Wai/Handler/Warp/FileInfoCache.hs+22−19
@@ -2,6 +2,7 @@
22
33module Network.Wai.Handler.Warp.FileInfoCache (
44 FileInfo(..)
5+ , Hash
56 , withFileInfoCache
67 , getInfo -- test purpose only
78 ) where
@@ -17,6 +18,8 @@ import Network.Wai.Handler.Warp.Imports
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,7 +85,7 @@ 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 =
@@ -90,14 +93,14 @@ withFileInfoCache duration action =
9093 terminate
9194 (action . getAndRegisterInfo)
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+54−70
@@ -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 Network.HTTP2
129import Network.Socket (SockAddr)
1310import Network.Wai
14−import Network.Wai.Internal (ResponseReceived(..))
15−import qualified System.TimeManager as T
1611
17−import Network.Wai.Handler.Warp.HTTP2.File
18−import Network.Wai.Handler.Warp.HTTP2.PushPromise
12+import Network.Wai.Handler.Warp.HTTP2.EncodeFrame
13+import Network.Wai.Handler.Warp.HTTP2.Manager
14+import Network.Wai.Handler.Warp.HTTP2.Receiver
1915import Network.Wai.Handler.Warp.HTTP2.Request
20−import Network.Wai.Handler.Warp.HTTP2.Response
16+import Network.Wai.Handler.Warp.HTTP2.Sender
17+import Network.Wai.Handler.Warp.HTTP2.Types
18+import Network.Wai.Handler.Warp.HTTP2.Worker
2119import Network.Wai.Handler.Warp.Imports
22−import qualified Network.Wai.Handler.Warp.Settings as S
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+34
@@ -0,0 +1,34 @@
1+module Network.Wai.Handler.Warp.HTTP2.EncodeFrame where
2+
3+import Network.HTTP2
4+
5+import Network.Wai.Handler.Warp.Imports
6+
7+----------------------------------------------------------------
8+
9+goawayFrame :: StreamId -> ErrorCodeId -> ByteString -> ByteString
10+goawayFrame sid etype debugmsg = encodeFrame einfo frame
11+ where
12+ einfo = encodeInfo id 0
13+ frame = GoAwayFrame sid etype debugmsg
14+
15+resetFrame :: ErrorCodeId -> StreamId -> ByteString
16+resetFrame etype sid = encodeFrame einfo frame
17+ where
18+ einfo = encodeInfo id sid
19+ frame = RSTStreamFrame etype
20+
21+settingsFrame :: (FrameFlags -> FrameFlags) -> SettingsList -> ByteString
22+settingsFrame func alist = encodeFrame einfo $ SettingsFrame alist
23+ where
24+ einfo = encodeInfo func 0
25+
26+pingFrame :: ByteString -> ByteString
27+pingFrame bs = encodeFrame einfo $ PingFrame bs
28+ where
29+ einfo = encodeInfo setAck 0
30+
31+windowUpdateFrame :: StreamId -> WindowSize -> ByteString
32+windowUpdateFrame sid winsiz = encodeFrame einfo $ WindowUpdateFrame winsiz
33+ where
34+ einfo = encodeInfo id sid
warp/Network/Wai/Handler/Warp/HTTP2/File.hs+150−23
@@ -1,30 +1,157 @@
11{-# LANGUAGE CPP #-}
2+{-# LANGUAGE OverloadedStrings #-}
3+{-# LANGUAGE BangPatterns #-}
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+ , H.parseByteRanges
10+ ) where
411
5−import Network.HTTP2.Server
12+import qualified Data.ByteString.Char8 as C8 (pack)
13+import Network.HPACK
14+import Network.HPACK.Token
15+import Network.HTTP.Date
16+import qualified Network.HTTP.Types as H
17+import Network.Wai
618
7−import Network.Wai.Handler.Warp.Types
19+import qualified Network.Wai.Handler.Warp.FileInfoCache as I
20+import Network.Wai.Handler.Warp.Imports
21+import Network.Wai.Handler.Warp.PackInt
822
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)
23+-- $setup
24+-- >>> import Test.QuickCheck
1525
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)
26+----------------------------------------------------------------
27+
28+data RspFileInfo = WithoutBody !H.Status
29+ | WithBody !H.Status !TokenHeaderList !Integer !Integer
30+ deriving (Eq,Show)
31+
32+----------------------------------------------------------------
33+
34+conditionalRequest :: I.FileInfo
35+ -> TokenHeaderList -- Response
36+ -> ValueTable -- Request
37+ -> RspFileInfo
38+conditionalRequest (I.FileInfo _ size mtime date) ths0 reqtbl = case condition of
39+ nobody@(WithoutBody _) -> nobody
40+ WithBody s _ off len -> let !hs = (tokenLastModified,date) :
41+ addContentHeaders ths0 off len size
42+ in WithBody s hs off len
43+ where
44+ !mcondition = ifmodified reqtbl size mtime
45+ <|> ifunmodified reqtbl size mtime
46+ <|> ifrange reqtbl size mtime
47+ !condition = fromMaybe (unconditional reqtbl size) mcondition
48+
49+----------------------------------------------------------------
50+
51+{-# INLINE ifModifiedSince #-}
52+ifModifiedSince :: ValueTable -> Maybe HTTPDate
53+ifModifiedSince reqtbl = getHeaderValue tokenIfModifiedSince reqtbl >>= parseHTTPDate
54+
55+{-# INLINE ifUnmodifiedSince #-}
56+ifUnmodifiedSince :: ValueTable -> Maybe HTTPDate
57+ifUnmodifiedSince reqtbl = getHeaderValue tokenIfUnmodifiedSince reqtbl >>= parseHTTPDate
58+
59+{-# INLINE ifRange #-}
60+ifRange :: ValueTable -> Maybe HTTPDate
61+ifRange reqtbl = getHeaderValue tokenIfRange reqtbl >>= parseHTTPDate
62+
63+----------------------------------------------------------------
64+
65+{-# INLINE ifmodified #-}
66+ifmodified :: ValueTable -> Integer -> HTTPDate -> Maybe RspFileInfo
67+ifmodified reqtbl size mtime = do
68+ date <- ifModifiedSince reqtbl
69+ return $ if date /= mtime
70+ then unconditional reqtbl size
71+ else WithoutBody H.notModified304
72+
73+{-# INLINE ifunmodified #-}
74+ifunmodified :: ValueTable -> Integer -> HTTPDate -> Maybe RspFileInfo
75+ifunmodified reqtbl size mtime = do
76+ date <- ifUnmodifiedSince reqtbl
77+ return $ if date == mtime
78+ then unconditional reqtbl size
79+ else WithoutBody H.preconditionFailed412
80+
81+{-# INLINE ifrange #-}
82+ifrange :: ValueTable -> Integer -> HTTPDate -> Maybe RspFileInfo
83+ifrange reqtbl size mtime = do
84+ date <- ifRange reqtbl
85+ rng <- getHeaderValue tokenRange reqtbl
86+ return $ if date == mtime
87+ then parseRange rng size
88+ else WithBody H.ok200 [] 0 size
89+
90+{-# INLINE unconditional #-}
91+unconditional :: ValueTable -> Integer -> RspFileInfo
92+unconditional reqtbl size = case getHeaderValue tokenRange reqtbl of
93+ Nothing -> WithBody H.ok200 [] 0 size
94+ Just rng -> parseRange rng size
95+
96+----------------------------------------------------------------
97+
98+{-# INLINE parseRange #-}
99+parseRange :: ByteString -> Integer -> RspFileInfo
100+parseRange rng size = case H.parseByteRanges rng of
101+ Nothing -> WithoutBody H.requestedRangeNotSatisfiable416
102+ Just [] -> WithoutBody H.requestedRangeNotSatisfiable416
103+ Just (r:_) -> let (!beg, !end) = checkRange r size
104+ !len = end - beg + 1
105+ s = if beg == 0 && end == size - 1 then
106+ H.ok200
107+ else
108+ H.partialContent206
109+ in WithBody s [] beg len
110+
111+{-# INLINE checkRange #-}
112+checkRange :: H.ByteRange -> Integer -> (Integer, Integer)
113+checkRange (H.ByteRangeFrom beg) size = (beg, size - 1)
114+checkRange (H.ByteRangeFromTo beg end) size = (beg, min (size - 1) end)
115+checkRange (H.ByteRangeSuffix count) size = (max 0 (size - count), size - 1)
116+
117+----------------------------------------------------------------
118+
119+{-# INLINE contentRangeHeader #-}
120+-- | @contentRangeHeader beg end total@ constructs a Content-Range 'H.Header'
121+-- for the range specified.
122+contentRangeHeader :: Integer -> Integer -> Integer -> TokenHeader
123+contentRangeHeader beg end total = (tokenContentRange, range)
124+ where
125+ range = C8.pack
126+ -- building with ShowS
127+ $ 'b' : 'y': 't' : 'e' : 's' : ' '
128+ : (if beg > end then ('*':) else
129+ showInt beg
130+ . ('-' :)
131+ . showInt end)
132+ ( '/'
133+ : showInt total "")
134+
135+{-# INLINE addContentHeaders #-}
136+addContentHeaders :: TokenHeaderList -> Integer -> Integer -> Integer -> TokenHeaderList
137+addContentHeaders ths off len size
138+ | len == size = ths'
139+ | otherwise = let !ctrng = contentRangeHeader off (off + len - 1) size
140+ in ctrng:ths'
141+ where
142+ !lengthBS = packIntegral len
143+ !ths' = (tokenContentLength, lengthBS) : (tokenAcceptRanges,"bytes") : ths
144+
145+{-# INLINE addContentHeadersForFilePart #-}
146+-- |
147+--
148+-- >>> addContentHeadersForFilePart [] (FilePart 2 10 16)
149+-- [(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")]
150+-- >>> addContentHeadersForFilePart [] (FilePart 0 16 16)
151+-- [(Token {ix = 18, shouldBeIndexed = False, isPseudo = False, tokenKey = "Content-Length"},"16"),(Token {ix = 8, shouldBeIndexed = True, isPseudo = False, tokenKey = "Accept-Ranges"},"bytes")]
152+addContentHeadersForFilePart :: TokenHeaderList -> FilePart -> TokenHeaderList
153+addContentHeadersForFilePart hs part = addContentHeaders hs off len size
24154 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
155+ off = filePartOffset part
156+ len = filePartByteCount part
157+ size = filePartFileSize part
warp/Network/Wai/Handler/Warp/HTTP2/HPACK.hsnew file+112
@@ -0,0 +1,112 @@
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+ , addHeader -- testing
11+ ) where
12+
13+import qualified Control.Exception as E
14+import Network.HPACK hiding (Buffer)
15+import Network.HPACK.Token
16+import Network.HTTP2
17+
18+import Network.Wai.Handler.Warp.HTTP2.Types
19+import Network.Wai.Handler.Warp.Imports
20+import Network.Wai.Handler.Warp.PackInt
21+import qualified Network.Wai.Handler.Warp.Settings as S
22+import Network.Wai.Handler.Warp.Types
23+
24+-- $setup
25+-- >>> :set -XOverloadedStrings
26+
27+----------------------------------------------------------------
28+
29+{-# INLINE addHeader #-}
30+addHeader :: Token -> ByteString -> ValueTable -> TokenHeaderList -> TokenHeaderList
31+addHeader t "" tbl ths = case getHeaderValue t tbl of
32+ Nothing -> ths
33+ _ -> filter ((/= tokenServer) . fst) ths
34+addHeader t v tbl ths = case getHeaderValue t tbl of
35+ Nothing -> (t,v) : ths
36+ _ -> ths
37+
38+addNecessaryHeaders :: Context
39+ -> Rspn
40+ -> InternalInfo
41+ -> S.Settings
42+ -> IO TokenHeaderList
43+addNecessaryHeaders Context{..} rspn ii settings = do
44+ date <- getDate ii
45+ let !s = rspnStatus rspn
46+ !status = packStatus s
47+ !defServer = S.settingsServerName settings
48+ (!ths0,tbl) = rspnHeaders rspn
49+ !ths1 = addHeader tokenServer defServer tbl ths0
50+ !ths2 = addHeader tokenDate date tbl ths1
51+ !ths3 = (tokenStatus, status) : ths2
52+ return ths3
53+
54+----------------------------------------------------------------
55+
56+strategy :: EncodeStrategy
57+strategy = EncodeStrategy { compressionAlgo = Linear, useHuffman = False }
58+
59+-- Set-Cookie: contains only one cookie value.
60+-- So, we don't need to split it.
61+hpackEncodeHeader :: Context -> Buffer -> BufSize
62+ -> TokenHeaderList
63+ -> IO (TokenHeaderList, Int)
64+hpackEncodeHeader Context{..} buf siz ths =
65+ encodeTokenHeader buf siz strategy True encodeDynamicTable ths
66+
67+hpackEncodeHeaderLoop :: Context -> Buffer -> BufSize
68+ -> TokenHeaderList
69+ -> IO (TokenHeaderList, Int)
70+hpackEncodeHeaderLoop Context{..} buf siz hs =
71+ encodeTokenHeader buf siz strategy False encodeDynamicTable hs
72+
73+----------------------------------------------------------------
74+
75+hpackDecodeHeader :: HeaderBlockFragment -> Context -> IO (TokenHeaderList, ValueTable)
76+hpackDecodeHeader hdrblk Context{..} = do
77+ tbl@(_,vt) <- decodeTokenHeader decodeDynamicTable hdrblk `E.catch` handl
78+ unless (checkRequestHeader vt) $
79+ E.throwIO $ ConnectionError ProtocolError "the header key is illegal"
80+ return tbl
81+ where
82+ handl IllegalHeaderName =
83+ E.throwIO $ ConnectionError ProtocolError "the header key is illegal"
84+ handl _ =
85+ E.throwIO $ ConnectionError CompressionError "cannot decompress the header"
86+
87+{-# INLINE checkRequestHeader #-}
88+checkRequestHeader :: ValueTable -> Bool
89+checkRequestHeader reqvt
90+ | just mMethod (== "CONNECT") = isNothing mPath && isNothing mScheme
91+ | isJust mStatus = False
92+ | isNothing mMethod = False
93+ | isNothing mScheme = False
94+ | isNothing mPath = False
95+ | mPath == Just "" = False
96+ | isJust mConnection = False
97+ | just mTE (/= "trailers") = False
98+ | otherwise = True
99+ where
100+ mStatus = getHeaderValue tokenStatus reqvt
101+ mScheme = getHeaderValue tokenScheme reqvt
102+ mPath = getHeaderValue tokenPath reqvt
103+ mMethod = getHeaderValue tokenMethod reqvt
104+ mConnection = getHeaderValue tokenConnection reqvt
105+ mTE = getHeaderValue tokenTE reqvt
106+
107+{-# INLINE just #-}
108+just :: Maybe a -> (a -> Bool) -> Bool
109+just Nothing _ = False
110+just (Just x) p
111+ | p x = True
112+ | otherwise = False
warp/Network/Wai/Handler/Warp/HTTP2/Manager.hsnew file+95
@@ -0,0 +1,95 @@
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+import Control.Concurrent
17+import Control.Concurrent.STM
18+import Data.Foldable
19+import Data.IORef
20+import Data.Set (Set)
21+import qualified Data.Set as Set
22+
23+import Network.Wai.Handler.Warp.Imports
24+import Network.Wai.Handler.Warp.Settings
25+import qualified Network.Wai.Handler.Warp.Timeout as T
26+
27+----------------------------------------------------------------
28+
29+type Action = T.Manager -> IO ()
30+
31+data Command = Stop | Spawn | Add ThreadId | Delete ThreadId
32+
33+data Manager = Manager (TQueue Command) (IORef Action)
34+
35+-- | Starting a thread pool manager.
36+-- Its action is initially set to 'return ()' and should be set
37+-- by 'setAction'. This allows that the action can include
38+-- the manager itself.
39+start :: Settings -> IO Manager
40+start set = do
41+ q <- newTQueueIO
42+ ref <- newIORef (\_ -> return ())
43+ timmgr <- T.initialize $ settingsTimeout set * 1000000
44+ void $ forkIO $ go q Set.empty ref timmgr
45+ return $ Manager q ref
46+ where
47+ go q !tset0 ref timmgr = do
48+ x <- atomically $ readTQueue q
49+ case x of
50+ Stop -> kill tset0 >> T.killManager timmgr
51+ Spawn -> next tset0
52+ Add newtid -> let !tset = add newtid tset0
53+ in go q tset ref timmgr
54+ Delete oldtid -> let !tset = del oldtid tset0
55+ in go q tset ref timmgr
56+ where
57+ next tset = do
58+ action <- readIORef ref
59+ newtid <- forkIO (action timmgr)
60+ let !tset' = add newtid tset
61+ go q tset' ref timmgr
62+
63+setAction :: Manager -> Action -> IO ()
64+setAction (Manager _ ref) action = writeIORef ref action
65+
66+stop :: Manager -> IO ()
67+stop (Manager q _) = atomically $ writeTQueue q Stop
68+
69+spawnAction :: Manager -> IO ()
70+spawnAction (Manager q _) = atomically $ writeTQueue q Spawn
71+
72+addMyId :: Manager -> IO ()
73+addMyId (Manager q _) = do
74+ tid <- myThreadId
75+ atomically $ writeTQueue q $ Add tid
76+
77+deleteMyId :: Manager -> IO ()
78+deleteMyId (Manager q _) = do
79+ tid <- myThreadId
80+ atomically $ writeTQueue q $ Delete tid
81+
82+----------------------------------------------------------------
83+
84+add :: ThreadId -> Set ThreadId -> Set ThreadId
85+add tid set = set'
86+ where
87+ !set' = Set.insert tid set
88+
89+del :: ThreadId -> Set ThreadId -> Set ThreadId
90+del tid set = set'
91+ where
92+ !set' = Set.delete tid set
93+
94+kill :: Set ThreadId -> IO ()
95+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+397
@@ -0,0 +1,397 @@
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+import Control.Concurrent
10+import Control.Concurrent.STM
11+import qualified Control.Exception as E
12+import qualified Data.ByteString as BS
13+import Data.IORef
14+import Network.HPACK
15+import Network.HPACK.Token
16+import Network.HTTP2
17+import Network.HTTP2.Priority (toPrecedence, delete, prepare)
18+
19+import Network.Wai.Handler.Warp.HTTP2.EncodeFrame
20+import Network.Wai.Handler.Warp.HTTP2.HPACK
21+import Network.Wai.Handler.Warp.HTTP2.Request
22+import Network.Wai.Handler.Warp.HTTP2.Types
23+import Network.Wai.Handler.Warp.Imports hiding (delete, insert, readInt)
24+import Network.Wai.Handler.Warp.ReadInt
25+import Network.Wai.Handler.Warp.Types
26+
27+----------------------------------------------------------------
28+
29+frameReceiver :: Context -> MkReq -> (BufSize -> IO ByteString) -> IO ()
30+frameReceiver ctx mkreq recvN = loop 0 `E.catch` sendGoaway
31+ where
32+ Context{ http2settings
33+ , streamTable
34+ , concurrency
35+ , continued
36+ , clientStreamId
37+ , inputQ
38+ , controlQ
39+ } = ctx
40+ sendGoaway e
41+ | Just (ConnectionError err msg) <- E.fromException e = do
42+ csid <- readIORef clientStreamId
43+ let !frame = goawayFrame csid err msg
44+ enqueueControl controlQ $ CGoaway frame
45+ | otherwise = return ()
46+
47+ sendReset err sid = do
48+ let !frame = resetFrame err sid
49+ enqueueControl controlQ $ CFrame frame
50+
51+ loop :: Int -> IO ()
52+ loop !n
53+ | n == 6 = do
54+ yield
55+ loop 0
56+ | otherwise = do
57+ hd <- recvN frameHeaderLength
58+ if BS.null hd then
59+ enqueueControl controlQ CFinish
60+ else do
61+ cont <- processStreamGuardingError $ decodeFrameHeader hd
62+ when cont $ loop (n + 1)
63+
64+ processStreamGuardingError (fid, FrameHeader{streamId})
65+ | isResponse streamId &&
66+ (fid `notElem` [FramePriority,FrameRSTStream,FrameWindowUpdate]) =
67+ E.throwIO $ ConnectionError ProtocolError "stream id should be odd"
68+ processStreamGuardingError (FrameUnknown _, FrameHeader{payloadLength}) = do
69+ mx <- readIORef continued
70+ case mx of
71+ Nothing -> do
72+ -- ignoring unknown frame
73+ consume payloadLength
74+ return True
75+ Just _ -> E.throwIO $ ConnectionError ProtocolError "unknown frame"
76+ processStreamGuardingError (FramePushPromise, _) =
77+ E.throwIO $ ConnectionError ProtocolError "push promise is not allowed"
78+ processStreamGuardingError typhdr@(ftyp, header@FrameHeader{payloadLength}) = do
79+ settings <- readIORef http2settings
80+ case checkFrameHeader settings typhdr of
81+ Left h2err -> case h2err of
82+ StreamError err sid -> do
83+ sendReset err sid
84+ consume payloadLength
85+ return True
86+ connErr -> E.throwIO connErr
87+ Right _ -> do
88+ ex <- E.try $ controlOrStream ftyp header
89+ case ex of
90+ Left (StreamError err sid) -> do
91+ sendReset err sid
92+ return True
93+ Left connErr -> E.throw connErr
94+ Right cont -> return cont
95+
96+ controlOrStream ftyp header@FrameHeader{streamId, payloadLength}
97+ | isControl streamId = do
98+ pl <- recvN payloadLength
99+ control ftyp header pl ctx
100+ | otherwise = do
101+ checkContinued
102+ !mstrm <- getStream
103+ pl <- recvN payloadLength
104+ case mstrm of
105+ Nothing -> do
106+ -- for h2spec only
107+ when (ftyp == FramePriority) $ do
108+ PriorityFrame newpri <- guardIt $ decodePriorityFrame header pl
109+ checkPriority newpri streamId
110+ return True -- just ignore this frame
111+ Just strm@Stream{streamState,streamPrecedence} -> do
112+ state <- readIORef streamState
113+ state' <- stream ftyp header pl ctx state strm
114+ case state' of
115+ Open (NoBody tbl@(_,reqvt) pri) -> do
116+ resetContinued
117+ let mcl = readInt <$> getHeaderValue tokenContentLength reqvt
118+ when (just mcl (== (0 :: Int))) $
119+ E.throwIO $ StreamError ProtocolError streamId
120+ writeIORef streamPrecedence $ toPrecedence pri
121+ writeIORef streamState HalfClosed
122+ (!req, !ii) <- mkreq tbl (Just 0, return "")
123+ atomically $ writeTQueue inputQ $ Input strm req reqvt ii
124+ Open (HasBody tbl@(_,reqvt) pri) -> do
125+ resetContinued
126+ q <- newTQueueIO
127+ let !mcl = readInt <$> getHeaderValue tokenContentLength reqvt
128+ writeIORef streamPrecedence $ toPrecedence pri
129+ bodyLength <- newIORef 0
130+ writeIORef streamState $ Open (Body q mcl bodyLength)
131+ readQ <- newReadBody q
132+ bodySource <- mkSource readQ
133+ (!req, !ii) <- mkreq tbl (mcl, readSource bodySource)
134+ atomically $ writeTQueue inputQ $ Input strm req reqvt ii
135+ s@(Open Continued{}) -> do
136+ setContinued
137+ writeIORef streamState s
138+ s -> do -- Idle, Open Body, HalfClosed, Closed
139+ resetContinued
140+ writeIORef streamState s
141+ return True
142+ where
143+ setContinued = writeIORef continued (Just streamId)
144+ resetContinued = writeIORef continued Nothing
145+ checkContinued = do
146+ mx <- readIORef continued
147+ case mx of
148+ Nothing -> return ()
149+ Just sid
150+ | sid == streamId && ftyp == FrameContinuation -> return ()
151+ | otherwise -> E.throwIO $ ConnectionError ProtocolError "continuation frame must follow"
152+ getStream = do
153+ mstrm0 <- search streamTable streamId
154+ case mstrm0 of
155+ js@(Just strm0) -> do
156+ when (ftyp == FrameHeaders) $ do
157+ st <- readIORef $ streamState strm0
158+ when (isHalfClosed st) $ E.throwIO $ ConnectionError StreamClosed "header must not be sent to half closed"
159+ -- Priority made an idele stream
160+ when (isIdle st) $ opened ctx strm0
161+ return js
162+ Nothing
163+ | isResponse streamId -> return Nothing
164+ | otherwise -> do
165+ when (ftyp `notElem` [FrameHeaders,FramePriority]) $
166+ E.throwIO $ ConnectionError ProtocolError "this frame is not allowed in an idel stream"
167+ csid <- readIORef clientStreamId
168+ if streamId <= csid then
169+ if ftyp == FramePriority then
170+ return Nothing -- will be ignored
171+ else
172+ E.throwIO $ ConnectionError ProtocolError "stream identifier must not decrease"
173+ else do
174+ when (ftyp == FrameHeaders) $ do
175+ writeIORef clientStreamId streamId
176+ cnt <- readIORef concurrency
177+ -- Checking the limitation of concurrency
178+ when (cnt >= maxConcurrency) $
179+ E.throwIO $ StreamError RefusedStream streamId
180+ ws <- initialWindowSize <$> readIORef http2settings
181+ newstrm <- newStream streamId (fromIntegral ws)
182+ when (ftyp == FrameHeaders) $ opened ctx newstrm
183+ insert streamTable streamId newstrm
184+ return $ Just newstrm
185+
186+ consume = void . recvN
187+
188+maxConcurrency :: Int
189+maxConcurrency = recommendedConcurrency
190+
191+initialFrame :: ByteString
192+initialFrame = settingsFrame id [(SettingsMaxConcurrentStreams,maxConcurrency)]
193+
194+----------------------------------------------------------------
195+
196+control :: FrameTypeId -> FrameHeader -> ByteString -> Context -> IO Bool
197+control FrameSettings header@FrameHeader{flags} bs Context{http2settings, controlQ, firstSettings, streamTable} = do
198+ SettingsFrame alist <- guardIt $ decodeSettingsFrame header bs
199+ case checkSettingsList alist of
200+ Just x -> E.throwIO x
201+ Nothing -> return ()
202+ -- HTTP/2 Setting from a browser
203+ unless (testAck flags) $ do
204+ oldws <- initialWindowSize <$> readIORef http2settings
205+ modifyIORef' http2settings $ \old -> updateSettings old alist
206+ newws <- initialWindowSize <$> readIORef http2settings
207+ let diff = newws - oldws
208+ when (diff /= 0) $ updateAllStreamWindow (+ diff) streamTable
209+ let !frame = settingsFrame setAck []
210+ sent <- readIORef firstSettings
211+ let !setframe
212+ | sent = CSettings frame alist
213+ | otherwise = CSettings0 initialFrame frame alist
214+ unless sent $ writeIORef firstSettings True
215+ enqueueControl controlQ setframe
216+ return True
217+
218+control FramePing FrameHeader{flags} bs Context{controlQ} =
219+ if testAck flags then
220+ return True -- just ignore
221+ else do
222+ let !frame = pingFrame bs
223+ enqueueControl controlQ $ CFrame frame
224+ return True
225+
226+control FrameGoAway _ _ Context{controlQ} = do
227+ enqueueControl controlQ CFinish
228+ return False
229+
230+control FrameWindowUpdate header bs Context{connectionWindow} = do
231+ WindowUpdateFrame n <- guardIt $ decodeWindowUpdateFrame header bs
232+ !w <- atomically $ do
233+ w0 <- readTVar connectionWindow
234+ let !w1 = w0 + n
235+ writeTVar connectionWindow w1
236+ return w1
237+ when (isWindowOverflow w) $ E.throwIO $ ConnectionError FlowControlError "control window should be less than 2^31"
238+ return True
239+
240+control _ _ _ _ =
241+ -- must not reach here
242+ return False
243+
244+----------------------------------------------------------------
245+
246+{-# INLINE guardIt #-}
247+guardIt :: Either HTTP2Error a -> IO a
248+guardIt x = case x of
249+ Left err -> E.throwIO err
250+ Right frame -> return frame
251+
252+
253+{-# INLINE checkPriority #-}
254+checkPriority :: Priority -> StreamId -> IO ()
255+checkPriority p me
256+ | dep == me = E.throwIO $ StreamError ProtocolError me
257+ | otherwise = return ()
258+ where
259+ dep = streamDependency p
260+
261+stream :: FrameTypeId -> FrameHeader -> ByteString -> Context -> StreamState -> Stream -> IO StreamState
262+stream FrameHeaders header@FrameHeader{flags} bs ctx (Open JustOpened) Stream{streamNumber} = do
263+ HeadersFrame mp frag <- guardIt $ decodeHeadersFrame header bs
264+ pri <- case mp of
265+ Nothing -> return defaultPriority
266+ Just p -> do
267+ checkPriority p streamNumber
268+ return p
269+ let !endOfStream = testEndStream flags
270+ !endOfHeader = testEndHeader flags
271+ if endOfHeader then do
272+ tbl <- hpackDecodeHeader frag ctx -- fixme
273+ return $ if endOfStream then
274+ Open (NoBody tbl pri)
275+ else
276+ Open (HasBody tbl pri)
277+ else do
278+ let !siz = BS.length frag
279+ return $ Open $ Continued [frag] siz 1 endOfStream pri
280+
281+stream FrameHeaders header@FrameHeader{flags} bs _ (Open (Body q _ _)) _ = do
282+ -- trailer is not supported.
283+ -- let's read and ignore it.
284+ HeadersFrame _ _ <- guardIt $ decodeHeadersFrame header bs
285+ let !endOfStream = testEndStream flags
286+ if endOfStream then do
287+ atomically $ writeTQueue q ""
288+ return HalfClosed
289+ else
290+ -- we don't support continuation here.
291+ E.throwIO $ ConnectionError ProtocolError "continuation in trailer is not supported"
292+
293+stream FrameData
294+ header@FrameHeader{flags,payloadLength,streamId}
295+ bs
296+ Context{controlQ} s@(Open (Body q mcl bodyLength))
297+ Stream{streamNumber} = do
298+ DataFrame body <- guardIt $ decodeDataFrame header bs
299+ let !endOfStream = testEndStream flags
300+ len0 <- readIORef bodyLength
301+ let !len = len0 + payloadLength
302+ writeIORef bodyLength len
303+ when (payloadLength /= 0) $ do
304+ let !frame1 = windowUpdateFrame 0 payloadLength
305+ !frame2 = windowUpdateFrame streamNumber payloadLength
306+ !frame = frame1 `BS.append` frame2
307+ enqueueControl controlQ $ CFrame frame
308+ atomically $ writeTQueue q body
309+ if endOfStream then do
310+ case mcl of
311+ Nothing -> return ()
312+ Just cl -> when (cl /= len) $ E.throwIO $ StreamError ProtocolError streamId
313+ atomically $ writeTQueue q ""
314+ return HalfClosed
315+ else
316+ return s
317+
318+stream FrameContinuation FrameHeader{flags} frag ctx (Open (Continued rfrags siz n endOfStream pri)) _ = do
319+ let !endOfHeader = testEndHeader flags
320+ !rfrags' = frag : rfrags
321+ !siz' = siz + BS.length frag
322+ !n' = n + 1
323+ when (siz' > 51200) $ -- fixme: hard coding: 50K
324+ E.throwIO $ ConnectionError EnhanceYourCalm "Header is too big"
325+ when (n' > 10) $ -- fixme: hard coding
326+ E.throwIO $ ConnectionError EnhanceYourCalm "Header is too fragmented"
327+ if endOfHeader then do
328+ let !hdrblk = BS.concat $ reverse rfrags'
329+ tbl <- hpackDecodeHeader hdrblk ctx
330+ return $ if endOfStream then
331+ Open (NoBody tbl pri)
332+ else
333+ Open (HasBody tbl pri)
334+ else
335+ return $ Open $ Continued rfrags' siz' n' endOfStream pri
336+
337+stream FrameWindowUpdate header@FrameHeader{streamId} bs _ s Stream{streamWindow} = do
338+ WindowUpdateFrame n <- guardIt $ decodeWindowUpdateFrame header bs
339+ !w <- atomically $ do
340+ w0 <- readTVar streamWindow
341+ let !w1 = w0 + n
342+ writeTVar streamWindow w1
343+ return w1
344+ when (isWindowOverflow w) $
345+ E.throwIO $ StreamError FlowControlError streamId
346+ return s
347+
348+stream FrameRSTStream header bs ctx _ strm = do
349+ RSTStreamFrame e <- guardIt $ decoderstStreamFrame header bs
350+ let !cc = Reset e
351+ closed ctx strm cc
352+ return $ Closed cc -- will be written to streamState again
353+
354+stream FramePriority header bs Context{outputQ,priorityTreeSize} s Stream{streamNumber,streamPrecedence} = do
355+ PriorityFrame newpri <- guardIt $ decodePriorityFrame header bs
356+ checkPriority newpri streamNumber
357+ oldpre <- readIORef streamPrecedence
358+ let !newpre = toPrecedence newpri
359+ writeIORef streamPrecedence newpre
360+ if isIdle s then do
361+ n <- atomicModifyIORef' priorityTreeSize (\x -> (x+1,x+1))
362+ -- fixme hard coding
363+ when (n >= 20) $ E.throwIO $ ConnectionError EnhanceYourCalm "too many idle priority frames"
364+ prepare outputQ streamNumber newpri
365+ else do
366+ mx <- delete outputQ streamNumber oldpre
367+ case mx of
368+ Nothing -> return ()
369+ Just out -> enqueueOutput outputQ out
370+ return s
371+
372+-- this ordering is important
373+stream FrameContinuation _ _ _ _ _ = E.throwIO $ ConnectionError ProtocolError "continue frame cannot come here"
374+stream _ _ _ _ (Open Continued{}) _ = E.throwIO $ ConnectionError ProtocolError "an illegal frame follows header/continuation frames"
375+-- Ignore frames to streams we have just reset, per section 5.1.
376+stream _ _ _ _ st@(Closed (ResetByMe _)) _ = return st
377+stream FrameData FrameHeader{streamId} _ _ _ _ = E.throwIO $ StreamError StreamClosed streamId
378+stream _ FrameHeader{streamId} _ _ _ _ = E.throwIO $ StreamError ProtocolError streamId
379+
380+----------------------------------------------------------------
381+
382+{-# INLINE newReadBody #-}
383+newReadBody :: TQueue ByteString -> IO (IO ByteString)
384+newReadBody q = do
385+ ref <- newIORef False
386+ return $ readBody q ref
387+
388+{-# INLINE readBody #-}
389+readBody :: TQueue ByteString -> IORef Bool -> IO ByteString
390+readBody q ref = do
391+ eof <- readIORef ref
392+ if eof then
393+ return ""
394+ else do
395+ bs <- atomically $ readTQueue q
396+ when (bs == "") $ writeIORef ref True
397+ return bs
warp/Network/Wai/Handler/Warp/HTTP2/Request.hs+20−18
@@ -1,7 +1,9 @@
1+{-# LANGUAGE CPP #-}
12{-# LANGUAGE BangPatterns #-}
23
34module Network.Wai.Handler.Warp.HTTP2.Request (
4− toRequest
5+ mkRequest
6+ , MkReq
57 , getHTTP2Data
68 , setHTTP2Data
79 , modifyHTTP2Data
@@ -18,37 +20,36 @@ import Network.Socket (SockAddr)
1820import Network.Wai
1921import Network.Wai.Internal (Request(..))
2022import System.IO.Unsafe (unsafePerformIO)
21−import qualified System.TimeManager as T
2223
2324import Network.Wai.Handler.Warp.HTTP2.Types
25+import Network.Wai.Handler.Warp.HashMap (hashByteString)
2426import Network.Wai.Handler.Warp.Imports
25−import Network.Wai.Handler.Warp.Request (getFileInfoKey, pauseTimeoutKey, getClientCertificateKey)
27+import Network.Wai.Handler.Warp.Request (pauseTimeoutKey, getFileInfoKey)
2628import qualified Network.Wai.Handler.Warp.Settings as S (Settings, settingsNoParsePath)
29+import qualified Network.Wai.Handler.Warp.Timeout as Timeout
2730import Network.Wai.Handler.Warp.Types
2831
29−type ToReq = (TokenHeaderList,ValueTable) -> Maybe Int -> IO ByteString -> T.Handle -> Transport -> IO Request
32+type MkReq = (TokenHeaderList,ValueTable) -> (Maybe Int,IO ByteString) -> IO (Request,InternalInfo)
3033
31−----------------------------------------------------------------
32−
33−toRequest :: InternalInfo -> S.Settings -> SockAddr -> ToReq
34−toRequest ii settings addr ht bodylen body th transport = do
34+mkRequest :: InternalInfo1 -> S.Settings -> SockAddr -> MkReq
35+mkRequest ii1 settings addr (reqths,reqvt) (bodylen,body) = do
3536 ref <- newIORef Nothing
36− toRequest' ii settings addr ref ht bodylen body th transport
37+ mkRequest' ii1 settings addr ref (reqths,reqvt) (bodylen,body)
3738
38−toRequest' :: InternalInfo -> S.Settings -> SockAddr
39+mkRequest' :: InternalInfo1 -> S.Settings -> SockAddr
3940 -> IORef (Maybe HTTP2Data)
40− -> ToReq
41−toRequest' ii settings addr ref (reqths,reqvt) bodylen body th transport = return req
41+ -> MkReq
42+mkRequest' ii1 settings addr ref (reqths,reqvt) (bodylen,body) = return (req,ii)
4243 where
4344 !req = Request {
4445 requestMethod = colonMethod
45− , httpVersion = H.http20
46+ , httpVersion = http2ver
4647 , rawPathInfo = rawPath
4748 , pathInfo = H.decodePathSegments path
4849 , rawQueryString = query
4950 , queryString = H.parseQuery query
5051 , requestHeaders = headers
51− , isSecure = isTransportSecure transport
52+ , isSecure = True
5253 , remoteHost = addr
5354 , requestBody = body
5455 , vault = vaultValue
@@ -77,13 +78,14 @@ toRequest' ii settings addr ref (reqths,reqvt) bodylen body th transport = retur
7778 (unparsedPath,query) = C8.break (=='?') $ fromJust (mPath <|> mAuth)
7879 !path = H.extractPath unparsedPath
7980 !rawPath = if S.settingsNoParsePath settings then unparsedPath else path
80− -- fixme: pauseTimeout. th is not available here.
81− !vaultValue = Vault.insert getFileInfoKey (getFileInfo ii)
81+ !h = hashByteString rawPath
82+ !ii = toInternalInfo ii1 h
83+ !th = threadHandle ii
84+ !vaultValue = Vault.insert pauseTimeoutKey (Timeout.pause th)
85+ $ Vault.insert getFileInfoKey (getFileInfo ii)
8286 $ Vault.insert getHTTP2DataKey (readIORef ref)
8387 $ Vault.insert setHTTP2DataKey (writeIORef ref)
8488 $ Vault.insert modifyHTTP2DataKey (modifyIORef' ref)
85− $ Vault.insert pauseTimeoutKey (T.pause th)
86− $ Vault.insert getClientCertificateKey (tlsClientCertificate transport)
8789 Vault.empty
8890
8991getHTTP2DataKey :: Vault.Key (IO (Maybe HTTP2Data))
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+536
@@ -0,0 +1,536 @@
1+{-# LANGUAGE OverloadedStrings #-}
2+{-# LANGUAGE BangPatterns, CPP #-}
3+{-# LANGUAGE NamedFieldPuns #-}
4+
5+module Network.Wai.Handler.Warp.HTTP2.Sender (frameSender) where
6+
7+import Control.Concurrent.STM
8+import qualified Control.Exception as E
9+import qualified Data.ByteString as BS
10+import Data.ByteString.Builder (Builder)
11+import qualified Data.ByteString.Builder.Extra as B
12+import Data.IORef
13+import Foreign.Ptr (Ptr, plusPtr)
14+import Foreign.Storable (poke)
15+import Network.HPACK (setLimitForEncoding, toHeaderTable)
16+import Network.HTTP2
17+import Network.HTTP2.Priority (isEmptySTM, dequeueSTM, Precedence)
18+import Network.Wai
19+
20+#ifdef WINDOWS
21+import qualified System.IO as IO
22+#else
23+import Network.Wai.Handler.Warp.FdCache
24+import Network.Wai.Handler.Warp.SendFile (positionRead)
25+import qualified Network.Wai.Handler.Warp.Timeout as T
26+#endif
27+
28+import Network.Wai.Handler.Warp.Buffer
29+import Network.Wai.Handler.Warp.HTTP2.EncodeFrame
30+import Network.Wai.Handler.Warp.HTTP2.HPACK
31+import Network.Wai.Handler.Warp.HTTP2.Manager (Manager)
32+import Network.Wai.Handler.Warp.HTTP2.Types
33+import Network.Wai.Handler.Warp.Imports hiding (readInt)
34+import qualified Network.Wai.Handler.Warp.Settings as S
35+import Network.Wai.Handler.Warp.Types
36+
37+----------------------------------------------------------------
38+
39+data Leftover = LZero
40+ | LOne B.BufferWriter
41+ | LTwo ByteString B.BufferWriter
42+
43+----------------------------------------------------------------
44+
45+{-# INLINE getStreamWindowSize #-}
46+getStreamWindowSize :: Stream -> IO WindowSize
47+getStreamWindowSize Stream{streamWindow} = atomically $ readTVar streamWindow
48+
49+{-# INLINE waitStreamWindowSize #-}
50+waitStreamWindowSize :: Stream -> IO ()
51+waitStreamWindowSize Stream{streamWindow} = atomically $ do
52+ w <- readTVar streamWindow
53+ check (w > 0)
54+
55+{-# INLINE waitStreaming #-}
56+waitStreaming :: TBQueue a -> IO ()
57+waitStreaming tbq = atomically $ do
58+ isEmpty <- isEmptyTBQueue tbq
59+ check (not isEmpty)
60+
61+data Switch = C Control
62+ | O (StreamId,Precedence,Output)
63+ | Flush
64+
65+frameSender :: Context -> Connection -> S.Settings -> Manager -> IO ()
66+frameSender ctx@Context{outputQ,controlQ,connectionWindow,encodeDynamicTable}
67+ conn@Connection{connWriteBuffer,connBufferSize,connSendAll}
68+ settings mgr = loop 0 `E.catch` ignore
69+ where
70+ dequeue off = do
71+ isEmpty <- isEmptyTQueue controlQ
72+ if isEmpty then do
73+ w <- readTVar connectionWindow
74+ check (w > 0)
75+ emp <- isEmptySTM outputQ
76+ if emp then
77+ if off /= 0 then return Flush else retry
78+ else
79+ O <$> dequeueSTM outputQ
80+ else
81+ C <$> readTQueue controlQ
82+
83+ loop off = do
84+ x <- atomically $ dequeue off
85+ case x of
86+ C ctl -> do
87+ when (off /= 0) $ flushN off
88+ off' <- control ctl off
89+ when (off' >= 0) $ loop off'
90+ O (_,pre,out) -> do
91+ let strm = outputStream out
92+ writeIORef (streamPrecedence strm) pre
93+ off' <- outputOrEnqueueAgain out off
94+ case off' of
95+ 0 -> loop 0
96+ _ | off' > 15872 -> flushN off' >> loop 0 -- fixme: hard-coding
97+ | otherwise -> loop off'
98+ Flush -> flushN off >> loop 0
99+
100+ control CFinish _ = return (-1)
101+ control (CGoaway frame) _ = connSendAll frame >> return (-1)
102+ control (CFrame frame) _ = connSendAll frame >> return 0
103+ control (CSettings frame alist) _ = do
104+ connSendAll frame
105+ setLimit alist
106+ return 0
107+ control (CSettings0 frame1 frame2 alist) off = do -- off == 0, just in case
108+ let !buf = connWriteBuffer `plusPtr` off
109+ !off' = off + BS.length frame1 + BS.length frame2
110+ buf' <- copy buf frame1
111+ void $ copy buf' frame2
112+ setLimit alist
113+ return off'
114+
115+ {-# INLINE setLimit #-}
116+ setLimit alist = case lookup SettingsHeaderTableSize alist of
117+ Nothing -> return ()
118+ Just siz -> setLimitForEncoding siz encodeDynamicTable
119+
120+ output out@(Output strm _ _ tell getH2D (ONext curr)) off0 lim = do
121+ -- Data frame payload
122+ let !buf = connWriteBuffer `plusPtr` off0
123+ !siz = connBufferSize - off0
124+ Next datPayloadLen mnext <- curr buf siz lim
125+ off <- fillDataHeader strm off0 datPayloadLen mnext tell getH2D
126+ maybeEnqueueNext out mnext
127+ return off
128+
129+ output out@(Output strm rspn ii tell getH2D ORspn) off0 lim = do
130+ -- Header frame and Continuation frame
131+ let !sid = streamNumber strm
132+ !endOfStream = case rspn of
133+ RspnNobody _ _ -> True
134+ _ -> False
135+ ths <- addNecessaryHeaders ctx rspn ii settings
136+ kvlen <- headerContinue sid ths endOfStream off0
137+ off <- sendHeadersIfNecessary $ off0 + frameHeaderLength + kvlen
138+ case rspn of
139+ RspnNobody _ _ -> do
140+ closed ctx strm Finished
141+ return off
142+ RspnFile _ _ path mpart -> do
143+ -- Data frame payload
144+ let payloadOff = off + frameHeaderLength
145+ Next datPayloadLen mnext <-
146+ fillFileBodyGetNext conn ii payloadOff lim path mpart
147+ off' <- fillDataHeader strm off datPayloadLen mnext tell getH2D
148+ maybeEnqueueNext out mnext
149+ return off'
150+ RspnBuilder _ _ builder -> do
151+ -- Data frame payload
152+ let payloadOff = off + frameHeaderLength
153+ Next datPayloadLen mnext <-
154+ fillBuilderBodyGetNext conn ii payloadOff lim builder
155+ off' <- fillDataHeader strm off datPayloadLen mnext tell getH2D
156+ maybeEnqueueNext out mnext
157+ return off'
158+ RspnStreaming _ _ tbq -> do
159+ let payloadOff = off + frameHeaderLength
160+ Next datPayloadLen mnext <-
161+ fillStreamBodyGetNext conn payloadOff lim tbq strm
162+ off' <- fillDataHeader strm off datPayloadLen mnext tell getH2D
163+ maybeEnqueueNext out mnext
164+ return off'
165+
166+ output out@(Output strm _ _ _ _ (OPush ths pid)) off0 lim = do
167+ -- Creating a push promise header
168+ -- Frame id should be associated stream id from the client.
169+ let !sid = streamNumber strm
170+ len <- pushPromise pid sid ths off0
171+ off <- sendHeadersIfNecessary $ off0 + frameHeaderLength + len
172+ output out{ outputType = ORspn } off lim
173+
174+ output _ _ _ = undefined -- never reach
175+
176+ outputOrEnqueueAgain out off = E.handle resetStream $ do
177+ state <- readIORef $ streamState strm
178+ if isClosed state then
179+ return off
180+ else case out of
181+ Output _ _ _ wait _ OWait -> do
182+ -- Checking if all push are done.
183+ let out' = out {
184+ outputHook = return ()
185+ , outputType = ORspn
186+ }
187+ forkAndEnqueueWhenReady wait outputQ out' mgr
188+ return off
189+ _ -> case mtbq of
190+ Just tbq -> checkStreaming tbq
191+ _ -> checkStreamWindowSize
192+ where
193+ strm = outputStream out
194+ mtbq = outputMaybeTBQueue out
195+ checkStreaming tbq = do
196+ isEmpty <- atomically $ isEmptyTBQueue tbq
197+ if isEmpty then do
198+ forkAndEnqueueWhenReady (waitStreaming tbq) outputQ out mgr
199+ return off
200+ else
201+ checkStreamWindowSize
202+ checkStreamWindowSize = do
203+ sws <- getStreamWindowSize strm
204+ if sws == 0 then do
205+ forkAndEnqueueWhenReady (waitStreamWindowSize strm) outputQ out mgr
206+ return off
207+ else do
208+ cws <- atomically $ readTVar connectionWindow -- not 0
209+ let !lim = min cws sws
210+ output out off lim
211+ resetStream e = do
212+ closed ctx strm (ResetByMe e)
213+ let !rst = resetFrame InternalError $ streamNumber strm
214+ enqueueControl controlQ $ CFrame rst
215+ return off
216+
217+ {-# INLINE flushN #-}
218+ -- Flush the connection buffer to the socket, where the first 'n' bytes of
219+ -- the buffer are filled.
220+ flushN :: Int -> IO ()
221+ flushN n = bufferIO connWriteBuffer n connSendAll
222+
223+ headerContinue sid ths endOfStream off = do
224+ let !offkv = off + frameHeaderLength
225+ let !bufkv = connWriteBuffer `plusPtr` offkv
226+ !limkv = connBufferSize - offkv
227+ (hs,kvlen) <- hpackEncodeHeader ctx bufkv limkv ths
228+ let flag0 = case hs of
229+ [] -> setEndHeader defaultFlags
230+ _ -> defaultFlags
231+ flag = if endOfStream then setEndStream flag0 else flag0
232+ let buf = connWriteBuffer `plusPtr` off
233+ fillFrameHeader FrameHeaders kvlen sid flag buf
234+ continue sid kvlen hs
235+
236+ !bufHeaderPayload = connWriteBuffer `plusPtr` frameHeaderLength
237+ !headerPayloadLim = connBufferSize - frameHeaderLength
238+
239+ continue _ kvlen [] = return kvlen
240+ continue sid kvlen ths = do
241+ flushN $ kvlen + frameHeaderLength
242+ -- Now off is 0
243+ (ths', kvlen') <- hpackEncodeHeaderLoop ctx bufHeaderPayload headerPayloadLim ths
244+ when (ths == ths') $ E.throwIO $ ConnectionError CompressionError "cannot compress the header"
245+ let flag = case ths' of
246+ [] -> setEndHeader defaultFlags
247+ _ -> defaultFlags
248+ fillFrameHeader FrameContinuation kvlen' sid flag connWriteBuffer
249+ continue sid kvlen' ths'
250+
251+ {-# INLINE maybeEnqueueNext #-}
252+ -- Re-enqueue the stream in the output queue.
253+ maybeEnqueueNext :: Output -> Maybe DynaNext -> IO ()
254+ maybeEnqueueNext _ Nothing = return ()
255+ maybeEnqueueNext out (Just next) = enqueueOutput outputQ out'
256+ where
257+ !out' = out { outputType = ONext next }
258+
259+ {-# INLINE sendHeadersIfNecessary #-}
260+ -- Send headers if there is not room for a 1-byte data frame, and return
261+ -- the offset of the next frame's first header byte.
262+ sendHeadersIfNecessary off
263+ -- True if the connection buffer has room for a 1-byte data frame.
264+ | off + frameHeaderLength < connBufferSize = return off
265+ | otherwise = do
266+ flushN off
267+ return 0
268+
269+ fillDataHeader strm@Stream{streamWindow,streamNumber}
270+ off datPayloadLen mnext tell getH2D = do
271+ -- Data frame header
272+ mh2d <- getH2D
273+ let (!trailers,!noTrailers) = case http2dataTrailers <$> mh2d of
274+ Nothing -> ([], True)
275+ Just ts -> (ts, null ts)
276+ !buf = connWriteBuffer `plusPtr` off
277+ !off' = off + frameHeaderLength + datPayloadLen
278+ !noMoreBody = isNothing mnext
279+ flag | noMoreBody && noTrailers = setEndStream defaultFlags
280+ | otherwise = defaultFlags
281+ fillFrameHeader FrameData datPayloadLen streamNumber flag buf
282+ off'' <- handleEndOfBody noMoreBody off' noTrailers trailers
283+ atomically $ modifyTVar' connectionWindow (subtract datPayloadLen)
284+ atomically $ modifyTVar' streamWindow (subtract datPayloadLen)
285+ return off''
286+ where
287+ handleTrailers True off0 _ = return off0
288+ handleTrailers _ off0 trailers = do
289+ (ths,_) <- toHeaderTable trailers
290+ kvlen <- headerContinue streamNumber ths True off0
291+ sendHeadersIfNecessary $ off0 + frameHeaderLength + kvlen
292+ handleEndOfBody True off0 noTrailers trailers = do
293+ off1 <- handleTrailers noTrailers off0 trailers
294+ void tell
295+ closed ctx strm Finished
296+ return off1
297+ handleEndOfBody False off0 _ _ = return off0
298+
299+
300+ pushPromise pid sid ths off = do
301+ let !offsid = off + frameHeaderLength
302+ !bufsid = connWriteBuffer `plusPtr` offsid
303+ poke32 bufsid $ fromIntegral sid
304+ let !offkv = offsid + 4
305+ !bufkv = connWriteBuffer `plusPtr` offkv
306+ !limkv = connBufferSize - offkv
307+ (_,kvlen) <- hpackEncodeHeader ctx bufkv limkv ths
308+ let !flag = setEndHeader defaultFlags -- No EndStream flag
309+ !buf = connWriteBuffer `plusPtr` off
310+ !len = kvlen + 4
311+ fillFrameHeader FramePushPromise len pid flag buf
312+ return len
313+
314+ {-# INLINE fillFrameHeader #-}
315+ fillFrameHeader ftyp len sid flag buf = encodeFrameHeaderBuf ftyp hinfo buf
316+ where
317+ hinfo = FrameHeader len flag sid
318+
319+ {-# INLINE ignore #-}
320+ ignore :: E.SomeException -> IO ()
321+ ignore _ = return ()
322+
323+----------------------------------------------------------------
324+
325+{-
326+ResponseFile Status ResponseHeaders FilePath (Maybe FilePart)
327+ResponseBuilder Status ResponseHeaders Builder
328+ResponseStream Status ResponseHeaders StreamingBody
329+ResponseRaw (IO ByteString -> (ByteString -> IO ()) -> IO ()) Response
330+-}
331+
332+fillBuilderBodyGetNext :: Connection -> InternalInfo -> Int -> WindowSize -> Builder -> IO Next
333+fillBuilderBodyGetNext Connection{connWriteBuffer,connBufferSize}
334+ _ off lim bb = do
335+ let datBuf = connWriteBuffer `plusPtr` off
336+ room = min (connBufferSize - off) lim
337+ (len, signal) <- B.runBuilder bb datBuf room
338+ return $ nextForBuilder len signal
339+
340+fillFileBodyGetNext :: Connection -> InternalInfo -> Int -> WindowSize -> FilePath -> Maybe FilePart -> IO Next
341+#ifdef WINDOWS
342+fillFileBodyGetNext Connection{connWriteBuffer,connBufferSize}
343+ _ off lim path mpart = do
344+ let datBuf = connWriteBuffer `plusPtr` off
345+ room = min (connBufferSize - off) lim
346+ (start, bytes) <- fileStartEnd path mpart
347+ -- fixme: how to close Handle? GC does it at this moment.
348+ hdl <- IO.openBinaryFile path IO.ReadMode
349+ IO.hSeek hdl IO.AbsoluteSeek start
350+ len <- IO.hGetBufSome hdl datBuf (mini room bytes)
351+ let bytes' = bytes - fromIntegral len
352+ -- fixme: connWriteBuffer connBufferSize
353+ return $ nextForFile len hdl bytes' (return ())
354+#else
355+fillFileBodyGetNext Connection{connWriteBuffer,connBufferSize}
356+ ii off lim path mpart = do
357+ (mfd, refresh') <- getFd ii path
358+ (fd, refresh) <- case mfd of
359+ Nothing -> do
360+ fd' <- openFile path
361+ th <- T.register (timeoutManager ii) (closeFile fd')
362+ return (fd', T.tickle th)
363+ Just fd -> return (fd, refresh')
364+ let datBuf = connWriteBuffer `plusPtr` off
365+ room = min (connBufferSize - off) lim
366+ (start, bytes) <- fileStartEnd path mpart
367+ len <- positionRead fd datBuf (mini room bytes) start
368+ refresh
369+ let len' = fromIntegral len
370+ return $ nextForFile len fd (start + len') (bytes - len') refresh
371+#endif
372+
373+fileStartEnd :: FilePath -> Maybe FilePart -> IO (Integer, Integer)
374+fileStartEnd _ (Just part) =
375+ return (filePartOffset part, filePartByteCount part)
376+fileStartEnd _ _ = error "fileStartEnd"
377+
378+----------------------------------------------------------------
379+
380+fillStreamBodyGetNext :: Connection -> Int -> WindowSize -> TBQueue Sequence -> Stream -> IO Next
381+fillStreamBodyGetNext Connection{connWriteBuffer,connBufferSize}
382+ off lim sq strm = do
383+ let datBuf = connWriteBuffer `plusPtr` off
384+ room = min (connBufferSize - off) lim
385+ (leftover, cont, len) <- runStreamBuilder datBuf room sq
386+ return $ nextForStream sq strm leftover cont len
387+
388+----------------------------------------------------------------
389+
390+fillBufBuilder :: Leftover -> DynaNext
391+fillBufBuilder leftover buf0 siz0 lim = do
392+ let payloadBuf = buf0 `plusPtr` frameHeaderLength
393+ room = min (siz0 - frameHeaderLength) lim
394+ case leftover of
395+ LZero -> error "fillBufBuilder: LZero"
396+ LOne writer -> do
397+ (len, signal) <- writer payloadBuf room
398+ getNext len signal
399+ LTwo bs writer
400+ | BS.length bs <= room -> do
401+ buf1 <- copy payloadBuf bs
402+ let len1 = BS.length bs
403+ (len2, signal) <- writer buf1 (room - len1)
404+ getNext (len1 + len2) signal
405+ | otherwise -> do
406+ let (bs1,bs2) = BS.splitAt room bs
407+ void $ copy payloadBuf bs1
408+ getNext room (B.Chunk bs2 writer)
409+ where
410+ getNext l s = return $ nextForBuilder l s
411+
412+nextForBuilder :: BytesFilled -> B.Next -> Next
413+nextForBuilder len B.Done
414+ = Next len Nothing
415+nextForBuilder len (B.More _ writer)
416+ = Next len $ Just (fillBufBuilder (LOne writer))
417+nextForBuilder len (B.Chunk bs writer)
418+ = Next len $ Just (fillBufBuilder (LTwo bs writer))
419+
420+----------------------------------------------------------------
421+
422+runStreamBuilder :: Buffer -> BufSize -> TBQueue Sequence
423+ -> IO (Leftover, Bool, BytesFilled)
424+runStreamBuilder buf0 room0 sq = loop buf0 room0 0
425+ where
426+ loop !buf !room !total = do
427+ mbuilder <- atomically $ tryReadTBQueue sq
428+ case mbuilder of
429+ Nothing -> return (LZero, True, total)
430+ Just (SBuilder builder) -> do
431+ (len, signal) <- B.runBuilder builder buf room
432+ let !total' = total + len
433+ case signal of
434+ B.Done -> loop (buf `plusPtr` len) (room - len) total'
435+ B.More _ writer -> return (LOne writer, True, total')
436+ B.Chunk bs writer -> return (LTwo bs writer, True, total')
437+ Just SFlush -> return (LZero, True, total)
438+ Just SFinish -> return (LZero, False, total)
439+
440+fillBufStream :: Leftover -> TBQueue Sequence -> Stream -> DynaNext
441+fillBufStream leftover0 sq strm buf0 siz0 lim0 = do
442+ let payloadBuf = buf0 `plusPtr` frameHeaderLength
443+ room0 = min (siz0 - frameHeaderLength) lim0
444+ case leftover0 of
445+ LZero -> do
446+ (leftover, cont, len) <- runStreamBuilder payloadBuf room0 sq
447+ getNext leftover cont len
448+ LOne writer -> write writer payloadBuf room0 0
449+ LTwo bs writer
450+ | BS.length bs <= room0 -> do
451+ buf1 <- copy payloadBuf bs
452+ let len = BS.length bs
453+ write writer buf1 (room0 - len) len
454+ | otherwise -> do
455+ let (bs1,bs2) = BS.splitAt room0 bs
456+ void $ copy payloadBuf bs1
457+ getNext (LTwo bs2 writer) True room0
458+ where
459+ getNext l b r = return $ nextForStream sq strm l b r
460+ write writer1 buf room sofar = do
461+ (len, signal) <- writer1 buf room
462+ case signal of
463+ B.Done -> do
464+ (leftover, cont, extra) <- runStreamBuilder (buf `plusPtr` len) (room - len) sq
465+ let !total = sofar + len + extra
466+ getNext leftover cont total
467+ B.More _ writer -> do
468+ let !total = sofar + len
469+ getNext (LOne writer) True total
470+ B.Chunk bs writer -> do
471+ let !total = sofar + len
472+ getNext (LTwo bs writer) True total
473+
474+nextForStream :: TBQueue Sequence -> Stream
475+ -> Leftover -> Bool -> BytesFilled
476+ -> Next
477+nextForStream _ _ _ False len = Next len Nothing
478+nextForStream sq strm leftOrZero True len =
479+ Next len $ Just (fillBufStream leftOrZero sq strm)
480+
481+----------------------------------------------------------------
482+
483+#ifdef WINDOWS
484+fillBufFile :: IO.Handle -> Integer -> IO () -> DynaNext
485+fillBufFile h bytes refresh buf siz lim = do
486+ let payloadBuf = buf `plusPtr` frameHeaderLength
487+ room = min (siz - frameHeaderLength) lim
488+ len <- IO.hGetBufSome h payloadBuf room
489+ refresh
490+ let bytes' = bytes - fromIntegral len
491+ return $ nextForFile len h bytes' refresh
492+
493+nextForFile :: BytesFilled -> IO.Handle -> Integer -> IO () -> Next
494+nextForFile 0 _ _ _ = Next 0 Nothing
495+nextForFile len _ 0 _ = Next len Nothing
496+nextForFile len h bytes refresh =
497+ Next len $ Just (fillBufFile h bytes refresh)
498+#else
499+fillBufFile :: Fd -> Integer -> Integer -> IO () -> DynaNext
500+fillBufFile fd start bytes refresh buf siz lim = do
501+ let payloadBuf = buf `plusPtr` frameHeaderLength
502+ room = min (siz - frameHeaderLength) lim
503+ len <- positionRead fd payloadBuf (mini room bytes) start
504+ let len' = fromIntegral len
505+ refresh
506+ return $ nextForFile len fd (start + len') (bytes - len') refresh
507+
508+nextForFile :: BytesFilled -> Fd -> Integer -> Integer -> IO () -> Next
509+nextForFile 0 _ _ _ _ = Next 0 Nothing
510+nextForFile len _ _ 0 _ = Next len Nothing
511+nextForFile len fd start bytes refresh =
512+ Next len $ Just (fillBufFile fd start bytes refresh)
513+#endif
514+
515+{-# INLINE mini #-}
516+mini :: Int -> Integer -> Int
517+mini i n
518+ | fromIntegral i < n = i
519+ | otherwise = fromIntegral n
520+
521+
522+----------------------------------------------------------------
523+
524+poke32 :: Ptr Word8 -> Word32 -> IO ()
525+poke32 ptr i = do
526+ poke ptr w0
527+ poke8 ptr 1 w1
528+ poke8 ptr 2 w2
529+ poke8 ptr 3 w3
530+ where
531+ w0 = fromIntegral ((i `shiftR` 24) .&. 0xff)
532+ w1 = fromIntegral ((i `shiftR` 16) .&. 0xff)
533+ w2 = fromIntegral ((i `shiftR` 8) .&. 0xff)
534+ w3 = fromIntegral (i .&. 0xff)
535+ poke8 :: Ptr Word8 -> Int -> Word8 -> IO ()
536+ poke8 ptr0 n w = poke (ptr0 `plusPtr` n) w
warp/Network/Wai/Handler/Warp/HTTP2/Types.hs+265−13
@@ -1,26 +1,282 @@
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 Control.Concurrent (forkIO)
8+import Control.Concurrent.STM
9+import Control.Exception (SomeException, bracket)
710import qualified Data.ByteString as BS
11+import Data.ByteString.Builder (Builder)
12+import Data.IORef
13+import Data.IntMap.Strict (IntMap, IntMap)
14+import qualified Data.IntMap.Strict as M
15+import Network.HPACK hiding (Buffer)
816import qualified Network.HTTP.Types as H
917import Network.HTTP2
10−import qualified Network.HTTP2.Server as H2
18+import Network.HTTP2.Priority
19+import Network.Wai (Request, FilePart)
1120
21+import Network.Wai.Handler.Warp.HTTP2.Manager
1222import Network.Wai.Handler.Warp.Imports
1323import Network.Wai.Handler.Warp.Types
1424
1525----------------------------------------------------------------
1626
27+http2ver :: H.HttpVersion
28+http2ver = H.HttpVersion 2 0
29+
1730isHTTP2 :: Transport -> Bool
1831isHTTP2 TCP = False
1932isHTTP2 tls = useHTTP2
2033 where
2134 useHTTP2 = case tlsNegotiatedProtocol tls of
2235 Nothing -> False
23− Just proto -> "h2" `BS.isPrefixOf` proto
36+ Just proto -> "h2-" `BS.isPrefixOf` proto
37+
38+----------------------------------------------------------------
39+
40+data Input = Input Stream Request ValueTable InternalInfo
41+
42+----------------------------------------------------------------
43+
44+type DynaNext = Buffer -> BufSize -> WindowSize -> IO Next
45+
46+type BytesFilled = Int
47+
48+data Next = Next !BytesFilled (Maybe DynaNext)
49+
50+data Rspn = RspnNobody H.Status (TokenHeaderList, ValueTable)
51+ | RspnStreaming H.Status (TokenHeaderList, ValueTable) (TBQueue Sequence)
52+ | RspnBuilder H.Status (TokenHeaderList, ValueTable) Builder
53+ | RspnFile H.Status (TokenHeaderList, ValueTable) FilePath (Maybe FilePart)
54+
55+rspnStatus :: Rspn -> H.Status
56+rspnStatus (RspnNobody s _) = s
57+rspnStatus (RspnStreaming s _ _) = s
58+rspnStatus (RspnBuilder s _ _) = s
59+rspnStatus (RspnFile s _ _ _ ) = s
60+
61+rspnHeaders :: Rspn -> (TokenHeaderList, ValueTable)
62+rspnHeaders (RspnNobody _ t) = t
63+rspnHeaders (RspnStreaming _ t _) = t
64+rspnHeaders (RspnBuilder _ t _) = t
65+rspnHeaders (RspnFile _ t _ _ ) = t
66+
67+data Output = Output {
68+ outputStream :: !Stream
69+ , outputRspn :: !Rspn
70+ , outputII :: !InternalInfo
71+ , outputHook :: IO () -- OPush: wait for done, O*: telling done
72+ , outputH2Data :: IO (Maybe HTTP2Data)
73+ , outputType :: !OutputType
74+ }
75+
76+data OutputType = ORspn
77+ | OWait
78+ | OPush !TokenHeaderList !StreamId -- associated stream id from client
79+ | ONext !DynaNext
80+
81+outputMaybeTBQueue :: Output -> Maybe (TBQueue Sequence)
82+outputMaybeTBQueue (Output _ (RspnStreaming _ _ tbq) _ _ _ _) = Just tbq
83+outputMaybeTBQueue _ = Nothing
84+
85+data Control = CFinish
86+ | CGoaway !ByteString
87+ | CFrame !ByteString
88+ | CSettings !ByteString !SettingsList
89+ | CSettings0 !ByteString !ByteString !SettingsList
90+
91+----------------------------------------------------------------
92+
93+data Sequence = SFinish
94+ | SFlush
95+ | SBuilder Builder
96+
97+----------------------------------------------------------------
98+
99+-- | The context for HTTP/2 connection.
100+data Context = Context {
101+ -- HTTP/2 settings received from a browser
102+ http2settings :: !(IORef Settings)
103+ , firstSettings :: !(IORef Bool)
104+ , streamTable :: !StreamTable
105+ , concurrency :: !(IORef Int)
106+ , priorityTreeSize :: !(IORef Int)
107+ -- | RFC 7540 says "Other frames (from any stream) MUST NOT
108+ -- occur between the HEADERS frame and any CONTINUATION
109+ -- frames that might follow". This field is used to implement
110+ -- this requirement.
111+ , continued :: !(IORef (Maybe StreamId))
112+ , clientStreamId :: !(IORef StreamId)
113+ , serverStreamId :: !(IORef StreamId)
114+ , inputQ :: !(TQueue Input)
115+ , outputQ :: !(PriorityTree Output)
116+ , controlQ :: !(TQueue Control)
117+ , encodeDynamicTable :: !DynamicTable
118+ , decodeDynamicTable :: !DynamicTable
119+ -- the connection window for data from a server to a browser.
120+ , connectionWindow :: !(TVar WindowSize)
121+ }
122+
123+----------------------------------------------------------------
124+
125+newContext :: IO Context
126+newContext = Context <$> newIORef defaultSettings
127+ <*> newIORef False
128+ <*> newStreamTable
129+ <*> newIORef 0
130+ <*> newIORef 0
131+ <*> newIORef Nothing
132+ <*> newIORef 0
133+ <*> newIORef 0
134+ <*> newTQueueIO
135+ <*> newPriorityTree
136+ <*> newTQueueIO
137+ <*> newDynamicTableForEncoding defaultDynamicTableSize
138+ <*> newDynamicTableForDecoding defaultDynamicTableSize 4096
139+ <*> newTVarIO defaultInitialWindowSize
140+
141+clearContext :: Context -> IO ()
142+clearContext _ctx = return ()
143+
144+----------------------------------------------------------------
145+
146+data OpenState =
147+ JustOpened
148+ | Continued [HeaderBlockFragment]
149+ !Int -- Total size
150+ !Int -- The number of continuation frames
151+ !Bool -- End of stream
152+ !Priority
153+ | NoBody (TokenHeaderList,ValueTable) !Priority
154+ | HasBody (TokenHeaderList,ValueTable) !Priority
155+ | Body !(TQueue ByteString)
156+ !(Maybe Int) -- received Content-Length
157+ -- compared the body length for error checking
158+ !(IORef Int) -- actual body length
159+
160+data ClosedCode = Finished
161+ | Killed
162+ | Reset !ErrorCodeId
163+ | ResetByMe SomeException
164+ deriving Show
165+
166+data StreamState =
167+ Idle
168+ | Open !OpenState
169+ | HalfClosed
170+ | Closed !ClosedCode
171+ | Reserved
172+
173+isIdle :: StreamState -> Bool
174+isIdle Idle = True
175+isIdle _ = False
176+
177+isOpen :: StreamState -> Bool
178+isOpen Open{} = True
179+isOpen _ = False
180+
181+isHalfClosed :: StreamState -> Bool
182+isHalfClosed HalfClosed = True
183+isHalfClosed _ = False
184+
185+isClosed :: StreamState -> Bool
186+isClosed Closed{} = True
187+isClosed _ = False
188+
189+instance Show StreamState where
190+ show Idle = "Idle"
191+ show Open{} = "Open"
192+ show HalfClosed = "HalfClosed"
193+ show (Closed e) = "Closed: " ++ show e
194+ show Reserved = "Reserved"
195+
196+----------------------------------------------------------------
197+
198+data Stream = Stream {
199+ streamNumber :: !StreamId
200+ , streamState :: !(IORef StreamState)
201+ , streamWindow :: !(TVar WindowSize)
202+ , streamPrecedence :: !(IORef Precedence)
203+ }
204+
205+instance Show Stream where
206+ show s = show (streamNumber s)
207+
208+newStream :: StreamId -> WindowSize -> IO Stream
209+newStream sid win = Stream sid <$> newIORef Idle
210+ <*> newTVarIO win
211+ <*> newIORef defaultPrecedence
212+
213+newPushStream :: Context -> WindowSize -> Precedence -> IO Stream
214+newPushStream Context{serverStreamId} win pre = do
215+ sid <- atomicModifyIORef' serverStreamId inc2
216+ Stream sid <$> newIORef Reserved
217+ <*> newTVarIO win
218+ <*> newIORef pre
219+ where
220+ inc2 x = let !x' = x + 2 in (x', x')
221+
222+----------------------------------------------------------------
223+
224+opened :: Context -> Stream -> IO ()
225+opened Context{concurrency} Stream{streamState} = do
226+ atomicModifyIORef' concurrency (\x -> (x+1,()))
227+ writeIORef streamState (Open JustOpened)
228+
229+closed :: Context -> Stream -> ClosedCode -> IO ()
230+closed Context{concurrency,streamTable} Stream{streamState,streamNumber} cc = do
231+ remove streamTable streamNumber
232+ atomicModifyIORef' concurrency (\x -> (x-1,()))
233+ writeIORef streamState (Closed cc) -- anyway
234+
235+----------------------------------------------------------------
236+
237+newtype StreamTable = StreamTable (IORef (IntMap Stream))
238+
239+newStreamTable :: IO StreamTable
240+newStreamTable = StreamTable <$> newIORef M.empty
241+
242+insert :: StreamTable -> M.Key -> Stream -> IO ()
243+insert (StreamTable ref) k v = atomicModifyIORef' ref $ \m ->
244+ let !m' = M.insert k v m
245+ in (m', ())
246+
247+remove :: StreamTable -> M.Key -> IO ()
248+remove (StreamTable ref) k = atomicModifyIORef' ref $ \m ->
249+ let !m' = M.delete k m
250+ in (m', ())
251+
252+search :: StreamTable -> M.Key -> IO (Maybe Stream)
253+search (StreamTable ref) k = M.lookup k <$> readIORef ref
254+
255+updateAllStreamWindow :: (WindowSize -> WindowSize) -> StreamTable -> IO ()
256+updateAllStreamWindow adst (StreamTable ref) = do
257+ strms <- M.elems <$> readIORef ref
258+ forM_ strms $ \strm -> atomically $ modifyTVar (streamWindow strm) adst
259+
260+{-# INLINE forkAndEnqueueWhenReady #-}
261+forkAndEnqueueWhenReady :: IO () -> PriorityTree Output -> Output -> Manager -> IO ()
262+forkAndEnqueueWhenReady wait outQ out mgr = bracket setup teardown $ \_ ->
263+ void . forkIO $ do
264+ wait
265+ enqueueOutput outQ out
266+ where
267+ setup = addMyId mgr
268+ teardown _ = deleteMyId mgr
269+
270+{-# INLINE enqueueOutput #-}
271+enqueueOutput :: PriorityTree Output -> Output -> IO ()
272+enqueueOutput outQ out = do
273+ let Stream{..} = outputStream out
274+ pre <- readIORef streamPrecedence
275+ enqueue outQ streamNumber pre out
276+
277+{-# INLINE enqueueControl #-}
278+enqueueControl :: TQueue Control -> Control -> IO ()
279+enqueueControl ctlQ ctl = atomically $ writeTQueue ctlQ ctl
24280
25281----------------------------------------------------------------
26282
@@ -32,21 +288,17 @@ data HTTP2Data = HTTP2Data {
32288 --
33289 -- Since: 3.2.7
34290 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− }
291+ -- Since: 3.2.8
292+ , http2dataTrailers :: H.ResponseHeaders
293+ } deriving (Eq,Show)
40294
41295-- | Default HTTP/2 specific data.
42296--
43297-- Since: 3.2.7
44298defaultHTTP2Data :: HTTP2Data
45−defaultHTTP2Data = HTTP2Data [] H2.defaultTrailersMaker
299+defaultHTTP2Data = HTTP2Data [] []
46300
47301-- | HTTP/2 push promise or sever push.
48−-- This allows files only for backward-compatibility
49−-- while the HTTP/2 library supports other types.
50302--
51303-- Since: 3.2.7
52304data PushPromise = PushPromise {
warp/Network/Wai/Handler/Warp/HTTP2/Worker.hsnew file+315
@@ -0,0 +1,315 @@
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+import Control.Concurrent.STM
15+import Control.Exception (SomeException(..), AsyncException(..))
16+import qualified Control.Exception as E
17+import Data.ByteString.Builder (byteString)
18+import Data.IORef
19+import Network.HPACK
20+import Network.HPACK.Token
21+import qualified Network.HTTP.Types as H
22+import Network.HTTP2
23+import Network.HTTP2.Priority
24+import Network.Wai
25+import Network.Wai.Internal (Response(..), ResponseReceived(..), ResponseReceived(..))
26+
27+import Network.Wai.Handler.Warp.FileInfoCache
28+import Network.Wai.Handler.Warp.HTTP2.EncodeFrame
29+import Network.Wai.Handler.Warp.HTTP2.File
30+import Network.Wai.Handler.Warp.HTTP2.Manager
31+import Network.Wai.Handler.Warp.HTTP2.Request
32+import Network.Wai.Handler.Warp.HTTP2.Types
33+import Network.Wai.Handler.Warp.Imports hiding (insert)
34+import qualified Network.Wai.Handler.Warp.Response as R
35+import qualified Network.Wai.Handler.Warp.Settings as S
36+import qualified Network.Wai.Handler.Warp.Timeout as T
37+import Network.Wai.Handler.Warp.Types
38+
39+----------------------------------------------------------------
40+
41+-- | The wai definition is 'type Application = Request -> (Response -> IO ResponseReceived) -> IO ResponseReceived'.
42+-- This type implements the second argument (Response -> IO ResponseReceived)
43+-- with extra arguments.
44+type Responder = InternalInfo
45+ -> ValueTable -- for Request
46+ -> ThreadContinue
47+ -> Stream
48+ -> Request
49+ -> Response
50+ -> IO ResponseReceived
51+
52+pushStream :: Context -> S.Settings
53+ -> StreamId -> ValueTable -> Request -> InternalInfo
54+ -> Maybe HTTP2Data
55+ -> IO (OutputType, IO ())
56+pushStream _ _ _ _ _ _ Nothing = return (ORspn, return ())
57+pushStream ctx@Context{http2settings,outputQ,streamTable}
58+ settings pid reqvt req ii (Just h2d)
59+ | len == 0 = return (ORspn, return ())
60+ | otherwise = do
61+ pushable <- enablePush <$> readIORef http2settings
62+ if pushable then do
63+ tvar <- newTVarIO 0
64+ lim <- push tvar pps0 0
65+ if lim == 0 then
66+ return (ORspn, return ())
67+ else
68+ return (OWait, waiter lim tvar)
69+ else
70+ return (ORspn, return ())
71+ where
72+ !pps0 = http2dataPushPromise h2d
73+ !len = length pps0
74+ !pushLogger = S.settingsServerPushLogger settings
75+ increment tvar = atomically $ modifyTVar' tvar (+1)
76+ waiter lim tvar = atomically $ do
77+ n <- readTVar tvar
78+ check (n >= lim)
79+ !h2data = getHTTP2Data req
80+ push _ [] !n = return (n :: Int)
81+ push tvar (pp:pps) !n = do
82+ let !file = promisedFile pp
83+ efinfo <- E.try $ getFileInfo ii file
84+ case efinfo of
85+ Left (_ex :: E.IOException) -> push tvar pps n
86+ Right (FileInfo _ size _ date) -> do
87+ ws <- initialWindowSize <$> readIORef http2settings
88+ let !w = promisedWeight pp
89+ !pri = defaultPriority { weight = w }
90+ !pre = toPrecedence pri
91+ strm <- newPushStream ctx ws pre
92+ let !sid = streamNumber strm
93+ insert streamTable sid strm
94+ (ths0, vt) <- toHeaderTable (promisedResponseHeaders pp)
95+ let !scheme = fromJust $ getHeaderValue tokenScheme reqvt
96+ -- fixme: this value can be Nothing
97+ !auth = fromJust (getHeaderValue tokenHost reqvt
98+ <|> getHeaderValue tokenAuthority reqvt)
99+ !path = promisedPath pp
100+ !promisedRequest = [(tokenMethod, H.methodGet)
101+ ,(tokenScheme, scheme)
102+ ,(tokenAuthority, auth)
103+ ,(tokenPath, path)]
104+ !part = FilePart 0 size size
105+ !rsp = RspnFile H.ok200 (ths,vt) file (Just part)
106+ !ths = (tokenLastModified,date) :
107+ addContentHeadersForFilePart ths0 part
108+ pushLogger req path size
109+ let !ot = OPush promisedRequest pid
110+ !out = Output strm rsp ii (increment tvar) h2data ot
111+ enqueueOutput outputQ out
112+ push tvar pps (n + 1)
113+
114+
115+-- | This function is passed to workers.
116+-- They also pass 'Response's from 'Application's to this function.
117+-- This function enqueues commands for the HTTP/2 sender.
118+response :: S.Settings -> Context -> Manager -> Responder
119+response settings ctx@Context{outputQ} mgr ii reqvt tconf strm req rsp = case rsp of
120+ ResponseStream s0 hs0 strmbdy
121+ | noBody s0 -> responseNoBody s0 hs0
122+ | isHead -> responseNoBody s0 hs0
123+ | otherwise -> getHTTP2Data req
124+ >>= pushStream ctx settings sid reqvt req ii
125+ >>= responseStreaming s0 hs0 strmbdy
126+ ResponseBuilder s0 hs0 b
127+ | noBody s0 -> responseNoBody s0 hs0
128+ | isHead -> responseNoBody s0 hs0
129+ | otherwise -> getHTTP2Data req
130+ >>= pushStream ctx settings sid reqvt req ii
131+ >>= responseBuilderBody s0 hs0 b
132+ ResponseFile s0 hs0 p mp
133+ | noBody s0 -> responseNoBody s0 hs0
134+ | otherwise -> getHTTP2Data req
135+ >>= pushStream ctx settings sid reqvt req ii
136+ >>= responseFileXXX s0 hs0 p mp
137+ ResponseRaw _ _ -> error "HTTP/2 does not support ResponseRaw"
138+ where
139+ noBody = not . R.hasBody
140+ !isHead = requestMethod req == H.methodHead
141+ !logger = S.settingsLogger settings
142+ !th = threadHandle ii
143+ sid = streamNumber strm
144+ !h2data = getHTTP2Data req
145+
146+ -- Ideally, log messages should be written when responses are
147+ -- actually sent. But there is no way to keep good memory usage
148+ -- (resist to Request leak) and throughput. By compromise,
149+ -- log message are written here even the window size of streams
150+ -- is 0.
151+
152+ responseNoBody s hs0 = toHeaderTable hs0 >>= responseNoBody' s
153+
154+ responseNoBody' s tbl = do
155+ logger req s Nothing
156+ setThreadContinue tconf True
157+ let !rspn = RspnNobody s tbl
158+ !out = Output strm rspn ii (return ()) h2data ORspn
159+ enqueueOutput outputQ out
160+ return ResponseReceived
161+
162+ responseBuilderBody s hs0 bdy (rspnOrWait,tell) = do
163+ logger req s Nothing
164+ setThreadContinue tconf True
165+ tbl <- toHeaderTable hs0
166+ let !rspn = RspnBuilder s tbl bdy
167+ !out = Output strm rspn ii tell h2data rspnOrWait
168+ enqueueOutput outputQ out
169+ return ResponseReceived
170+
171+ responseFileXXX _ hs0 path Nothing aux = do
172+ efinfo <- E.try $ getFileInfo ii path
173+ case efinfo of
174+ Left (_ex :: E.IOException) -> response404 hs0
175+ Right finfo -> do
176+ (rspths0,vt) <- toHeaderTable hs0
177+ case conditionalRequest finfo rspths0 reqvt of
178+ WithoutBody s -> responseNoBody s hs0
179+ WithBody s rspths beg len -> responseFile2XX s (rspths,vt) path (Just (FilePart beg len (fileInfoSize finfo))) aux
180+
181+ responseFileXXX s0 hs0 path mpart aux = do
182+ tbl <- toHeaderTable hs0
183+ responseFile2XX s0 tbl path mpart aux
184+
185+ responseFile2XX s tbl path mpart (rspnOrWait,tell)
186+ | isHead = do
187+ logger req s Nothing
188+ responseNoBody' s tbl
189+ | otherwise = do
190+ logger req s (filePartByteCount <$> mpart)
191+ setThreadContinue tconf True
192+ let !rspn = RspnFile s tbl path mpart
193+ !out = Output strm rspn ii tell h2data rspnOrWait
194+ enqueueOutput outputQ out
195+ return ResponseReceived
196+
197+ response404 hs0 = responseBuilderBody s hs body (ORspn, return ())
198+ where
199+ s = H.notFound404
200+ hs = R.replaceHeader H.hContentType "text/plain; charset=utf-8" hs0
201+ body = byteString "File not found"
202+
203+ responseStreaming s0 hs0 strmbdy (rspnOrWait,tell) = do
204+ logger req s0 Nothing
205+ -- We must not exit this WAI application.
206+ -- If the application exits, streaming would be also closed.
207+ -- So, this work occupies this thread.
208+ --
209+ -- We need to increase the number of workers.
210+ spawnAction mgr
211+ -- After this work, this thread stops to decease
212+ -- the number of workers.
213+ setThreadContinue tconf False
214+ -- Since 'StreamingBody' is loop, we cannot control it.
215+ -- So, let's serialize 'Builder' with a designated queue.
216+ tbq <- newTBQueueIO 10 -- fixme: hard coding: 10
217+ tbl <- toHeaderTable hs0
218+ let !rspn = RspnStreaming s0 tbl tbq
219+ !out = Output strm rspn ii tell h2data rspnOrWait
220+ enqueueOutput outputQ out
221+ let push b = do
222+ atomically $ writeTBQueue tbq (SBuilder b)
223+ T.tickle th
224+ flush = atomically $ writeTBQueue tbq SFlush
225+ _ <- strmbdy push flush
226+ atomically $ writeTBQueue tbq SFinish
227+ deleteMyId mgr
228+ return ResponseReceived
229+
230+worker :: Context -> S.Settings -> Application -> Responder -> T.Manager -> IO ()
231+worker ctx@Context{inputQ,controlQ} set app responder tm = do
232+ sinfo <- newStreamInfo
233+ tcont <- newThreadContinue
234+ let timeoutAction = return () -- cannot close the shared connection
235+ E.bracket (T.registerKillThread tm timeoutAction) T.cancel $ go sinfo tcont
236+ where
237+ go sinfo tcont th = do
238+ setThreadContinue tcont True
239+ ex <- E.try $ do
240+ T.pause th
241+ inp@(Input strm req reqvt ii) <- atomically $ readTQueue inputQ
242+ setStreamInfo sinfo inp
243+ T.resume th
244+ T.tickle th
245+ app req $ responder ii reqvt tcont strm req
246+ cont1 <- case ex of
247+ Right ResponseReceived -> return True
248+ Left e@(SomeException _)
249+ -- killed by the local worker manager
250+ | Just ThreadKilled <- E.fromException e -> return False
251+ -- killed by the local timeout manager
252+ | Just T.TimeoutThread <- E.fromException e -> do
253+ cleanup sinfo Nothing
254+ return True
255+ | otherwise -> do
256+ cleanup sinfo $ Just e
257+ return True
258+ cont2 <- getThreadContinue tcont
259+ clearStreamInfo sinfo
260+ when (cont1 && cont2) $ go sinfo tcont th
261+ cleanup sinfo me = do
262+ minp <- getStreamInfo sinfo
263+ case minp of
264+ Nothing -> return ()
265+ Just (Input strm req _reqvt _ii) -> do
266+ closed ctx strm Killed
267+ let !frame = resetFrame InternalError (streamNumber strm)
268+ enqueueControl controlQ $ CFrame frame
269+ case me of
270+ Nothing -> return ()
271+ Just e -> S.settingsOnException set (Just req) e
272+
273+----------------------------------------------------------------
274+
275+-- | It would nice if responders could return values to workers.
276+-- Unfortunately, 'ResponseReceived' is already defined in WAI 2.0.
277+-- It is not wise to change this type.
278+-- So, a reference is shared by a responder and its worker.
279+-- The reference refers a value of this type as a return value.
280+-- If 'True', the worker continue to serve requests.
281+-- Otherwise, the worker get finished.
282+newtype ThreadContinue = ThreadContinue (IORef Bool)
283+
284+{-# INLINE newThreadContinue #-}
285+newThreadContinue :: IO ThreadContinue
286+newThreadContinue = ThreadContinue <$> newIORef True
287+
288+{-# INLINE setThreadContinue #-}
289+setThreadContinue :: ThreadContinue -> Bool -> IO ()
290+setThreadContinue (ThreadContinue ref) x = writeIORef ref x
291+
292+{-# INLINE getThreadContinue #-}
293+getThreadContinue :: ThreadContinue -> IO Bool
294+getThreadContinue (ThreadContinue ref) = readIORef ref
295+
296+----------------------------------------------------------------
297+
298+-- | The type to store enough information for 'settingsOnException'.
299+newtype StreamInfo = StreamInfo (IORef (Maybe Input))
300+
301+{-# INLINE newStreamInfo #-}
302+newStreamInfo :: IO StreamInfo
303+newStreamInfo = StreamInfo <$> newIORef Nothing
304+
305+{-# INLINE clearStreamInfo #-}
306+clearStreamInfo :: StreamInfo -> IO ()
307+clearStreamInfo (StreamInfo ref) = writeIORef ref Nothing
308+
309+{-# INLINE setStreamInfo #-}
310+setStreamInfo :: StreamInfo -> Input -> IO ()
311+setStreamInfo (StreamInfo ref) inp = writeIORef ref $ Just inp
312+
313+{-# INLINE getStreamInfo #-}
314+getStreamInfo :: StreamInfo -> IO (Maybe Input)
315+getStreamInfo (StreamInfo ref) = readIORef ref
warp/Network/Wai/Handler/Warp/HashMap.hs+15−24
@@ -1,5 +1,3 @@
1−{-# LANGUAGE BangPatterns #-}
2−
31module Network.Wai.Handler.Warp.HashMap where
42
53import Data.Hashable (hash)
@@ -9,34 +7,27 @@ import Data.Map.Strict (Map)
97import qualified Data.Map.Strict as M
108import Prelude hiding (lookup)
119
12−----------------------------------------------------------------
10+import Network.Wai.Handler.Warp.Imports hiding (insert, lookup)
1311
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))
12+type Hash = Int
13+newtype HashMap k v = HashMap (IntMap (Map k v))
2114
22−----------------------------------------------------------------
15+hashByteString :: ByteString -> Hash
16+hashByteString = hash
2317
24−empty :: HashMap v
18+empty :: HashMap k v
2519empty = HashMap I.empty
2620
27−isEmpty :: HashMap v -> Bool
28−isEmpty (HashMap hm) = I.null hm
29−
30−----------------------------------------------------------------
21+null :: HashMap k v -> Bool
22+null (HashMap hm) = I.null hm
3123
32−insert :: FilePath -> v -> HashMap v -> HashMap v
33−insert path v (HashMap hm) = HashMap $ I.insertWith f h m hm
24+insert :: Ord k => Hash -> k -> v -> HashMap k v -> HashMap k v
25+insert h k v (HashMap hm) = HashMap $ I.insertWith f h m hm
3426 where
35− !h = hash path
36− !m = M.singleton path v
27+ m = M.singleton k v
3728 f = M.union -- fimxe
29+{-# SPECIALIZE insert :: Hash -> String -> v -> HashMap String v -> HashMap String v #-}
3830
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
31+lookup :: Ord k => Hash -> k -> HashMap k v -> Maybe v
32+lookup h k (HashMap hm) = I.lookup h hm >>= M.lookup k
33+{-# SPECIALIZE lookup :: Hash -> String -> HashMap String v -> Maybe v #-}
warp/Network/Wai/Handler/Warp/Header.hs−2
@@ -69,7 +69,6 @@ indexResponseHeader hdr = traverseHeader hdr responseMaxIndex responseKeyIndex
6969data ResponseHeaderIndex = ResContentLength
7070 | ResServer
7171 | ResDate
72− | ResLastModified
7372 deriving (Enum,Bounded)
7473
7574-- | The size for 'IndexedHeader' for HTTP Response.
@@ -80,7 +79,6 @@ responseKeyIndex :: HeaderName -> Int
8079responseKeyIndex hn = case BS.length bs of
8180 4 -> if bs == "date" then fromEnum ResDate else -1
8281 6 -> if bs == "server" then fromEnum ResServer else -1
83− 13 -> if bs == "last-modified" then fromEnum ResLastModified else -1
8482 14 -> if bs == "content-length" then fromEnum ResContentLength else -1
8583 _ -> -1
8684 where
warp/Network/Wai/Handler/Warp/Internal.hs+2−3
@@ -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
@@ -69,8 +69,6 @@ module Network.Wai.Handler.Warp.Internal (
6969 , windowsThreadBlockHack
7070 ) where
7171
72−import System.TimeManager
73−
7472import Network.Wai.Handler.Warp.Buffer
7573import Network.Wai.Handler.Warp.Date
7674import Network.Wai.Handler.Warp.FdCache
@@ -82,5 +80,6 @@ import Network.Wai.Handler.Warp.Response
8280import Network.Wai.Handler.Warp.Run
8381import Network.Wai.Handler.Warp.SendFile
8482import Network.Wai.Handler.Warp.Settings
83+import Network.Wai.Handler.Warp.Timeout
8584import Network.Wai.Handler.Warp.Types
8685import Network.Wai.Handler.Warp.Windows
warp/Network/Wai/Handler/Warp/MultiMap.hs+44−56
@@ -1,111 +1,99 @@
1−{-# LANGUAGE BangPatterns #-}
2−
31module Network.Wai.Handler.Warp.MultiMap (
4− MultiMap
2+ MMap
53 , isEmpty
64 , empty
75 , singleton
86 , insert
9− , Network.Wai.Handler.Warp.MultiMap.lookup
7+ , search
8+ , searchWith
109 , pruneWith
1110 , toList
1211 , merge
1312 ) where
1413
15−import Data.Hashable (hash)
1614import Data.IntMap.Strict (IntMap)
1715import qualified Data.IntMap.Strict as I
16+import qualified Data.List.NonEmpty as NE
1817import Data.Semigroup
19−import Prelude -- Silence redundant import warnings
18+
19+import Network.Wai.Handler.Warp.Imports hiding ((<>), union, empty, insert)
2020
2121----------------------------------------------------------------
2222
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)])
23+type MMap v = IntMap (NonEmpty v)
3324
3425----------------------------------------------------------------
3526
3627-- | O(1)
37−empty :: MultiMap v
38−empty = MultiMap $ I.empty
28+isEmpty :: MMap v -> Bool
29+isEmpty = I.null
3930
4031-- | O(1)
41−isEmpty :: MultiMap v -> Bool
42−isEmpty (MultiMap mm) = I.null mm
32+empty :: MMap v
33+empty = I.empty
4334
4435----------------------------------------------------------------
4536
4637-- | 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)]
38+singleton :: Int -> v -> MMap v
39+singleton k v = I.singleton k (v :| [])
5240
5341----------------------------------------------------------------
5442
55−-- | O(N)
56−lookup :: FilePath -> MultiMap v -> Maybe v
57−lookup path (MultiMap mm) = case I.lookup h mm of
43+-- | O(log n)
44+search :: Int -> MMap v -> Maybe v
45+search k m = case I.lookup k m of
5846 Nothing -> Nothing
59− Just s -> Prelude.lookup path s
60− where
61− !h = hash path
47+ Just s -> Just $! NE.head s
48+
49+-- | O(log n)
50+searchWith :: Int -> (v -> Bool) -> MMap v -> Maybe v
51+searchWith k f m = case I.lookup k m of
52+ Nothing -> Nothing
53+ Just nxs -> find f $ NE.toList nxs
6254
6355----------------------------------------------------------------
6456
6557-- | 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
58+insert :: Int -> v -> MMap v -> MMap v
59+insert k v m = I.insertWith (<>) k (v :| []) m
7160
7261----------------------------------------------------------------
7362
7463-- | O(n)
75−toList :: MultiMap v -> [(FilePath,v)]
76−toList (MultiMap mm) = concatMap snd $ I.toAscList mm
64+toList :: MMap v -> [v]
65+toList m = concatMap f $ I.toAscList m
66+ where
67+ f (_,s) = NE.toList s
7768
7869----------------------------------------------------------------
7970
8071-- | O(n)
81−pruneWith :: MultiMap v
82− -> ((FilePath,v) -> IO Bool)
83− -> IO (MultiMap v)
84−pruneWith (MultiMap mm) action = MultiMap <$> mm'
72+pruneWith :: MMap v
73+ -> (v -> IO Bool)
74+ -> IO (MMap v)
75+pruneWith m action = I.fromAscList <$> go (I.toDescList m) []
8576 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)
77+ go [] acc = return acc
78+ go ((k,s):kss) acc = do
79+ mt <- prune action s
80+ case mt of
81+ Nothing -> go kss acc
82+ Just t -> go kss ((k,t) : acc)
9383
9484----------------------------------------------------------------
9585
9686-- 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
99− where
100− !mm = I.unionWith (<>) m1 m2
87+merge :: MMap v -> MMap v -> MMap v
88+merge m1 m2 = I.unionWith (<>) m1 m2
10189
10290----------------------------------------------------------------
10391
104−prune :: ((FilePath,v) -> IO Bool) -> [(FilePath,v)] -> IO [(FilePath,v)]
105−prune action xs0 = go xs0
92+prune :: (a -> IO Bool) -> NonEmpty a -> IO (Maybe (NonEmpty a))
93+prune act nxs = NE.nonEmpty <$> go (NE.toList nxs)
10694 where
10795 go [] = return []
10896 go (x:xs) = do
109− keep <- action x
97+ keep <- act x
11098 rs <- go xs
11199 return $ if keep then x:rs else rs
warp/Network/Wai/Handler/Warp/Recv.hs+10−40
@@ -17,14 +17,7 @@ import Foreign.C.Types
1717import Foreign.ForeignPtr (withForeignPtr)
1818import Foreign.Ptr (Ptr, castPtr, plusPtr)
1919import 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
20+import Network.Socket (Socket, fdSocket)
2821import System.Posix.Types (Fd(..))
2922
3023import Network.Wai.Handler.Warp.Buffer
@@ -96,45 +89,24 @@ spell init0 siz0 recv recvBuf
9689 siz' = siz - len
9790 loop bss' siz'
9891
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.
10292receive :: 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
93+receive sock pool = withBufferPool pool $ \ (ptr, size) -> do
94+ let sock' = fdSocket sock
95+ size' = fromIntegral size
96+ fromIntegral <$> receiveloop sock' ptr size'
11897
11998receiveBuf :: 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
99+receiveBuf sock buf0 siz0 = loop buf0 siz0
129100 where
130− loop _ _ 0 = return True
131− loop fd buf siz = do
101+ loop _ 0 = return True
102+ loop buf siz = do
132103 n <- fromIntegral <$> receiveloop fd buf (fromIntegral siz)
133104 -- fixme: what should we do in the case of n == 0
134105 if n == 0 then
135106 return False
136107 else
137− loop fd (buf `plusPtr` n) (siz - n)
108+ loop (buf `plusPtr` n) (siz - n)
109+ fd = fdSocket sock
138110
139111receiveloop :: CInt -> Ptr Word8 -> CSize -> IO CInt
140112receiveloop sock ptr size = do
@@ -153,8 +125,6 @@ receiveloop sock ptr size = do
153125 else
154126 return bytes
155127
156−#ifndef mingw32_HOST_OS
157128-- fixme: the type of the return value
158129foreign import ccall unsafe "recv"
159130 c_recv :: CInt -> Ptr CChar -> CSize -> CInt -> IO CInt
160−#endif
warp/Network/Wai/Handler/Warp/Request.hs+28−26
@@ -9,7 +9,6 @@ module Network.Wai.Handler.Warp.Request (
99 , headerLines
1010 , pauseTimeoutKey
1111 , getFileInfoKey
12− , getClientCertificateKey
1312 , NoKeepAliveRequest (..)
1413 ) where
1514
@@ -22,23 +21,29 @@ import qualified Data.CaseInsensitive as CI
2221import qualified Data.IORef as I
2322import Data.Typeable (Typeable)
2423import qualified Data.Vault.Lazy as Vault
25−import Data.X509
2624import qualified Network.HTTP.Types as H
2725import Network.Socket (SockAddr)
2826import Network.Wai
27+import qualified Network.Wai.Handler.Warp.Timeout as Timeout
2928import Network.Wai.Handler.Warp.Types
3029import Network.Wai.Internal
3130import Prelude hiding (lines)
3231import System.IO.Unsafe (unsafePerformIO)
33−import qualified System.TimeManager as Timeout
3432
3533import Network.Wai.Handler.Warp.Conduit
3634import Network.Wai.Handler.Warp.FileInfoCache
35+import Network.Wai.Handler.Warp.HashMap (hashByteString)
3736import Network.Wai.Handler.Warp.Header
3837import Network.Wai.Handler.Warp.Imports hiding (readInt, lines)
3938import Network.Wai.Handler.Warp.ReadInt
4039import Network.Wai.Handler.Warp.RequestHeader
41−import Network.Wai.Handler.Warp.Settings (Settings, settingsNoParsePath, settingsMaxTotalHeaderLength)
40+import Network.Wai.Handler.Warp.Settings (Settings, settingsNoParsePath)
41+
42+----------------------------------------------------------------
43+
44+-- FIXME come up with good values here
45+maxTotalHeaderLength :: Int
46+maxTotalHeaderLength = 50 * 1024
4247
4348----------------------------------------------------------------
4449
@@ -47,22 +52,21 @@ import Network.Wai.Handler.Warp.Settings (Settings, settingsNoParsePath, setting
4752recvRequest :: Bool -- ^ first request on this connection?
4853 -> Settings
4954 -> Connection
50− -> InternalInfo
51− -> Timeout.Handle
55+ -> InternalInfo1
5256 -> SockAddr -- ^ Peer's address.
5357 -> Source -- ^ Where HTTP request comes from.
54− -> Transport
5558 -> IO (Request
5659 ,Maybe (I.IORef Int)
5760 ,IndexedHeader
58− ,IO ByteString) -- ^
61+ ,IO ByteString
62+ ,InternalInfo) -- ^
5963 -- 'Request' passed to 'Application',
6064 -- how many bytes remain to be consumed, if known
6165 -- 'IndexedHeader' of HTTP request for internal use,
6266 -- Body producing action used for flushing the request body
6367
64−recvRequest firstRequest settings conn ii th addr src transport = do
65− hdrlines <- headerLines (settingsMaxTotalHeaderLength settings) firstRequest src
68+recvRequest firstRequest settings conn ii1 addr src = do
69+ hdrlines <- headerLines firstRequest src
6670 (method, unparsedPath, path, query, httpversion, hdr) <- parseHeaderLines hdrlines
6771 let idxhdr = indexRequestHeader hdr
6872 expect = idxhdr ! fromEnum ReqExpect
@@ -70,9 +74,11 @@ recvRequest firstRequest settings conn ii th addr src transport = do
7074 te = idxhdr ! fromEnum ReqTransferEncoding
7175 handle100Continue = handleExpect conn httpversion expect
7276 rawPath = if settingsNoParsePath settings then unparsedPath else path
77+ h = hashByteString rawPath
78+ ii = toInternalInfo ii1 h
79+ th = threadHandle ii
7380 vaultValue = Vault.insert pauseTimeoutKey (Timeout.pause th)
7481 $ Vault.insert getFileInfoKey (getFileInfo ii)
75− $ Vault.insert getClientCertificateKey (tlsClientCertificate transport)
7682 Vault.empty
7783 (rbody, remainingRef, bodyLength) <- bodyAndSource src cl te
7884 -- body producing function which will produce '100-continue', if needed
@@ -87,7 +93,7 @@ recvRequest firstRequest settings conn ii th addr src transport = do
8793 , rawQueryString = query
8894 , queryString = H.parseQuery query
8995 , requestHeaders = hdr
90− , isSecure = isTransportSecure transport
96+ , isSecure = False
9197 , remoteHost = addr
9298 , requestBody = rbody'
9399 , vault = vaultValue
@@ -97,12 +103,12 @@ recvRequest firstRequest settings conn ii th addr src transport = do
97103 , requestHeaderReferer = idxhdr ! fromEnum ReqReferer
98104 , requestHeaderUserAgent = idxhdr ! fromEnum ReqUserAgent
99105 }
100− return (req, remainingRef, idxhdr, rbodyFlush)
106+ return (req, remainingRef, idxhdr, rbodyFlush, ii)
101107
102108----------------------------------------------------------------
103109
104−headerLines :: Int -> Bool -> Source -> IO [ByteString]
105−headerLines maxTotalHeaderLength firstRequest src = do
110+headerLines :: Bool -> Source -> IO [ByteString]
111+headerLines firstRequest src = do
106112 bs <- readSource src
107113 if S.null bs
108114 -- When we're working on a keep-alive connection and trying to
@@ -110,7 +116,7 @@ headerLines maxTotalHeaderLength firstRequest src = do
110116 -- lack of data as a real exception. See the http1 function in
111117 -- the Run module for more details.
112118 then if firstRequest then throwIO ConnectionClosedByPeer else throwIO NoKeepAliveRequest
113− else push maxTotalHeaderLength src (THStatus 0 id id) bs
119+ else push src (THStatus 0 id id) bs
114120
115121data NoKeepAliveRequest = NoKeepAliveRequest
116122 deriving (Show, Typeable)
@@ -220,8 +226,8 @@ close :: Sink ByteString IO a
220226close = throwIO IncompleteHeaders
221227-}
222228
223−push :: Int -> Source -> THStatus -> ByteString -> IO [ByteString]
224−push maxTotalHeaderLength src (THStatus len lines prepend) bs'
229+push :: Source -> THStatus -> ByteString -> IO [ByteString]
230+push src (THStatus len lines prepend) bs'
225231 -- Too many bytes
226232 | len > maxTotalHeaderLength = throwIO OverLargeHeader
227233 | otherwise = push' mnl
@@ -249,13 +255,13 @@ push maxTotalHeaderLength src (THStatus len lines prepend) bs'
249255 push' Nothing = do
250256 bst <- readSource' src
251257 when (S.null bst) $ throwIO IncompleteHeaders
252− push maxTotalHeaderLength src status bst
258+ push src status bst
253259 where
254260 len' = len + bsLen
255261 prepend' = S.append bs
256262 status = THStatus len' lines prepend'
257263 -- Found a newline, but next line continues as a multiline header
258− push' (Just (end, True)) = push maxTotalHeaderLength src status rest
264+ push' (Just (end, True)) = push src status rest
259265 where
260266 rest = S.drop (end + 1) bs
261267 prepend' = S.append (SU.unsafeTake (checkCR bs end) bs)
@@ -274,12 +280,12 @@ push maxTotalHeaderLength src (THStatus len lines prepend) bs'
274280 in if start < bsLen then
275281 -- more bytes in this chunk, push again
276282 let bs'' = SU.unsafeDrop start bs
277− in push maxTotalHeaderLength src status bs''
283+ in push src status bs''
278284 else do
279285 -- no more bytes in this chunk, ask for more
280286 bst <- readSource' src
281287 when (S.null bs) $ throwIO IncompleteHeaders
282− push maxTotalHeaderLength src status bst
288+ push src status bst
283289 where
284290 start = end + 1 -- start of next chunk
285291 line = SU.unsafeTake (checkCR bs end) bs
@@ -297,7 +303,3 @@ pauseTimeoutKey = unsafePerformIO Vault.newKey
297303getFileInfoKey :: Vault.Key (FilePath -> IO FileInfo)
298304getFileInfoKey = unsafePerformIO Vault.newKey
299305{-# NOINLINE getFileInfoKey #-}
300−
301−getClientCertificateKey :: Vault.Key (Maybe CertificateChain)
302−getClientCertificateKey = unsafePerformIO Vault.newKey
303−{-# NOINLINE getClientCertificateKey #-}
warp/Network/Wai/Handler/Warp/Response.hs+20−23
@@ -13,7 +13,7 @@ module Network.Wai.Handler.Warp.Response (
1313 , addServer -- testing
1414 ) where
1515
16−import Data.ByteString.Builder.HTTP.Chunked (chunkedTransferEncoding, chunkedTransferTerminator)
16+import Blaze.ByteString.Builder.HTTP (chunkedTransferEncoding, chunkedTransferTerminator)
1717import qualified Control.Exception as E
1818import Data.Array ((!))
1919import qualified Data.ByteString as S
@@ -30,7 +30,6 @@ import qualified Network.HTTP.Types.Header as H
3030import Network.Wai
3131import Network.Wai.Internal
3232import qualified Paths_warp
33−import qualified System.TimeManager as T
3433
3534import Network.Wai.Handler.Warp.Buffer (toBuilderBuffer)
3635import qualified Network.Wai.Handler.Warp.Date as D
@@ -40,6 +39,7 @@ import Network.Wai.Handler.Warp.IO (toBufIOWith)
4039import Network.Wai.Handler.Warp.Imports
4140import Network.Wai.Handler.Warp.ResponseHeader
4241import Network.Wai.Handler.Warp.Settings
42+import qualified Network.Wai.Handler.Warp.Timeout as T
4343import Network.Wai.Handler.Warp.Types
4444
4545-- $setup
@@ -101,13 +101,12 @@ import Network.Wai.Handler.Warp.Types
101101sendResponse :: Settings
102102 -> Connection
103103 -> InternalInfo
104− -> T.Handle
105104 -> Request -- ^ HTTP request.
106105 -> IndexedHeader -- ^ Indexed header of HTTP request.
107106 -> IO ByteString -- ^ source from client, for raw response
108107 -> Response -- ^ HTTP response including status code and response header.
109108 -> IO Bool -- ^ Returing True if the connection is persistent.
110−sendResponse settings conn ii th req reqidxhdr src response = do
109+sendResponse settings conn ii req reqidxhdr src response = do
111110 hs <- addServerAndDate hs0
112111 if hasBody s then do
113112 -- The response to HEAD does not have body.
@@ -116,14 +115,14 @@ sendResponse settings conn ii th req reqidxhdr src response = do
116115 -- and status, the response to HEAD is processed here.
117116 --
118117 -- See definition of rsp below for proper body stripping.
119− (ms, mlen) <- sendRsp conn ii ver s hs rspidxhdr rsp
118+ (ms, mlen) <- sendRsp conn ii ver s hs rsp
120119 case ms of
121120 Nothing -> return ()
122121 Just realStatus -> logger req realStatus mlen
123122 T.tickle th
124123 return ret
125124 else do
126− _ <- sendRsp conn ii ver s hs rspidxhdr RspNoBody
125+ _ <- sendRsp conn ii ver s hs RspNoBody
127126 logger req s Nothing
128127 T.tickle th
129128 return isPersist
@@ -134,6 +133,7 @@ sendResponse settings conn ii th req reqidxhdr src response = do
134133 s = responseStatus response
135134 hs0 = sanitizeHeaders $ responseHeaders response
136135 rspidxhdr = indexResponseHeader hs0
136+ th = threadHandle ii
137137 getdate = getDate ii
138138 addServerAndDate = addDate getdate rspidxhdr . addServer defServer rspidxhdr
139139 (isPersist,isChunked0) = infoFromRequest req reqidxhdr
@@ -196,13 +196,12 @@ sendRsp :: Connection
196196 -> H.HttpVersion
197197 -> H.Status
198198 -> H.ResponseHeaders
199− -> IndexedHeader -- Response
200199 -> Rsp
201200 -> IO (Maybe H.Status, Maybe Integer)
202201
203202----------------------------------------------------------------
204203
205−sendRsp conn _ ver s hs _ RspNoBody = do
204+sendRsp conn _ ver s hs RspNoBody = do
206205 -- Not adding Content-Length.
207206 -- User agents treats it as Content-Length: 0.
208207 composeHeader ver s hs >>= connSendAll conn
@@ -210,7 +209,7 @@ sendRsp conn _ ver s hs _ RspNoBody = do
210209
211210----------------------------------------------------------------
212211
213−sendRsp conn _ ver s hs _ (RspBuilder body needsChunked) = do
212+sendRsp conn _ ver s hs (RspBuilder body needsChunked) = do
214213 header <- composeHeaderBuilder ver s hs needsChunked
215214 let hdrBdy
216215 | needsChunked = header <> chunkedTransferEncoding body
@@ -223,7 +222,7 @@ sendRsp conn _ ver s hs _ (RspBuilder body needsChunked) = do
223222
224223----------------------------------------------------------------
225224
226−sendRsp conn _ ver s hs _ (RspStream streamingBody needsChunked th) = do
225+sendRsp conn _ ver s hs (RspStream streamingBody needsChunked th) = do
227226 header <- composeHeaderBuilder ver s hs needsChunked
228227 (recv, finish) <- newByteStringBuilderRecv $ reuseBufferStrategy
229228 $ toBuilderBuffer (connWriteBuffer conn) (connBufferSize conn)
@@ -247,7 +246,7 @@ sendRsp conn _ ver s hs _ (RspStream streamingBody needsChunked th) = do
247246
248247----------------------------------------------------------------
249248
250−sendRsp conn _ _ _ _ _ (RspRaw withApp src tickle) = do
249+sendRsp conn _ _ _ _ (RspRaw withApp src tickle) = do
251250 withApp recv send
252251 return (Nothing, Nothing)
253252 where
@@ -261,8 +260,8 @@ sendRsp conn _ _ _ _ _ (RspRaw withApp src tickle) = do
261260
262261-- Sophisticated WAI applications.
263262-- 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
263+sendRsp conn ii ver s0 hs0 (RspFile path (Just part) _ isHead hook) =
264+ sendRspFile2XX conn ii ver s0 hs path beg len isHead hook
266265 where
267266 beg = filePartOffset part
268267 len = filePartByteCount part
@@ -272,17 +271,17 @@ sendRsp conn ii ver s0 hs0 rspidxhdr (RspFile path (Just part) _ isHead hook) =
272271
273272-- Simple WAI applications.
274273-- Status is ignored
275−sendRsp conn ii ver _ hs0 rspidxhdr (RspFile path Nothing reqidxhdr isHead hook) = do
274+sendRsp conn ii ver _ hs0 (RspFile path Nothing idxhdr isHead hook) = do
276275 efinfo <- E.try $ getFileInfo ii path
277276 case efinfo of
278277 Left (_ex :: E.IOException) ->
279278#ifdef WARP_DEBUG
280279 print _ex >>
281280#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
281+ sendRspFile404 conn ii ver hs0
282+ Right finfo -> case conditionalRequest finfo hs0 idxhdr of
283+ WithoutBody s -> sendRsp conn ii ver s hs0 RspNoBody
284+ WithBody s hs beg len -> sendRspFile2XX conn ii ver s hs path beg len isHead hook
286285
287286----------------------------------------------------------------
288287
@@ -291,15 +290,14 @@ sendRspFile2XX :: Connection
291290 -> H.HttpVersion
292291 -> H.Status
293292 -> H.ResponseHeaders
294− -> IndexedHeader
295293 -> FilePath
296294 -> Integer
297295 -> Integer
298296 -> Bool
299297 -> IO ()
300298 -> 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
299+sendRspFile2XX conn ii ver s hs path beg len isHead hook
300+ | isHead = sendRsp conn ii ver s hs RspNoBody
303301 | otherwise = do
304302 lheader <- composeHeader ver s hs
305303 (mfd, fresher) <- getFd ii path
@@ -312,9 +310,8 @@ sendRspFile404 :: Connection
312310 -> InternalInfo
313311 -> H.HttpVersion
314312 -> H.ResponseHeaders
315− -> IndexedHeader
316313 -> IO (Maybe H.Status, Maybe Integer)
317−sendRspFile404 conn ii ver hs0 rspidxhdr = sendRsp conn ii ver s hs rspidxhdr (RspBuilder body True)
314+sendRspFile404 conn ii ver hs0 = sendRsp conn ii ver s hs (RspBuilder body True)
318315 where
319316 s = H.notFound404
320317 hs = replaceHeader H.hContentType "text/plain; charset=utf-8" hs0
warp/Network/Wai/Handler/Warp/Run.hs+69−124
@@ -3,10 +3,8 @@
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
@@ -17,20 +15,15 @@ import qualified Control.Concurrent as Conc (yield)
1715import Control.Exception as E
1816import qualified Data.ByteString as S
1917import Data.Char (chr)
20−import Data.IORef (IORef, newIORef, readIORef, writeIORef)
18+import Data.IORef (IORef, newIORef, readIORef, writeIORef, atomicModifyIORef')
2119import Data.Streaming.Network (bindPortTCP)
2220import Foreign.C.Error (Errno(..), eCONNABORTED)
2321import GHC.IO.Exception (IOException(..))
24−import qualified Network.HTTP2 as H2
2522import 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
2923import qualified Network.Socket.ByteString as Sock
3024import Network.Wai
3125import Network.Wai.Internal (ResponseReceived (ResponseReceived))
32−import System.Environment (lookupEnv)
33−import qualified System.TimeManager as T
26+import System.Environment (getEnvironment)
3427import System.Timeout (timeout)
3528
3629import Network.Wai.Handler.Warp.Buffer
@@ -38,8 +31,7 @@ import Network.Wai.Handler.Warp.Counter
3831import qualified Network.Wai.Handler.Warp.Date as D
3932import qualified Network.Wai.Handler.Warp.FdCache as F
4033import 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)
34+import Network.Wai.Handler.Warp.HTTP2 (http2, isHTTP2)
4335import Network.Wai.Handler.Warp.Header
4436import Network.Wai.Handler.Warp.Imports hiding (readInt)
4537import Network.Wai.Handler.Warp.ReadInt
@@ -48,6 +40,7 @@ import Network.Wai.Handler.Warp.Request
4840import Network.Wai.Handler.Warp.Response
4941import Network.Wai.Handler.Warp.SendFile
5042import Network.Wai.Handler.Warp.Settings
43+import qualified Network.Wai.Handler.Warp.Timeout as T
5144import Network.Wai.Handler.Warp.Types
5245
5346
@@ -58,38 +51,21 @@ import Network.Socket (fdSocket)
5851#endif
5952
6053-- | 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
54+socketConnection :: Socket -> IO Connection
55+socketConnection s = do
6756 bufferPool <- newBufferPool
6857 writeBuf <- allocateBuffer bufferSize
6958 let sendall = Sock.sendAll s
70− isH2 <- newIORef False -- HTTP/1.x
7159 return Connection {
7260 connSendMany = Sock.sendMany s
7361 , connSendAll = sendall
7462 , 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
8563 , connClose = close s
86−#endif
8764 , connFree = freeBuffer writeBuf
8865 , connRecv = receive s bufferPool
8966 , connRecvBuf = receiveBuf s
9067 , connWriteBuffer = writeBuf
9168 , connBufferSize = bufferSize
92− , connHTTP2 = isH2
9369 }
9470
9571-- | Run an 'Application' on the given port.
@@ -104,7 +80,7 @@ run p = runSettings defaultSettings { settingsPort = p }
10480-- Since 3.0.9
10581runEnv :: Port -> Application -> IO ()
10682runEnv p app = do
107− mp <- lookupEnv "PORT"
83+ mp <- lookup "PORT" <$> getEnvironment
10884
10985 maybe (run p app) runReadPort mp
11086
@@ -151,7 +127,7 @@ runSettingsSocket set socket app = do
151127 setSocketCloseOnExec s
152128 -- NoDelay causes an error for AF_UNIX.
153129 setSocketOption s NoDelay 1 `E.catch` \(E.SomeException _) -> return ()
154− conn <- socketConnection set s
130+ conn <- socketConnection s
155131 return (conn, sa)
156132
157133 closeListenSocket = close socket
@@ -192,15 +168,15 @@ runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport),
192168runSettingsConnectionMakerSecure set getConnMaker app = do
193169 settingsBeforeMainLoop set
194170 counter <- newCounter
195− withII $ acceptConnection set getConnMaker app counter
171+ withII0 $ acceptConnection set getConnMaker app counter
196172 where
197− withII action =
173+ withII0 action =
198174 withTimeoutManager $ \tm ->
199175 D.withDateCache $ \dc ->
200176 F.withFdCache fdCacheDurationInSeconds $ \fdc ->
201177 I.withFileInfoCache fdFileInfoDurationInSeconds $ \fic -> do
202− let ii = InternalInfo tm dc fdc fic
203− action ii
178+ let ii0 = InternalInfo0 tm dc fdc fic
179+ action ii0
204180
205181 !fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
206182 !fdFileInfoDurationInSeconds = settingsFileInfoCacheDuration set * 1000000
@@ -229,18 +205,13 @@ acceptConnection :: Settings
229205 -> IO (IO (Connection, Transport), SockAddr)
230206 -> Application
231207 -> Counter
232− -> InternalInfo
208+ -> InternalInfo0
233209 -> IO ()
234−acceptConnection set getConnMaker app counter ii = do
210+acceptConnection set getConnMaker app counter ii0 = do
235211 -- First mask all exceptions in acceptLoop. This is necessary to
236212 -- ensure that no async exception is throw between the call to
237213 -- acceptNewConnection and the registering of connClose.
238− --
239− -- acceptLoop can be broken by closing the listing socket.
240214 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.
244215 gracefulShutdown set counter
245216 where
246217 acceptLoop = do
@@ -258,7 +229,7 @@ acceptConnection set getConnMaker app counter ii = do
258229 case mx of
259230 Nothing -> return ()
260231 Just (mkConn, addr) -> do
261− fork set mkConn addr app counter ii
232+ fork set mkConn addr app counter ii0
262233 acceptLoop
263234
264235 acceptNewConnection = do
@@ -281,12 +252,15 @@ fork :: Settings
281252 -> SockAddr
282253 -> Application
283254 -> Counter
284− -> InternalInfo
255+ -> InternalInfo0
285256 -> IO ()
286−fork set mkConn addr app counter ii = settingsFork set $ \unmask ->
257+fork set mkConn addr app counter ii0 = settingsFork set $ \unmask ->
287258 -- Call the user-supplied on exception code if any
288259 -- exceptions are thrown.
289− handle (settingsOnException set Nothing) $
260+ handle (settingsOnException set Nothing) .
261+ -- Allocate a new IORef indicating whether the connection has been
262+ -- closed, to avoid double-freeing a connection
263+ withClosedRef $ \ref ->
290264 -- Run the connection maker to get a new connection, and ensure
291265 -- that the connection is closed. If the mkConn call throws an
292266 -- exception, we will leak the connection. If the mkConn call is
@@ -297,15 +271,24 @@ fork set mkConn addr app counter ii = settingsFork set $ \unmask ->
297271 -- We grab the connection before registering timeouts since the
298272 -- timeouts will be useless during connection creation, due to the
299273 -- fact that async exceptions are still masked.
300− bracket mkConn cleanUp (serve unmask)
274+ bracket mkConn (cleanUp ref) (serve unmask ref)
301275 where
302− cleanUp (conn, _) = connClose conn `finally` connFree conn
276+ withClosedRef inner = newIORef False >>= inner
277+
278+ closeConn ref conn = do
279+ isClosed <- atomicModifyIORef' ref $ \x -> (True, x)
280+ unless isClosed $ connClose conn
281+
282+ cleanUp ref (conn, _) = closeConn ref conn `finally` connFree conn
303283
304284 -- We need to register a timeout handler for this thread, and
305− -- cancel that handler as soon as we exit.
306− serve unmask (conn, transport) = bracket register cancel $ \th -> do
285+ -- cancel that handler as soon as we exit. We additionally close
286+ -- the connection immediately in case the child thread catches the
287+ -- async exception or performs some long-running cleanup action.
288+ serve unmask ref (conn, transport) = bracket register cancel $ \th -> do
289+ let ii1 = toInternalInfo1 ii0 th
307290 -- We now have fully registered a connection close handler in
308− -- the case of all exceptions, so it is safe to once again
291+ -- the case of all exceptions, so it is safe to one again
309292 -- allow async exceptions.
310293 unmask .
311294 -- Call the user-supplied code for connection open and
@@ -313,23 +296,23 @@ fork set mkConn addr app counter ii = settingsFork set $ \unmask ->
313296 bracket (onOpen addr) (onClose addr) $ \goingon ->
314297 -- Actually serve this connection. bracket with closeConn
315298 -- above ensures the connection is closed.
316− when goingon $ serveConnection conn ii th addr transport set app
299+ when goingon $ serveConnection conn ii1 addr transport set app
317300 where
318− register = T.registerKillThread (timeoutManager ii) (connClose conn)
301+ register = T.registerKillThread (timeoutManager0 ii0)
302+ (closeConn ref conn)
319303 cancel = T.cancel
320304
321305 onOpen adr = increase counter >> settingsOnOpen set adr
322306 onClose adr _ = decrease counter >> settingsOnClose set adr
323307
324308serveConnection :: Connection
325− -> InternalInfo
326− -> T.Handle
309+ -> InternalInfo1
327310 -> SockAddr
328311 -> Transport
329312 -> Settings
330313 -> Application
331314 -> IO ()
332−serveConnection conn ii th origAddr transport settings app = do
315+serveConnection conn ii1 origAddr transport settings app = do
333316 -- fixme: Upgrading to HTTP/2 should be supported.
334317 (h2,bs) <- if isHTTP2 transport then
335318 return (True, "")
@@ -342,36 +325,22 @@ serveConnection conn ii th origAddr transport settings app = do
342325 istatus <- newIORef False
343326 if settingsHTTP2Enabled settings && h2 then do
344327 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.
352328 let recvN = wrappedRecvN th istatus (settingsSlowlorisSize settings) rawRecvN
353− sendBS x = connSendAll conn x >> T.tickle th
354329 -- fixme: origAddr
355− checkTLS
356− setConnHTTP2 conn True
357− http2 conn transport ii origAddr settings recvN sendBS app
330+ http2 conn ii1 origAddr transport settings recvN app
358331 else do
359332 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
360333 writeIORef istatus True
361334 leftoverSource src bs
362335 addr <- getProxyProtocolAddr src
363336 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−
337+ case fromException e of
338+ -- See comment below referencing
339+ -- https://github.com/yesodweb/wai/issues/618
340+ Just NoKeepAliveRequest -> return ()
341+ Nothing -> do
342+ sendErrorResponse addr istatus e
343+ throwIO e
375344 where
376345 getProxyProtocolAddr src =
377346 case settingsProxyProtocol settings of
@@ -413,25 +382,30 @@ serveConnection conn ii th origAddr transport settings app = do
413382
414383 decodeAscii = map (chr . fromEnum) . S.unpack
415384
385+ th = threadHandle1 ii1
386+
416387 shouldSendErrorResponse se
417388 | Just ConnectionClosedByPeer <- fromException se = False
418389 | otherwise = True
419390
420− sendErrorResponse req istatus e = do
391+ sendErrorResponse addr istatus e = do
421392 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
393+ when (shouldSendErrorResponse e && status) $ do
394+ let ii = toInternalInfo ii1 0 -- dummy
395+ dreq = dummyreq addr
396+ void $ sendResponse settings conn ii dreq defaultIndexRequestHeader (return S.empty) (errorResponse e)
426397
427398 dummyreq addr = defaultRequest { remoteHost = addr }
428399
429400 errorResponse e = settingsOnExceptionResponse settings e
430401
431402 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
403+ (req', mremainingRef, idxhdr, nextBodyFlush, ii) <- recvRequest firstRequest settings conn ii1 addr src
404+ let req = req' { isSecure = isTransportSecure transport }
405+ keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush ii
434406 `E.catch` \e -> do
407+ -- Call the user-supplied exception handlers, passing the request.
408+ sendErrorResponse addr istatus e
435409 settingsOnException settings (Just req) e
436410 -- Don't throw the error again to prevent calling settingsOnException twice.
437411 return False
@@ -446,7 +420,7 @@ serveConnection conn ii th origAddr transport settings app = do
446420 -- and ignore. See: https://github.com/yesodweb/wai/issues/618
447421 when keepAlive $ http1 False addr istatus src
448422
449− processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
423+ processRequest istatus src req mremainingRef idxhdr nextBodyFlush ii = do
450424 -- Let the application run for as long as it wants
451425 T.pause th
452426
@@ -454,38 +428,30 @@ serveConnection conn ii th origAddr transport settings app = do
454428 -- creating the request, we need to make sure that we don't get
455429 -- an async exception before calling the ResponseSource.
456430 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
457− r <- E.try $ app req $ \res -> do
431+ _ <- app req $ \res -> do
458432 T.resume th
459433 -- FIXME consider forcing evaluation of the res here to
460434 -- send more meaningful error messages to the user.
461435 -- However, it may affect performance.
462436 writeIORef istatus False
463− keepAlive <- sendResponse settings conn ii th req idxhdr (readSource src) res
437+ keepAlive <- sendResponse settings conn ii req idxhdr (readSource src) res
464438 writeIORef keepAliveRef keepAlive
465439 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−
475440 keepAlive <- readIORef keepAliveRef
476441
477442 -- We just send a Response and it takes a time to
478443 -- 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
444+ -- it is likely to fail and the IO manager works.
445+ -- It is very costly. So, we yield to another Haskell
481446 -- thread hoping that the next Request will arrive
482447 -- when this Haskell thread will be re-scheduled.
483448 -- This improves performance at least when
484449 -- the number of cores is small.
485450 Conc.yield
486451
487− if keepAlive
488− then
452+ if not keepAlive then
453+ return False
454+ else
489455 -- If there is an unknown or large amount of data to still be read
490456 -- from the request body, simple drop this connection instead of
491457 -- reading it all in to satisfy a keep-alive request.
@@ -511,21 +477,6 @@ serveConnection conn ii th origAddr transport settings app = do
511477 else
512478 return False
513479 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
529480
530481flushEntireBody :: IO ByteString -> IO ()
531482flushEntireBody src =
@@ -580,13 +531,7 @@ setSocketCloseOnExec :: Socket -> IO ()
580531#if WINDOWS
581532setSocketCloseOnExec _ = return ()
582533#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
534+setSocketCloseOnExec socket = F.setFileCloseOnExec $ fromIntegral $ fdSocket socket
590535#endif
591536
592537gracefulShutdown :: Settings -> Counter -> IO ()
warp/Network/Wai/Handler/Warp/Settings.hs+10−54
@@ -8,22 +8,20 @@ import Control.Concurrent (forkIOWithUnmask)
88import Control.Exception
99import Data.ByteString.Builder (byteString)
1010import qualified Data.ByteString.Char8 as C8
11−import Data.ByteString.Lazy (fromStrict)
1211import Data.Streaming.Network (HostPreference)
1312import qualified Data.Text as T
1413import qualified Data.Text.IO as TIO
1514import Data.Version (showVersion)
1615import GHC.IO.Exception (IOErrorType(..))
1716import qualified Network.HTTP.Types as H
18−import Network.HTTP2( HTTP2Error (..), ErrorCodeId (..) )
1917import Network.Socket (SockAddr)
2018import Network.Wai
2119import qualified Paths_warp
2220import System.IO (stderr)
2321import System.IO.Error (ioeGetErrorType)
24−import System.TimeManager
2522
2623import Network.Wai.Handler.Warp.Imports
24+import Network.Wai.Handler.Warp.Timeout
2725import Network.Wai.Handler.Warp.Types
2826
2927-- | Various Warp server settings. This is purposely kept as an abstract data
@@ -76,13 +74,6 @@ data Settings = Settings
7674 --
7775 -- Since 2.0.3
7876 , 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
8677 , settingsServerName :: ByteString
8778 -- ^ Default server name if application does not set one.
8879 --
@@ -94,44 +85,28 @@ data Settings = Settings
9485 , settingsProxyProtocol :: ProxyProtocol
9586 -- ^ Specify usage of the PROXY protocol.
9687 --
97− -- Since 3.0.5
88+ -- Since 3.0.5.
9889 , settingsSlowlorisSize :: Int
9990 -- ^ Size of bytes read to prevent Slowloris protection. Default value: 2048
10091 --
101− -- Since 3.1.2
92+ -- Since 3.1.2.
10293 , settingsHTTP2Enabled :: Bool
10394 -- ^ Whether to enable HTTP2 ALPN/upgrades. Default: True
10495 --
105− -- Since 3.1.7
96+ -- Since 3.1.7.
10697 , settingsLogger :: Request -> H.Status -> Maybe Integer -> IO ()
10798 -- ^ A log function. Default: no action.
10899 --
109− -- Since 3.1.10
100+ -- Since 3.X.X.
110101 , settingsServerPushLogger :: Request -> ByteString -> Integer -> IO ()
111102 -- ^ A HTTP/2 server push log function. Default: no action.
112103 --
113− -- Since 3.2.7
104+ -- Since 3.X.X.
114105 , settingsGracefulShutdownTimeout :: Maybe Int
115106 -- ^ An optional timeout to limit the time (in seconds) waiting for
116107 -- a graceful shutdown of the web server.
117108 --
118109 -- 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
135110 }
136111
137112-- | Specify usage of the PROXY protocol.
@@ -168,9 +143,6 @@ defaultSettings = Settings
168143 , settingsLogger = \_ _ _ -> return ()
169144 , settingsServerPushLogger = \_ _ _ -> return ()
170145 , settingsGracefulShutdownTimeout = Nothing
171− , settingsGracefulCloseTimeout1 = 0
172− , settingsGracefulCloseTimeout2 = 2000
173− , settingsMaxTotalHeaderLength = 50 * 1024
174146 }
175147
176148-- | Apply the logic provided by 'defaultOnException' to determine if an
@@ -196,29 +168,13 @@ defaultOnException _ e =
196168 when (defaultShouldDisplayException e)
197169 $ TIO.hPutStrLn stderr $ T.pack $ show e
198170
199−-- | Sending 400 for bad requests.
200−-- Sending 500 for internal server errors.
171+-- | Sending 400 for bad requests. Sending 500 for internal server errors.
172+--
201173-- Since: 3.1.0
202−-- Sending 413 for too large payload.
203−-- Sending 431 for too large headers.
204−-- Since 3.2.27
205174defaultOnExceptionResponse :: SomeException -> Response
206175defaultOnExceptionResponse 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"
176+ | Just (_ :: InvalidRequest) <- fromException e = responseLBS H.badRequest400 [(H.hContentType, "text/plain; charset=utf-8")] "Bad Request"
177+ | otherwise = responseLBS H.internalServerError500 [(H.hContentType, "text/plain; charset=utf-8")] "Something went wrong"
222178
223179-- | Exception handler for the debugging purpose.
224180-- 500, text/plain, a showed exception.
time-manager/System/TimeManager.hs → warp/Network/Wai/Handler/Warp/Timeout.hsrenamed+3−2
@@ -1,6 +1,7 @@
1+{-# LANGUAGE CPP #-}
12{-# LANGUAGE DeriveDataTypeable #-}
23
3−module System.TimeManager (
4+module Network.Wai.Handler.Warp.Timeout (
45 -- ** Types
56 Manager
67 , TimeoutAction
@@ -114,7 +115,7 @@ instance E.Exception TimeoutThread where
114115 toException = E.asyncExceptionToException
115116 fromException = E.asyncExceptionFromException
116117instance Show TimeoutThread where
117− show TimeoutThread = "Thread killed by timeout manager"
118+ show TimeoutThread = "Thread killed by Warp's timeout reaper"
118119
119120----------------------------------------------------------------
120121
warp/Network/Wai/Handler/Warp/Types.hs+30−25
@@ -8,15 +8,14 @@ import Control.Exception
88import qualified Data.ByteString as S
99import Data.IORef (IORef, readIORef, writeIORef, newIORef)
1010import Data.Typeable (Typeable)
11−import Data.X509
1211import Foreign.Ptr (Ptr)
1312import System.Posix.Types (Fd)
14−import qualified System.TimeManager as T
1513
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
1917import Network.Wai.Handler.Warp.Imports
18+import qualified Network.Wai.Handler.Warp.Timeout as T
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.
@@ -123,25 +108,46 @@ data Connection = Connection {
123108 , connWriteBuffer :: Buffer
124109 -- | The size of the write buffer.
125110 , connBufferSize :: BufSize
126− -- | Is this connection HTTP/2?
127− , connHTTP2 :: IORef Bool
128111 }
129112
130−getConnHTTP2 :: Connection -> IO Bool
131−getConnHTTP2 conn = readIORef (connHTTP2 conn)
113+----------------------------------------------------------------
114+
115+type Hash = Int
132116
133−setConnHTTP2 :: Connection -> Bool -> IO ()
134−setConnHTTP2 conn b = writeIORef (connHTTP2 conn) b
135117
136−----------------------------------------------------------------
118+data InternalInfo0 =
119+ InternalInfo0 T.Manager
120+ (IO D.GMTDate)
121+ (Hash -> FilePath -> IO (Maybe F.Fd, F.Refresh))
122+ (Hash -> FilePath -> IO I.FileInfo)
123+
124+timeoutManager0 :: InternalInfo0 -> T.Manager
125+timeoutManager0 (InternalInfo0 tm _ _ _) = tm
126+
127+data InternalInfo1 =
128+ InternalInfo1 T.Handle
129+ T.Manager
130+ (IO D.GMTDate)
131+ (Hash -> FilePath -> IO (Maybe F.Fd, F.Refresh))
132+ (Hash -> FilePath -> IO I.FileInfo)
133+
134+toInternalInfo1 :: InternalInfo0 -> T.Handle -> InternalInfo1
135+toInternalInfo1 (InternalInfo0 b c d e) a = InternalInfo1 a b c d e
136+
137+threadHandle1 :: InternalInfo1 -> T.Handle
138+threadHandle1 (InternalInfo1 th _ _ _ _) = th
137139
138140data InternalInfo = InternalInfo {
139− timeoutManager :: T.Manager
141+ threadHandle :: T.Handle
142+ , timeoutManager :: T.Manager
140143 , getDate :: IO D.GMTDate
141144 , getFd :: FilePath -> IO (Maybe F.Fd, F.Refresh)
142145 , getFileInfo :: FilePath -> IO I.FileInfo
143146 }
144147
148+toInternalInfo :: InternalInfo1 -> Hash -> InternalInfo
149+toInternalInfo (InternalInfo1 a b c d e) h = InternalInfo a b c (d h) (e h)
150+
145151----------------------------------------------------------------
146152
147153-- | Type for input streaming.
@@ -180,7 +186,6 @@ data Transport = TCP -- ^ Plain channel: TCP
180186 , tlsMinorVersion :: Int
181187 , tlsNegotiatedProtocol :: Maybe ByteString -- ^ The result of Application Layer Protocol Negociation in RFC 7301
182188 , tlsChiperID :: Word16
183− , tlsClientCertificate :: Maybe CertificateChain
184189 } -- ^ Encrypted channel: TLS or SSL
185190
186191isTransportSecure :: Transport -> Bool
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/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 True 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 True 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 True 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 True 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 True src
9187 x `shouldBe` []
92− y <- headerLines defaultMaxTotalHeaderLength True src
88+ y <- headerLines True 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 True src'
119115 return (res, src')
120116
121117consumeLen :: Int -> Source -> IO S8.ByteString
warp/test/ResponseHeaderSpec.hs+30−2
@@ -7,6 +7,9 @@ import qualified Network.HTTP.Types as H
77import Network.Wai.Handler.Warp.ResponseHeader
88import Network.Wai.Handler.Warp.Response
99import Network.Wai.Handler.Warp.Header
10+import Network.Wai.Handler.Warp.HTTP2.HPACK
11+import Network.HPACK
12+import Network.HPACK.Token
1013import Test.Hspec
1114
1215main :: IO ()
@@ -34,15 +37,40 @@ spec = do
3437 let hdrs = [("Server","MyServer")]
3538 rspidxhdr = indexResponseHeader hdrs
3639 addServer "" rspidxhdr hdrs `shouldBe` []
40+ describe "addHeader" $ do
41+ it "adds Server if not exist" $ do
42+ let v = "MyServer"
43+ hdrs = []
44+ hdrs1 = [("Server",v)]
45+ (thl, vt) <- toHeaderTable hdrs
46+ (thl1, _) <- toHeaderTable hdrs1
47+ addHeader tokenServer v vt thl `shouldBe` thl1
48+ it "does not add Server if exists" $ do
49+ let v = "MyServer2"
50+ hdrs = [("Server","MyServer")]
51+ (thl, vt) <- toHeaderTable hdrs
52+ addHeader tokenServer v vt thl `shouldBe` thl
53+ it "does not add Server if empty" $ do
54+ let v = ""
55+ hdrs = []
56+ (thl, vt) <- toHeaderTable hdrs
57+ addHeader tokenServer v vt thl `shouldBe` thl
58+ it "deletes Server " $ do
59+ let v = ""
60+ hdrs = [("Server","MyServer")]
61+ hdrs1 = []
62+ (thl, vt) <- toHeaderTable hdrs
63+ (thl1, _) <- toHeaderTable hdrs1
64+ addHeader tokenServer v vt thl `shouldBe` thl1
3765
3866headers :: H.ResponseHeaders
3967headers = [
4068 ("Date", "Mon, 13 Aug 2012 04:22:55 GMT")
41− , ("Content-Length", "151")
69+ , ("Content-Lenght", "151")
4270 , ("Server", "Mighttpd/2.5.8")
4371 , ("Last-Modified", "Fri, 22 Jun 2012 01:18:08 GMT")
4472 , ("Content-Type", "text/html")
4573 ]
4674
4775composedHeader :: 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"
76+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+21−11
@@ -10,9 +10,13 @@ import Network.HTTP.Types
1010import Network.Wai hiding (responseHeaders)
1111import Network.Wai.Handler.Warp
1212import Network.Wai.Handler.Warp.Response
13−import RunSpec (withApp, msWrite, msRead, withMySocket)
13+import RunSpec (withApp)
14+import System.IO (hClose, hFlush)
1415import Test.Hspec
1516
17+-- import HTTP
18+import RunSpec (connectTo)
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" 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" 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)
@@ -83,7 +93,7 @@ spec = do
8393 it "discards empty lines" $ do
8494 sanitizeHeaderValue "foo\r\n\r\nbar" `shouldBe` "foo\r\n bar"
8595
86− context "when sanitizing single occurrences of \n" $ do
96+ context "when sanitizing single occurences of \n" $ do
8797 it "replaces \n with \r\n" $ do
8898 sanitizeHeaderValue "foo\n bar" `shouldBe` "foo\r\n bar"
8999
warp/test/RunSpec.hs+82−125
@@ -1,16 +1,16 @@
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, connectTo) 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
@@ -21,8 +21,8 @@ import Network.HTTP.Types
2121import Network.Socket
2222import Network.Socket.ByteString (sendAll)
2323import Network.Wai hiding (responseHeaders)
24−import Network.Wai.Internal (getRequestBodyChunk)
2524import Network.Wai.Handler.Warp
25+import System.IO (hFlush, hClose, Handle, IOMode(..))
2626import System.IO.Unsafe (unsafePerformIO)
2727import System.Timeout (timeout)
2828import Test.Hspec
@@ -35,51 +35,13 @@ main = hspec spec
3535type Counter = I.IORef (Either String Int)
3636type CounterApplication = Counter -> Application
3737
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
38+connectTo :: HostName -> Int -> IO Handle
39+connectTo host port = do
40+ let hints = defaultHints { addrSocketType = Stream }
41+ addr:_ <- getAddrInfo (Just hints) (Just host) (Just $ show port)
42+ sock <- socket (addrFamily addr) (addrSocketType addr) (addrProtocol addr)
43+ connect sock $ addrAddress addr
44+ socketToHandle sock ReadWriteMode
8345
8446incr :: MonadIO m => Counter -> m ()
8547incr icount = liftIO $ I.atomicModifyIORef icount $ \ecount ->
@@ -92,7 +54,7 @@ err icount msg = liftIO $ I.writeIORef icount $ Left $ show msg
9254
9355readBody :: CounterApplication
9456readBody icount req f = do
95− body <- consumeBody $ getRequestBodyChunk req
57+ body <- consumeBody $ requestBody req
9658 case () of
9759 ()
9860 | pathInfo req == ["hello"] && L.fromChunks body /= "Hello"
@@ -113,8 +75,8 @@ ignoreBody icount req f = do
11375
11476doubleConnect :: CounterApplication
11577doubleConnect icount req f = do
116− _ <- consumeBody $ getRequestBodyChunk req
117− _ <- consumeBody $ getRequestBodyChunk req
78+ _ <- consumeBody $ requestBody req
79+ _ <- consumeBody $ requestBody req
11880 incr icount
11981 f $ responseLBS status200 [] "double connect"
12082
@@ -143,13 +105,7 @@ withApp settings app f = do
143105 bracket
144106 (forkIO $ runSettings settings' app `onException` putMVar baton ())
145107 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)
108+ (const $ takeMVar baton >> f port)
153109
154110runTest :: Int -- ^ expected number of requests
155111 -> CounterApplication
@@ -157,9 +113,10 @@ runTest :: Int -- ^ expected number of requests
157113 -> IO ()
158114runTest expected app chunks = do
159115 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
116+ withApp defaultSettings (app ref) $ \port -> do
117+ handle <- connectTo "127.0.0.1" port
118+ forM_ chunks $ \chunk -> hPutStr handle chunk >> hFlush handle
119+ _ <- timeout 100000 $ replicateM_ expected $ hGetSome handle 4096
163120 res <- I.readIORef ref
164121 case res of
165122 Left s -> error s
@@ -174,9 +131,11 @@ runTerminateTest :: InvalidRequest
174131runTerminateTest expected input = do
175132 ref <- I.newIORef Nothing
176133 let onExc _ = I.writeIORef ref . Just
177− withApp (setOnException onExc defaultSettings) dummyApp $ withMySocket $ \ms -> do
178− msWrite ms input
179− msClose ms -- explicitly
134+ withApp (setOnException onExc defaultSettings) dummyApp $ \port -> do
135+ handle <- connectTo "127.0.0.1" port
136+ hPutStr handle input
137+ hFlush handle
138+ hClose handle
180139 threadDelay 1000
181140 res <- I.readIORef ref
182141 show res `shouldBe` show (Just expected)
@@ -247,11 +206,14 @@ spec = do
247206 let app req f = do
248207 liftIO $ I.writeIORef iheaders $ requestHeaders req
249208 f $ responseLBS status200 [] ""
250− withApp defaultSettings app $ withMySocket $ \ms -> do
209+ withApp defaultSettings app $ \port -> do
210+ handle <- connectTo "127.0.0.1" port
251211 let input = S.concat
252212 [ "GET / HTTP/1.1\r\nfoo: bar\r\n baz\r\n\tbin\r\n\r\n"
253213 ]
254− msWrite ms input
214+ hPutStr handle input
215+ hFlush handle
216+ hClose handle
255217 threadDelay 1000
256218 headers <- I.readIORef iheaders
257219 headers `shouldBe`
@@ -262,11 +224,14 @@ spec = do
262224 let app req f = do
263225 liftIO $ I.writeIORef iheaders $ requestHeaders req
264226 f $ responseLBS status200 [] ""
265− withApp defaultSettings app $ withMySocket $ \ms -> do
227+ withApp defaultSettings app $ \port -> do
228+ handle <- connectTo "127.0.0.1" port
266229 let input = S.concat
267230 [ "GET / HTTP/1.1\r\nfoo:bar\r\n\r\n"
268231 ]
269− msWrite ms input
232+ hPutStr handle input
233+ hFlush handle
234+ hClose handle
270235 threadDelay 1000
271236 headers <- I.readIORef iheaders
272237 headers `shouldBe`
@@ -275,24 +240,23 @@ spec = do
275240
276241 describe "chunked bodies" $ do
277242 it "works" $ do
278− countVar <- newTVarIO (0 :: Int)
279243 ifront <- I.newIORef id
280244 let app req f = do
281− bss <- consumeBody $ getRequestBodyChunk req
245+ bss <- consumeBody $ requestBody req
282246 liftIO $ I.atomicModifyIORef ifront $ \front -> (front . (S.concat bss:), ())
283− atomically $ modifyTVar countVar (+ 1)
284247 f $ responseLBS status200 [] ""
285− withApp defaultSettings app $ withMySocket $ \ms -> do
248+ withApp defaultSettings app $ \port -> do
249+ handle <- connectTo "127.0.0.1" port
286250 let input = S.concat
287251 [ "POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"
288252 , "c\r\nHello World\n\r\n3\r\nBye\r\n0\r\n\r\n"
289253 , "POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"
290254 , "b\r\nHello World\r\n0\r\n\r\n"
291255 ]
292− msWrite ms input
293− atomically $ do
294− count <- readTVar countVar
295− check $ count == 2
256+ hPutStr handle input
257+ hFlush handle
258+ hClose handle
259+ threadDelay 1000
296260 front <- I.readIORef ifront
297261 front [] `shouldBe`
298262 [ "Hello World\nBye"
@@ -300,44 +264,38 @@ spec = do
300264 ]
301265 it "lots of chunks" $ do
302266 ifront <- I.newIORef id
303− countVar <- newTVarIO (0 :: Int)
304267 let app req f = do
305− bss <- consumeBody $ getRequestBodyChunk req
268+ bss <- consumeBody $ requestBody req
306269 I.atomicModifyIORef ifront $ \front -> (front . (S.concat bss:), ())
307− atomically $ modifyTVar countVar (+ 1)
308270 f $ responseLBS status200 [] ""
309− withApp defaultSettings app $ withMySocket $ \ms -> do
271+ withApp defaultSettings app $ \port -> do
272+ handle <- connectTo "127.0.0.1" port
310273 let input = concat $ replicate 2 $
311274 ["POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"] ++
312275 (replicate 50 "5\r\n12345\r\n") ++
313276 ["0\r\n\r\n"]
314− mapM_ (msWrite ms) input
315− atomically $ do
316− count <- readTVar countVar
317− check $ count == 2
277+ mapM_ (\bs -> hPutStr handle bs >> hFlush handle) input
278+ hClose handle
279+ threadDelay 100000 -- FIXME why does this delay need to be so high?
318280 front <- I.readIORef ifront
319281 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.
322282 it "in chunks" $ do
323283 ifront <- I.newIORef id
324− countVar <- newTVarIO (0 :: Int)
325284 let app req f = do
326− bss <- consumeBody $ getRequestBodyChunk req
285+ bss <- consumeBody $ requestBody req
327286 liftIO $ I.atomicModifyIORef ifront $ \front -> (front . (S.concat bss:), ())
328− atomically $ modifyTVar countVar (+ 1)
329287 f $ responseLBS status200 [] ""
330− withApp defaultSettings app $ withMySocket $ \ms -> do
288+ withApp defaultSettings app $ \port -> do
289+ handle <- connectTo "127.0.0.1" port
331290 let input = S.concat
332291 [ "POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"
333292 , "c\r\nHello World\n\r\n3\r\nBye\r\n0\r\n"
334293 , "POST / HTTP/1.1\r\nTransfer-Encoding: Chunked\r\n\r\n"
335294 , "b\r\nHello World\r\n0\r\n\r\n"
336295 ]
337− mapM_ (msWrite ms) $ map S.singleton $ S.unpack input
338− atomically $ do
339− count <- readTVar countVar
340− check $ count == 2
296+ mapM_ (\bs -> hPutStr handle bs >> hFlush handle) $ map S.singleton $ S.unpack input
297+ hClose handle
298+ threadDelay 1000
341299 front <- I.readIORef ifront
342300 front [] `shouldBe`
343301 [ "Hello World\nBye"
@@ -346,7 +304,7 @@ spec = do
346304 it "timeout in request body" $ do
347305 ifront <- I.newIORef id
348306 let app req f = do
349− bss <- (consumeBody $ getRequestBodyChunk req) `onException`
307+ bss <- (consumeBody $ requestBody req) `onException`
350308 liftIO (I.atomicModifyIORef ifront (\front -> (front . ("consume interrupted":), ())))
351309 liftIO $ threadDelay 4000000 `E.catch` \e -> do
352310 I.atomicModifyIORef ifront (\front ->
@@ -355,18 +313,20 @@ spec = do
355313 E.throwIO (e :: E.SomeException)
356314 liftIO $ I.atomicModifyIORef ifront $ \front -> (front . (S.concat bss:), ())
357315 f $ responseLBS status200 [] ""
358− withApp (setTimeout 1 defaultSettings) app $ withMySocket $ \ms -> do
316+ withApp (setTimeout 1 defaultSettings) app $ \port -> do
359317 let bs1 = S.replicate 2048 88
360318 bs2 = "This is short"
361319 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"
320+ handle <- connectTo "127.0.0.1" port
321+ hPutStr handle "POST / HTTP/1.1\r\n"
322+ hPutStr handle "content-length: "
323+ hPutStr handle $ S8.pack $ show $ S.length bs
324+ hPutStr handle "\r\n\r\n"
366325 threadDelay 100000
367− msWrite ms bs1
326+ hPutStr handle bs1
368327 threadDelay 100000
369− msWrite ms bs2
328+ hPutStr handle bs2
329+ hClose handle
370330 threadDelay 5000000
371331 front <- I.readIORef ifront
372332 S.concat (front []) `shouldBe` bs
@@ -382,42 +342,39 @@ spec = do
382342 loop
383343 loop
384344 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")
345+ withApp defaultSettings app $ \port -> do
346+ handle <- connectTo "127.0.0.1" port
347+ hPutStr handle "POST / HTTP/1.1\r\n\r\n12345"
348+ hFlush handle
349+ timeout 100000 (S.hGet handle 10) >>= (`shouldBe` Just "1122334455")
350+ hPutStr handle "67890"
351+ hFlush handle
352+ timeout 100000 (S.hGet handle 10) >>= (`shouldBe` Just "6677889900")
353+
390354 it "only one date and server header" $ do
391355 let app _ f = f $ responseLBS status200
392356 [ ("server", "server")
393357 , ("date", "date")
394358 ] ""
395− getValues key = map snd
396− . filter (\(key', _) -> key == key')
397− . responseHeaders
398359 withApp defaultSettings app $ \port -> do
399360 res <- sendGET $ "http://127.0.0.1:" ++ show port
400− getValues hServer res `shouldBe` ["server"]
401− getValues hDate res `shouldBe` ["date"]
361+ getHeaderValue hServer (responseHeaders res) `shouldBe` Just "server"
362+ getHeaderValue hDate (responseHeaders res) `shouldBe` Just "date"
402363
403364 it "streaming echo #249" $ do
404− countVar <- newTVarIO (0 :: Int)
405365 let app req f = f $ responseStream status200 [] $ \write _ -> do
406− let loop = do
407− bs <- getRequestBodyChunk req
366+ let loop = do
367+ bs <- requestBody req
408368 unless (S.null bs) $ do
409369 write $ byteString bs
410− atomically $ modifyTVar countVar (+ 1)
411370 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"
371+ loop
372+ withApp defaultSettings app $ \port -> do
373+ (sock, _addr) <- getSocketTCP "127.0.0.1" port
374+ sendAll sock "POST / HTTP/1.1\r\ntransfer-encoding: chunked\r\n\r\n"
415375 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
376+ sendAll sock "5\r\nhello\r\n0\r\n\r\n"
377+ bs <- safeRecv sock 4096
421378 S.takeWhile (/= 13) bs `shouldBe` "HTTP/1.1 200 OK"
422379
423380 it "streaming response with length" $ do
warp/test/WithApplicationSpec.hs+16−10
@@ -2,10 +2,14 @@
22
33module WithApplicationSpec where
44
5+import Control.Concurrent
56import Control.Exception
67import Network.HTTP.Types
8+import Network.Socket
79import Network.Wai
810import System.Environment
11+import System.IO
12+import System.IO.Silently
913import System.Process
1014import Test.Hspec
1115
@@ -23,18 +27,20 @@ spec = do
2327 output <- readProcess "curl" ["-s", "localhost:" ++ show port] ""
2428 output `shouldBe` "foo"
2529
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"
30+ it "does not propagate exceptions from the server to the executing thread" $
31+ hSilence [stderr] $ do
32+ let mkApp = return $ \ _request _respond -> throwIO $ ErrorCall "foo"
33+ withApplication mkApp $ \ port -> do
34+ output <- readProcess "curl" ["-s", "localhost:" ++ show port] ""
35+ output `shouldContain` "Something went wron"
3136
3237 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")
38+ it "propagates exceptions from the server to the executing thread" $
39+ hSilence [stderr] $ do
40+ let mkApp = return $ \ _request _respond -> throwIO $ ErrorCall "foo"
41+ (testWithApplication mkApp $ \ port -> do
42+ readProcess "curl" ["-s", "localhost:" ++ show port] "")
43+ `shouldThrow` (errorCall "foo")
3844
3945{- The future netwrok library will not export MkSocket.
4046 describe "withFreePort" $ do
warp/warp.cabal+49−62
@@ -1,5 +1,5 @@
11Name: warp
2−Version: 3.3.9
2+Version: 3.2.18.1
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)
@@ -37,26 +37,24 @@ Library
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
4242 , case-insensitive >= 0.2
4343 , containers
4444 , ghc-prim
45− , hashable
46− , http-date
47− , http-types >= 0.12
48− , http2 >= 2.0 && < 2.1
45+ , http-types >= 0.9.1
4946 , iproute >= 1.3.1
47+ , http2 >= 1.6 && < 1.7
5048 , simple-sendfile >= 0.2.7 && < 0.3
51− , stm >= 2.3
52− , streaming-commons >= 0.1.10
53− , text
54− , time-manager
5549 , unix-compat >= 0.2
56− , vault >= 0.3
5750 , wai >= 3.2 && < 3.3
51+ , text
52+ , streaming-commons >= 0.1.10
53+ , vault >= 0.3
54+ , stm >= 2.3
5855 , word8
59− , x509
56+ , hashable
57+ , http-date
6058 if impl(ghc < 8)
6159 Build-Depends: semigroups
6260 if flag(network-bytestring)
@@ -75,11 +73,15 @@ Library
7573 Network.Wai.Handler.Warp.FileInfoCache
7674 Network.Wai.Handler.Warp.HashMap
7775 Network.Wai.Handler.Warp.HTTP2
76+ Network.Wai.Handler.Warp.HTTP2.EncodeFrame
7877 Network.Wai.Handler.Warp.HTTP2.File
79− Network.Wai.Handler.Warp.HTTP2.PushPromise
78+ Network.Wai.Handler.Warp.HTTP2.HPACK
79+ Network.Wai.Handler.Warp.HTTP2.Manager
80+ Network.Wai.Handler.Warp.HTTP2.Receiver
8081 Network.Wai.Handler.Warp.HTTP2.Request
81− Network.Wai.Handler.Warp.HTTP2.Response
82+ Network.Wai.Handler.Warp.HTTP2.Sender
8283 Network.Wai.Handler.Warp.HTTP2.Types
84+ Network.Wai.Handler.Warp.HTTP2.Worker
8385 Network.Wai.Handler.Warp.Header
8486 Network.Wai.Handler.Warp.IO
8587 Network.Wai.Handler.Warp.Imports
@@ -93,6 +95,7 @@ Library
9395 Network.Wai.Handler.Warp.Run
9496 Network.Wai.Handler.Warp.SendFile
9597 Network.Wai.Handler.Warp.Settings
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
122121 Build-Depends: base >= 4.8 && < 5
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
@@ -151,11 +145,15 @@ Test-Suite spec
151145 Network.Wai.Handler.Warp.File
152146 Network.Wai.Handler.Warp.FileInfoCache
153147 Network.Wai.Handler.Warp.HTTP2
148+ Network.Wai.Handler.Warp.HTTP2.EncodeFrame
154149 Network.Wai.Handler.Warp.HTTP2.File
155− Network.Wai.Handler.Warp.HTTP2.PushPromise
150+ Network.Wai.Handler.Warp.HTTP2.HPACK
151+ Network.Wai.Handler.Warp.HTTP2.Manager
152+ Network.Wai.Handler.Warp.HTTP2.Receiver
156153 Network.Wai.Handler.Warp.HTTP2.Request
157− Network.Wai.Handler.Warp.HTTP2.Response
154+ Network.Wai.Handler.Warp.HTTP2.Sender
158155 Network.Wai.Handler.Warp.HTTP2.Types
156+ Network.Wai.Handler.Warp.HTTP2.Worker
159157 Network.Wai.Handler.Warp.HashMap
160158 Network.Wai.Handler.Warp.Header
161159 Network.Wai.Handler.Warp.IO
@@ -171,62 +169,56 @@ Test-Suite spec
171169 Network.Wai.Handler.Warp.Run
172170 Network.Wai.Handler.Warp.SendFile
173171 Network.Wai.Handler.Warp.Settings
172+ Network.Wai.Handler.Warp.Timeout
174173 Network.Wai.Handler.Warp.Types
175− Network.Wai.Handler.Warp.Windows
176174 Network.Wai.Handler.Warp.WithApplication
177175 Paths_warp
178176
179177 Hs-Source-Dirs: test, .
180178 Type: exitcode-stdio-1.0
181179
182− Ghc-Options: -Wall -threaded
180+ Ghc-Options: -Wall
183181 Build-Depends: base >= 4.8 && < 5
184− , HUnit
185− , QuickCheck
186182 , array
187− , async
188183 , auto-update
189− , bsb-http-chunked < 0.1
184+ , blaze-builder >= 0.4
190185 , bytestring >= 0.9.1.4
191186 , case-insensitive >= 0.2
192− , containers
193− , directory
194187 , ghc-prim
195− , hashable
196− , hspec >= 1.3
197188 , http-client
198− , http-date
199− , http-types >= 0.12
200− , http2 >= 2.0 && < 2.1
189+ , http-types >= 0.8.5
201190 , iproute >= 1.3.1
202191 , lifted-base >= 0.1
203− , network
204− , process
205192 , simple-sendfile >= 0.2.4 && < 0.3
206− , stm >= 2.3
207− , streaming-commons >= 0.1.10
208− , text
209− , time
210− , time-manager
193+ , transformers >= 0.2.2
211194 , unix-compat >= 0.2
212− , vault
213195 , wai >= 3.2 && < 3.3
196+ , network
197+ , HUnit
198+ , QuickCheck
199+ , hspec >= 1.3
200+ , time
201+ , text
202+ , streaming-commons >= 0.1.10
203+ , silently
204+ , async
205+ , vault
206+ , stm >= 2.3
207+ , directory
208+ , process
209+ , containers
210+ , http2 >= 1.6 && < 1.7
214211 , word8
215− , x509
216− -- Build-Tool-Depends: hspec-discover:hspec-discover
212+ , hashable
213+ , http-date
217214 if impl(ghc < 8)
218215 Build-Depends: semigroups
219− , transformers
220216
221217 if (os(linux) || os(freebsd) || os(darwin)) && flag(allow-sendfilefd)
222218 Cpp-Options: -DSENDFILEFD
223219 Build-Depends: unix
224220 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
221+ Cpp-Options: -DWINDOWS
230222
231223Benchmark parser
232224 Type: exitcode-stdio-1.0
@@ -237,6 +229,7 @@ Benchmark parser
237229 Network.Wai.Handler.Warp.HashMap
238230 Network.Wai.Handler.Warp.Imports
239231 Network.Wai.Handler.Warp.MultiMap
232+ Network.Wai.Handler.Warp.Timeout
240233 Network.Wai.Handler.Warp.Types
241234 HS-Source-Dirs: bench .
242235 Build-Depends: base >= 4.8 && < 5
@@ -249,9 +242,7 @@ Benchmark parser
249242 , http-types
250243 , network
251244 , network
252− , time-manager
253245 , unix-compat
254− , x509
255246 if impl(ghc < 8)
256247 Build-Depends: semigroups
257248
@@ -259,11 +250,7 @@ Benchmark parser
259250 Cpp-Options: -DSENDFILEFD
260251 Build-Depends: unix
261252 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
253+ Cpp-Options: -DWINDOWS
267254
268255Source-Repository head
269256 Type: git