HPACK huffman decode: Process 8 bits at a time

2025-12-07 02:28:53 +08:00 · 2016-02-08 23:34:15 +09:00
656 changed files with 94485 additions and 88415 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -1,165 +1,57 @@
 ---
 Language:        Cpp
 # BasedOnStyle:  LLVM
 AccessModifierOffset: -2
-AlignAfterOpenBracket: Align
+ConstructorInitializerIndentWidth: 4
-AlignConsecutiveMacros: None
+AlignEscapedNewlinesLeft: false
 AlignConsecutiveAssignments: None
 AlignConsecutiveBitFields: None
 AlignConsecutiveDeclarations: None
 AlignEscapedNewlines: Right
 AlignOperands:   Align
 AlignTrailingComments: true
 AllowAllArgumentsOnNextLine: true
 AllowAllConstructorInitializersOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortEnumsOnASingleLine: true
+AllowShortBlocksOnASingleLine: false
-AllowShortBlocksOnASingleLine: Never
+AllowShortIfStatementsOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: All
 AllowShortLambdasOnASingleLine: All
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
+AllowShortFunctionsOnASingleLine: All
-AlwaysBreakAfterReturnType: None
+AlwaysBreakTemplateDeclarations: false
 AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: MultiLine
+BreakBeforeBinaryOperators: false
 AttributeMacros:
  - __capability
 BinPackArguments: true
 BinPackParameters: true
 BraceWrapping:
  AfterCaseLabel:  false
  AfterClass:      false
  AfterControlStatement: Never
  AfterEnum:       false
  AfterFunction:   false
  AfterNamespace:  false
  AfterObjCDeclaration: false
  AfterStruct:     false
  AfterUnion:      false
  AfterExternBlock: false
  BeforeCatch:     false
  BeforeElse:      false
  BeforeLambdaBody: false
  BeforeWhile:     false
  IndentBraces:    false
  SplitEmptyFunction: true
  SplitEmptyRecord: true
  SplitEmptyNamespace: true
 BreakBeforeBinaryOperators: None
 BreakBeforeConceptDeclarations: true
 BreakBeforeBraces: Attach
 BreakBeforeInheritanceComma: false
 BreakInheritanceList: BeforeColon
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeColon
+BinPackParameters: true
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: true
 ColumnLimit:     80
 CommentPragmas:  '^ IWYU pragma:'
 CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
 DeriveLineEnding: true
 DerivePointerAlignment: false
 DisableFormat:   false
 EmptyLineBeforeAccessModifier: LogicalBlock
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
 ForEachMacros:
  - foreach
  - Q_FOREACH
  - BOOST_FOREACH
 StatementAttributeLikeMacros:
  - Q_EMIT
 IncludeBlocks:   Preserve
 IncludeCategories:
  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
    Priority:        2
    SortPriority:    0
    CaseSensitive:   false
  - Regex:           '^(<|"(gtest|isl|json)/)'
    Priority:        3
    SortPriority:    0
    CaseSensitive:   false
  - Regex:           '.*'
    Priority:        1
    SortPriority:    0
    CaseSensitive:   false
 IncludeIsMainRegex: '$'
 IncludeIsMainSourceRegex: ''
 IndentCaseLabels: false
 IndentCaseBlocks: false
 IndentGotoLabels: true
 IndentPPDirectives: AfterHash
 IndentExternBlock: AfterExternBlock
 IndentRequires:  false
 IndentWidth:     2
 IndentWrappedFunctionNames: false
-InsertTrailingCommas: None
+IndentFunctionDeclarationAfterType: false
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: true
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
 KeepEmptyLinesAtTheStartOfBlocks: true
 NamespaceIndentation: None
 ObjCBinPackProtocolList: Auto
 ObjCBlockIndentWidth: 2
 ObjCBreakBeforeNestedBlockParam: true
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
 PenaltyBreakAssignment: 2
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
-PenaltyBreakTemplateDeclaration: 10
+PenaltyBreakFirstLessLess: 120
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
 PenaltyIndentedWhitespace: 0
 PointerAlignment: Right
 ReflowComments:  true
 SortIncludes:    false
 SortJavaStaticImport: Before
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
 SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeCaseColon: false
 SpaceBeforeCpp11BracedList: false
 SpaceBeforeCtorInitializerColon: true
 SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
 SpaceAroundPointerQualifiers: Default
 SpaceBeforeRangeBasedForLoopColon: true
 SpaceInEmptyBlock: false
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
+Cpp11BracedListStyle: true
-SpacesInConditionalStatement: false
+Standard:        Cpp11
-SpacesInContainerLiterals: true
+IndentWidth:     2
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 SpaceBeforeSquareBrackets: false
 BitFieldColonSpacing: Both
 Standard:        Latest
 StatementMacros:
  - Q_UNUSED
  - QT_REQUIRE_VERSION
 TabWidth:        8
 UseCRLF:         false
 UseTab:          Never
-WhitespaceSensitiveMacros:
+BreakBeforeBraces: Attach
-  - STRINGIZE
+SpacesInParentheses: false
-  - PP_STRINGIZE
+SpacesInAngles:  false
-  - BOOST_PP_STRINGIZE
+SpaceInEmptyParentheses: false
-  - NS_SWIFT_NAME
+SpacesInCStyleCastParentheses: false
-  - CF_SWIFT_NAME
+SpacesInContainerLiterals: true
 SpaceBeforeAssignmentOperators: true
 ContinuationIndentWidth: 4
 CommentPragmas:  '^ IWYU pragma:'
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
 SpaceBeforeParens: ControlStatements
 DisableFormat:   false
 ...
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,181 +0,0 @@
 name: build
 on: push
 jobs:
  build:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
        os: [ubuntu-20.04, macos-10.15]
        compiler: [gcc, clang]
        buildtool: [autotools, cmake]
        http3: [http3, no-http3]
        openssl: [openssl1, openssl3]
        exclude:
        - os: macos-10.15
          openssl: openssl3
        - http3: no-http3
          openssl: openssl3
    steps:
    - uses: actions/checkout@v2
    - name: Linux setup
      if: runner.os == 'Linux'
      run: |
        sudo apt-get install \
          g++-8 \
          clang-10 \
          autoconf \
          automake \
          autotools-dev \
          libtool \
          pkg-config \
          zlib1g-dev \
          libcunit1-dev \
          libssl-dev \
          libxml2-dev \
          libev-dev \
          libevent-dev \
          libjansson-dev \
          libjemalloc-dev \
          libc-ares-dev \
          libelf-dev \
          cmake \
          cmake-data
        echo 'CPPFLAGS=-fsanitize=address,undefined -fno-sanitize-recover=undefined -g' >> $GITHUB_ENV
        echo 'LDFLAGS=-fsanitize=address,undefined -fno-sanitize-recover=undefined' >> $GITHUB_ENV
    - name: MacOS setup
      if: runner.os == 'macOS'
      run: |
        brew install \
          libev \
          libevent \
          c-ares \
          cunit \
          libressl \
          autoconf \
          automake \
          pkg-config \
          libtool
        echo 'PKG_CONFIG_PATH=/usr/local/opt/libressl/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig' >> $GITHUB_ENV
    - name: Setup clang (Linux)
      if: runner.os == 'Linux' && matrix.compiler == 'clang'
      run: |
        echo 'CC=clang-10' >> $GITHUB_ENV
        echo 'CXX=clang++-10' >> $GITHUB_ENV
    - name: Setup clang (MacOS)
      if: runner.os == 'macOS' && matrix.compiler == 'clang'
      run: |
        echo 'CC=clang' >> $GITHUB_ENV
        echo 'CXX=clang++' >> $GITHUB_ENV
    - name: Setup gcc (Linux)
      if: runner.os == 'Linux' && matrix.compiler == 'gcc'
      run: |
        echo 'CC=gcc-8' >> $GITHUB_ENV
        echo 'CXX=g++-8' >> $GITHUB_ENV
    - name: Setup gcc (MacOS)
      if: runner.os == 'macOS' && matrix.compiler == 'gcc'
      run: |
        echo 'CC=gcc' >> $GITHUB_ENV
        echo 'CXX=g++' >> $GITHUB_ENV
    - name: Build libbpf
      if: matrix.http3 == 'http3' && matrix.compiler == 'clang' && runner.os == 'Linux'
      run: |
        git clone -b v0.4.0 https://github.com/libbpf/libbpf
        cd libbpf
        PREFIX=$PWD/build make -C src install
        EXTRA_AUTOTOOLS_OPTS="--with-libbpf"
        EXTRA_CMAKE_OPTS="-DWITH_LIBBPF=1"
        echo 'EXTRA_AUTOTOOLS_OPTS='"$EXTRA_AUTOTOOLS_OPTS" >> $GITHUB_ENV
        echo 'EXTRA_CMAKE_OPTS='"$EXTRA_CMAKE_OPTS" >> $GITHUB_ENV
    - name: Build quictls/openssl v1.1.1
      if: matrix.http3 == 'http3' && matrix.openssl == 'openssl1'
      run: |
        git clone --depth 1 -b OpenSSL_1_1_1m+quic https://github.com/quictls/openssl
        cd openssl
        ./config enable-tls1_3 --prefix=$PWD/build
        make -j$(nproc)
        make install_sw
    - name: Build quictls/openssl v3.0.x
      if: matrix.http3 == 'http3' && matrix.openssl == 'openssl3'
      run: |
        unset CPPFLAGS
        unset LDFLAGS
        git clone --depth 1 -b openssl-3.0.1+quic https://github.com/quictls/openssl
        cd openssl
        ./config enable-tls1_3 --prefix=$PWD/build --libdir=$PWD/build/lib
        make -j$(nproc)
        make install_sw
    - name: Build nghttp3
      if: matrix.http3 == 'http3'
      run: |
        git clone --depth 1 -b v0.1.1 https://github.com/ngtcp2/nghttp3
        cd nghttp3
        autoreconf -i
        ./configure --prefix=$PWD/build --enable-lib-only
        make -j$(nproc) check
        make install
    - name: Build ngtcp2
      if: matrix.http3 == 'http3'
      run: |
        git clone --depth 1 -b v0.1.0 https://github.com/ngtcp2/ngtcp2
        cd ngtcp2
        autoreconf -i
        ./configure --prefix=$PWD/build --enable-lib-only PKG_CONFIG_PATH="../openssl/build/lib/pkgconfig"
        make -j$(nproc) check
        make install
    - name: Setup extra environment variables for HTTP/3
      if: matrix.http3 == 'http3'
      run: |
        PKG_CONFIG_PATH="$PWD/openssl/build/lib/pkgconfig:$PWD/nghttp3/build/lib/pkgconfig:$PWD/ngtcp2/build/lib/pkgconfig:$PWD/libbpf/build/lib64/pkgconfig:$PKG_CONFIG_PATH"
        LDFLAGS="$LDFLAGS -Wl,-rpath,$PWD/openssl/build/lib -Wl,-rpath,$PWD/libbpf/build/lib64"
        EXTRA_AUTOTOOLS_OPTS="--enable-http3 $EXTRA_AUTOTOOLS_OPTS"
        EXTRA_CMAKE_OPTS="-DENABLE_HTTP3=1 $EXTRA_CMAKE_OPTS"
        echo 'PKG_CONFIG_PATH='"$PKG_CONFIG_PATH" >> $GITHUB_ENV
        echo 'LDFLAGS='"$LDFLAGS" >> $GITHUB_ENV
        echo 'EXTRA_AUTOTOOLS_OPTS='"$EXTRA_AUTOTOOLS_OPTS" >> $GITHUB_ENV
        echo 'EXTRA_CMAKE_OPTS='"$EXTRA_CMAKE_OPTS" >> $GITHUB_ENV
    - name: Setup git submodules
      run: |
        git submodule update --init
    - name: Configure autotools
      run: |
        autoreconf -i
        ./configure
    - name: Configure cmake
      if: matrix.buildtool == 'cmake'
      run: |
        make dist
        VERSION=$(grep PACKAGE_VERSION config.h | cut -d' ' -f3 | tr -d '"')
        tar xf nghttp2-$VERSION.tar.gz
        cd nghttp2-$VERSION
        echo 'NGHTTP2_CMAKE_DIR='"$PWD" >> $GITHUB_ENV
        # This fixes infamous 'stdio.h not found' error.
        echo 'SDKROOT='"$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
        cmake -DENABLE_WERROR=1 -DWITH_MRUBY=1 -DWITH_NEVERBLEED=1 -DENABLE_APP=1 $EXTRA_CMAKE_OPTS -DCPPFLAGS="$CPPFLAGS" -DLDFLAGS="$LDFLAGS" .
    - name: Build nghttp2 with autotools
      if: matrix.buildtool == 'autotools'
      run: |
        make distcheck \
          DISTCHECK_CONFIGURE_FLAGS="--with-mruby --with-neverbleed --with-libev --enable-werror $EXTRA_AUTOTOOLS_OPTS CPPFLAGS=\"$CPPFLAGS\" LDFLAGS=\"$LDFLAGS\""
    - name: Build nghttp2 with cmake
      if: matrix.buildtool == 'cmake'
      run: |
        cd $NGHTTP2_CMAKE_DIR
        make
        make check
    - name: Integration test
      # Integration tests for nghttpx; autotools erases build
      # artifacts.
      if: matrix.buildtool == 'cmake'
      run: |
        cd $NGHTTP2_CMAKE_DIR/integration-tests
        make itprep it
--- a/.github/workflows/fuzz.yml
+++ b/.github/workflows/fuzz.yml
@@ -1,23 +0,0 @@
 name: CIFuzz
 on: [pull_request]
 jobs:
  Fuzzing:
    runs-on: ubuntu-latest
    steps:
    - name: Build Fuzzers
      uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
      with:
        oss-fuzz-project-name: 'nghttp2'
        dry-run: false
    - name: Run Fuzzers
      uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
      with:
        oss-fuzz-project-name: 'nghttp2'
        fuzz-seconds: 600
        dry-run: false
    - name: Upload Crash
      uses: actions/upload-artifact@v1
      if: failure()
      with:
        name: artifacts
        path: ./out/artifacts
--- a/.gitignore
+++ b/.gitignore
@@ -29,22 +29,6 @@ missing
 stamp-h1
 test-driver
 # cmake
 CMakeCache.txt
 CMakeFiles/
 cmake_install.cmake
 install_manifest.txt
 CTestTestfile.cmake
 build.ninja
 rules.ninja
 .ninja_deps
 .ninja_log
 lib*.so
 lib*.so.*
 lib*.a
 # generated by "make test" with cmake
 Testing/
 # test logs generated by `make check`
 *.log
 *.trs
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,5 +3,4 @@
 	url = https://github.com/mruby/mruby
 [submodule "third-party/neverbleed"]
 	path = third-party/neverbleed
-	url = https://github.com/tatsuhiro-t/neverbleed.git
+	url = https://github.com/h2o/neverbleed.git
 	branch = openssl111fix
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,27 +1,15 @@
-dist: xenial
+language: cpp
 os:
  - linux
 compiler:
  - clang
  - gcc
-env:
+sudo: false
  matrix:
    - CI_BUILD=cmake
    - CI_BUILD=autotools
 matrix:
  include:
    - os: osx
      compiler: clang
      osx_image: xcode10.2
      env: CI_BUILD=autotools
 language: cpp
 sudo: required
 addons:
  apt:
    sources:
    - ubuntu-toolchain-r-test
    packages:
-    - g++-8
+    - g++-4.9
    - libstdc++-4.9-dev
    - autoconf
    - automake
    - autotools-dev
@@ -35,55 +23,30 @@ addons:
    - libevent-dev
    - libjansson-dev
    - libjemalloc-dev
    - libc-ares-dev
    - cmake
    - cmake-data
  homebrew:
    packages:
      - libev
      - libevent
      - c-ares
      - cunit
      - libressl
 before_install:
  - $CC --version
-  - if [ "$CXX" = "g++" ]; then export CXX="g++-8" CC="gcc-8"; fi
+  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
  - $CC --version
  - go version
  - cmake --version
 before_script:
-  - |
+  # First build spdylay, since integration tests require it.
-    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+  # spdylay is going to be built under third-party/spdylay
-      CPPFLAGS="-fsanitize=address" LDFLAGS="-fsanitize=address -fuse-ld=gold"
+  - cd third-party
-    fi
+  - git clone https://github.com/tatsuhiro-t/spdylay.git
-  - |
+  - cd spdylay
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+  - autoreconf -i
-      PKG_CONFIG_PATH="/usr/local/opt/libressl/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig"
+  - ./configure --disable-src --disable-examples
-    fi
+  - make check
  - export SPDYLAY_HOME=$PWD
  - cd ../..
  # Now build nghttp2
  - autoreconf -i
  - git submodule update --init
-  - |
+  - ./configure --enable-werror --with-mruby --with-neverbleed LIBSPDYLAY_CFLAGS="-I$SPDYLAY_HOME/lib/includes" LIBSPDYLAY_LIBS="-L$SPDYLAY_HOME/lib/.libs -lspdylay"
    if [ "$CI_BUILD" = "autotools" ]; then
      autoreconf -i && ./configure --with-mruby PKG_CONFIG_PATH=$PKG_CONFIG_PATH
    fi
  - |
    if [ "$CI_BUILD" = "cmake" ]; then
      cmake -DENABLE_WERROR=1 -DWITH_MRUBY=1 -DWITH_NEVERBLEED=1
    fi
 script:
-  - |
+  - make
-    if [ "$CI_BUILD" = "autotools" ]; then
+  - make check
-      make distcheck DISTCHECK_CONFIGURE_FLAGS="--with-mruby --with-neverbleed --enable-werror CPPFLAGS=$CPPFLAGS LDFLAGS=\"$LDFLAGS\" PKG_CONFIG_PATH=$PKG_CONFIG_PATH"
+  - cd integration-tests
-    fi
+  - export GOPATH="$PWD/integration-tests/golang"
-  - |
+  - make itprep-local
-    if [ "$CI_BUILD" = "cmake" ]; then
+  - make it-local
      make && make check
    fi
  - |
    if [ "$CI_BUILD" = "cmake" ]; then
      # Integration tests for nghttpx; autotools build erases build
      # for packaging test.
      cd integration-tests
      export GO111MODULE=on
      make it
    fi
--- a/144
+++ b/144
@@ -1,143 +1 @@
-nghttp2 project was started as a fork of spdylay project [1].  Both
+Tatsuhiro Tsujikawa <t-tujikawa at users dot sourceforge dot net>
 projects were started by Tatsuhiro Tsujikawa, who is still the main
 author of these projects.  Meanwhile, we have many contributions, and
 we are not here without them.  We sincerely thank you to all who made
 a contribution.  Here is the all individuals/organizations who
 contributed to nghttp2 and spdylay project at which we forked.  These
 names are retrieved from git commit log.  If you have made a
 contribution, but you are missing in the list, please let us know via
 github issues [2].
 [1] https://github.com/tatsuhiro-t/spdylay
 [2] https://github.com/nghttp2/nghttp2/issues
 --------
 187j3x1
 Adam Gołębiowski
 Alek Storm
 Alex Nalivko
 Alexandros Konstantinakis-Karmis
 Alexis La Goutte
 Amir Livneh
 Amir Pakdel
 Anders Bakken
 Andreas Pohl
 Andrew Penkrat
 Andy Davies
 Angus Gratton
 Anna Henningsen
 Ant Bryan
 Asra Ali
 Benedikt Christoph Wolters
 Benjamin Peterson
 Bernard Spil
 Brendan Heinonen
 Brian Card
 Brian Suh
 Daniel Bevenius
 Daniel Evers
 Daniel Stenberg
 Dave Reisner
 David Beitey
 David Weekly
 Dmitri Tikhonov
 Dmitriy Vetutnev
 Don
 Dylan Plecki
 Etienne Cimon
 Fabian Möller
 Fabian Wiesel
 Gabi Davar
 Gaël PORTAY
 Geoff Hill
 George Liu
 Gitai
 Google Inc.
 Hajime Fujita
 Jacky Tian
 Jacky_Yin
 Jacob Champion
 James M Snell
 Jan Kundrát
 Jan-E
 Janusz Dziemidowicz
 Jay Satiro
 Jeff 'Raid' Baitis
 Jianqing Wang
 Jim Morrison
 Josh Braegger
 José F. Calcerrada
 Kamil Dudka
 Kazuho Oku
 Kenny (kang-yen) Peng
 Kenny Peng
 Kit Chan
 Kyle Schomp
 LazyHamster
 Leo Neat
 Lorenz Nickel
 Lucas Pardue
 MATSUMOTO Ryosuke
 Marc Bachmann
 Matt Rudary
 Matt Way
 Michael Kaufmann
 Mike Conlen
 Mike Frysinger
 Mike Lothian
 Nicholas Hurley
 Nora Shoemaker
 Pedro Santos
 Peeyush Aggarwal
 Peter Wu
 Piotr Sikora
 Raul Gutierrez Segales
 Remo E
 Reza Tavakoli
 Richard Wolfert
 Rick Lei
 Ross Smith II
 Scott Mitchell
 Sebastiaan Deckers
 Simon Frankenberger
 Simone Basso
 Soham Sinha
 Stefan Eissing
 Stephen Ludin
 Sunpoet Po-Chuan Hsieh
 Svante Signell
 Syohei YOSHIDA
 Tapanito
 Tatsuhiko Kubo
 Tatsuhiro Tsujikawa
 Tobias Geerinckx-Rice
 Tom Harwood
 Tomas Krizek
 Tomasz Buchert
 Tomasz Torcz
 Vernon Tang
 Viacheslav Biriukov
 Viktor Szakats
 Viktor Szépe
 Wenfeng Liu
 William A Rowe Jr
 Xiaoguang Sun
 Zhuoyun Wei
 acesso
 ayanamist
 bxshi
 clemahieu
 dalf
 dawg
 es
 fangdingjun
 jwchoi
 kumagi
 lhuang04
 lstefani
 makovich
 mod-h2-dev
 moparisthebest
 snnn
 yuuki-kodama
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,576 +0,0 @@
 # nghttp2 - HTTP/2 C Library
 #
 # Copyright (c) 2012, 2013, 2014, 2015 Tatsuhiro Tsujikawa
 # Copyright (c) 2016 Peter Wu <peter@lekensteyn.nl>
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish,
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
 #
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 cmake_minimum_required(VERSION 3.0)
 # XXX using 1.8.90 instead of 1.9.0-DEV
 project(nghttp2 VERSION 1.46.90)
 # See versioning rule:
 #  https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 set(LT_CURRENT  35)
 set(LT_REVISION 1)
 set(LT_AGE      21)
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 include(Version)
 math(EXPR LT_SOVERSION "${LT_CURRENT} - ${LT_AGE}")
 set(LT_VERSION "${LT_SOVERSION}.${LT_AGE}.${LT_REVISION}")
 set(PACKAGE_VERSION     "${PROJECT_VERSION}")
 HexVersion(PACKAGE_VERSION_NUM ${PROJECT_VERSION_MAJOR} ${PROJECT_VERSION_MINOR} ${PROJECT_VERSION_PATCH})
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the build type" FORCE)
  # Include "None" as option to disable any additional (optimization) flags,
  # relying on just CMAKE_C_FLAGS and CMAKE_CXX_FLAGS (which are empty by
  # default). These strings are presented in cmake-gui.
  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
    "None" "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
 include(GNUInstallDirs)
 # For Python bindings and documentation
 # (Must be called before PythonLibs for matching versions.)
 find_package(PythonInterp)
 # Auto-detection of features that can be toggled
 find_package(OpenSSL 1.0.1)
 find_package(Libev 4.11)
 find_package(Libcares 1.7.5)
 find_package(ZLIB 1.2.3)
 find_package(Libngtcp2 0.0.0)
 find_package(Libngtcp2_crypto_openssl 0.0.0)
 if(LIBNGTCP2_CRYPTO_OPENSSL_FOUND)
  set(HAVE_LIBNGTCP2_CRYPTO_OPENSSL 1)
 endif()
 find_package(Libnghttp3 0.0.0)
 if(WITH_LIBBPF)
  find_package(Libbpf 0.4.0)
  if(NOT LIBBPF_FOUND)
    message(FATAL_ERROR "libbpf was requested (WITH_LIBBPF=1) but not found.")
  endif()
 endif()
 if(OPENSSL_FOUND AND LIBEV_FOUND AND ZLIB_FOUND)
  set(ENABLE_APP_DEFAULT ON)
 else()
  set(ENABLE_APP_DEFAULT OFF)
 endif()
 find_package(Systemd 209)
 find_package(Jansson  2.5)
 set(ENABLE_HPACK_TOOLS_DEFAULT ${JANSSON_FOUND})
 # 2.0.8 is required because we use evconnlistener_set_error_cb()
 find_package(Libevent 2.0.8 COMPONENTS libevent openssl)
 set(ENABLE_EXAMPLES_DEFAULT ${LIBEVENT_OPENSSL_FOUND})
 find_package(Cython)
 find_package(PythonLibs)
 if(CYTHON_FOUND AND PYTHONLIBS_FOUND)
  set(ENABLE_PYTHON_BINDINGS_DEFAULT ON)
 else()
  set(ENABLE_PYTHON_BINDINGS_DEFAULT OFF)
 endif()
 find_package(LibXml2 2.6.26)
 set(WITH_LIBXML2_DEFAULT    ${LIBXML2_FOUND})
 find_package(Jemalloc)
 set(WITH_JEMALLOC_DEFAULT   ${JEMALLOC_FOUND})
 include(CMakeOptions.txt)
 if(ENABLE_LIB_ONLY AND (ENABLE_APP OR ENABLE_HPACK_TOOLS OR ENABLE_EXAMPLES OR
  ENABLE_PYTHON_BINDINGS))
  # Remember when disabled options are disabled for later diagnostics.
  set(ENABLE_LIB_ONLY_DISABLED_OTHERS 1)
 else()
  set(ENABLE_LIB_ONLY_DISABLED_OTHERS 0)
 endif()
 if(ENABLE_LIB_ONLY)
  set(ENABLE_APP            OFF)
  set(ENABLE_HPACK_TOOLS    OFF)
  set(ENABLE_EXAMPLES       OFF)
  set(ENABLE_PYTHON_BINDINGS OFF)
 endif()
 # Do not disable assertions based on CMAKE_BUILD_TYPE.
 foreach(_build_type "Release" "MinSizeRel" "RelWithDebInfo")
  foreach(_lang C CXX)
    string(TOUPPER "CMAKE_${_lang}_FLAGS_${_build_type}" _var)
    string(REGEX REPLACE "(^| )[/-]D *NDEBUG($| )" " " ${_var} "${${_var}}")
  endforeach()
 endforeach()
 if(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
  set(HINT_NORETURN       "__attribute__((noreturn))")
 else()
  set(HINT_NORETURN)
 endif()
 include(ExtractValidFlags)
 foreach(_cxx1x_flag -std=c++14)
  extract_valid_cxx_flags(_cxx1x_flag_supported ${_cxx1x_flag})
  if(_cxx1x_flag_supported)
    set(CXX1XCXXFLAGS ${_cxx1x_flag})
    break()
  endif()
 endforeach()
 include(CMakePushCheckState)
 include(CheckCXXSourceCompiles)
 cmake_push_check_state()
 set(CMAKE_REQUIRED_DEFINITIONS "${CXX1XCXXFLAGS}")
 # Check that std::future is available.
 check_cxx_source_compiles("
 #include <vector>
 #include <future>
 int main() { std::vector<std::future<int>> v; }" HAVE_STD_FUTURE)
 # Check that std::map::emplace is available for g++-4.7.
 check_cxx_source_compiles("
 #include <map>
 int main() { std::map<int, int>().emplace(1, 2); }" HAVE_STD_MAP_EMPLACE)
 cmake_pop_check_state()
 # Checks for libraries.
 # Additional libraries required for programs under src directory.
 set(APP_LIBRARIES)
 if(ENABLE_PYTHON_BINDINGS)
  if(NOT (CYTHON_FOUND AND PYTHONLIBS_FOUND))
    message(FATAL_ERROR "python bindings were requested "
      "(ENABLE_PYTHON_BINDINGS=1) but dependencies are not met.")
  endif()
  if(NOT PYTHON_VERSION_STRING STREQUAL PYTHONLIBS_VERSION_STRING)
    message(FATAL_ERROR
      "Python executable and library must have the same version!"
      " Found Python ${PYTHON_VERSION_STRING} and"
      " PythonLibs ${PYTHONLIBS_VERSION_STRING}"
    )
  endif()
 endif()
 set(CMAKE_THREAD_PREFER_PTHREAD 1)
 find_package(Threads)
 if(CMAKE_USE_PTHREADS_INIT)
  list(APPEND APP_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
 endif()
 # XXX android and C++, is this still needed in cmake?
 # case "$host" in
 #   *android*)
 #     android_build=yes
 #     # android does not need -pthread, but needs following 3 libs for C++
 #     APPLDFLAGS="$APPLDFLAGS -lstdc++ -latomic -lsupc++"
 # dl: openssl requires libdl when it is statically linked.
 # XXX shouldn't ${CMAKE_DL_LIBS} be appended to OPENSSL_LIBRARIES instead of
 # APP_LIBRARIES if it is really specific to OpenSSL?
 find_package(CUnit 2.1)
 enable_testing()
 set(HAVE_CUNIT      ${CUNIT_FOUND})
 if(HAVE_CUNIT)
  add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
 endif()
 # openssl (for src)
 include(CheckSymbolExists)
 set(HAVE_OPENSSL    ${OPENSSL_FOUND})
 if(OPENSSL_FOUND)
  set(OPENSSL_INCLUDE_DIRS  ${OPENSSL_INCLUDE_DIR})
  cmake_push_check_state()
  set(CMAKE_REQUIRED_INCLUDES   "${OPENSSL_INCLUDE_DIR}")
  set(CMAKE_REQUIRED_LIBRARIES  "${OPENSSL_LIBRARIES}")
  check_symbol_exists(SSL_is_quic "openssl/ssl.h" HAVE_SSL_IS_QUIC)
  if(NOT HAVE_SSL_IS_QUIC)
    message(WARNING "OpenSSL in ${OPENSSL_LIBRARIES} dose not have SSL_is_quic.  HTTP/3 support cannot be enabled")
  endif()
  cmake_pop_check_state()
 else()
  set(OPENSSL_INCLUDE_DIRS  "")
  set(OPENSSL_LIBRARIES     "")
 endif()
 # libev (for src)
 set(HAVE_LIBEV      ${LIBEV_FOUND})
 set(HAVE_ZLIB       ${ZLIB_FOUND})
 set(HAVE_SYSTEMD    ${SYSTEMD_FOUND})
 set(HAVE_LIBEVENT_OPENSSL ${LIBEVENT_FOUND})
 if(LIBEVENT_FOUND)
  # Must both link the core and openssl libraries.
  set(LIBEVENT_OPENSSL_LIBRARIES ${LIBEVENT_LIBRARIES})
 endif()
 # libc-ares (for src)
 set(HAVE_LIBCARES   ${LIBCARES_FOUND})
 if(LIBCARES_FOUND)
  set(LIBCARES_INCLUDE_DIRS ${LIBCARES_INCLUDE_DIR})
 else()
  set(LIBCARES_INCLUDE_DIRS "")
  set(LIBCARES_LIBRARIES    "")
 endif()
 # jansson (for src/nghttp, src/deflatehd and src/inflatehd)
 set(HAVE_JANSSON    ${JANSSON_FOUND})
 # libxml2 (for src/nghttp)
 set(HAVE_LIBXML2    ${LIBXML2_FOUND})
 if(LIBXML2_FOUND)
  set(LIBXML2_INCLUDE_DIRS  ${LIBXML2_INCLUDE_DIR})
 else()
  set(LIBXML2_INCLUDE_DIRS  "")
  set(LIBXML2_LIBRARIES     "")
 endif()
 # jemalloc
 set(HAVE_JEMALLOC   ${JEMALLOC_FOUND})
 if(ENABLE_ASIO_LIB)
  find_package(Boost 1.54.0 REQUIRED system thread)
 endif()
 # libbpf (for bpf)
 set(HAVE_LIBBPF ${LIBBPF_FOUND})
 if(LIBBPF_FOUND)
  set(BPFCFLAGS -Wall -O2 -g)
  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
    # For Debian/Ubuntu
    set(EXTRABPFCFLAGS -I/usr/include/${CMAKE_SYSTEM_PROCESSOR}-linux-gnu)
  endif()
  check_c_source_compiles("
 #include <linux/bpf.h>
 int main() { enum bpf_stats_type foo; (void)foo; }" HAVE_BPF_STATS_TYPE)
 endif()
 # The nghttp, nghttpd and nghttpx under src depend on zlib, OpenSSL and libev
 if(ENABLE_APP AND NOT (ZLIB_FOUND AND OPENSSL_FOUND AND LIBEV_FOUND))
  message(FATAL_ERROR "Applications were requested (ENABLE_APP=1) but dependencies are not met.")
 endif()
 # HTTP/3 requires quictls/openssl, libngtcp2, libngtcp2_crypto_openssl
 # and libnghttp3.
 if(ENABLE_HTTP3 AND NOT (HAVE_SSL_IS_QUIC AND LIBNGTCP2_FOUND AND LIBNGTCP2_CRYPTO_OPENSSL_FOUND AND LIBNGHTTP3_FOUND))
  message(FATAL_ERROR "HTTP/3 was requested (ENABLE_HTTP3=1) but dependencies are not met.")
 endif()
 # HPACK tools requires jansson
 if(ENABLE_HPACK_TOOLS AND NOT HAVE_JANSSON)
  message(FATAL_ERROR "HPACK tools were requested (ENABLE_HPACK_TOOLS=1) but dependencies are not met.")
 endif()
 # C++ library libnghttp2_asio
 if(ENABLE_EXAMPLES AND NOT (OPENSSL_FOUND AND LIBEVENT_OPENSSL_FOUND))
  message(FATAL_ERROR "examples were requested (ENABLE_EXAMPLES=1) but dependencies are not met.")
 endif()
 # third-party http-parser only be built when needed
 if(ENABLE_EXAMPLES OR ENABLE_APP OR ENABLE_HPACK_TOOLS OR ENABLE_ASIO_LIB)
  set(ENABLE_THIRD_PARTY 1)
  # mruby (for src/nghttpx)
  set(HAVE_MRUBY      ${WITH_MRUBY})
  set(HAVE_NEVERBLEED ${WITH_NEVERBLEED})
 else()
  set(HAVE_MRUBY 0)
  set(HAVE_NEVERBLEED 0)
 endif()
 # Checks for header files.
 include(CheckIncludeFile)
 check_include_file("arpa/inet.h"    HAVE_ARPA_INET_H)
 check_include_file("fcntl.h"        HAVE_FCNTL_H)
 check_include_file("inttypes.h"     HAVE_INTTYPES_H)
 check_include_file("limits.h"       HAVE_LIMITS_H)
 check_include_file("netdb.h"        HAVE_NETDB_H)
 check_include_file("netinet/in.h"   HAVE_NETINET_IN_H)
 check_include_file("pwd.h"          HAVE_PWD_H)
 check_include_file("sys/socket.h"   HAVE_SYS_SOCKET_H)
 check_include_file("sys/time.h"     HAVE_SYS_TIME_H)
 check_include_file("syslog.h"       HAVE_SYSLOG_H)
 check_include_file("time.h"         HAVE_TIME_H)
 check_include_file("unistd.h"       HAVE_UNISTD_H)
 include(CheckTypeSize)
 # Checks for typedefs, structures, and compiler characteristics.
 # AC_TYPE_SIZE_T
 check_type_size("ssize_t" SIZEOF_SSIZE_T)
 if(SIZEOF_SSIZE_T STREQUAL "")
  # ssize_t is a signed type in POSIX storing at least -1.
  # Set it to "int" to match the behavior of AC_TYPE_SSIZE_T (autotools).
  set(ssize_t int)
 endif()
 # AC_TYPE_UINT8_T
 # AC_TYPE_UINT16_T
 # AC_TYPE_UINT32_T
 # AC_TYPE_UINT64_T
 # AC_TYPE_INT8_T
 # AC_TYPE_INT16_T
 # AC_TYPE_INT32_T
 # AC_TYPE_INT64_T
 # AC_TYPE_OFF_T
 # AC_TYPE_PID_T
 # AC_TYPE_UID_T
 # XXX To support inline for crappy compilers, see https://cmake.org/Wiki/CMakeTestInline
 # AC_C_INLINE
 # XXX is AC_SYS_LARGEFILE still needed for modern systems?
 # add_definitions(-D_FILE_OFFSET_BITS=64)
 include(CheckStructHasMember)
 check_struct_has_member("struct tm" tm_gmtoff time.h HAVE_STRUCT_TM_TM_GMTOFF)
 # Check size of pointer to decide we need 8 bytes alignment adjustment.
 check_type_size("int *"   SIZEOF_INT_P)
 check_type_size("time_t"  SIZEOF_TIME_T)
 # Checks for library functions.
 include(CheckFunctionExists)
 check_function_exists(_Exit     HAVE__EXIT)
 check_function_exists(accept4   HAVE_ACCEPT4)
 check_function_exists(mkostemp  HAVE_MKOSTEMP)
 include(CheckSymbolExists)
 # XXX does this correctly detect initgroups (un)availability on cygwin?
 check_symbol_exists(initgroups grp.h HAVE_DECL_INITGROUPS)
 if(NOT HAVE_DECL_INITGROUPS AND HAVE_UNISTD_H)
  # FreeBSD declares initgroups() in unistd.h
  check_symbol_exists(initgroups unistd.h HAVE_DECL_INITGROUPS2)
  if(HAVE_DECL_INITGROUPS2)
    set(HAVE_DECL_INITGROUPS 1)
  endif()
 endif()
 set(WARNCFLAGS)
 set(WARNCXXFLAGS)
 if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
  if(ENABLE_WERROR)
    set(WARNCFLAGS    /WX)
    set(WARNCXXFLAGS  /WX)
  endif()
 else()
  if(ENABLE_WERROR)
    extract_valid_c_flags(WARNCFLAGS    -Werror)
    extract_valid_c_flags(WARNCXXFLAGS  -Werror)
  endif()
  # For C compiler
  extract_valid_c_flags(WARNCFLAGS
    -Wall
    -Wextra
    -Wmissing-prototypes
    -Wstrict-prototypes
    -Wmissing-declarations
    -Wpointer-arith
    -Wdeclaration-after-statement
    -Wformat-security
    -Wwrite-strings
    -Wshadow
    -Winline
    -Wnested-externs
    -Wfloat-equal
    -Wundef
    -Wendif-labels
    -Wempty-body
    -Wcast-align
    -Wclobbered
    -Wvla
    -Wpragmas
    -Wunreachable-code
    -Waddress
    -Wattributes
    -Wdiv-by-zero
    -Wshorten-64-to-32
    -Wconversion
    -Wextended-offsetof
    -Wformat-nonliteral
    -Wlanguage-extension-token
    -Wmissing-field-initializers
    -Wmissing-noreturn
    -Wmissing-variable-declarations
    # Not used because we cannot change public structs
    # -Wpadded
    -Wsign-conversion
    # Not used because this basically disallows default case
    # -Wswitch-enum
    -Wunreachable-code-break
    -Wunused-macros
    -Wunused-parameter
    -Wredundant-decls
    # Only work with Clang for the moment
    -Wheader-guard
    # This is required because we pass format string as "const char*.
    -Wno-format-nonliteral
  )
  extract_valid_cxx_flags(WARNCXXFLAGS
    # For C++ compiler
    -Wall
    -Wformat-security
  )
 endif()
 if(ENABLE_STATIC_CRT)
  foreach(lang C CXX)
    foreach(suffix "" _DEBUG _MINSIZEREL _RELEASE _RELWITHDEBINFO)
      set(var "CMAKE_${lang}_FLAGS${suffix}")
      string(REPLACE "/MD" "/MT" ${var} "${${var}}")
    endforeach()
  endforeach()
 endif()
 if(ENABLE_DEBUG)
  set(DEBUGBUILD 1)
 endif()
 # Some platform does not have working std::future.  We disable
 # threading for those platforms.
 if(NOT ENABLE_THREADS OR NOT HAVE_STD_FUTURE)
  set(NOTHREADS 1)
 endif()
 add_definitions(-DHAVE_CONFIG_H)
 configure_file(cmakeconfig.h.in config.h)
 # autotools-compatible names
 # Sphinx expects relative paths in the .rst files. Use the fact that the files
 # below are all one directory level deep.
 file(RELATIVE_PATH top_srcdir   "${CMAKE_CURRENT_BINARY_DIR}/dir" "${CMAKE_CURRENT_SOURCE_DIR}")
 file(RELATIVE_PATH top_builddir "${CMAKE_CURRENT_BINARY_DIR}/dir" "${CMAKE_CURRENT_BINARY_DIR}")
 set(abs_top_srcdir  "${CMAKE_CURRENT_SOURCE_DIR}")
 set(abs_top_builddir "${CMAKE_CURRENT_BINARY_DIR}")
 # libnghttp2.pc (pkg-config file)
 set(prefix          "${CMAKE_INSTALL_PREFIX}")
 set(exec_prefix     "${CMAKE_INSTALL_PREFIX}")
 set(libdir          "${CMAKE_INSTALL_FULL_LIBDIR}")
 set(includedir      "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
 set(VERSION         "${PACKAGE_VERSION}")
 # For init scripts and systemd service file (in contrib/)
 set(bindir          "${CMAKE_INSTALL_FULL_BINDIR}")
 set(sbindir         "${CMAKE_INSTALL_FULL_SBINDIR}")
 foreach(name
   lib/libnghttp2.pc
   lib/includes/nghttp2/nghttp2ver.h
   src/libnghttp2_asio.pc
   python/setup.py
   integration-tests/config.go
   integration-tests/setenv
   doc/conf.py
   doc/index.rst
   doc/package_README.rst
   doc/tutorial-client.rst
   doc/tutorial-server.rst
   doc/tutorial-hpack.rst
   doc/nghttpx-howto.rst
   doc/h2load-howto.rst
   doc/libnghttp2_asio.rst
   doc/python-apiref.rst
   doc/building-android-binary.rst
   doc/nghttp2.h.rst
   doc/nghttp2ver.h.rst
   doc/asio_http2.h.rst
   doc/asio_http2_server.h.rst
   doc/asio_http2_client.h.rst
   doc/contribute.rst
 )
  configure_file("${name}.in" "${name}" @ONLY)
 endforeach()
 if(APPLE)
  add_definitions(-D__APPLE_USE_RFC_3542)
 endif()
 include_directories(
  "${CMAKE_CURRENT_BINARY_DIR}" # for config.h
 )
 # For use in src/CMakeLists.txt
 set(PKGDATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${CMAKE_PROJECT_NAME}")
 set(PKGLIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_PROJECT_NAME}")
 install(FILES README.rst DESTINATION "${CMAKE_INSTALL_DOCDIR}")
 add_subdirectory(lib)
 #add_subdirectory(lib/includes)
 add_subdirectory(third-party)
 add_subdirectory(src)
 #add_subdirectory(src/includes)
 add_subdirectory(examples)
 add_subdirectory(python)
 add_subdirectory(tests)
 #add_subdirectory(tests/testdata)
 add_subdirectory(integration-tests)
 add_subdirectory(doc)
 add_subdirectory(contrib)
 add_subdirectory(script)
 add_subdirectory(bpf)
 string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_type)
 message(STATUS "summary of build options:
    Package version: ${VERSION}
    Library version: ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}
    Install prefix:  ${CMAKE_INSTALL_PREFIX}
    Target system:   ${CMAKE_SYSTEM_NAME}
    Compiler:
      Build type:     ${CMAKE_BUILD_TYPE}
      C compiler:     ${CMAKE_C_COMPILER}
      CFLAGS:         ${CMAKE_C_FLAGS_${_build_type}} ${CMAKE_C_FLAGS}
      C++ compiler:   ${CMAKE_CXX_COMPILER}
      CXXFLAGS:       ${CMAKE_CXX_FLAGS_${_build_type}} ${CMAKE_CXX_FLAGS}
      WARNCFLAGS:     ${WARNCFLAGS}
      CXX1XCXXFLAGS:  ${CXX1XCXXFLAGS}
    Python:
      Python:         ${PYTHON_EXECUTABLE}
      PYTHON_VERSION: ${PYTHON_VERSION_STRING}
      Library version:${PYTHONLIBS_VERSION_STRING}
      Cython:         ${CYTHON_EXECUTABLE}
    Test:
      CUnit:          ${HAVE_CUNIT} (LIBS='${CUNIT_LIBRARIES}')
      Failmalloc:     ${ENABLE_FAILMALLOC}
    Libs:
      OpenSSL:        ${HAVE_OPENSSL} (LIBS='${OPENSSL_LIBRARIES}')
      Libxml2:        ${HAVE_LIBXML2} (LIBS='${LIBXML2_LIBRARIES}')
      Libev:          ${HAVE_LIBEV} (LIBS='${LIBEV_LIBRARIES}')
      Libc-ares:      ${HAVE_LIBCARES} (LIBS='${LIBCARES_LIBRARIES}')
      Libngtcp2:      ${HAVE_LIBNGTCP2} (LIBS='${LIBNGTCP2_LIBRARIES}')
      Libngtcp2_crypto_openssl: ${HAVE_LIBNGTCP2_CRYPTO_OPENSSL} (LIBS='${LIBNGTCP2_CRYPTO_OPENSSL_LIBRARIES}')
      Libnghttp3:     ${HAVE_LIBNGHTTP3} (LIBS='${LIBNGHTTP3_LIBRARIES}')
      Libbpf:         ${HAVE_LIBBPF} (LIBS='${LIBBPF_LIBRARIES}')
      Libevent(SSL):  ${HAVE_LIBEVENT_OPENSSL} (LIBS='${LIBEVENT_OPENSSL_LIBRARIES}')
      Jansson:        ${HAVE_JANSSON} (LIBS='${JANSSON_LIBRARIES}')
      Jemalloc:       ${HAVE_JEMALLOC} (LIBS='${JEMALLOC_LIBRARIES}')
      Zlib:           ${HAVE_ZLIB} (LIBS='${ZLIB_LIBRARIES}')
      Systemd:        ${HAVE_SYSTEMD} (LIBS='${SYSTEMD_LIBRARIES}')
      Boost::System:  ${Boost_SYSTEM_LIBRARY}
      Boost::Thread:  ${Boost_THREAD_LIBRARY}
    Third-party:
      http-parser:    ${ENABLE_THIRD_PARTY}
      MRuby:          ${HAVE_MRUBY}
      Neverbleed:     ${HAVE_NEVERBLEED}
    Features:
      Applications:   ${ENABLE_APP}
      HPACK tools:    ${ENABLE_HPACK_TOOLS}
      Libnghttp2_asio:${ENABLE_ASIO_LIB}
      Examples:       ${ENABLE_EXAMPLES}
      Python bindings:${ENABLE_PYTHON_BINDINGS}
      Threading:      ${ENABLE_THREADS}
      HTTP/3(EXPERIMENTAL): ${ENABLE_HTTP3}
 ")
 if(ENABLE_LIB_ONLY_DISABLED_OTHERS)
  message("Only the library will be built. To build other components "
    "(such as applications and examples), set ENABLE_LIB_ONLY=OFF.")
 endif()
--- a/CMakeOptions.txt
+++ b/CMakeOptions.txt
@@ -1,30 +0,0 @@
 # Features that can be enabled for cmake (see CMakeLists.txt)
 option(ENABLE_WERROR    "Turn on compile time warnings")
 option(ENABLE_DEBUG     "Turn on debug output")
 option(ENABLE_THREADS   "Turn on threading in apps" ON)
 option(ENABLE_APP       "Build applications (nghttp, nghttpd, nghttpx and h2load)"
  ${ENABLE_APP_DEFAULT})
 option(ENABLE_HPACK_TOOLS "Build HPACK tools"
  ${ENABLE_HPACK_TOOLS_DEFAULT})
 option(ENABLE_ASIO_LIB  "Build C++ libnghttp2_asio library")
 option(ENABLE_EXAMPLES  "Build examples"
  ${ENABLE_EXAMPLES_DEFAULT})
 option(ENABLE_PYTHON_BINDINGS "Build Python bindings"
  ${ENABLE_PYTHON_BINDINGS_DEFAULT})
 option(ENABLE_FAILMALLOC "Build failmalloc test program" ON)
 option(ENABLE_LIB_ONLY  "Build libnghttp2 only.  This is a short hand for -DENABLE_APP=0 -DENABLE_EXAMPLES=0 -DENABLE_HPACK_TOOLS=0 -DENABLE_PYTHON_BINDINGS=0")
 option(ENABLE_STATIC_LIB "Build libnghttp2 in static mode also")
 option(ENABLE_SHARED_LIB "Build libnghttp2 as a shared library" ON)
 option(ENABLE_STATIC_CRT "Build libnghttp2 against the MS LIBCMT[d]")
 option(ENABLE_HTTP3      "Enable HTTP/3 support" OFF)
 option(WITH_LIBXML2     "Use libxml2"
  ${WITH_LIBXML2_DEFAULT})
 option(WITH_JEMALLOC    "Use jemalloc"
  ${WITH_JEMALLOC_DEFAULT})
 option(WITH_MRUBY       "Use mruby")
 option(WITH_NEVERBLEED  "Use neverbleed")
 option(WITH_LIBBPF      "Use libbpf")
 # vim: ft=cmake:
--- a/1
+++ b/1
@@ -1,7 +1,6 @@
 The MIT License
 Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa
 Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/Dockerfile.android
+++ b/Dockerfile.android
@@ -10,47 +10,39 @@
 #
 # $ sudo docker run -v /path/to/dest:/out nghttp2-android cp /root/build/nghttp2/src/nghttpx /out
 FROM ubuntu:vivid
 # Only use standalone-toolchain for reduce size
 FROM ubuntu:xenial
 MAINTAINER Tatsuhiro Tsujikawa
-ENV ANDROID_HOME /root
+
 ENV ANDROID_HOME /root/android
 ENV PREFIX $ANDROID_HOME/usr/local
 ENV TOOLCHAIN $ANDROID_HOME/toolchain
 ENV PATH $TOOLCHAIN/bin:$PATH
-ENV NDK_VERSION r14b
+# It would be better to use nearest ubuntu archive mirror for faster
 # downloads.
 # RUN sed -ie 's/archive\.ubuntu/jp.archive.ubuntu/g' /etc/apt/sources.list
-WORKDIR /root
+RUN apt-get update
-RUN apt-get update && \
+# genisoimage, libc6-i386 and lib32stdc++6 are required to decompress ndk.
-    apt-get install -y unzip make binutils autoconf \
+RUN apt-get install -y make binutils autoconf automake autotools-dev libtool \
-      automake autotools-dev libtool pkg-config git \
+    pkg-config git curl dpkg-dev libxml2-dev \
-      curl dpkg-dev libxml2-dev genisoimage libc6-i386 \
+    genisoimage libc6-i386 lib32stdc++6
      lib32stdc++6 python&& \
    rm -rf /var/cache/apk/*
 # Install toolchain
 RUN curl -L -O https://dl.google.com/android/repository/android-ndk-$NDK_VERSION-linux-x86_64.zip && \
   unzip -q android-ndk-$NDK_VERSION-linux-x86_64.zip && \
   rm android-ndk-$NDK_VERSION-linux-x86_64.zip && \
   mkdir -p $ANDROID_HOME/toolchain && \
   $ANDROID_HOME/android-ndk-$NDK_VERSION/build/tools/make-standalone-toolchain.sh \
       --install-dir=$ANDROID_HOME/toolchain \
       --toolchain=arm-linux-androideabi-4.9 \
       --force && \
   rm -r android-ndk-$NDK_VERSION
 ENV PREFIX /root/usr/local
 # Setup version of libraries
 ENV OPENSSL_VERSION 1.0.2d
 ENV SPDYLAY_VERSION v1.4.0
 ENV LIBEV_VERSION 4.19
 ENV ZLIB_VERSION 1.2.8
 ENV CARES_VERSION 1.13.0
 ENV NGHTTP2_VERSION v1.24.0
 WORKDIR /root/build
-RUN git clone https://github.com/tatsuhiro-t/spdylay -b $SPDYLAY_VERSION --depth 1
+RUN curl -L -O http://dl.google.com/android/ndk/android-ndk-r10d-linux-x86_64.bin && \
    chmod a+x android-ndk-r10d-linux-x86_64.bin && \
    ./android-ndk-r10d-linux-x86_64.bin && \
    rm android-ndk-r10d-linux-x86_64.bin
 WORKDIR /root/build/android-ndk-r10d
 RUN /bin/bash build/tools/make-standalone-toolchain.sh \
    --install-dir=$ANDROID_HOME/toolchain \
    --toolchain=arm-linux-androideabi-4.9 --llvm-version=3.5 \
    --system=linux-x86_64
 WORKDIR /root/build
 RUN git clone https://github.com/tatsuhiro-t/spdylay
 WORKDIR /root/build/spdylay
 RUN autoreconf -i && \
    ./configure \
@@ -67,22 +59,22 @@ RUN autoreconf -i && \
    make install
 WORKDIR /root/build
-RUN curl -L -O https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz && \
+RUN curl -L -O https://www.openssl.org/source/openssl-1.0.2d.tar.gz && \
-    tar xf openssl-$OPENSSL_VERSION.tar.gz && \
+    tar xf openssl-1.0.2d.tar.gz && \
-    rm openssl-$OPENSSL_VERSION.tar.gz
+    rm openssl-1.0.2d.tar.gz
-WORKDIR /root/build/openssl-$OPENSSL_VERSION
+WORKDIR /root/build/openssl-1.0.2d
 RUN export CROSS_COMPILE=$TOOLCHAIN/bin/arm-linux-androideabi- && \
    ./Configure --prefix=$PREFIX android && \
    make && make install_sw
 WORKDIR /root/build
-RUN curl -L -O http://dist.schmorp.de/libev/Attic/libev-$LIBEV_VERSION.tar.gz && \
+RUN curl -L -O http://dist.schmorp.de/libev/libev-4.19.tar.gz && \
    curl -L -O https://gist.github.com/tatsuhiro-t/48c45f08950f587180ed/raw/80a8f003b5d1091eae497c5995bbaa68096e739b/libev-4.19-android.patch && \
-    tar xf libev-$LIBEV_VERSION.tar.gz && \
+    tar xf libev-4.19.tar.gz && \
-    rm libev-$LIBEV_VERSION.tar.gz
+    rm libev-4.19.tar.gz
-WORKDIR /root/build/libev-$LIBEV_VERSION
+WORKDIR /root/build/libev-4.19
 RUN patch -p1 < ../libev-4.19-android.patch && \
    ./configure \
    --host=arm-linux-androideabi \
@@ -95,11 +87,11 @@ RUN patch -p1 < ../libev-4.19-android.patch && \
    make install
 WORKDIR /root/build
-RUN curl -L -O https://downloads.sourceforge.net/project/libpng/zlib/$ZLIB_VERSION/zlib-$ZLIB_VERSION.tar.gz && \
+RUN curl -L -O http://zlib.net/zlib-1.2.8.tar.gz && \
-    tar xf zlib-$ZLIB_VERSION.tar.gz && \
+    tar xf zlib-1.2.8.tar.gz && \
-    rm zlib-$ZLIB_VERSION.tar.gz
+    rm zlib-1.2.8.tar.gz
-WORKDIR /root/build/zlib-$ZLIB_VERSION
+WORKDIR /root/build/zlib-1.2.8
 RUN HOST=arm-linux-androideabi \
    CC=$HOST-gcc \
    AR=$HOST-ar \
@@ -113,26 +105,11 @@ RUN HOST=arm-linux-androideabi \
    --static && \
    make install
 WORKDIR /root/build
-RUN curl -L -O https://c-ares.haxx.se/download/c-ares-$CARES_VERSION.tar.gz && \
+RUN git clone https://github.com/tatsuhiro-t/nghttp2
    tar xf c-ares-$CARES_VERSION.tar.gz && \
    rm c-ares-$CARES_VERSION.tar.gz
 WORKDIR /root/build/c-ares-$CARES_VERSION
 RUN ./configure \
      --host=arm-linux-androideabi \
      --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
      --prefix=$PREFIX \
      --disable-shared && \
    make install
 WORKDIR /root/build
 RUN git clone https://github.com/nghttp2/nghttp2 -b $NGHTTP2_VERSION --depth 1
 WORKDIR /root/build/nghttp2
 RUN autoreconf -i && \
    ./configure \
    --enable-app \
    --disable-shared \
    --host=arm-linux-androideabi \
    --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
@@ -141,9 +118,10 @@ RUN autoreconf -i && \
    --disable-python-bindings \
    --disable-examples \
    --disable-threads \
-      CC="$TOOLCHAIN"/bin/arm-linux-androideabi-clang \
+    LIBSPDYLAY_CFLAGS=-I$PREFIX/usr/local/include \
-      CXX="$TOOLCHAIN"/bin/arm-linux-androideabi-clang++ \
+    LIBSPDYLAY_LIBS="-L$PREFIX/usr/local/lib -lspdylay" \
    CPPFLAGS="-fPIE -I$PREFIX/include" \
    CXXFLAGS="-fno-strict-aliasing" \
    PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
    LDFLAGS="-fPIE -pie -L$PREFIX/lib" && \
    make && \
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-SUBDIRS = lib third-party src bpf examples python tests integration-tests \
+SUBDIRS = lib third-party src examples python tests integration-tests \
 	doc contrib script
 # Now with python setuptools, make uninstall will leave many files we
@@ -33,33 +33,18 @@ ACLOCAL_AMFLAGS = -I m4
 dist_doc_DATA = README.rst
 EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-make \
-	Dockerfile.android \
+	Dockerfile.android
 	cmakeconfig.h.in \
 	CMakeLists.txt \
 	CMakeOptions.txt \
 	cmake/ExtractValidFlags.cmake \
 	cmake/FindJemalloc.cmake \
 	cmake/FindLibev.cmake \
 	cmake/FindCUnit.cmake \
 	cmake/Version.cmake \
 	cmake/FindCython.cmake \
 	cmake/FindLibevent.cmake \
 	cmake/FindJansson.cmake \
 	cmake/FindLibcares.cmake \
 	cmake/FindSystemd.cmake \
 	cmake/FindLibbpf.cmake \
 	cmake/FindLibnghttp3.cmake \
 	cmake/FindLibngtcp2.cmake \
 	cmake/FindLibngtcp2_crypto_openssl.cmake
 .PHONY: clang-format
 # Format source files using clang-format.  Don't format source files
-# under third-party directory since we are not responsible for their
+# under third-party directory since we are not responsible for thier
 # coding style.
 clang-format:
 	CLANGFORMAT=`git config --get clangformat.binary`; \
 	test -z $${CLANGFORMAT} && CLANGFORMAT="clang-format"; \
-	$${CLANGFORMAT} -i lib/*.{c,h} lib/includes/nghttp2/*.h \
+	$${CLANGFORMAT} -i \
 	`ls lib/*.{c,h} | grep -v nghttp2_hd_huffman_data.c` \
 	lib/includes/nghttp2/*.h \
 	src/*.{c,cc,h} src/includes/nghttp2/*.h examples/*.{c,cc} \
-	tests/*.{c,h} bpf/*.c
+	tests/*.{c,h}
--- a/README.rst
+++ b/README.rst
@@ -4,10 +4,10 @@ nghttp2 - HTTP/2 C Library
 This is an implementation of the Hypertext Transfer Protocol version 2
 in C.
-The framing layer of HTTP/2 is implemented as a reusable C library.
+The framing layer of HTTP/2 is implemented as a reusable C
-On top of that, we have implemented an HTTP/2 client, server and
+library.  On top of that, we have implemented an HTTP/2 client, server
-proxy.  We have also developed load test and benchmarking tools for
+and proxy.  We have also developed load test and benchmarking tools for
-HTTP/2.
+HTTP/2 and SPDY.
 An HPACK encoder and decoder are available as a public API.
@@ -32,14 +32,12 @@ Public Test Server
 The following endpoints are available to try out our nghttp2
 implementation.
-* https://nghttp2.org/ (TLS + ALPN/NPN and HTTP/3)
+* https://nghttp2.org/ (TLS + ALPN/NPN)
-  This endpoint supports ``h2``, ``h2-16``, ``h2-14``, and
+  This endpoint supports ``h2``, ``h2-16``, ``h2-14``, ``spdy/3.1``
-  ``http/1.1`` via ALPN/NPN and requires TLSv1.2 for HTTP/2
+  and ``http/1.1`` via ALPN/NPN and requires TLSv1.2 for HTTP/2
  connection.
  It also supports HTTP/3.
 * http://nghttp2.org/ (HTTP Upgrade and HTTP/2 Direct)
  ``h2c`` and ``http/1.1``.
@@ -60,33 +58,27 @@ To build the documentation, you need to install:
 * sphinx (http://sphinx-doc.org/)
-If you need libnghttp2 (C library) only, then the above packages are
+To build and run the application programs (``nghttp``, ``nghttpd`` and
-all you need.  Use ``--enable-lib-only`` to ensure that only
+``nghttpx``) in the ``src`` directory, the following packages are
-libnghttp2 is built.  This avoids potential build error related to
+required:
 building bundled applications.
 To build and run the application programs (``nghttp``, ``nghttpd``,
 ``nghttpx`` and ``h2load``) in the ``src`` directory, the following packages
 are required:
 * OpenSSL >= 1.0.1
-* libev >= 4.11
+* libev >= 4.15
 * zlib >= 1.2.3
 * libc-ares >= 1.7.5
 ALPN support requires OpenSSL >= 1.0.2 (released 22 January 2015).
 LibreSSL >= 2.2.0 can be used instead of OpenSSL, but OpenSSL has more
 features than LibreSSL at the time of this writing.
 To enable the SPDY protocol in the application program ``nghttpx`` and
 ``h2load``, the following package is required:
 * spdylay >= 1.3.2
 To enable ``-a`` option (getting linked assets from the downloaded
 resource) in ``nghttp``, the following package is required:
-* libxml2 >= 2.6.26
+* libxml2 >= 2.7.7
 To enable systemd support in nghttpx, the following package is
 required:
 * libsystemd-dev >= 209
 The HPACK tools require the following package:
@@ -101,11 +93,6 @@ To mitigate heap fragmentation in long running server programs
 * jemalloc
  .. note::
     Alpine Linux currently does not support malloc replacement
     due to musl limitations. See details in issue `#762 <https://github.com/nghttp2/nghttp2/issues/762>`_.
 libnghttp2_asio C++ library requires the following packages:
 * libboost-dev >= 1.54.0
@@ -114,18 +101,17 @@ libnghttp2_asio C++ library requires the following packages:
 The Python bindings require the following packages:
 * cython >= 0.19
-* python >= 3.8
+* python >= 2.7
 * python-setuptools
-If you are using Ubuntu 16.04 LTS (Xenial Xerus) or Debian 8 (jessie)
+If you are using Ubuntu 14.04 LTS (trusty) or Debian 7.0 (wheezy) and above run the following to install the needed packages::
 and above, run the following to install the required packages:
 .. code-block:: text
    sudo apt-get install g++ make binutils autoconf automake autotools-dev libtool pkg-config \
      zlib1g-dev libcunit1-dev libssl-dev libxml2-dev libev-dev libevent-dev libjansson-dev \
-      libc-ares-dev libjemalloc-dev libsystemd-dev \
+      libjemalloc-dev cython python3-dev python-setuptools
-      cython python3-dev python-setuptools
+
 spdylay is not packaged in Ubuntu, so you need to build it yourself:
 http://tatsuhiro-t.github.io/spdylay/
 To enable mruby support for nghttpx, `mruby
 <https://github.com/mruby/mruby>`_ is required.  We need to build
@@ -147,41 +133,24 @@ minimizes the risk of private key leakage when serious bug like
 Heartbleed is exploited.  The neverbleed is disabled by default.  To
 enable it, use ``--with-neverbleed`` configure option.
-To enable the experimental HTTP/3 support for h2load and nghttpx, the
+Building from git
-following libraries are required:
+-----------------
-* `OpenSSL with QUIC support
+Building from git is easy, but please be sure that at least autoconf 2.68 is
-  <https://github.com/quictls/openssl/tree/OpenSSL_1_1_1m+quic>`_; or
+used::
  `BoringSSL <https://boringssl.googlesource.com/boringssl/>`_ (commit
  f6ef1c560ae5af51e2df5d8d2175bed207b28b8f)
 * `ngtcp2 <https://github.com/ngtcp2/ngtcp2>`_
 * `nghttp3 <https://github.com/ngtcp2/nghttp3>`_
-Use ``--enable-http3`` configure option to enable HTTP/3 feature for
+    $ autoreconf -i
-h2load and nghttpx.
+    $ automake
    $ autoconf
    $ ./configure
    $ make
-In order to build optional eBPF program to direct an incoming QUIC UDP
+To compile the source code, gcc >= 4.8.3 or clang >= 3.4 is required.
 datagram to a correct socket for nghttpx, the following libraries are
 required:
 * libbpf-dev >= 0.4.0
 Use ``--with-libbpf`` configure option to build eBPF program.
 libelf-dev is needed to build libbpf.
 For Ubuntu 20.04, you can build libbpf from `the source code
 <https://github.com/libbpf/libbpf/releases/tag/v0.4.0>`_.  nghttpx
 requires eBPF program for reloading its configuration and hot swapping
 its executable.
 Compiling libnghttp2 C source code requires a C99 compiler.  gcc 4.8
 is known to be adequate.  In order to compile the C++ source code, gcc
 >= 6.0 or clang >= 6.0 is required.  C++ source code requires C++14
 language features.
 .. note::
-   To enable mruby support in nghttpx, and use ``--with-mruby``
+   To enable mruby support in nghttpx, run ``git submodule update
   --init`` before running configure script, and use ``--with-mruby``
   configure option.
 .. note::
@@ -191,90 +160,6 @@ language features.
   them from crashing. A patch is welcome to make multi threading work
   on Mac OS X platform.
 .. note::
   To compile the associated applications (nghttp, nghttpd, nghttpx
   and h2load), you must use the ``--enable-app`` configure option and
   ensure that the specified requirements above are met.  Normally,
   configure script checks required dependencies to build these
   applications, and enable ``--enable-app`` automatically, so you
   don't have to use it explicitly.  But if you found that
   applications were not built, then using ``--enable-app`` may find
   that cause, such as the missing dependency.
 .. note::
   In order to detect third party libraries, pkg-config is used
   (however we don't use pkg-config for some libraries (e.g., libev)).
   By default, pkg-config searches ``*.pc`` file in the standard
   locations (e.g., /usr/lib/pkgconfig).  If it is necessary to use
   ``*.pc`` file in the custom location, specify paths to
   ``PKG_CONFIG_PATH`` environment variable, and pass it to configure
   script, like so:
   .. code-block:: text
       $ ./configure PKG_CONFIG_PATH=/path/to/pkgconfig
   For pkg-config managed libraries, ``*_CFLAG`` and ``*_LIBS``
   environment variables are defined (e.g., ``OPENSSL_CFLAGS``,
   ``OPENSSL_LIBS``).  Specifying non-empty string to these variables
   completely overrides pkg-config.  In other words, if they are
   specified, pkg-config is not used for detection, and user is
   responsible to specify the correct values to these variables.  For
   complete list of these variables, run ``./configure -h``.
 Building nghttp2 from release tar archive
 -----------------------------------------
 The nghttp2 project regularly releases tar archives which includes
 nghttp2 source code, and generated build files.  They can be
 downloaded from `Releases
 <https://github.com/nghttp2/nghttp2/releases>`_ page.
 Building nghttp2 from git requires autotools development packages.
 Building from tar archives does not require them, and thus it is much
 easier.  The usual build step is as follows:
 .. code-block:: text
    $ tar xf nghttp2-X.Y.Z.tar.bz2
    $ cd nghttp2-X.Y.Z
    $ ./configure
    $ make
 Building from git
 -----------------
 Building from git is easy, but please be sure that at least autoconf 2.68 is
 used:
 .. code-block:: text
    $ git submodule update --init
    $ autoreconf -i
    $ automake
    $ autoconf
    $ ./configure
    $ make
 Notes for building on Windows (MSVC)
 ------------------------------------
 The easiest way to build native Windows nghttp2 dll is use `cmake
 <https://cmake.org/>`_.  The free version of `Visual C++ Build Tools
 <http://landinghub.visualstudio.com/visual-cpp-build-tools>`_ works
 fine.
 1. Install cmake for windows
 2. Open "Visual C++ ... Native Build Tool Command Prompt", and inside
   nghttp2 directly, run ``cmake``.
 3. Then run ``cmake --build`` to build library.
 4. nghttp2.dll, nghttp2.lib, nghttp2.exp are placed under lib directory.
 Note that the above steps most likely produce nghttp2 library only.
 No bundled applications are compiled.
 Notes for building on Windows (Mingw/Cygwin)
 --------------------------------------------
@@ -291,9 +176,7 @@ Secondly, you need to undefine the macro ``__STRICT_ANSI__``, if you
 not, the functions ``fdopen``, ``fileno`` and ``strptime`` will not
 available.
-the sample command like this:
+the sample command like this::
 .. code-block:: text
    $ export CFLAGS="-U__STRICT_ANSI__ -I$libev_PREFIX/include -L$libev_PREFIX/lib"
    $ export CXXFLAGS=$CFLAGS
@@ -304,18 +187,6 @@ If you want to compile the applications under ``examples/``, you need
 to remove or rename the ``event.h`` from libev's installation, because
 it conflicts with libevent's installation.
 Notes for installation on Linux systems
 --------------------------------------------
 After installing nghttp2 tool suite with ``make install`` one might experience a similar error:
 .. code-block:: text
    nghttpx: error while loading shared libraries: libnghttp2.so.14: cannot open shared object file: No such file or directory
 This means that the tool is unable to locate the ``libnghttp2.so`` shared library.
 To update the shared library cache run ``sudo ldconfig``.
 Building the documentation
 --------------------------
@@ -323,9 +194,7 @@ Building the documentation
   Documentation is still incomplete.
-To build the documentation, run:
+To build the documentation, run::
 .. code-block:: text
    $ make html
@@ -336,88 +205,6 @@ The generated documents will not be installed with ``make install``.
 The online documentation is available at
 https://nghttp2.org/documentation/
 Build HTTP/3 enabled h2load and nghttpx
 ---------------------------------------
 To build h2load and nghttpx with HTTP/3 feature enabled, run the
 configure script with ``--enable-http3``.
 For nghttpx to reload configurations and swapping its executable while
 gracefully terminating old worker processes, eBPF is required.  Run
 the configure script with ``--enable-http3 --with-libbpf`` to build
 eBPF program.  The QUIC keying material must be set with
 ``--frontend-quic-secret-file`` in order to keep the existing
 connections alive during reload.
 The detailed steps to build HTTP/3 enabled h2load and nghttpx follow.
 Build custom OpenSSL:
 .. code-block:: text
   $ git clone --depth 1 -b OpenSSL_1_1_1m+quic https://github.com/quictls/openssl
   $ cd openssl
   $ ./config --prefix=$PWD/build --openssldir=/etc/ssl
   $ make -j$(nproc)
   $ make install_sw
   $ cd ..
 Build nghttp3:
 .. code-block:: text
   $ git clone --depth 1 -b v0.1.1 https://github.com/ngtcp2/nghttp3
   $ cd nghttp3
   $ autoreconf -i
   $ ./configure --prefix=$PWD/build --enable-lib-only
   $ make -j$(nproc)
   $ make install
   $ cd ..
 Build ngtcp2:
 .. code-block:: text
   $ git clone --depth 1 -b v0.1.0 https://github.com/ngtcp2/ngtcp2
   $ cd ngtcp2
   $ autoreconf -i
   $ ./configure --prefix=$PWD/build --enable-lib-only \
         PKG_CONFIG_PATH="$PWD/../openssl/build/lib/pkgconfig"
   $ make -j$(nproc)
   $ make install
   $ cd ..
 If your Linux distribution does not have libbpf-dev >= 0.4.0, build
 from source:
 .. code-block:: text
   $ git clone --depth 1 -b v0.4.0 https://github.com/libbpf/libbpf
   $ cd libbpf
   $ PREFIX=$PWD/build make -C src install
   $ cd ..
 Build nghttp2:
 .. code-block:: text
   $ git clone https://github.com/nghttp2/nghttp2
   $ cd nghttp2
   $ git submodule update --init
   $ autoreconf -i
   $ ./configure --with-mruby --with-neverbleed --enable-http3 --with-libbpf \
         --disable-python-bindings \
         CC=clang-12 CXX=clang++-12 \
         PKG_CONFIG_PATH="$PWD/../openssl/build/lib/pkgconfig:$PWD/../nghttp3/build/lib/pkgconfig:$PWD/../ngtcp2/build/lib/pkgconfig:$PWD/../libbpf/build/lib64/pkgconfig" \
         LDFLAGS="$LDFLAGS -Wl,-rpath,$PWD/../openssl/build/lib -Wl,-rpath,$PWD/../libbpf/build/lib64"
   $ make -j$(nproc)
 The eBPF program ``reuseport_kern.o`` should be found under bpf
 directory.  Pass ``--quic-bpf-program-file=bpf/reuseport_kern.o``
 option to nghttpx to load it.  See also `HTTP/3 section in nghttpx -
 HTTP/2 proxy - HOW-TO
 <https://nghttp2.org/documentation/nghttpx-howto.html#http-3>`_.
 Unit tests
 ----------
@@ -433,18 +220,25 @@ its testing framework.  We depend on the following libraries:
 * golang.org/x/net/http2
 * golang.org/x/net/websocket
 * https://github.com/tatsuhiro-t/go-nghttp2
 * https://github.com/tatsuhiro-t/spdy
-Go modules will download these dependencies automatically.
+To download the above packages, after settings ``GOPATH``, run the
 following command under ``integration-tests`` directory::
    $ make itprep
 To run the tests, run the following command under
-``integration-tests`` directory:
+``integration-tests`` directory::
 .. code-block:: text
    $ make it
 Inside the tests, we use port 3009 to run the test subject server.
 .. note::
   github.com/tatsuhiro-t/spdy is a copy used to be available at
   golang.org/x/net/spdy, but it is now gone.
 Migration from v0.7.15 or earlier
 ---------------------------------
@@ -555,9 +349,7 @@ nghttp - client
 with prior knowledge, HTTP Upgrade and NPN/ALPN TLS extension.
 It has verbose output mode for framing information.  Here is sample
-output from ``nghttp`` client:
+output from ``nghttp`` client::
 .. code-block:: text
    $ nghttp -nv https://nghttp2.org
    [  0.190] Connected
@@ -640,9 +432,7 @@ output from ``nghttp`` client:
    [  0.228] send GOAWAY frame <length=8, flags=0x00, stream_id=0>
 	      (last_stream_id=2, error_code=NO_ERROR(0x00), opaque_data(0)=[])
-The HTTP Upgrade is performed like so:
+The HTTP Upgrade is performed like so::
 .. code-block:: text
    $ nghttp -nvu http://nghttp2.org
    [  0.011] Connected
@@ -738,9 +528,7 @@ The HTTP Upgrade is performed like so:
 	      (last_stream_id=2, error_code=NO_ERROR(0x00), opaque_data(0)=[])
 Using the ``-s`` option, ``nghttp`` prints out some timing information for
-requests, sorted by completion time:
+requests, sorted by completion time::
 .. code-block:: text
    $ nghttp -nas https://nghttp2.org/
    ***** Statistics *****
@@ -784,9 +572,7 @@ HTTP/2 connections.  No HTTP Upgrade is supported.
 The ``-p`` option allows users to configure server push.
 Just like ``nghttp``, it has a verbose output mode for framing
-information.  Here is sample output from ``nghttpd``:
+information.  Here is sample output from ``nghttpd``::
 .. code-block:: text
    $ nghttpd --no-tls -v 8080
    IPv4: listen 0.0.0.0:8080
@@ -845,71 +631,68 @@ information.  Here is sample output from ``nghttpd``:
 nghttpx - proxy
 +++++++++++++++
-``nghttpx`` is a multi-threaded reverse proxy for HTTP/3, HTTP/2, and
+``nghttpx`` is a multi-threaded reverse proxy for HTTP/2, SPDY and
 HTTP/1.1, and powers http://nghttp2.org and supports HTTP/2 server
 push.
 We reworked ``nghttpx`` command-line interface, and as a result, there
 are several incompatibles from 1.8.0 or earlier.  This is necessary to
 extend its capability, and secure the further feature enhancements in
 the future release.  Please read `Migration from nghttpx v1.8.0 or
 earlier
 <https://nghttp2.org/documentation/nghttpx-howto.html#migration-from-nghttpx-v1-8-0-or-earlier>`_
 to know how to migrate from earlier releases.
 ``nghttpx`` implements `important performance-oriented features
 <https://istlsfastyet.com/#server-performance>`_ in TLS, such as
 session IDs, session tickets (with automatic key rotation), OCSP
-stapling, dynamic record sizing, ALPN/NPN, forward secrecy and HTTP/2.
+stapling, dynamic record sizing, ALPN/NPN, forward secrecy and SPDY &
-``nghttpx`` also offers the functionality to share session cache and
+HTTP/2.  ``nghttpx`` also offers the functionality to share session
-ticket keys among multiple ``nghttpx`` instances via memcached.
+cache and ticket keys among multiple ``nghttpx`` instances via
 memcached.
-``nghttpx`` has 2 operation modes:
+``nghttpx`` has several operational modes:
-================== ======================== ================ =============
+================== ============================ ============== =============
 Mode option        Frontend                     Backend        Note
-================== ======================== ================ =============
+================== ============================ ============== =============
-default mode       HTTP/3, HTTP/2, HTTP/1.1 HTTP/1.1, HTTP/2 Reverse proxy
+default mode       HTTP/2, SPDY, HTTP/1.1 (TLS) HTTP/1.1       Reverse proxy
-``--http2-proxy``  HTTP/3, HTTP/2, HTTP/1.1 HTTP/1.1, HTTP/2 Forward proxy
+``--http2-proxy``  HTTP/2, SPDY, HTTP/1.1 (TLS) HTTP/1.1       SPDY proxy
-================== ======================== ================ =============
+``--http2-bridge`` HTTP/2, SPDY, HTTP/1.1 (TLS) HTTP/2 (TLS)
 ``--client``       HTTP/2, HTTP/1.1             HTTP/2 (TLS)
 ``--client-proxy`` HTTP/2, HTTP/1.1             HTTP/2 (TLS)   Forward proxy
 ================== ============================ ============== =============
 The interesting mode at the moment is the default mode.  It works like
-a reverse proxy and listens for HTTP/3, HTTP/2, and HTTP/1.1 and can
+a reverse proxy and listens for HTTP/2, SPDY and HTTP/1.1 and can be
-be deployed as a SSL/TLS terminator for existing web server.
+deployed as a SSL/TLS terminator for existing web server.
-In all modes, the frontend connections are encrypted by SSL/TLS by
+The default mode, ``--http2-proxy`` and ``--http2-bridge`` modes use
-default.  To disable encryption, use the ``no-tls`` keyword in
+SSL/TLS in the frontend connection by default.  To disable SSL/TLS,
-``--frontend`` option.  If encryption is disabled, incoming HTTP/1.1
+use the ``--frontend-no-tls`` option.  If that option is used, SPDY is
-connections can be upgraded to HTTP/2 through HTTP Upgrade.  On the
+disabled in the frontend and incoming HTTP/1.1 connections can be
-other hard, backend connections are not encrypted by default.  To
+upgraded to HTTP/2 through HTTP Upgrade.  In these modes, HTTP/1
-encrypt backend connections, use ``tls`` keyword in ``--backend``
+backend connections are cleartext by default.  To enable TLS, use
-option.
+``--backend-http1-tls`` opiton.
 The ``--http2-bridge``, ``--client`` and ``--client-proxy`` modes use
 SSL/TLS in the backend connection by default.  To disable SSL/TLS, use
 the ``--backend-no-tls`` option.
 ``nghttpx`` supports a configuration file.  See the ``--conf`` option and
 sample configuration file ``nghttpx.conf.sample``.
-In the default mode, ``nghttpx`` works as reverse proxy to the backend
+In the default mode, (without any of ``--http2-proxy``,
-server:
+``--http2-bridge``, ``--client-proxy`` and ``--client`` options),
 ``nghttpx`` works as reverse proxy to the backend server::
-.. code-block:: text
+    Client <-- (HTTP/2, SPDY, HTTP/1.1) --> nghttpx <-- (HTTP/1.1) --> Web Server
    Client <-- (HTTP/3, HTTP/2, HTTP/1.1) --> nghttpx <-- (HTTP/1.1, HTTP/2) --> Web Server
                                          [reverse proxy]
-With the ``--http2-proxy`` option, it works as forward proxy, and it
+With the ``--http2-proxy`` option, it works as a so called secure proxy (aka
-is so called secure HTTP/2 proxy:
+SPDY proxy)::
-.. code-block:: text
+    Client <-- (HTTP/2, SPDY, HTTP/1.1) --> nghttpx <-- (HTTP/1.1) --> Proxy
    Client <-- (HTTP/3, HTTP/2, HTTP/1.1) --> nghttpx <-- (HTTP/1.1) --> Proxy
                                           [secure proxy]          (e.g., Squid, ATS)
 The ``Client`` in the above example needs to be configured to use
 ``nghttpx`` as secure proxy.
-At the time of this writing, both Chrome and Firefox support secure
+At the time of this writing, Chrome is the only browser which supports
-HTTP/2 proxy.  One way to configure Chrome to use a secure proxy is to
+secure proxy.  One way to configure Chrome to use a secure proxy is
-create a proxy.pac script like this:
+to create a proxy.pac script like this:
 .. code-block:: javascript
@@ -921,20 +704,44 @@ create a proxy.pac script like this:
 machine nghttpx is running on.  Please note that Chrome requires a valid
 certificate for secure proxy.
-Then run Chrome with the following arguments:
+Then run Chrome with the following arguments::
 .. code-block:: text
    $ google-chrome --proxy-pac-url=file:///path/to/proxy.pac --use-npn
-The backend HTTP/2 connections can be tunneled through an HTTP proxy.
+With ``--http2-bridge``, it accepts HTTP/2, SPDY and HTTP/1.1
 connections and communicates with the backend in HTTP/2::
    Client <-- (HTTP/2, SPDY, HTTP/1.1) --> nghttpx <-- (HTTP/2) --> Web or HTTP/2 Proxy etc
                                                                         (e.g., nghttpx -s)
 With ``--client-proxy``, it works as a forward proxy and expects
 that the backend is an HTTP/2 proxy::
    Client <-- (HTTP/2, HTTP/1.1) --> nghttpx <-- (HTTP/2) --> HTTP/2 Proxy
                                     [forward proxy]               (e.g., nghttpx -s)
 The ``Client`` needs to be configured to use nghttpx as a forward
 proxy.  The frontend HTTP/1.1 connection can be upgraded to HTTP/2
 through HTTP Upgrade.  With the above configuration, one can use
 HTTP/1.1 client to access and test their HTTP/2 servers.
 With ``--client``, it works as a reverse proxy and expects that
 the backend is an HTTP/2 Web server::
    Client <-- (HTTP/2, HTTP/1.1) --> nghttpx <-- (HTTP/2) --> Web Server
                                    [reverse proxy]
 The frontend HTTP/1.1 connection can be upgraded to HTTP/2
 through HTTP Upgrade.
 For the operation modes which talk to the backend in HTTP/2 over
 SSL/TLS, the backend connections can be tunneled through an HTTP proxy.
 The proxy is specified using ``--backend-http-proxy-uri``.  The
-following figure illustrates how nghttpx talks to the outside HTTP/2
+following figure illustrates the example of the ``--http2-bridge`` and
-proxy through an HTTP proxy:
+``--backend-http-proxy-uri`` options to talk to the outside HTTP/2
 proxy through an HTTP proxy::
-.. code-block:: text
+    Client <-- (HTTP/2, SPDY, HTTP/1.1) --> nghttpx <-- (HTTP/2) --
    Client <-- (HTTP/3, HTTP/2, HTTP/1.1) --> nghttpx <-- (HTTP/2) --
            --===================---> HTTP/2 Proxy
              (HTTP proxy tunnel)     (e.g., nghttpx -s)
@@ -942,12 +749,11 @@ proxy through an HTTP proxy:
 Benchmarking tool
 -----------------
-The ``h2load`` program is a benchmarking tool for HTTP/3, HTTP/2, and
+The ``h2load`` program is a benchmarking tool for HTTP/2 and SPDY.
-HTTP/1.1.  The UI of ``h2load`` is heavily inspired by ``weighttp``
+The SPDY support is enabled if the program was built with the spdylay
 library.  The UI of ``h2load`` is heavily inspired by ``weighttp``
 (https://github.com/lighttpd/weighttp).  The typical usage is as
-follows:
+follows::
 .. code-block:: text
    $ h2load -n100000 -c100 -m100 https://localhost:8443/
    starting benchmark...
@@ -986,14 +792,6 @@ threads to avoid saturating a single core on client side.
   considered a DOS attack.  Please only use it against your private
   servers.
 If the experimental HTTP/3 is enabled, h2load can send requests to
 HTTP/3 server.  To do this, specify ``h3`` to ``--npn-list`` option
 like so:
 .. code-block:: text
    $ h2load --npn-list h3 https://127.0.0.1:4433
 HPACK tools
 -----------
@@ -1043,9 +841,7 @@ Example:
 With the ``-t`` option, the program can accept more familiar HTTP/1 style
 header field blocks.  Each header set is delimited by an empty line:
-Example:
+Example::
 .. code-block:: text
    :method: GET
    :scheme: https
@@ -1067,7 +863,7 @@ output_length
    The length of the compressed header block.
 percentage_of_original_size
-    ``output_length`` / ``input_length`` * 100
+    ``input_length`` / ``output_length`` * 100
 wire
    The compressed header block as a hex string.
@@ -1448,7 +1244,7 @@ are:
 * Boost::Thread
 The server API is designed to build an HTTP/2 server very easily to utilize
-C++14 anonymous functions and closures.  The bare minimum example of
+C++11 anonymous functions and closures.  The bare minimum example of
 an HTTP/2 server looks like this:
 .. code-block:: cpp
@@ -1541,7 +1337,7 @@ The extension module is called ``nghttp2``.
 determined by the ``configure`` script.  If the detected Python version is not
 what you expect, specify a path to Python executable in a ``PYTHON``
 variable as an argument to configure script (e.g., ``./configure
-PYTHON=/usr/bin/python3.8``).
+PYTHON=/usr/bin/python3.4``).
 The following example code illustrates basic usage of the HPACK compressor
 and decompressor in Python:
@@ -1613,7 +1409,7 @@ BaseRequestHandler usage:
 .. code-block:: python
-    #!/usr/bin/env python3
+    #!/usr/bin/env python
    import io, ssl
    import nghttp2
@@ -1671,17 +1467,6 @@ See `Contribution Guidelines
 <https://nghttp2.org/documentation/contribute.html>`_ for more
 details.
 Reporting vulnerability
 -----------------------
 If you find a vulnerability in our software, please send the email to
 "tatsuhiro.t at gmail dot com" about its details instead of submitting
 issues on github issue page.  It is a standard practice not to
 disclose vulnerability information publicly until a fixed version is
 released, or mitigation is worked out.
 In the future, we may setup a dedicated mail address for this purpose.
 Release schedule
 ----------------
@@ -1694,8 +1479,3 @@ severe security bug fixes.
 We have no plan to break API compatibility changes involving soname
 bump, so MAJOR version will stay 1 for the foreseeable future.
 License
 -------
 The MIT License
--- a/6
+++ b/6
@@ -39,9 +39,9 @@ PATH="$TOOLCHAIN"/bin:"$PATH"
    --without-libxml2 \
    --disable-python-bindings \
    --disable-examples \
-    --disable-threads \
+    --enable-werror \
-    CC="$TOOLCHAIN"/bin/arm-linux-androideabi-clang \
+    CC="$TOOLCHAIN"/bin/clang \
-    CXX="$TOOLCHAIN"/bin/arm-linux-androideabi-clang++ \
+    CXX="$TOOLCHAIN"/bin/clang++ \
    CPPFLAGS="-fPIE -I$PREFIX/include" \
    PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
    LDFLAGS="-fPIE -pie -L$PREFIX/lib"
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,53 +0,0 @@
 # Notes:
 #   - Minimal appveyor.yml file is an empty file. All sections are optional.
 #   - Indent each level of configuration with 2 spaces. Do not use tabs!
 #   - All section names are case-sensitive.
 #   - Section names should be unique on each level.
 #---------------------------------#
 #      general configuration      #
 #---------------------------------#
 # version format
 #version: 0.10.{build}
 # branches to build
 branches:
  # blacklist
  except:
    - gh-pages
 # Do not build on tags (GitHub only)
 skip_tags: true
 #---------------------------------#
 #    environment configuration    #
 #---------------------------------#
 os: Windows Server 2012
 # scripts that run after cloning repository
 install:
  # install Win-Flex-Bison
  #- cmd: cinst winflexbison -y
 #---------------------------------#
 #       build configuration       #
 #---------------------------------#
 # scripts to run before build
 before_build:
  - cmd: cmake .
 # scripts to run *after* solution is built and *before* automatic packaging occurs (web apps, NuGet packages, Azure Cloud Services)
 # before_package:
 # scripts to run after build
 # after_build:
 # to run your custom scripts instead of automatic MSBuild
 build_script:
  - cmd: cmake --build .
 # to disable automatic builds
 # build: off
--- a/author.py
+++ b/author.py
@@ -1,52 +0,0 @@
 #!/usr/bin/env python3
 # script to extract commit author's name from standard input.  The
 # input should be <AUTHOR>:<EMAIL>, one per line.
 # This script expects the input is created by git-log command:
 #
 #   git log --format=%aN:%aE
 #
 # This script removes duplicates based on email address, breaking a
 # tie with longer author name.  Among the all author names extract the
 # previous step, we remove duplicate by case-insensitive match.
 #
 # So we can do this in one line:
 #
 #   git log --format=%aN:%aE | sort | uniq | ./author.py > authors
 import sys
 edict = {}
 for line in sys.stdin:
    author, email = line.strip().split(':', 1)
    if email in edict:
        an = edict[email]
        if len(an) < len(author) or an > author:
            sys.stderr.write(
                'eliminated {} in favor of {}\n'.format(an, author))
            edict[email] = author
        else:
            sys.stderr.write(
                'eliminated {} in favor of {}\n'.format(author, an))
    else:
        edict[email] = author
 names = list(sorted(edict.values()))
 ndict = {}
 for name in names:
    lowname = name.lower()
    if lowname in ndict:
        an = ndict[lowname]
        if an > name:
            sys.stderr.write('eliminated {} in favor of {}\n'.format(an, name))
            ndict[lowname] = name
        else:
            sys.stderr.write('eliminated {} in favor of {}\n'.format(name, an))
    else:
        ndict[lowname] = name
 for name in sorted(ndict.values()):
    print(name)
--- a/bpf/CMakeLists.txt
+++ b/bpf/CMakeLists.txt
@@ -1,13 +0,0 @@
 if(LIBBPF_FOUND)
  add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/reuseport_kern.o"
    COMMAND ${CMAKE_C_COMPILER} ${BPFCFLAGS} ${EXTRABPFCFLAGS} -I${LIBBPF_INCLUDE_DIRS} -target bpf -c reuseport_kern.c -o "${CMAKE_CURRENT_BINARY_DIR}/reuseport_kern.o"
    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
    VERBATIM)
  add_custom_target(bpf ALL
    DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/reuseport_kern.o"
    VERBATIM)
  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/reuseport_kern.o"
    DESTINATION "${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME}")
 endif()
--- a/bpf/Makefile.am
+++ b/bpf/Makefile.am
@@ -1,40 +0,0 @@
 # nghttp2 - HTTP/2 C Library
 # Copyright (c) 2021 Tatsuhiro Tsujikawa
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish,
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 EXTRA_DIST = CMakeLists.txt reuseport_kern.c
 if HAVE_LIBBPF
 bpf_pkglibdir = $(pkglibdir)
 bpf_pkglib_DATA = reuseport_kern.o
 all: $(builddir)/reuseport_kern.o
 $(builddir)/reuseport_kern.o: reuseport_kern.c
 	$(CC) @LIBBPF_CFLAGS@ @BPFCFLAGS@ @EXTRABPFCFLAGS@ \
 	  -target bpf -c $< -o $@
 clean-local:
 	-rm -f reuseport_kern.o
 endif # HAVE_LIBBPF
--- a/bpf/reuseport_kern.c
+++ b/bpf/reuseport_kern.c
@@ -1,663 +0,0 @@
 /*
 * nghttp2 - HTTP/2 C Library
 *
 * Copyright (c) 2021 Tatsuhiro Tsujikawa
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
 * "Software"), to deal in the Software without restriction, including
 * without limitation the rights to use, copy, modify, merge, publish,
 * distribute, sublicense, and/or sell copies of the Software, and to
 * permit persons to whom the Software is furnished to do so, subject to
 * the following conditions:
 *
 * The above copyright notice and this permission notice shall be
 * included in all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <linux/udp.h>
 #include <linux/bpf.h>
 #include <bpf/bpf_helpers.h>
 /*
 * How to compile:
 *
 * clang-12 -O2 -Wall -target bpf -g -c reuseport_kern.c -o reuseport_kern.o \
 *   -I/path/to/kernel/include
 *
 * See
 * https://www.kernel.org/doc/Documentation/kbuild/headers_install.txt
 * how to install kernel header files.
 */
 /* AES_CBC_decrypt_buffer: https://github.com/kokke/tiny-AES-c
   License is Public Domain.  Commit hash:
   12e7744b4919e9d55de75b7ab566326a1c8e7a67 */
 #define AES_BLOCKLEN                                                           \
  16 /* Block length in bytes - AES is 128b block                              \
        only */
 #define AES_KEYLEN 16 /* Key length in bytes */
 #define AES_keyExpSize 176
 struct AES_ctx {
  __u8 RoundKey[AES_keyExpSize];
 };
 /* The number of columns comprising a state in AES. This is a constant
   in AES. Value=4 */
 #define Nb 4
 #define Nk 4  /* The number of 32 bit words in a key. */
 #define Nr 10 /* The number of rounds in AES Cipher. */
 /* state - array holding the intermediate results during
   decryption. */
 typedef __u8 state_t[4][4];
 /* The lookup-tables are marked const so they can be placed in
   read-only storage instead of RAM The numbers below can be computed
   dynamically trading ROM for RAM - This can be useful in (embedded)
   bootloader applications, where ROM is often limited. */
 static const __u8 sbox[256] = {
    /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
    0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b,
    0xfe, 0xd7, 0xab, 0x76, 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
    0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, 0xb7, 0xfd, 0x93, 0x26,
    0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
    0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2,
    0xeb, 0x27, 0xb2, 0x75, 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
    0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, 0x53, 0xd1, 0x00, 0xed,
    0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
    0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f,
    0x50, 0x3c, 0x9f, 0xa8, 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
    0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, 0xcd, 0x0c, 0x13, 0xec,
    0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
    0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14,
    0xde, 0x5e, 0x0b, 0xdb, 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
    0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, 0xe7, 0xc8, 0x37, 0x6d,
    0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
    0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f,
    0x4b, 0xbd, 0x8b, 0x8a, 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
    0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, 0xe1, 0xf8, 0x98, 0x11,
    0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
    0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f,
    0xb0, 0x54, 0xbb, 0x16};
 static const __u8 rsbox[256] = {
    0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e,
    0x81, 0xf3, 0xd7, 0xfb, 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87,
    0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb, 0x54, 0x7b, 0x94, 0x32,
    0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,
    0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49,
    0x6d, 0x8b, 0xd1, 0x25, 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16,
    0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, 0x6c, 0x70, 0x48, 0x50,
    0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
    0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05,
    0xb8, 0xb3, 0x45, 0x06, 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02,
    0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b, 0x3a, 0x91, 0x11, 0x41,
    0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,
    0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8,
    0x1c, 0x75, 0xdf, 0x6e, 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89,
    0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, 0xfc, 0x56, 0x3e, 0x4b,
    0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
    0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59,
    0x27, 0x80, 0xec, 0x5f, 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d,
    0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef, 0xa0, 0xe0, 0x3b, 0x4d,
    0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,
    0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63,
    0x55, 0x21, 0x0c, 0x7d};
 /* The round constant word array, Rcon[i], contains the values given
   by x to the power (i-1) being powers of x (x is denoted as {02}) in
   the field GF(2^8) */
 static const __u8 Rcon[11] = {0x8d, 0x01, 0x02, 0x04, 0x08, 0x10,
                              0x20, 0x40, 0x80, 0x1b, 0x36};
 #define getSBoxValue(num) (sbox[(num)])
 /* This function produces Nb(Nr+1) round keys. The round keys are used
   in each round to decrypt the states. */
 static void KeyExpansion(__u8 *RoundKey, const __u8 *Key) {
  unsigned i, j, k;
  __u8 tempa[4]; /* Used for the column/row operations */
  /* The first round key is the key itself. */
  for (i = 0; i < Nk; ++i) {
    RoundKey[(i * 4) + 0] = Key[(i * 4) + 0];
    RoundKey[(i * 4) + 1] = Key[(i * 4) + 1];
    RoundKey[(i * 4) + 2] = Key[(i * 4) + 2];
    RoundKey[(i * 4) + 3] = Key[(i * 4) + 3];
  }
  /* All other round keys are found from the previous round keys. */
  for (i = Nk; i < Nb * (Nr + 1); ++i) {
    {
      k = (i - 1) * 4;
      tempa[0] = RoundKey[k + 0];
      tempa[1] = RoundKey[k + 1];
      tempa[2] = RoundKey[k + 2];
      tempa[3] = RoundKey[k + 3];
    }
    if (i % Nk == 0) {
      /* This function shifts the 4 bytes in a word to the left once.
         [a0,a1,a2,a3] becomes [a1,a2,a3,a0] */
      /* Function RotWord() */
      {
        const __u8 u8tmp = tempa[0];
        tempa[0] = tempa[1];
        tempa[1] = tempa[2];
        tempa[2] = tempa[3];
        tempa[3] = u8tmp;
      }
      /* SubWord() is a function that takes a four-byte input word and
         applies the S-box to each of the four bytes to produce an
         output word. */
      /* Function Subword() */
      {
        tempa[0] = getSBoxValue(tempa[0]);
        tempa[1] = getSBoxValue(tempa[1]);
        tempa[2] = getSBoxValue(tempa[2]);
        tempa[3] = getSBoxValue(tempa[3]);
      }
      tempa[0] = tempa[0] ^ Rcon[i / Nk];
    }
    j = i * 4;
    k = (i - Nk) * 4;
    RoundKey[j + 0] = RoundKey[k + 0] ^ tempa[0];
    RoundKey[j + 1] = RoundKey[k + 1] ^ tempa[1];
    RoundKey[j + 2] = RoundKey[k + 2] ^ tempa[2];
    RoundKey[j + 3] = RoundKey[k + 3] ^ tempa[3];
  }
 }
 static void AES_init_ctx(struct AES_ctx *ctx, const __u8 *key) {
  KeyExpansion(ctx->RoundKey, key);
 }
 /* This function adds the round key to state.  The round key is added
   to the state by an XOR function. */
 static void AddRoundKey(__u8 round, state_t *state, const __u8 *RoundKey) {
  __u8 i, j;
  for (i = 0; i < 4; ++i) {
    for (j = 0; j < 4; ++j) {
      (*state)[i][j] ^= RoundKey[(round * Nb * 4) + (i * Nb) + j];
    }
  }
 }
 static __u8 xtime(__u8 x) { return ((x << 1) ^ (((x >> 7) & 1) * 0x1b)); }
 #define Multiply(x, y)                                                         \
  (((y & 1) * x) ^ ((y >> 1 & 1) * xtime(x)) ^                                 \
   ((y >> 2 & 1) * xtime(xtime(x))) ^                                          \
   ((y >> 3 & 1) * xtime(xtime(xtime(x)))) ^                                   \
   ((y >> 4 & 1) * xtime(xtime(xtime(xtime(x))))))
 #define getSBoxInvert(num) (rsbox[(num)])
 /* MixColumns function mixes the columns of the state matrix.  The
   method used to multiply may be difficult to understand for the
   inexperienced. Please use the references to gain more
   information. */
 static void InvMixColumns(state_t *state) {
  int i;
  __u8 a, b, c, d;
  for (i = 0; i < 4; ++i) {
    a = (*state)[i][0];
    b = (*state)[i][1];
    c = (*state)[i][2];
    d = (*state)[i][3];
    (*state)[i][0] = Multiply(a, 0x0e) ^ Multiply(b, 0x0b) ^ Multiply(c, 0x0d) ^
                     Multiply(d, 0x09);
    (*state)[i][1] = Multiply(a, 0x09) ^ Multiply(b, 0x0e) ^ Multiply(c, 0x0b) ^
                     Multiply(d, 0x0d);
    (*state)[i][2] = Multiply(a, 0x0d) ^ Multiply(b, 0x09) ^ Multiply(c, 0x0e) ^
                     Multiply(d, 0x0b);
    (*state)[i][3] = Multiply(a, 0x0b) ^ Multiply(b, 0x0d) ^ Multiply(c, 0x09) ^
                     Multiply(d, 0x0e);
  }
 }
 extern __u32 LINUX_KERNEL_VERSION __kconfig;
 /* The SubBytes Function Substitutes the values in the state matrix
   with values in an S-box. */
 static void InvSubBytes(state_t *state) {
  __u8 i, j;
  if (LINUX_KERNEL_VERSION < KERNEL_VERSION(5, 10, 0)) {
    for (i = 0; i < 4; ++i) {
      for (j = 0; j < 4; ++j) {
        /* Ubuntu 20.04 LTS kernel 5.4.0 needs this workaround
           otherwise "math between map_value pointer and register with
           unbounded min value is not allowed".  5.10.0 is a kernel
           version that works but it might not be the minimum
           version.  */
        __u8 k = (*state)[j][i];
        (*state)[j][i] = k ? getSBoxInvert(k) : getSBoxInvert(0);
      }
    }
  } else {
    for (i = 0; i < 4; ++i) {
      for (j = 0; j < 4; ++j) {
        (*state)[j][i] = getSBoxInvert((*state)[j][i]);
      }
    }
  }
 }
 static void InvShiftRows(state_t *state) {
  __u8 temp;
  /* Rotate first row 1 columns to right */
  temp = (*state)[3][1];
  (*state)[3][1] = (*state)[2][1];
  (*state)[2][1] = (*state)[1][1];
  (*state)[1][1] = (*state)[0][1];
  (*state)[0][1] = temp;
  /* Rotate second row 2 columns to right */
  temp = (*state)[0][2];
  (*state)[0][2] = (*state)[2][2];
  (*state)[2][2] = temp;
  temp = (*state)[1][2];
  (*state)[1][2] = (*state)[3][2];
  (*state)[3][2] = temp;
  /* Rotate third row 3 columns to right */
  temp = (*state)[0][3];
  (*state)[0][3] = (*state)[1][3];
  (*state)[1][3] = (*state)[2][3];
  (*state)[2][3] = (*state)[3][3];
  (*state)[3][3] = temp;
 }
 static void InvCipher(state_t *state, const __u8 *RoundKey) {
  /* Add the First round key to the state before starting the
     rounds. */
  AddRoundKey(Nr, state, RoundKey);
  /* There will be Nr rounds.  The first Nr-1 rounds are identical.
     These Nr rounds are executed in the loop below.  Last one without
     InvMixColumn() */
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 1, state, RoundKey);
  InvMixColumns(state);
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 2, state, RoundKey);
  InvMixColumns(state);
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 3, state, RoundKey);
  InvMixColumns(state);
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 4, state, RoundKey);
  InvMixColumns(state);
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 5, state, RoundKey);
  InvMixColumns(state);
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 6, state, RoundKey);
  InvMixColumns(state);
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 7, state, RoundKey);
  InvMixColumns(state);
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 8, state, RoundKey);
  InvMixColumns(state);
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 9, state, RoundKey);
  InvMixColumns(state);
  InvShiftRows(state);
  InvSubBytes(state);
  AddRoundKey(Nr - 10, state, RoundKey);
 }
 static void AES_ECB_decrypt(const struct AES_ctx *ctx, __u8 *buf) {
  /* The next function call decrypts the PlainText with the Key using
     AES algorithm. */
  InvCipher((state_t *)buf, ctx->RoundKey);
 }
 /* rol32: From linux kernel source code */
 /**
 * rol32 - rotate a 32-bit value left
 * @word: value to rotate
 * @shift: bits to roll
 */
 static inline __u32 rol32(__u32 word, unsigned int shift) {
  return (word << shift) | (word >> ((-shift) & 31));
 }
 /* jhash.h: Jenkins hash support.
 *
 * Copyright (C) 2006. Bob Jenkins (bob_jenkins@burtleburtle.net)
 *
 * https://burtleburtle.net/bob/hash/
 *
 * These are the credits from Bob's sources:
 *
 * lookup3.c, by Bob Jenkins, May 2006, Public Domain.
 *
 * These are functions for producing 32-bit hashes for hash table lookup.
 * hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final()
 * are externally useful functions.  Routines to test the hash are included
 * if SELF_TEST is defined.  You can use this free for any purpose.  It's in
 * the public domain.  It has no warranty.
 *
 * Copyright (C) 2009-2010 Jozsef Kadlecsik (kadlec@blackhole.kfki.hu)
 *
 * I've modified Bob's hash to be useful in the Linux kernel, and
 * any bugs present are my fault.
 * Jozsef
 */
 /* __jhash_final - final mixing of 3 32-bit values (a,b,c) into c */
 #define __jhash_final(a, b, c)                                                 \
  {                                                                            \
    c ^= b;                                                                    \
    c -= rol32(b, 14);                                                         \
    a ^= c;                                                                    \
    a -= rol32(c, 11);                                                         \
    b ^= a;                                                                    \
    b -= rol32(a, 25);                                                         \
    c ^= b;                                                                    \
    c -= rol32(b, 16);                                                         \
    a ^= c;                                                                    \
    a -= rol32(c, 4);                                                          \
    b ^= a;                                                                    \
    b -= rol32(a, 14);                                                         \
    c ^= b;                                                                    \
    c -= rol32(b, 24);                                                         \
  }
 /* __jhash_nwords - hash exactly 3, 2 or 1 word(s) */
 static inline __u32 __jhash_nwords(__u32 a, __u32 b, __u32 c, __u32 initval) {
  a += initval;
  b += initval;
  c += initval;
  __jhash_final(a, b, c);
  return c;
 }
 /* An arbitrary initial parameter */
 #define JHASH_INITVAL 0xdeadbeef
 static inline __u32 jhash_2words(__u32 a, __u32 b, __u32 initval) {
  return __jhash_nwords(a, b, 0, initval + JHASH_INITVAL + (2 << 2));
 }
 struct bpf_map_def SEC("maps") cid_prefix_map = {
    .type = BPF_MAP_TYPE_HASH,
    .max_entries = 255,
    .key_size = sizeof(__u64),
    .value_size = sizeof(__u32),
 };
 struct bpf_map_def SEC("maps") reuseport_array = {
    .type = BPF_MAP_TYPE_REUSEPORT_SOCKARRAY,
    .max_entries = 255,
    .key_size = sizeof(__u32),
    .value_size = sizeof(__u32),
 };
 struct bpf_map_def SEC("maps") sk_info = {
    .type = BPF_MAP_TYPE_ARRAY,
    .max_entries = 3,
    .key_size = sizeof(__u32),
    .value_size = sizeof(__u64),
 };
 typedef struct quic_hd {
  __u8 *dcid;
  __u32 dcidlen;
  __u32 dcid_offset;
  __u8 type;
 } quic_hd;
 #define SV_DCIDLEN 20
 #define MAX_DCIDLEN 20
 #define MIN_DCIDLEN 8
 #define CID_PREFIXLEN 8
 #define CID_PREFIX_OFFSET 1
 enum {
  NGTCP2_PKT_INITIAL = 0x0,
  NGTCP2_PKT_0RTT = 0x1,
  NGTCP2_PKT_HANDSHAKE = 0x2,
  NGTCP2_PKT_SHORT = 0x40,
 };
 static inline int parse_quic(quic_hd *qhd, __u8 *data, __u8 *data_end) {
  __u8 *p;
  __u64 dcidlen;
  if (*data & 0x80) {
    p = data + 1 + 4;
    /* Do not check the actual DCID length because we might not buffer
       entire DCID here. */
    dcidlen = *p;
    if (dcidlen > MAX_DCIDLEN || dcidlen < MIN_DCIDLEN) {
      return -1;
    }
    ++p;
    qhd->type = (*data & 0x30) >> 4;
    qhd->dcid = p;
    qhd->dcidlen = dcidlen;
    qhd->dcid_offset = 6;
  } else {
    qhd->type = NGTCP2_PKT_SHORT;
    qhd->dcid = data + 1;
    qhd->dcidlen = SV_DCIDLEN;
    qhd->dcid_offset = 1;
  }
  return 0;
 }
 static __u32 hash(const __u8 *data, __u32 datalen, __u32 initval) {
  __u32 a, b;
  a = (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];
  b = (data[4] << 24) | (data[5] << 16) | (data[6] << 8) | data[7];
  return jhash_2words(a, b, initval);
 }
 static __u32 sk_index_from_dcid(const quic_hd *qhd,
                                const struct sk_reuseport_md *reuse_md,
                                __u64 num_socks) {
  __u32 len = qhd->dcidlen;
  __u32 h = reuse_md->hash;
  __u8 hbuf[8];
  if (len > 16) {
    __builtin_memset(hbuf, 0, sizeof(hbuf));
    switch (len) {
    case 20:
      __builtin_memcpy(hbuf, qhd->dcid + 16, 4);
      break;
    case 19:
      __builtin_memcpy(hbuf, qhd->dcid + 16, 3);
      break;
    case 18:
      __builtin_memcpy(hbuf, qhd->dcid + 16, 2);
      break;
    case 17:
      __builtin_memcpy(hbuf, qhd->dcid + 16, 1);
      break;
    }
    h = hash(hbuf, sizeof(hbuf), h);
    len = 16;
  }
  if (len > 8) {
    __builtin_memset(hbuf, 0, sizeof(hbuf));
    switch (len) {
    case 16:
      __builtin_memcpy(hbuf, qhd->dcid + 8, 8);
      break;
    case 15:
      __builtin_memcpy(hbuf, qhd->dcid + 8, 7);
      break;
    case 14:
      __builtin_memcpy(hbuf, qhd->dcid + 8, 6);
      break;
    case 13:
      __builtin_memcpy(hbuf, qhd->dcid + 8, 5);
      break;
    case 12:
      __builtin_memcpy(hbuf, qhd->dcid + 8, 4);
      break;
    case 11:
      __builtin_memcpy(hbuf, qhd->dcid + 8, 3);
      break;
    case 10:
      __builtin_memcpy(hbuf, qhd->dcid + 8, 2);
      break;
    case 9:
      __builtin_memcpy(hbuf, qhd->dcid + 8, 1);
      break;
    }
    h = hash(hbuf, sizeof(hbuf), h);
    len = 8;
  }
  return hash(qhd->dcid, len, h) % num_socks;
 }
 SEC("sk_reuseport")
 int select_reuseport(struct sk_reuseport_md *reuse_md) {
  __u32 sk_index, *psk_index;
  __u64 *pnum_socks, *pkey;
  __u32 zero = 0, key_high_idx = 1, key_low_idx = 2;
  int rv;
  quic_hd qhd;
  __u8 qpktbuf[6 + MAX_DCIDLEN];
  struct AES_ctx aes_ctx;
  __u8 key[AES_KEYLEN];
  __u8 *cid_prefix;
  if (bpf_skb_load_bytes(reuse_md, sizeof(struct udphdr), qpktbuf,
                         sizeof(qpktbuf)) != 0) {
    return SK_DROP;
  }
  pnum_socks = bpf_map_lookup_elem(&sk_info, &zero);
  if (pnum_socks == NULL) {
    return SK_DROP;
  }
  pkey = bpf_map_lookup_elem(&sk_info, &key_high_idx);
  if (pkey == NULL) {
    return SK_DROP;
  }
  __builtin_memcpy(key, pkey, sizeof(*pkey));
  pkey = bpf_map_lookup_elem(&sk_info, &key_low_idx);
  if (pkey == NULL) {
    return SK_DROP;
  }
  __builtin_memcpy(key + sizeof(*pkey), pkey, sizeof(*pkey));
  rv = parse_quic(&qhd, qpktbuf, qpktbuf + sizeof(qpktbuf));
  if (rv != 0) {
    return SK_DROP;
  }
  AES_init_ctx(&aes_ctx, key);
  switch (qhd.type) {
  case NGTCP2_PKT_INITIAL:
  case NGTCP2_PKT_0RTT:
    if (qhd.dcidlen == SV_DCIDLEN) {
      cid_prefix = qhd.dcid + CID_PREFIX_OFFSET;
      AES_ECB_decrypt(&aes_ctx, cid_prefix);
      psk_index = bpf_map_lookup_elem(&cid_prefix_map, cid_prefix);
      if (psk_index != NULL) {
        sk_index = *psk_index;
        break;
      }
    }
    sk_index = sk_index_from_dcid(&qhd, reuse_md, *pnum_socks);
    break;
  case NGTCP2_PKT_HANDSHAKE:
  case NGTCP2_PKT_SHORT:
    if (qhd.dcidlen != SV_DCIDLEN) {
      return SK_DROP;
    }
    cid_prefix = qhd.dcid + CID_PREFIX_OFFSET;
    AES_ECB_decrypt(&aes_ctx, cid_prefix);
    psk_index = bpf_map_lookup_elem(&cid_prefix_map, cid_prefix);
    if (psk_index == NULL) {
      sk_index = sk_index_from_dcid(&qhd, reuse_md, *pnum_socks);
      break;
    }
    sk_index = *psk_index;
    break;
  default:
    return SK_DROP;
  }
  rv = bpf_sk_select_reuseport(reuse_md, &reuseport_array, &sk_index, 0);
  if (rv != 0) {
    return SK_DROP;
  }
  return SK_PASS;
 }
--- a/cmake/ExtractValidFlags.cmake
+++ b/cmake/ExtractValidFlags.cmake
@@ -1,31 +0,0 @@
 # Convenience function that checks the availability of certain
 # C or C++ compiler flags and returns valid ones as a string.
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
 function(extract_valid_c_flags varname)
  set(valid_flags)
  foreach(flag IN LISTS ARGN)
    string(REGEX REPLACE "[^a-zA-Z0-9_]+" "_" flag_var ${flag})
    set(flag_var "C_FLAG_${flag_var}")
    check_c_compiler_flag("${flag}" "${flag_var}")
    if(${flag_var})
      set(valid_flags "${valid_flags} ${flag}")
    endif()
  endforeach()
  set(${varname} "${valid_flags}" PARENT_SCOPE)
 endfunction()
 function(extract_valid_cxx_flags varname)
  set(valid_flags)
  foreach(flag IN LISTS ARGN)
    string(REGEX REPLACE "[^a-zA-Z0-9_]+" "_" flag_var ${flag})
    set(flag_var "CXX_FLAG_${flag_var}")
    check_cxx_compiler_flag("${flag}" "${flag_var}")
    if(${flag_var})
      set(valid_flags "${valid_flags} ${flag}")
    endif()
  endforeach()
  set(${varname} "${valid_flags}" PARENT_SCOPE)
 endfunction()
--- a/cmake/FindCUnit.cmake
+++ b/cmake/FindCUnit.cmake
@@ -1,40 +0,0 @@
 # - Try to find cunit
 # Once done this will define
 #  CUNIT_FOUND        - System has cunit
 #  CUNIT_INCLUDE_DIRS - The cunit include directories
 #  CUNIT_LIBRARIES    - The libraries needed to use cunit
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_CUNIT QUIET cunit)
 find_path(CUNIT_INCLUDE_DIR
  NAMES CUnit/CUnit.h
  HINTS ${PC_CUNIT_INCLUDE_DIRS}
 )
 find_library(CUNIT_LIBRARY
  NAMES cunit
  HINTS ${PC_CUNIT_LIBRARY_DIRS}
 )
 if(CUNIT_INCLUDE_DIR)
  set(_version_regex "^#define[ \t]+CU_VERSION[ \t]+\"([^\"]+)\".*")
  file(STRINGS "${CUNIT_INCLUDE_DIR}/CUnit/CUnit.h"
    CUNIT_VERSION REGEX "${_version_regex}")
  string(REGEX REPLACE "${_version_regex}" "\\1"
    CUNIT_VERSION "${CUNIT_VERSION}")
  unset(_version_regex)
 endif()
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set CUNIT_FOUND to TRUE
 # if all listed variables are TRUE and the requested version matches.
 find_package_handle_standard_args(CUnit REQUIRED_VARS
                                  CUNIT_LIBRARY CUNIT_INCLUDE_DIR
                                  VERSION_VAR CUNIT_VERSION)
 if(CUNIT_FOUND)
  set(CUNIT_LIBRARIES     ${CUNIT_LIBRARY})
  set(CUNIT_INCLUDE_DIRS  ${CUNIT_INCLUDE_DIR})
 endif()
 mark_as_advanced(CUNIT_INCLUDE_DIR CUNIT_LIBRARY)
--- a/cmake/FindCython.cmake
+++ b/cmake/FindCython.cmake
@@ -1,44 +0,0 @@
 # Find the Cython compiler.
 #
 # This code sets the following variables:
 #
 #  CYTHON_EXECUTABLE
 #
 # See also UseCython.cmake
 #=============================================================================
 # Copyright 2011 Kitware, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #=============================================================================
 # Use the Cython executable that lives next to the Python executable
 # if it is a local installation.
 find_package( PythonInterp )
 if( PYTHONINTERP_FOUND )
  get_filename_component( _python_path ${PYTHON_EXECUTABLE} PATH )
  find_program( CYTHON_EXECUTABLE
    NAMES cython cython.bat cython3
    HINTS ${_python_path}
    )
 else()
  find_program( CYTHON_EXECUTABLE
    NAMES cython cython.bat cython3
    )
 endif()
 include( FindPackageHandleStandardArgs )
 FIND_PACKAGE_HANDLE_STANDARD_ARGS( Cython REQUIRED_VARS CYTHON_EXECUTABLE )
 mark_as_advanced( CYTHON_EXECUTABLE )
--- a/cmake/FindJansson.cmake
+++ b/cmake/FindJansson.cmake
@@ -1,40 +0,0 @@
 # - Try to find jansson
 # Once done this will define
 #  JANSSON_FOUND        - System has jansson
 #  JANSSON_INCLUDE_DIRS - The jansson include directories
 #  JANSSON_LIBRARIES    - The libraries needed to use jansson
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_JANSSON QUIET jansson)
 find_path(JANSSON_INCLUDE_DIR
  NAMES jansson.h
  HINTS ${PC_JANSSON_INCLUDE_DIRS}
 )
 find_library(JANSSON_LIBRARY
  NAMES jansson
  HINTS ${PC_JANSSON_LIBRARY_DIRS}
 )
 if(JANSSON_INCLUDE_DIR)
  set(_version_regex "^#define[ \t]+JANSSON_VERSION[ \t]+\"([^\"]+)\".*")
  file(STRINGS "${JANSSON_INCLUDE_DIR}/jansson.h"
    JANSSON_VERSION REGEX "${_version_regex}")
  string(REGEX REPLACE "${_version_regex}" "\\1"
    JANSSON_VERSION "${JANSSON_VERSION}")
  unset(_version_regex)
 endif()
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set JANSSON_FOUND to TRUE
 # if all listed variables are TRUE and the requested version matches.
 find_package_handle_standard_args(Jansson REQUIRED_VARS
                                  JANSSON_LIBRARY JANSSON_INCLUDE_DIR
                                  VERSION_VAR JANSSON_VERSION)
 if(JANSSON_FOUND)
  set(JANSSON_LIBRARIES     ${JANSSON_LIBRARY})
  set(JANSSON_INCLUDE_DIRS  ${JANSSON_INCLUDE_DIR})
 endif()
 mark_as_advanced(JANSSON_INCLUDE_DIR JANSSON_LIBRARY)
--- a/cmake/FindJemalloc.cmake
+++ b/cmake/FindJemalloc.cmake
@@ -1,40 +0,0 @@
 # - Try to find jemalloc
 # Once done this will define
 #  JEMALLOC_FOUND        - System has jemalloc
 #  JEMALLOC_INCLUDE_DIRS - The jemalloc include directories
 #  JEMALLOC_LIBRARIES    - The libraries needed to use jemalloc
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_JEMALLOC QUIET jemalloc)
 find_path(JEMALLOC_INCLUDE_DIR
  NAMES jemalloc/jemalloc.h
  HINTS ${PC_JEMALLOC_INCLUDE_DIRS}
 )
 find_library(JEMALLOC_LIBRARY
  NAMES jemalloc
  HINTS ${PC_JEMALLOC_LIBRARY_DIRS}
 )
 if(JEMALLOC_INCLUDE_DIR)
  set(_version_regex "^#define[ \t]+JEMALLOC_VERSION[ \t]+\"([^\"]+)\".*")
  file(STRINGS "${JEMALLOC_INCLUDE_DIR}/jemalloc/jemalloc.h"
    JEMALLOC_VERSION REGEX "${_version_regex}")
  string(REGEX REPLACE "${_version_regex}" "\\1"
    JEMALLOC_VERSION "${JEMALLOC_VERSION}")
  unset(_version_regex)
 endif()
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set JEMALLOC_FOUND to TRUE
 # if all listed variables are TRUE and the requested version matches.
 find_package_handle_standard_args(Jemalloc REQUIRED_VARS
                                  JEMALLOC_LIBRARY JEMALLOC_INCLUDE_DIR
                                  VERSION_VAR JEMALLOC_VERSION)
 if(JEMALLOC_FOUND)
  set(JEMALLOC_LIBRARIES    ${JEMALLOC_LIBRARY})
  set(JEMALLOC_INCLUDE_DIRS ${JEMALLOC_INCLUDE_DIR})
 endif()
 mark_as_advanced(JEMALLOC_INCLUDE_DIR JEMALLOC_LIBRARY)
--- a/cmake/FindLibbpf.cmake
+++ b/cmake/FindLibbpf.cmake
@@ -1,32 +0,0 @@
 # - Try to find libbpf
 # Once done this will define
 #  LIBBPF_FOUND        - System has libbpf
 #  LIBBPF_INCLUDE_DIRS - The libbpf include directories
 #  LIBBPF_LIBRARIES    - The libraries needed to use libbpf
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_LIBBPF QUIET libbpf)
 find_path(LIBBPF_INCLUDE_DIR
  NAMES bpf/bpf.h
  HINTS ${PC_LIBBPF_INCLUDE_DIRS}
 )
 find_library(LIBBPF_LIBRARY
  NAMES bpf
  HINTS ${PC_LIBBPF_LIBRARY_DIRS}
 )
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set LIBBPF_FOUND
 # to TRUE if all listed variables are TRUE and the requested version
 # matches.
 find_package_handle_standard_args(Libbpf REQUIRED_VARS
                                  LIBBPF_LIBRARY LIBBPF_INCLUDE_DIR
                                  VERSION_VAR LIBBPF_VERSION)
 if(LIBBPF_FOUND)
  set(LIBBPF_LIBRARIES     ${LIBBPF_LIBRARY})
  set(LIBBPF_INCLUDE_DIRS  ${LIBBPF_INCLUDE_DIR})
 endif()
 mark_as_advanced(LIBBPF_INCLUDE_DIR LIBBPF_LIBRARY)
--- a/cmake/FindLibcares.cmake
+++ b/cmake/FindLibcares.cmake
@@ -1,40 +0,0 @@
 # - Try to find libcares
 # Once done this will define
 #  LIBCARES_FOUND        - System has libcares
 #  LIBCARES_INCLUDE_DIRS - The libcares include directories
 #  LIBCARES_LIBRARIES    - The libraries needed to use libcares
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_LIBCARES QUIET libcares)
 find_path(LIBCARES_INCLUDE_DIR
  NAMES ares.h
  HINTS ${PC_LIBCARES_INCLUDE_DIRS}
 )
 find_library(LIBCARES_LIBRARY
  NAMES cares
  HINTS ${PC_LIBCARES_LIBRARY_DIRS}
 )
 if(LIBCARES_INCLUDE_DIR)
  set(_version_regex "^#define[ \t]+ARES_VERSION_STR[ \t]+\"([^\"]+)\".*")
  file(STRINGS "${LIBCARES_INCLUDE_DIR}/ares_version.h"
    LIBCARES_VERSION REGEX "${_version_regex}")
  string(REGEX REPLACE "${_version_regex}" "\\1"
    LIBCARES_VERSION "${LIBCARES_VERSION}")
  unset(_version_regex)
 endif()
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set LIBCARES_FOUND to TRUE
 # if all listed variables are TRUE and the requested version matches.
 find_package_handle_standard_args(Libcares REQUIRED_VARS
                                  LIBCARES_LIBRARY LIBCARES_INCLUDE_DIR
                                  VERSION_VAR LIBCARES_VERSION)
 if(LIBCARES_FOUND)
  set(LIBCARES_LIBRARIES     ${LIBCARES_LIBRARY})
  set(LIBCARES_INCLUDE_DIRS  ${LIBCARES_INCLUDE_DIR})
 endif()
 mark_as_advanced(LIBCARES_INCLUDE_DIR LIBCARES_LIBRARY)
--- a/cmake/FindLibev.cmake
+++ b/cmake/FindLibev.cmake
@@ -1,38 +0,0 @@
 # - Try to find libev
 # Once done this will define
 #  LIBEV_FOUND        - System has libev
 #  LIBEV_INCLUDE_DIRS - The libev include directories
 #  LIBEV_LIBRARIES    - The libraries needed to use libev
 find_path(LIBEV_INCLUDE_DIR
  NAMES ev.h
 )
 find_library(LIBEV_LIBRARY
  NAMES ev
 )
 if(LIBEV_INCLUDE_DIR)
  file(STRINGS "${LIBEV_INCLUDE_DIR}/ev.h"
    LIBEV_VERSION_MAJOR REGEX "^#define[ \t]+EV_VERSION_MAJOR[ \t]+[0-9]+")
  file(STRINGS "${LIBEV_INCLUDE_DIR}/ev.h"
    LIBEV_VERSION_MINOR REGEX "^#define[ \t]+EV_VERSION_MINOR[ \t]+[0-9]+")
  string(REGEX REPLACE "[^0-9]+" "" LIBEV_VERSION_MAJOR "${LIBEV_VERSION_MAJOR}")
  string(REGEX REPLACE "[^0-9]+" "" LIBEV_VERSION_MINOR "${LIBEV_VERSION_MINOR}")
  set(LIBEV_VERSION "${LIBEV_VERSION_MAJOR}.${LIBEV_VERSION_MINOR}")
  unset(LIBEV_VERSION_MINOR)
  unset(LIBEV_VERSION_MAJOR)
 endif()
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set LIBEV_FOUND to TRUE
 # if all listed variables are TRUE and the requested version matches.
 find_package_handle_standard_args(Libev REQUIRED_VARS
                                  LIBEV_LIBRARY LIBEV_INCLUDE_DIR
                                  VERSION_VAR LIBEV_VERSION)
 if(LIBEV_FOUND)
  set(LIBEV_LIBRARIES     ${LIBEV_LIBRARY})
  set(LIBEV_INCLUDE_DIRS  ${LIBEV_INCLUDE_DIR})
 endif()
 mark_as_advanced(LIBEV_INCLUDE_DIR LIBEV_LIBRARY)
--- a/cmake/FindLibevent.cmake
+++ b/cmake/FindLibevent.cmake
@@ -1,97 +0,0 @@
 # - Try to find libevent
 #.rst
 # FindLibevent
 # ------------
 #
 # Find Libevent include directories and libraries. Invoke as::
 #
 #   find_package(Libevent
 #     [version] [EXACT]   # Minimum or exact version
 #     [REQUIRED]          # Fail if Libevent is not found
 #     [COMPONENT <C>...]) # Libraries to look for
 #
 # Valid components are one or more of:: libevent core extra pthreads openssl.
 # Note that 'libevent' contains both core and extra. You must specify one of
 # them for the other components.
 #
 # This module will define the following variables::
 #
 #  LIBEVENT_FOUND        - True if headers and requested libraries were found
 #  LIBEVENT_INCLUDE_DIRS - Libevent include directories
 #  LIBEVENT_LIBRARIES    - Libevent libraries to be linked
 #  LIBEVENT_<C>_FOUND    - Component <C> was found (<C> is uppercase)
 #  LIBEVENT_<C>_LIBRARY  - Library to be linked for Libevent component <C>.
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_LIBEVENT QUIET libevent)
 # Look for the Libevent 2.0 or 1.4 headers
 find_path(LIBEVENT_INCLUDE_DIR
  NAMES
    event2/event-config.h
    event-config.h
  HINTS
    ${PC_LIBEVENT_INCLUDE_DIRS}
 )
 if(LIBEVENT_INCLUDE_DIR)
  set(_version_regex "^#define[ \t]+_EVENT_VERSION[ \t]+\"([^\"]+)\".*")
  if(EXISTS "${LIBEVENT_INCLUDE_DIR}/event2/event-config.h")
    # Libevent 2.0
    file(STRINGS "${LIBEVENT_INCLUDE_DIR}/event2/event-config.h"
      LIBEVENT_VERSION REGEX "${_version_regex}")
    if("${LIBEVENT_VERSION}" STREQUAL "")
      set(LIBEVENT_VERSION ${PC_LIBEVENT_VERSION})
    endif()
  else()
    # Libevent 1.4
    file(STRINGS "${LIBEVENT_INCLUDE_DIR}/event-config.h"
      LIBEVENT_VERSION REGEX "${_version_regex}")
  endif()
  string(REGEX REPLACE "${_version_regex}" "\\1"
    LIBEVENT_VERSION "${LIBEVENT_VERSION}")
  unset(_version_regex)
 endif()
 set(_LIBEVENT_REQUIRED_VARS)
 foreach(COMPONENT ${Libevent_FIND_COMPONENTS})
  set(_LIBEVENT_LIBNAME libevent)
  # Note: compare two variables to avoid a CMP0054 policy warning
  if(COMPONENT STREQUAL _LIBEVENT_LIBNAME)
    set(_LIBEVENT_LIBNAME event)
  else()
    set(_LIBEVENT_LIBNAME "event_${COMPONENT}")
  endif()
  string(TOUPPER "${COMPONENT}" COMPONENT_UPPER)
  find_library(LIBEVENT_${COMPONENT_UPPER}_LIBRARY
    NAMES ${_LIBEVENT_LIBNAME}
    HINTS ${PC_LIBEVENT_LIBRARY_DIRS}
  )
  if(LIBEVENT_${COMPONENT_UPPER}_LIBRARY)
    set(Libevent_${COMPONENT}_FOUND 1)
  endif()
  list(APPEND _LIBEVENT_REQUIRED_VARS LIBEVENT_${COMPONENT_UPPER}_LIBRARY)
 endforeach()
 unset(_LIBEVENT_LIBNAME)
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set LIBEVENT_FOUND to TRUE
 # if all listed variables are TRUE and the requested version matches.
 find_package_handle_standard_args(Libevent REQUIRED_VARS
                                  ${_LIBEVENT_REQUIRED_VARS}
                                  LIBEVENT_INCLUDE_DIR
                                  VERSION_VAR LIBEVENT_VERSION
                                  HANDLE_COMPONENTS)
 if(LIBEVENT_FOUND)
  set(LIBEVENT_INCLUDE_DIRS  ${LIBEVENT_INCLUDE_DIR})
  set(LIBEVENT_LIBRARIES)
  foreach(COMPONENT ${Libevent_FIND_COMPONENTS})
    string(TOUPPER "${COMPONENT}" COMPONENT_UPPER)
    list(APPEND LIBEVENT_LIBRARIES ${LIBEVENT_${COMPONENT_UPPER}_LIBRARY})
    set(LIBEVENT_${COMPONENT_UPPER}_FOUND ${Libevent_${COMPONENT}_FOUND})
  endforeach()
 endif()
 mark_as_advanced(LIBEVENT_INCLUDE_DIR ${_LIBEVENT_REQUIRED_VARS})
 unset(_LIBEVENT_REQUIRED_VARS)
--- a/cmake/FindLibnghttp3.cmake
+++ b/cmake/FindLibnghttp3.cmake
@@ -1,41 +0,0 @@
 # - Try to find libnghttp3
 # Once done this will define
 #  LIBNGHTTP3_FOUND        - System has libnghttp3
 #  LIBNGHTTP3_INCLUDE_DIRS - The libnghttp3 include directories
 #  LIBNGHTTP3_LIBRARIES    - The libraries needed to use libnghttp3
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_LIBNGHTTP3 QUIET libnghttp3)
 find_path(LIBNGHTTP3_INCLUDE_DIR
  NAMES nghttp3/nghttp3.h
  HINTS ${PC_LIBNGHTTP3_INCLUDE_DIRS}
 )
 find_library(LIBNGHTTP3_LIBRARY
  NAMES nghttp3
  HINTS ${PC_LIBNGHTTP3_LIBRARY_DIRS}
 )
 if(LIBNGHTTP3_INCLUDE_DIR)
  set(_version_regex "^#define[ \t]+NGHTTP3_VERSION[ \t]+\"([^\"]+)\".*")
  file(STRINGS "${LIBNGHTTP3_INCLUDE_DIR}/nghttp3/version.h"
    LIBNGHTTP3_VERSION REGEX "${_version_regex}")
  string(REGEX REPLACE "${_version_regex}" "\\1"
    LIBNGHTTP3_VERSION "${LIBNGHTTP3_VERSION}")
  unset(_version_regex)
 endif()
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set LIBNGHTTP3_FOUND
 # to TRUE if all listed variables are TRUE and the requested version
 # matches.
 find_package_handle_standard_args(Libnghttp3 REQUIRED_VARS
                                  LIBNGHTTP3_LIBRARY LIBNGHTTP3_INCLUDE_DIR
                                  VERSION_VAR LIBNGHTTP3_VERSION)
 if(LIBNGHTTP3_FOUND)
  set(LIBNGHTTP3_LIBRARIES     ${LIBNGHTTP3_LIBRARY})
  set(LIBNGHTTP3_INCLUDE_DIRS  ${LIBNGHTTP3_INCLUDE_DIR})
 endif()
 mark_as_advanced(LIBNGHTTP3_INCLUDE_DIR LIBNGHTTP3_LIBRARY)
--- a/cmake/FindLibngtcp2.cmake
+++ b/cmake/FindLibngtcp2.cmake
@@ -1,41 +0,0 @@
 # - Try to find libngtcp2
 # Once done this will define
 #  LIBNGTCP2_FOUND        - System has libngtcp2
 #  LIBNGTCP2_INCLUDE_DIRS - The libngtcp2 include directories
 #  LIBNGTCP2_LIBRARIES    - The libraries needed to use libngtcp2
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_LIBNGTCP2 QUIET libngtcp2)
 find_path(LIBNGTCP2_INCLUDE_DIR
  NAMES ngtcp2/ngtcp2.h
  HINTS ${PC_LIBNGTCP2_INCLUDE_DIRS}
 )
 find_library(LIBNGTCP2_LIBRARY
  NAMES ngtcp2
  HINTS ${PC_LIBNGTCP2_LIBRARY_DIRS}
 )
 if(LIBNGTCP2_INCLUDE_DIR)
  set(_version_regex "^#define[ \t]+NGTCP2_VERSION[ \t]+\"([^\"]+)\".*")
  file(STRINGS "${LIBNGTCP2_INCLUDE_DIR}/ngtcp2/version.h"
    LIBNGTCP2_VERSION REGEX "${_version_regex}")
  string(REGEX REPLACE "${_version_regex}" "\\1"
    LIBNGTCP2_VERSION "${LIBNGTCP2_VERSION}")
  unset(_version_regex)
 endif()
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set LIBNGTCP2_FOUND
 # to TRUE if all listed variables are TRUE and the requested version
 # matches.
 find_package_handle_standard_args(Libngtcp2 REQUIRED_VARS
                                  LIBNGTCP2_LIBRARY LIBNGTCP2_INCLUDE_DIR
                                  VERSION_VAR LIBNGTCP2_VERSION)
 if(LIBNGTCP2_FOUND)
  set(LIBNGTCP2_LIBRARIES     ${LIBNGTCP2_LIBRARY})
  set(LIBNGTCP2_INCLUDE_DIRS  ${LIBNGTCP2_INCLUDE_DIR})
 endif()
 mark_as_advanced(LIBNGTCP2_INCLUDE_DIR LIBNGTCP2_LIBRARY)
--- a/cmake/FindLibngtcp2_crypto_openssl.cmake
+++ b/cmake/FindLibngtcp2_crypto_openssl.cmake
@@ -1,43 +0,0 @@
 # - Try to find libngtcp2_crypto_openssl
 # Once done this will define
 #  LIBNGTCP2_CRYPTO_OPENSSL_FOUND        - System has libngtcp2_crypto_openssl
 #  LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIRS - The libngtcp2_crypto_openssl include directories
 #  LIBNGTCP2_CRYPTO_OPENSSL_LIBRARIES    - The libraries needed to use libngtcp2_crypto_openssl
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_LIBNGTCP2_CRYPTO_OPENSSL QUIET libngtcp2_crypto_openssl)
 find_path(LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIR
  NAMES ngtcp2/ngtcp2_crypto_openssl.h
  HINTS ${PC_LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIRS}
 )
 find_library(LIBNGTCP2_CRYPTO_OPENSSL_LIBRARY
  NAMES ngtcp2_crypto_openssl
  HINTS ${PC_LIBNGTCP2_CRYPTO_OPENSSL_LIBRARY_DIRS}
 )
 if(LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIR)
  set(_version_regex "^#define[ \t]+NGTCP2_VERSION[ \t]+\"([^\"]+)\".*")
  file(STRINGS "${LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIR}/ngtcp2/version.h"
    LIBNGTCP2_CRYPTO_OPENSSL_VERSION REGEX "${_version_regex}")
  string(REGEX REPLACE "${_version_regex}" "\\1"
    LIBNGTCP2_CRYPTO_OPENSSL_VERSION "${LIBNGTCP2_CRYPTO_OPENSSL_VERSION}")
  unset(_version_regex)
 endif()
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set
 # LIBNGTCP2_CRYPTO_OPENSSL_FOUND to TRUE if all listed variables are
 # TRUE and the requested version matches.
 find_package_handle_standard_args(Libngtcp2_crypto_openssl REQUIRED_VARS
                                  LIBNGTCP2_CRYPTO_OPENSSL_LIBRARY
                                  LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIR
                                  VERSION_VAR LIBNGTCP2_CRYPTO_OPENSSL_VERSION)
 if(LIBNGTCP2_CRYPTO_OPENSSL_FOUND)
  set(LIBNGTCP2_CRYPTO_OPENSSL_LIBRARIES ${LIBNGTCP2_CRYPTO_OPENSSL_LIBRARY})
  set(LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIRS ${LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIR})
 endif()
 mark_as_advanced(LIBNGTCP2_CRYPTO_OPENSSL_INCLUDE_DIR
                 LIBNGTCP2_CRYPTO_OPENSSL_LIBRARY)
--- a/cmake/FindSystemd.cmake
+++ b/cmake/FindSystemd.cmake
@@ -1,19 +0,0 @@
 # - Try to find systemd
 # Once done this will define
 #  SYSTEMD_FOUND        - System has systemd
 #  SYSTEMD_INCLUDE_DIRS - The systemd include directories
 #  SYSTEMD_LIBRARIES    - The libraries needed to use systemd
 include(FeatureSummary)
 set_package_properties(Systemd PROPERTIES
        URL "http://freedesktop.org/wiki/Software/systemd/"
        DESCRIPTION "System and Service Manager")
 find_package(PkgConfig QUIET)
 pkg_check_modules(PC_SYSTEMD QUIET libsystemd)
 find_library(SYSTEMD_LIBRARIES NAMES systemd ${PC_SYSTEMD_LIBRARY_DIRS})
 find_path(SYSTEMD_INCLUDE_DIRS systemd/sd-login.h HINTS ${PC_SYSTEMD_INCLUDE_DIRS})
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Systemd DEFAULT_MSG SYSTEMD_INCLUDE_DIRS SYSTEMD_LIBRARIES)
 mark_as_advanced(SYSTEMD_INCLUDE_DIRS SYSTEMD_LIBRARIES)
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -1,11 +0,0 @@
 # Converts a version such as 1.2.255 to 0x0102ff
 function(HexVersion version_hex_var major minor patch)
  math(EXPR version_dec "${major} * 256 * 256 + ${minor} * 256 + ${patch}")
  set(version_hex "0x")
  foreach(i RANGE 5 0 -1)
    math(EXPR num "(${version_dec} >> (4 * ${i})) & 15")
    string(SUBSTRING "0123456789abcdef" ${num} 1 num_hex)
    set(version_hex "${version_hex}${num_hex}")
  endforeach()
  set(${version_hex_var} "${version_hex}" PARENT_SCOPE)
 endfunction()
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -1,92 +0,0 @@
 /* Hint to the compiler that a function never returns */
 #define NGHTTP2_NORETURN @HINT_NORETURN@
 /* Define to `int' if <sys/types.h> does not define. */
 #cmakedefine ssize_t @ssize_t@
 /* Define to 1 if you have the `std::map::emplace`. */
 #cmakedefine HAVE_STD_MAP_EMPLACE 1
 /* Define to 1 if you have `libjansson` library. */
 #cmakedefine HAVE_JANSSON 1
 /* Define to 1 if you have `libxml2` library. */
 #cmakedefine HAVE_LIBXML2 1
 /* Define to 1 if you have `mruby` library. */
 #cmakedefine HAVE_MRUBY 1
 /* Define to 1 if you have `neverbleed` library. */
 #cmakedefine HAVE_NEVERBLEED 1
 /* sizeof(int *) */
 #cmakedefine SIZEOF_INT_P   @SIZEOF_INT_P@
 /* sizeof(time_t) */
 #cmakedefine SIZEOF_TIME_T  @SIZEOF_TIME_T@
 /* Define to 1 if you have the `_Exit` function. */
 #cmakedefine HAVE__EXIT 1
 /* Define to 1 if you have the `accept4` function. */
 #cmakedefine HAVE_ACCEPT4 1
 /* Define to 1 if you have the `mkostemp` function. */
 #cmakedefine HAVE_MKOSTEMP 1
 /* Define to 1 if you have the `initgroups` function. */
 #cmakedefine01 HAVE_DECL_INITGROUPS
 /* Define to 1 to enable debug output. */
 #cmakedefine DEBUGBUILD 1
 /* Define to 1 if you want to disable threads. */
 #cmakedefine NOTHREADS 1
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #cmakedefine HAVE_ARPA_INET_H 1
 /* Define to 1 if you have the <fcntl.h> header file. */
 #cmakedefine HAVE_FCNTL_H 1
 /* Define to 1 if you have the <inttypes.h> header file. */
 #cmakedefine HAVE_INTTYPES_H 1
 /* Define to 1 if you have the <limits.h> header file. */
 #cmakedefine HAVE_LIMITS_H 1
 /* Define to 1 if you have the <netdb.h> header file. */
 #cmakedefine HAVE_NETDB_H 1
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #cmakedefine HAVE_NETINET_IN_H 1
 /* Define to 1 if you have the <pwd.h> header file. */
 #cmakedefine HAVE_PWD_H 1
 /* Define to 1 if you have the <sys/socket.h> header file. */
 #cmakedefine HAVE_SYS_SOCKET_H 1
 /* Define to 1 if you have the <sys/time.h> header file. */
 #cmakedefine HAVE_SYS_TIME_H 1
 /* Define to 1 if you have the <syslog.h> header file. */
 #cmakedefine HAVE_SYSLOG_H 1
 /* Define to 1 if you have the <time.h> header file. */
 #cmakedefine HAVE_TIME_H 1
 /* Define to 1 if you have the <unistd.h> header file. */
 #cmakedefine HAVE_UNISTD_H 1
 /* Define to 1 if HTTP/3 is enabled. */
 #cmakedefine ENABLE_HTTP3 1
 /* Define to 1 if you have `libbpf` library. */
 #cmakedefine HAVE_LIBBPF 1
 /* Define to 1 if you have enum bpf_stats_type in linux/bpf.h. */
 #cmakedefine HAVE_BPF_STATS_TYPE 1
 /* Define to 1 if you have `libngtcp2_crypto_openssl` library. */
 #cmakedefine HAVE_LIBNGTCP2_CRYPTO_OPENSSL
--- a/configure.ac
+++ b/configure.ac
@@ -22,10 +22,10 @@ dnl OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 dnl WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 dnl Do not change user variables!
-dnl https://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html
+dnl http://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html
 AC_PREREQ(2.61)
-AC_INIT([nghttp2], [1.47.0-DEV], [t-tujikawa@users.sourceforge.net])
+AC_INIT([nghttp2], [1.8.0-DEV], [t-tujikawa@users.sourceforge.net])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
@@ -40,13 +40,15 @@ AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([subdir-objects])
 # AM_EXTRA_RECURSIVE_TARGETS requires automake 1.13 or higher
 m4_ifdef([AM_EXTRA_RECURSIVE_TARGETS], [AM_EXTRA_RECURSIVE_TARGETS([it itprep])])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 dnl See versioning rule:
-dnl  https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+dnl  http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST(LT_CURRENT, 35)
+AC_SUBST(LT_CURRENT, 18)
 AC_SUBST(LT_REVISION, 1)
-AC_SUBST(LT_AGE, 21)
+AC_SUBST(LT_AGE, 4)
 major=`echo $PACKAGE_VERSION |cut -d. -f1 | sed -e "s/[^0-9]//g"`
 minor=`echo $PACKAGE_VERSION |cut -d. -f2 | sed -e "s/[^0-9]//g"`
@@ -74,7 +76,7 @@ AC_ARG_ENABLE([threads],
 AC_ARG_ENABLE([app],
    [AS_HELP_STRING([--enable-app],
-                    [Build applications (nghttp, nghttpd, nghttpx and h2load) [default=check]])],
+                    [Build applications (nghttp, nghttpd and nghttpx) [default=check]])],
    [request_app=$enableval], [request_app=check])
 AC_ARG_ENABLE([hpack-tools],
@@ -107,60 +109,20 @@ AC_ARG_ENABLE([lib-only],
                    [Build libnghttp2 only.  This is a short hand for --disable-app --disable-examples --disable-hpack-tools --disable-python-bindings])],
    [request_lib_only=$enableval], [request_lib_only=no])
 AC_ARG_ENABLE([http3],
    [AS_HELP_STRING([--enable-http3],
                    [(EXPERIMENTAL) Enable HTTP/3.  This requires ngtcp2, nghttp3, and a custom OpenSSL.])],
    [request_http3=$enableval], [request_http3=no])
 AC_ARG_WITH([libxml2],
    [AS_HELP_STRING([--with-libxml2],
                    [Use libxml2 [default=check]])],
    [request_libxml2=$withval], [request_libxml2=check])
 AC_ARG_WITH([jansson],
    [AS_HELP_STRING([--with-jansson],
                    [Use jansson [default=check]])],
    [request_jansson=$withval], [request_jansson=check])
 AC_ARG_WITH([zlib],
    [AS_HELP_STRING([--with-zlib],
                    [Use zlib [default=check]])],
    [request_zlib=$withval], [request_zlib=check])
 AC_ARG_WITH([libevent-openssl],
    [AS_HELP_STRING([--with-libevent-openssl],
                    [Use libevent_openssl [default=check]])],
    [request_libevent_openssl=$withval], [request_libevent_openssl=check])
 AC_ARG_WITH([libcares],
    [AS_HELP_STRING([--with-libcares],
                    [Use libc-ares [default=check]])],
    [request_libcares=$withval], [request_libcares=check])
 AC_ARG_WITH([openssl],
    [AS_HELP_STRING([--with-openssl],
                    [Use openssl [default=check]])],
    [request_openssl=$withval], [request_openssl=check])
 AC_ARG_WITH([libev],
    [AS_HELP_STRING([--with-libev],
                    [Use libev [default=check]])],
    [request_libev=$withval], [request_libev=check])
 AC_ARG_WITH([cunit],
    [AS_HELP_STRING([--with-cunit],
                    [Use cunit [default=check]])],
    [request_cunit=$withval], [request_cunit=check])
 AC_ARG_WITH([jemalloc],
    [AS_HELP_STRING([--with-jemalloc],
                    [Use jemalloc [default=check]])],
    [request_jemalloc=$withval], [request_jemalloc=check])
-AC_ARG_WITH([systemd],
+AC_ARG_WITH([spdylay],
-    [AS_HELP_STRING([--with-systemd],
+    [AS_HELP_STRING([--with-spdylay],
-                    [Enable systemd support in nghttpx [default=check]])],
+                    [Use spdylay [default=check]])],
-    [request_systemd=$withval], [request_systemd=check])
+    [request_spdylay=$withval], [request_spdylay=check])
 AC_ARG_WITH([mruby],
    [AS_HELP_STRING([--with-mruby],
@@ -177,36 +139,9 @@ AC_ARG_WITH([cython],
                    [Use cython in given PATH])],
    [cython_path=$withval], [])
 AC_ARG_WITH([libngtcp2],
    [AS_HELP_STRING([--with-libngtcp2],
                    [Use libngtcp2 [default=check]])],
    [request_libngtcp2=$withval], [request_libngtcp2=check])
 AC_ARG_WITH([libnghttp3],
    [AS_HELP_STRING([--with-libnghttp3],
                    [Use libnghttp3 [default=check]])],
    [request_libnghttp3=$withval], [request_libnghttp3=check])
 AC_ARG_WITH([libbpf],
    [AS_HELP_STRING([--with-libbpf],
                    [Use libbpf [default=no]])],
    [request_libbpf=$withval], [request_libbpf=no])
 dnl Define variables
 AC_ARG_VAR([CYTHON], [the Cython executable])
 AC_ARG_VAR([LIBEV_CFLAGS], [C compiler flags for libev, skipping any checks])
 AC_ARG_VAR([LIBEV_LIBS], [linker flags for libev, skipping any checks])
 AC_ARG_VAR([JEMALLOC_CFLAGS],
           [C compiler flags for jemalloc, skipping any checks])
 AC_ARG_VAR([JEMALLOC_LIBS], [linker flags for jemalloc, skipping any checks])
 AC_ARG_VAR([LIBTOOL_LDFLAGS],
           [libtool specific flags (e.g., -static-libtool-libs)])
 AC_ARG_VAR([BPFCFLAGS], [C compiler flags for bpf program])
 dnl Checks for programs
 AC_PROG_CC
 AC_PROG_CXX
@@ -218,12 +153,7 @@ AC_PROG_MKDIR_P
 PKG_PROG_PKG_CONFIG([0.20])
-AM_PATH_PYTHON([3.8],, [:])
+AM_PATH_PYTHON([2.7],, [:])
 if test "x$request_python_bindings" = "xyes" &&
   test "x$PYTHON" = "x:"; then
  AC_MSG_ERROR([python was requested (enable-python-bindings) but not found])
 fi
 if [test "x$request_lib_only" = "xyes"]; then
  request_app=no
@@ -232,10 +162,8 @@ if [test "x$request_lib_only" = "xyes"]; then
  request_python_bindings=no
 fi
-if test "x$request_python_bindings" != "xno" &&
+if [test "x$request_python_bindings" != "xno"]; then
-   test "x$PYTHON" != "x:"; then
+  AX_PYTHON_DEVEL([>= '2.7'])
  # version check is broken
  AX_PYTHON_DEVEL()
 fi
 if test "x${cython_path}" = "x"; then
@@ -245,16 +173,26 @@ else
  AC_SUBST([CYTHON])
 fi
 #
 # If we're running GCC or clang define _U_ to be "__attribute__((unused))"
 # so we can use _U_ to flag unused function parameters and not get warnings
 # about them. Otherwise, define _U_ to be an empty string so that _U_ used
 # to flag an unused function parameters will compile with other compilers.
 #
 # XXX - similar hints for other compilers?
 #
 if test "x$GCC" = "xyes" -o "x$CC" = "xclang" ; then
  AC_DEFINE([_U_], [__attribute__((unused))], [Hint to the compiler that a function parameters is not used])
  AC_DEFINE([NGHTTP2_NORETURN], [__attribute__((noreturn))], [Hint to the compiler that a function never return])
 else
-  AC_DEFINE([NGHTTP2_NORETURN], , [Hint to the compiler that a function never return])
+  AC_DEFINE([_U_], , [Hint to the compiler that a function parameters is not use  AC_DEFINE([NGHTTP2_NORETURN], , [Hint to the compiler that a function never return])
 d])
 fi
 save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
-AX_CXX_COMPILE_STDCXX([14], [noext], [optional])
+AX_CXX_COMPILE_STDCXX_11([noext], [optional])
 CXX1XCXXFLAGS="$CXXFLAGS"
 CXXFLAGS="$save_CXXFLAGS"
@@ -274,7 +212,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 ]],
 [[
 std::vector<std::future<int>> v;
 (void)v;
 ]])],
    [AC_DEFINE([HAVE_STD_FUTURE], [1],
               [Define to 1 if you have the `std::future`.])
@@ -299,41 +236,6 @@ std::map<int, int>().emplace(1, 2);
    [have_std_map_emplace=no
     AC_MSG_RESULT([no])])
 # Check that std::atomic_* overloads for std::shared_ptr are
 # available.
 AC_MSG_CHECKING([whether std::atomic_* overloads for std::shared_ptr are available])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 [[
 #include <memory>
 ]],
 [[
 auto a = std::make_shared<int>(1000000007);
 auto p = std::atomic_load(&a);
 ++*p;
 std::atomic_store(&a, p);
 ]])],
    [AC_DEFINE([HAVE_ATOMIC_STD_SHARED_PTR], [1],
               [Define to 1 if you have the std::atomic_* overloads for std::shared_ptr.])
     have_atomic_std_shared_ptr=yes
     AC_MSG_RESULT([yes])],
    [have_atomic_std_shared_ptr=no
     AC_MSG_RESULT([no])])
 # Check that thread_local storage specifier is available
 AC_MSG_CHECKING([whether thread_local storage class specifier is available.])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 ,
 [[
 thread_local int a = 0;
 (void)a;
 ]])],
    [AC_DEFINE([HAVE_THREAD_LOCAL], [1],
               [Define to 1 if you have thread_local storage specifier.])
     have_thread_local=yes
     AC_MSG_RESULT([yes])],
    [have_Thread_local=no
     AC_MSG_RESULT([no])])
 CXXFLAGS=$save_CXXFLAGS
 AC_LANG_POP()
@@ -346,10 +248,10 @@ TESTLDADD=
 # Additional libraries required for programs under src directory.
 APPLDFLAGS=
-case "$host_os" in
+case "$host" in
  *android*)
    android_build=yes
-    # android does not need -pthread, but needs following 3 libs for C++
+    # android does not need -pthread, but needs followng 3 libs for C++
    APPLDFLAGS="$APPLDFLAGS -lstdc++ -latomic -lsupc++"
    ;;
  *)
@@ -358,32 +260,11 @@ case "$host_os" in
    ;;
 esac
 case "$host_os" in
  *solaris*)
    APPLDFLAGS="$APPLDFLAGS -lsocket -lnsl"
    ;;
 esac
 case "${build}" in
  *-apple-darwin*)
    EXTRA_DEFS="-D__APPLE_USE_RFC_3542"
    AC_SUBST([EXTRA_DEFS])
    ;;
 esac
 # zlib
-have_zlib=no
+PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.3], [have_zlib=yes], [have_zlib=no])
 if test "x${request_zlib}" != "xno"; then
  PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.3], [have_zlib=yes], [have_zlib=no])
-  if test "x${have_zlib}" = "xno"; then
+if test "x${have_zlib}" = "xno"; then
  AC_MSG_NOTICE($ZLIB_PKG_ERRORS)
  fi
 fi
 if test "x${request_zlib}" = "xyes" &&
   test "x${have_zlib}" != "xyes"; then
  AC_MSG_ERROR([zlib was requested (--with-zlib) but not found])
 fi
 # dl: openssl requires libdl when it is statically linked.
@@ -399,12 +280,10 @@ case "${host_os}" in
 esac
 # cunit
-have_cunit=no
+PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])
-if test "x${request_cunit}" != "xno"; then
+# If pkg-config does not find cunit, check it using AC_CHECK_LIB.  We
-  PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])
+# do this because Debian (Ubuntu) lacks pkg-config file for cunit.
-  # If pkg-config does not find cunit, check it using AC_CHECK_LIB.  We
+if test "x${have_cunit}" = "xno"; then
  # do this because Debian (Ubuntu) lacks pkg-config file for cunit.
  if test "x${have_cunit}" = "xno"; then
  AC_MSG_WARN([${CUNIT_PKG_ERRORS}])
  AC_CHECK_LIB([cunit], [CU_initialize_registry],
               [have_cunit=yes], [have_cunit=no])
@@ -414,8 +293,8 @@ if test "x${request_cunit}" != "xno"; then
    AC_SUBST([CUNIT_LIBS])
    AC_SUBST([CUNIT_CFLAGS])
  fi
-  fi
+fi
-  if test "x${have_cunit}" = "xyes"; then
+if test "x${have_cunit}" = "xyes"; then
  # cunit in Mac OS X requires ncurses. Note that in Mac OS X, test
  # program can be built without -lncurses, but it emits runtime
  # error.
@@ -425,283 +304,57 @@ if test "x${request_cunit}" != "xno"; then
      AC_SUBST([CUNIT_LIBS])
      ;;
  esac
  fi
 fi
 if test "x${request_cunit}" = "xyes" &&
   test "x${have_cunit}" != "xyes"; then
  AC_MSG_ERROR([cunit was requested (--with-cunit) but not found])
 fi
 AM_CONDITIONAL([HAVE_CUNIT], [ test "x${have_cunit}" = "xyes" ])
 # libev (for src)
-have_libev=no
+# libev does not have pkg-config file.  Check it in an old way.
-if test "x${request_libev}" != "xno"; then
+save_LIBS=$LIBS
-  if test "x${LIBEV_LIBS}" = "x" && test "x${LIBEV_CFLAGS}" = "x"; then
+# android requires -lm for floor
-    # libev does not have pkg-config file.  Check it in an old way.
+AC_CHECK_LIB([ev], [ev_time], [have_libev=yes], [have_libev=no], [-lm])
-    save_LIBS=$LIBS
+if test "x${have_libev}" = "xyes"; then
    # android requires -lm for floor
   AC_CHECK_LIB([ev], [ev_time], [have_libev=yes], [have_libev=no], [-lm])
   if test "x${have_libev}" = "xyes"; then
  AC_CHECK_HEADER([ev.h], [have_libev=yes], [have_libev=no])
  if test "x${have_libev}" = "xyes"; then
    LIBEV_LIBS=-lev
    LIBEV_CFLAGS=
-      fi
+    AC_SUBST([LIBEV_LIBS])
-    fi
+    AC_SUBST([LIBEV_CFLAGS])
    LIBS=$save_LIBS
  else
    have_libev=yes
  fi
 fi
-
+LIBS=$save_LIBS
 if test "x${request_libev}" = "xyes" &&
   test "x${have_libev}" != "xyes"; then
  AC_MSG_ERROR([libev was requested (--with-libev) but not found])
 fi
 # openssl (for src)
-have_openssl=no
+PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.0.1],
 if test "x${request_openssl}" != "xno"; then
  PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.0.1],
                  [have_openssl=yes], [have_openssl=no])
-  if test "x${have_openssl}" = "xno"; then
+if test "x${have_openssl}" = "xno"; then
  AC_MSG_NOTICE($OPENSSL_PKG_ERRORS)
  else
    save_CFLAGS="$CFLAGS"
    save_LIBS="$LIBS"
    CFLAGS="$OPENSSL_CFLAGS $CFLAGS"
    LIBS="$OPENSSL_LIBS $LIBS"
    # quictls/openssl has SSL_is_quic.
    have_ssl_is_quic=no
    AC_MSG_CHECKING([for SSL_is_quic])
    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
      #include <openssl/ssl.h>
    ]], [[
      SSL *ssl = NULL;
      SSL_is_quic(ssl);
    ]])],
    [AC_MSG_RESULT([yes]); have_ssl_is_quic=yes],
    [AC_MSG_RESULT([no]); have_ssl_is_quic=no])
    # boringssl has SSL_set_quic_early_data_context.
    AC_MSG_CHECKING([for SSL_set_quic_early_data_context])
    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
      #include <openssl/ssl.h>
    ]], [[
      SSL *ssl = NULL;
      SSL_set_quic_early_data_context(ssl, NULL, 0);
    ]])],
    [AC_MSG_RESULT([yes]); have_boringssl_quic=yes],
    [AC_MSG_RESULT([no]); have_boringssl_quic=no])
    CFLAGS="$save_CFLAGS"
    LIBS="$save_LIBS"
  fi
 fi
 if test "x${request_openssl}" = "xyes" &&
   test "x${have_openssl}" != "xyes"; then
  AC_MSG_ERROR([openssl was requested (--with-openssl) but not found])
 fi
 # c-ares (for src)
 have_libcares=no
 if test "x${request_libcares}" != "xno"; then
  PKG_CHECK_MODULES([LIBCARES], [libcares >= 1.7.5], [have_libcares=yes],
                    [have_libcares=no])
  if test "x${have_libcares}" = "xno"; then
    AC_MSG_NOTICE($LIBCARES_PKG_ERRORS)
  fi
 fi
 if test "x${request_libcares}" = "xyes" &&
   test "x${have_libcares}" != "xyes"; then
  AC_MSG_ERROR([libcares was requested (--with-libcares) but not found])
 fi
 # ngtcp2 (for src)
 have_libngtcp2=no
 if test "x${request_libngtcp2}" != "xno"; then
  PKG_CHECK_MODULES([LIBNGTCP2], [libngtcp2 >= 0.1.0], [have_libngtcp2=yes],
                    [have_libngtcp2=no])
  if test "x${have_libngtcp2}" = "xno"; then
    AC_MSG_NOTICE($LIBNGTCP2_PKG_ERRORS)
  fi
 fi
 if test "x${request_libngtcp2}" = "xyes" &&
   test "x${have_libngtcp2}" != "xyes"; then
  AC_MSG_ERROR([libngtcp2 was requested (--with-libngtcp2) but not found])
 fi
 # ngtcp2_crypto_openssl (for src)
 have_libngtcp2_crypto_openssl=no
 if test "x${have_ssl_is_quic}" = "xyes" &&
   test "x${request_libngtcp2}" != "xno"; then
  PKG_CHECK_MODULES([LIBNGTCP2_CRYPTO_OPENSSL],
                    [libngtcp2_crypto_openssl >= 0.0.0],
                    [have_libngtcp2_crypto_openssl=yes],
                    [have_libngtcp2_crypto_openssl=no])
  if test "x${have_libngtcp2_crypto_openssl}" = "xno"; then
    AC_MSG_NOTICE($LIBNGTCP2_CRYPTO_OPENSSL_PKG_ERRORS)
  else
    AC_DEFINE([HAVE_LIBNGTCP2_CRYPTO_OPENSSL], [1],
              [Define to 1 if you have `libngtcp2_crypto_openssl` library.])
  fi
 fi
 if test "x${have_ssl_is_quic}" = "xyes" &&
   test "x${request_libngtcp2}" = "xyes" &&
   test "x${have_libngtcp2_crypto_openssl}" != "xyes"; then
  AC_MSG_ERROR([libngtcp2_crypto_openssl was requested (--with-libngtcp2) but not found])
 fi
 # ngtcp2_crypto_boringssl (for src)
 have_libngtcp2_crypto_boringssl=no
 if test "x${have_boringssl_quic}" = "xyes" &&
   test "x${request_libngtcp2}" != "xno"; then
  PKG_CHECK_MODULES([LIBNGTCP2_CRYPTO_BORINGSSL],
                    [libngtcp2_crypto_boringssl >= 0.0.0],
                    [have_libngtcp2_crypto_boringssl=yes],
                    [have_libngtcp2_crypto_boringssl=no])
  if test "x${have_libngtcp2_crypto_boringssl}" = "xno"; then
    AC_MSG_NOTICE($LIBNGTCP2_CRYPTO_BORINGSSL_PKG_ERRORS)
  else
    AC_DEFINE([HAVE_LIBNGTCP2_CRYPTO_BORINGSSL], [1],
              [Define to 1 if you have `libngtcp2_crypto_boringssl` library.])
  fi
 fi
 if test "x${have_boringssl_quic}" = "xyes" &&
   test "x${request_libngtcp2}" = "xyes" &&
   test "x${have_libngtcp2_crypto_boringssl}" != "xyes"; then
  AC_MSG_ERROR([libngtcp2_crypto_boringssl was requested (--with-libngtcp2) but not found])
 fi
 # nghttp3 (for src)
 have_libnghttp3=no
 if test "x${request_libnghttp3}" != "xno"; then
  PKG_CHECK_MODULES([LIBNGHTTP3], [libnghttp3 >= 0.1.0], [have_libnghttp3=yes],
                    [have_libnghttp3=no])
  if test "x${have_libnghttp3}" = "xno"; then
    AC_MSG_NOTICE($LIBNGHTTP3_PKG_ERRORS)
  fi
 fi
 if test "x${request_libnghttp3}" = "xyes" &&
   test "x${have_libnghttp3}" != "xyes"; then
  AC_MSG_ERROR([libnghttp3 was requested (--with-libnghttp3) but not found])
 fi
 # libbpf (for src)
 have_libbpf=no
 if test "x${request_libbpf}" != "xno"; then
  PKG_CHECK_MODULES([LIBBPF], [libbpf >= 0.4.0], [have_libbpf=yes],
                    [have_libbpf=no])
  if test "x${have_libbpf}" = "xyes"; then
    AC_DEFINE([HAVE_LIBBPF], [1], [Define to 1 if you have `libbpf` library.])
    if test "x${BPFCFLAGS}" = "x"; then
      BPFCFLAGS="-Wall -O2 -g"
    fi
    # Add the include path for Debian
    EXTRABPFCFLAGS="-I/usr/include/$host_cpu-$host_os"
    AC_SUBST([EXTRABPFCFLAGS])
    AC_MSG_CHECKING([whether enum bpf_stats_type is defined in linux/bpf.h])
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
    [[
    #include <linux/bpf.h>
    ]],
    [[
    enum bpf_stats_type foo;
    (void)foo;
    ]])],
    [have_bpf_stats_type=yes],
    [have_bpf_stats_type=no])
    if test "x${have_bpf_stats_type}" = "xyes"; then
      AC_MSG_RESULT([yes])
      AC_DEFINE([HAVE_BPF_STATS_TYPE], [1],
                [Define to 1 if you have enum bpf_stats_type in linux/bpf.h.])
    else
      AC_MSG_RESULT([no])
    fi
  else
    AC_MSG_NOTICE($LIBBPF_PKG_ERRORS)
  fi
 fi
 if test "x${request_libbpf}" = "xyes" &&
   test "x${have_libbpf}" != "xyes"; then
  AC_MSG_ERROR([libbpf was requested (--with-libbpf) but not found])
 fi
 AM_CONDITIONAL([HAVE_LIBBPF], [ test "x${have_libbpf}" = "xyes" ])
 # libevent_openssl (for examples)
 # 2.0.8 is required because we use evconnlistener_set_error_cb()
-have_libevent_openssl=no
+PKG_CHECK_MODULES([LIBEVENT_OPENSSL], [libevent_openssl >= 2.0.8],
 if test "x${request_libevent_openssl}" != "xno"; then
  PKG_CHECK_MODULES([LIBEVENT_OPENSSL], [libevent_openssl >= 2.0.8],
                  [have_libevent_openssl=yes], [have_libevent_openssl=no])
-  if test "x${have_libevent_openssl}" = "xno"; then
+if test "x${have_libevent_openssl}" = "xno"; then
  AC_MSG_NOTICE($LIBEVENT_OPENSSL_PKG_ERRORS)
  fi
 fi
 if test "x${request_libevent_openssl}" = "xyes" &&
   test "x${have_libevent_openssl}" != "xyes"; then
  AC_MSG_ERROR([libevent_openssl was requested (--with-libevent) but not found])
 fi
 # jansson (for src/nghttp, src/deflatehd and src/inflatehd)
-have_jansson=no
+PKG_CHECK_MODULES([JANSSON], [jansson >= 2.5],
 if test "x${request_jansson}" != "xno"; then
  PKG_CHECK_MODULES([JANSSON], [jansson >= 2.5],
                  [have_jansson=yes], [have_jansson=no])
-  if test "x${have_jansson}" = "xyes"; then
+if test "x${have_jansson}" = "xyes"; then
  AC_DEFINE([HAVE_JANSSON], [1],
            [Define to 1 if you have `libjansson` library.])
-  else
+else
  AC_MSG_NOTICE($JANSSON_PKG_ERRORS)
  fi
 fi
 if test "x${request_jansson}" = "xyes" &&
   test "x${have_jansson}" != "xyes"; then
  AC_MSG_ERROR([jansson was requested (--with-jansson) but not found])
 fi
 #  libsystemd (for src/nghttpx)
 have_libsystemd=no
 if test "x${request_systemd}" != "xno"; then
  PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209], [have_libsystemd=yes],
                    [have_libsystemd=no])
  if test "x${have_libsystemd}" = "xyes"; then
    AC_DEFINE([HAVE_LIBSYSTEMD], [1],
              [Define to 1 if you have `libsystemd` library.])
  else
    AC_MSG_NOTICE($SYSTEMD_PKG_ERRORS)
  fi
 fi
 if test "x${request_systemd}" = "xyes" &&
   test "x${have_libsystemd}" != "xyes"; then
  AC_MSG_ERROR([systemd was requested (--with-systemd) but not found])
 fi
 # libxml2 (for src/nghttp)
 have_libxml2=no
 if test "x${request_libxml2}" != "xno"; then
-  PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6.26],
+  AM_PATH_XML2(2.7.7, [have_libxml2=yes], [have_libxml2=no])
                    [have_libxml2=yes], [have_libxml2=no])
  if test "x${have_libxml2}" = "xyes"; then
    AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if you have `libxml2` library.])
  else
    AC_MSG_NOTICE($LIBXML2_PKG_ERRORS)
  fi
 fi
@@ -715,7 +368,6 @@ AM_CONDITIONAL([HAVE_LIBXML2], [ test "x${have_libxml2}" = "xyes" ])
 # jemalloc
 have_jemalloc=no
 if test "x${request_jemalloc}" != "xno"; then
  if test "x${JEMALLOC_LIBS}" = "x" && test "x${JEMALLOC_CFLAGS}" = "x"; then
  save_LIBS=$LIBS
  AC_SEARCH_LIBS([malloc_stats_print], [jemalloc], [have_jemalloc=yes], [],
                 [$PTHREAD_LDFLAGS])
@@ -737,9 +389,7 @@ if test "x${request_jemalloc}" != "xno"; then
  if test "x${have_jemalloc}" = "xyes" &&
     test "x${jemalloc_libs}" != "xnone required"; then
    JEMALLOC_LIBS=${jemalloc_libs}
-    fi
+    AC_SUBST([JEMALLOC_LIBS])
  else
    have_jemalloc=yes
  fi
 fi
@@ -748,6 +398,26 @@ if test "x${request_jemalloc}" = "xyes" &&
  AC_MSG_ERROR([jemalloc was requested (--with-jemalloc) but not found])
 fi
 # spdylay (for src/nghttpx and src/h2load)
 have_spdylay=no
 if test "x${request_spdylay}" != "xno"; then
  PKG_CHECK_MODULES([LIBSPDYLAY], [libspdylay >= 1.3.2],
                    [have_spdylay=yes], [have_spdylay=no])
  if test "x${have_spdylay}" = "xyes"; then
    AC_DEFINE([HAVE_SPDYLAY], [1], [Define to 1 if you have `spdylay` library.])
  else
    AC_MSG_NOTICE($LIBSPDYLAY_PKG_ERRORS)
    AC_MSG_NOTICE([The SPDY support in nghttpx and h2load will be disabled.])
  fi
 fi
 if test "x${request_spdylay}" = "xyes" &&
   test "x${have_spdylay}" != "xyes"; then
  AC_MSG_ERROR([spdylay was requested (--with-spdylay) but not found])
 fi
 AM_CONDITIONAL([HAVE_SPDYLAY], [ test "x${have_spdylay}" = "xyes" ])
 # Check Boost Asio library
 have_asio_lib=no
@@ -767,14 +437,13 @@ if test "x${request_asio_lib}" = "xyes"; then
  fi
 fi
-# The nghttp, nghttpd and nghttpx under src depend on zlib, OpenSSL,
+# The nghttp, nghttpd and nghttpx under src depend on zlib, OpenSSL
-# libev, and libc-ares.
+# and libev
 enable_app=no
 if test "x${request_app}" != "xno" &&
   test "x${have_zlib}" = "xyes" &&
   test "x${have_openssl}" = "xyes" &&
-   test "x${have_libev}" = "xyes" &&
+   test "x${have_libev}" = "xyes"; then
   test "x${have_libcares}" = "xyes"; then
  enable_app=yes
 fi
@@ -785,26 +454,6 @@ fi
 AM_CONDITIONAL([ENABLE_APP], [ test "x${enable_app}" = "xyes" ])
 # Check HTTP/3 support
 enable_http3=no
 if test "x${request_http3}" != "xno" &&
   (test "x${have_ssl_is_quic}" = "xyes" ||
    test "x${have_boringssl_quic}" = "xyes") &&
   test "x${have_libngtcp2}" = "xyes" &&
   (test "x${have_libngtcp2_crypto_openssl}" = "xyes" ||
    test "x${have_libngtcp2_crypto_boringssl}" = "xyes") &&
   test "x${have_libnghttp3}" = "xyes"; then
  enable_http3=yes
  AC_DEFINE([ENABLE_HTTP3], [1], [Define to 1 if HTTP/3 is enabled.])
 fi
 if test "x${request_http3}" = "xyes" &&
   test "x${enable_http3}" != "xyes"; then
  AC_MSG_ERROR([HTTP/3 was requested (--enable-http3) but dependencies are not met.])
 fi
 AM_CONDITIONAL([ENABLE_HTTP3], [ test "x${enable_http3}" = "xyes" ])
 enable_hpack_tools=no
 # HPACK tools requires jansson
 if test "x${request_hpack_tools}" != "xno" &&
@@ -882,7 +531,7 @@ enable_python_bindings=no
 if test "x${request_python_bindings}" != "xno" &&
   test "x${CYTHON}" != "x" &&
   test "x${PYTHON}" != "x:" &&
-   test "x${PYTHON_VERSION}" != "x"; then
+   test "x${have_python_dev}" = "xyes"; then
  enable_python_bindings=yes
 fi
@@ -949,26 +598,6 @@ AC_SYS_LARGEFILE
 AC_CHECK_MEMBER([struct tm.tm_gmtoff], [have_struct_tm_tm_gmtoff=yes],
                [have_struct_tm_tm_gmtoff=no], [[#include <time.h>]])
 AC_CHECK_MEMBER([struct sockaddr_in.sin_len],
                [AC_DEFINE([HAVE_SOCKADDR_IN_SIN_LEN],[1],
                  [Define to 1 if struct sockaddr_in has sin_len member.])],
                [],
                [[
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 ]])
 AC_CHECK_MEMBER([struct sockaddr_in6.sin6_len],
                [AC_DEFINE([HAVE_SOCKADDR_IN6_SIN6_LEN],[1],
                  [Define to 1 if struct sockaddr_in6 has sin6_len member.])],
                [],
                [[
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 ]])
 if test "x$have_struct_tm_tm_gmtoff" = "xyes"; then
  AC_DEFINE([HAVE_STRUCT_TM_TM_GMTOFF], [1],
            [Define to 1 if you have `struct tm.tm_gmtoff` member.])
@@ -1003,7 +632,6 @@ AC_CHECK_FUNCS([ \
  memchr \
  memmove \
  memset \
  mkostemp \
  socket \
  sqrt \
  strchr \
@@ -1023,13 +651,15 @@ AC_CHECK_FUNC([timerfd_create],
 # For cygwin: we can link initgroups, so AC_CHECK_FUNCS succeeds, but
 # cygwin disables initgroups due to feature test macro magic with our
-# configuration.  FreeBSD declares initgroups() in unistd.h.
+# configuration.
-AC_CHECK_DECLS([initgroups], [], [], [[
+AC_CHECK_DECLS([initgroups], [], [], [[#include <grp.h>]])
-  #ifdef HAVE_UNISTD_H
+
-  # include <unistd.h>
+# Checks for epoll availability, primarily for examples/tiny-nghttpd
-  #endif
+AX_HAVE_EPOLL([have_epoll=yes], [have_epoll=no])
-  #include <grp.h>
+
-]])
+AM_CONDITIONAL([ENABLE_TINY_NGHTTPD],
               [ test "x${have_epoll}" = "xyes" &&
                 test "x${have_timerfd_create}" = "xyes"])
 save_CFLAGS=$CFLAGS
 save_CXXFLAGS=$CXXFLAGS
@@ -1084,20 +714,12 @@ if test "x$werror" != "xno"; then
    AX_CHECK_COMPILE_FLAG([-Wredundant-decls], [CFLAGS="$CFLAGS -Wredundant-decls"])
    # Only work with Clang for the moment
    AX_CHECK_COMPILE_FLAG([-Wheader-guard], [CFLAGS="$CFLAGS -Wheader-guard"])
    AX_CHECK_COMPILE_FLAG([-Wsometimes-uninitialized], [CFLAGS="$CFLAGS -Wsometimes-uninitialized"])
    # This is required because we pass format string as "const char*.
    AX_CHECK_COMPILE_FLAG([-Wno-format-nonliteral], [CFLAGS="$CFLAGS -Wno-format-nonliteral"])
    # For C++ compiler
    AC_LANG_PUSH(C++)
    AX_CHECK_COMPILE_FLAG([-Wall], [CXXFLAGS="$CXXFLAGS -Wall"])
    AX_CHECK_COMPILE_FLAG([-Werror], [CXXFLAGS="$CXXFLAGS -Werror"])
    AX_CHECK_COMPILE_FLAG([-Wformat-security], [CXXFLAGS="$CXXFLAGS -Wformat-security"])
    AX_CHECK_COMPILE_FLAG([-Wsometimes-uninitialized], [CXXFLAGS="$CXXFLAGS -Wsometimes-uninitialized"])
    # Disable noexcept-type warning of g++-7.  This is not harmful as
    # long as all source files are compiled with the same compiler.
    AX_CHECK_COMPILE_FLAG([-Wno-noexcept-type], [CXXFLAGS="$CXXFLAGS -Wno-noexcept-type"])
    AC_LANG_POP()
 fi
@@ -1146,7 +768,6 @@ AC_CONFIG_FILES([
  src/Makefile
  src/includes/Makefile
  src/libnghttp2_asio.pc
  bpf/Makefile
  examples/Makefile
  python/Makefile
  python/setup.py
@@ -1195,44 +816,32 @@ AC_MSG_NOTICE([summary of build options:
      C preprocessor: ${CPP}
      CPPFLAGS:       ${CPPFLAGS}
      WARNCFLAGS:     ${WARNCFLAGS}
      WARNCXXFLAGS:   ${WARNCXXFLAGS}
      CXX1XCXXFLAGS:  ${CXX1XCXXFLAGS}
      EXTRACFLAG:     ${EXTRACFLAG}
      BPFCFLAGS:      ${BPFCFLAGS}
      EXTRABPFCFLAGS: ${EXTRABPFCFLAGS}
      LIBS:           ${LIBS}
      DEFS:           ${DEFS}
      EXTRA_DEFS:     ${EXTRA_DEFS}
    Library:
      Shared:         ${enable_shared}
      Static:         ${enable_static}
    Libtool:
      LIBTOOL_LDFLAGS: ${LIBTOOL_LDFLAGS}
    Python:
      Python:         ${PYTHON}
      PYTHON_VERSION: ${PYTHON_VERSION}
      pyexecdir:      ${pyexecdir}
      Python-dev:     ${have_python_dev}
      PYTHON_CPPFLAGS:${PYTHON_CPPFLAGS}
-      PYTHON_LIBS:    ${PYTHON_LIBS}
+      PYTHON_LDFLAGS: ${PYTHON_LDFLAGS}
      Cython:         ${CYTHON}
    Test:
      CUnit:          ${have_cunit} (CFLAGS='${CUNIT_CFLAGS}' LIBS='${CUNIT_LIBS}')
      Failmalloc:     ${enable_failmalloc}
    Libs:
      OpenSSL:        ${have_openssl} (CFLAGS='${OPENSSL_CFLAGS}' LIBS='${OPENSSL_LIBS}')
-      Libxml2:        ${have_libxml2} (CFLAGS='${LIBXML2_CFLAGS}' LIBS='${LIBXML2_LIBS}')
+      Libxml2:        ${have_libxml2} (CFLAGS='${XML_CPPFLAGS}' LIBS='${XML_LIBS}')
      Libev:          ${have_libev} (CFLAGS='${LIBEV_CFLAGS}' LIBS='${LIBEV_LIBS}')
      Libc-ares:      ${have_libcares} (CFLAGS='${LIBCARES_CFLAGS}' LIBS='${LIBCARES_LIBS}')
      libngtcp2:      ${have_libngtcp2} (CFLAGS='${LIBNGTCP2_CFLAGS}' LIBS='${LIBNGTCP2_LIBS}')
      libngtcp2_crypto_openssl: ${have_libngtcp2_crypto_openssl} (CFLAGS='${LIBNGTCP2_CRYPTO_OPENSSL_CFLAGS}' LIBS='${LIBNGTCP2_CRYPTO_OPENSSL_LIBS}')
      libngtcp2_crypto_boringssl: ${have_libngtcp2_crypto_boringssl} (CFLAGS='${LIBNGTCP2_CRYPTO_BORINGSSL_CFLAGS}' LIBS='${LIBNGTCP2_CRYPTO_BORINGSSL_LIBS}')
      libnghttp3:     ${have_libnghttp3} (CFLAGS='${LIBNGHTTP3_CFLAGS}' LIBS='${LIBNGHTTP3_LIBS}')
      libbpf:         ${have_libbpf} (CFLAGS='${LIBBPF_CFLAGS}' LIBS='${LIBBPF_LIBS}')
      Libevent(SSL):  ${have_libevent_openssl} (CFLAGS='${LIBEVENT_OPENSSL_CFLAGS}' LIBS='${LIBEVENT_OPENSSL_LIBS}')
      Spdylay:        ${have_spdylay} (CFLAGS='${LIBSPDYLAY_CFLAGS}' LIBS='${LIBSPDYLAY_LIBS}')
      Jansson:        ${have_jansson} (CFLAGS='${JANSSON_CFLAGS}' LIBS='${JANSSON_LIBS}')
-      Jemalloc:       ${have_jemalloc} (CFLAGS='${JEMALLOC_CFLAGS}' LIBS='${JEMALLOC_LIBS}')
+      Jemalloc:       ${have_jemalloc} (LIBS='${JEMALLOC_LIBS}')
      Zlib:           ${have_zlib} (CFLAGS='${ZLIB_CFLAGS}' LIBS='${ZLIB_LIBS}')
      Systemd:        ${have_libsystemd} (CFLAGS='${SYSTEMD_CFLAGS}' LIBS='${SYSTEMD_LIBS}')
      Boost CPPFLAGS: ${BOOST_CPPFLAGS}
      Boost LDFLAGS:  ${BOOST_LDFLAGS}
      Boost::ASIO:    ${BOOST_ASIO_LIB}
@@ -1249,5 +858,4 @@ AC_MSG_NOTICE([summary of build options:
      Examples:       ${enable_examples}
      Python bindings:${enable_python_bindings}
      Threading:      ${enable_threads}
      HTTP/3 (EXPERIMENTAL): ${enable_http3}
 ])
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -1,12 +0,0 @@
 set(CONFIGFILES
  nghttpx-init
  nghttpx.service
  nghttpx-upstart.conf
 )
 # Note that the execute permissions of nghttpx-init is preserved
 foreach(name IN LISTS CONFIGFILES)
  configure_file("${name}.in" "${name}" @ONLY)
 endforeach()
 # set(EXTRA_DIST ${CONFIGFILES} nghttpx-logrotate tlsticketupdate.go)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -23,24 +23,17 @@
 configfiles = nghttpx-init nghttpx.service nghttpx-upstart.conf
-EXTRA_DIST = \
+EXTRA_DIST = $(configfiles:%=%.in) nghttpx-logrotate tlsticketupdate.go
 	CMakeLists.txt \
 	$(configfiles:%=%.in) \
 	nghttpx-logrotate \
 	tlsticketupdate.go
 edit = sed -e 's|@bindir[@]|$(bindir)|g'
-nghttpx-init: $(srcdir)/nghttpx-init.in
+nghttpx-init: %: $(srcdir)/%.in
 	rm -f $@ $@.tmp
 	$(edit) $< > $@.tmp
 	chmod +x $@.tmp
 	mv $@.tmp $@
-nghttpx.service: $(srcdir)/nghttpx.service.in
+nghttpx.service nghttpx-upstart.conf: %: $(srcdir)/%.in
 	$(edit) $< > $@
 nghttpx-upstart.conf: $(srcdir)/nghttpx-upstart.conf.in
 	$(edit) $< > $@
 $(configfiles): Makefile
--- a/contrib/nghttpx.service.in
+++ b/contrib/nghttpx.service.in
@@ -1,17 +1,10 @@
 [Unit]
 Description=HTTP/2 proxy
 Documentation=man:nghttpx
 After=network.target
 [Service]
-Type=notify
+Type=forking
-ExecStart=@bindir@/nghttpx --conf=/etc/nghttpx/nghttpx.conf
+ExecStart=@bindir@/nghttpx --conf=/etc/nghttpx/nghttpx.conf --pid-file=/run/nghttpx.pid --daemon
 ExecReload=/bin/kill --signal HUP $MAINPID
 KillSignal=SIGQUIT
 PrivateTmp=yes
 ProtectHome=yes
 ProtectSystem=full
 Restart=always
 [Install]
 WantedBy=multi-user.target
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,354 +0,0 @@
 # Generated documents
 set(APIDOCS
  macros.rst
  enums.rst
  types.rst
  nghttp2_check_header_name.rst
  nghttp2_check_header_value.rst
  nghttp2_hd_deflate_bound.rst
  nghttp2_hd_deflate_change_table_size.rst
  nghttp2_hd_deflate_del.rst
  nghttp2_hd_deflate_get_dynamic_table_size.rst
  nghttp2_hd_deflate_get_max_dynamic_table_size.rst
  nghttp2_hd_deflate_get_num_table_entries.rst
  nghttp2_hd_deflate_get_table_entry.rst
  nghttp2_hd_deflate_hd.rst
  nghttp2_hd_deflate_hd_vec.rst
  nghttp2_hd_deflate_new.rst
  nghttp2_hd_deflate_new2.rst
  nghttp2_hd_inflate_change_table_size.rst
  nghttp2_hd_inflate_del.rst
  nghttp2_hd_inflate_end_headers.rst
  nghttp2_hd_inflate_get_dynamic_table_size.rst
  nghttp2_hd_inflate_get_max_dynamic_table_size.rst
  nghttp2_hd_inflate_get_num_table_entries.rst
  nghttp2_hd_inflate_get_table_entry.rst
  nghttp2_hd_inflate_hd.rst
  nghttp2_hd_inflate_hd2.rst
  nghttp2_hd_inflate_new.rst
  nghttp2_hd_inflate_new2.rst
  nghttp2_http2_strerror.rst
  nghttp2_is_fatal.rst
  nghttp2_nv_compare_name.rst
  nghttp2_option_del.rst
  nghttp2_option_new.rst
  nghttp2_option_set_builtin_recv_extension_type.rst
  nghttp2_option_set_max_deflate_dynamic_table_size.rst
  nghttp2_option_set_max_reserved_remote_streams.rst
  nghttp2_option_set_max_send_header_block_length.rst
  nghttp2_option_set_no_auto_ping_ack.rst
  nghttp2_option_set_no_auto_window_update.rst
  nghttp2_option_set_no_http_messaging.rst
  nghttp2_option_set_no_recv_client_magic.rst
  nghttp2_option_set_peer_max_concurrent_streams.rst
  nghttp2_option_set_user_recv_extension_type.rst
  nghttp2_option_set_max_settings.rst
  nghttp2_pack_settings_payload.rst
  nghttp2_priority_spec_check_default.rst
  nghttp2_priority_spec_default_init.rst
  nghttp2_priority_spec_init.rst
  nghttp2_rcbuf_decref.rst
  nghttp2_rcbuf_get_buf.rst
  nghttp2_rcbuf_incref.rst
  nghttp2_rcbuf_is_static.rst
  nghttp2_select_next_protocol.rst
  nghttp2_session_callbacks_del.rst
  nghttp2_session_callbacks_new.rst
  nghttp2_session_callbacks_set_before_frame_send_callback.rst
  nghttp2_session_callbacks_set_data_source_read_length_callback.rst
  nghttp2_session_callbacks_set_error_callback.rst
  nghttp2_session_callbacks_set_on_begin_frame_callback.rst
  nghttp2_session_callbacks_set_on_begin_headers_callback.rst
  nghttp2_session_callbacks_set_on_data_chunk_recv_callback.rst
  nghttp2_session_callbacks_set_on_extension_chunk_recv_callback.rst
  nghttp2_session_callbacks_set_on_frame_not_send_callback.rst
  nghttp2_session_callbacks_set_on_frame_recv_callback.rst
  nghttp2_session_callbacks_set_on_frame_send_callback.rst
  nghttp2_session_callbacks_set_on_header_callback.rst
  nghttp2_session_callbacks_set_on_header_callback2.rst
  nghttp2_session_callbacks_set_on_invalid_frame_recv_callback.rst
  nghttp2_session_callbacks_set_on_invalid_header_callback.rst
  nghttp2_session_callbacks_set_on_invalid_header_callback2.rst
  nghttp2_session_callbacks_set_on_stream_close_callback.rst
  nghttp2_session_callbacks_set_pack_extension_callback.rst
  nghttp2_session_callbacks_set_recv_callback.rst
  nghttp2_session_callbacks_set_select_padding_callback.rst
  nghttp2_session_callbacks_set_send_callback.rst
  nghttp2_session_callbacks_set_send_data_callback.rst
  nghttp2_session_callbacks_set_unpack_extension_callback.rst
  nghttp2_session_change_stream_priority.rst
  nghttp2_session_check_request_allowed.rst
  nghttp2_session_check_server_session.rst
  nghttp2_session_client_new.rst
  nghttp2_session_client_new2.rst
  nghttp2_session_client_new3.rst
  nghttp2_session_consume.rst
  nghttp2_session_consume_connection.rst
  nghttp2_session_consume_stream.rst
  nghttp2_session_create_idle_stream.rst
  nghttp2_session_del.rst
  nghttp2_session_find_stream.rst
  nghttp2_session_get_effective_local_window_size.rst
  nghttp2_session_get_effective_recv_data_length.rst
  nghttp2_session_get_hd_deflate_dynamic_table_size.rst
  nghttp2_session_get_hd_inflate_dynamic_table_size.rst
  nghttp2_session_get_last_proc_stream_id.rst
  nghttp2_session_get_local_settings.rst
  nghttp2_session_get_local_window_size.rst
  nghttp2_session_get_next_stream_id.rst
  nghttp2_session_get_outbound_queue_size.rst
  nghttp2_session_get_remote_settings.rst
  nghttp2_session_get_remote_window_size.rst
  nghttp2_session_get_root_stream.rst
  nghttp2_session_get_stream_effective_local_window_size.rst
  nghttp2_session_get_stream_effective_recv_data_length.rst
  nghttp2_session_get_stream_local_close.rst
  nghttp2_session_get_stream_local_window_size.rst
  nghttp2_session_get_stream_remote_close.rst
  nghttp2_session_get_stream_remote_window_size.rst
  nghttp2_session_get_stream_user_data.rst
  nghttp2_session_mem_recv.rst
  nghttp2_session_mem_send.rst
  nghttp2_session_recv.rst
  nghttp2_session_resume_data.rst
  nghttp2_session_send.rst
  nghttp2_session_server_new.rst
  nghttp2_session_server_new2.rst
  nghttp2_session_server_new3.rst
  nghttp2_session_set_local_window_size.rst
  nghttp2_session_set_next_stream_id.rst
  nghttp2_session_set_stream_user_data.rst
  nghttp2_session_terminate_session.rst
  nghttp2_session_terminate_session2.rst
  nghttp2_session_upgrade.rst
  nghttp2_session_upgrade2.rst
  nghttp2_session_want_read.rst
  nghttp2_session_want_write.rst
  nghttp2_set_debug_vprintf_callback.rst
  nghttp2_stream_get_first_child.rst
  nghttp2_stream_get_next_sibling.rst
  nghttp2_stream_get_parent.rst
  nghttp2_stream_get_previous_sibling.rst
  nghttp2_stream_get_state.rst
  nghttp2_stream_get_sum_dependency_weight.rst
  nghttp2_stream_get_weight.rst
  nghttp2_strerror.rst
  nghttp2_submit_altsvc.rst
  nghttp2_submit_data.rst
  nghttp2_submit_extension.rst
  nghttp2_submit_goaway.rst
  nghttp2_submit_headers.rst
  nghttp2_submit_ping.rst
  nghttp2_submit_priority.rst
  nghttp2_submit_push_promise.rst
  nghttp2_submit_request.rst
  nghttp2_submit_response.rst
  nghttp2_submit_rst_stream.rst
  nghttp2_submit_settings.rst
  nghttp2_submit_shutdown_notice.rst
  nghttp2_submit_trailer.rst
  nghttp2_submit_window_update.rst
  nghttp2_version.rst
 )
 set(MAN_PAGES
  nghttp.1
  nghttpd.1
  nghttpx.1
  h2load.1
 )
 # Other .rst files from the source tree that need to be copied
 # XXX move them to sources/ and create .in files?
 set(RST_FILES
  README.rst
  programmers-guide.rst
  nghttp.1.rst
  nghttpd.1.rst
  nghttpx.1.rst
  h2load.1.rst
 )
 # XXX unused for now
 set(EXTRA_DIST
  mkapiref.py
  ${RST_FILES}
  ${APIDOCS}
  sources/index.rst
  sources/tutorial-client.rst
  sources/tutorial-server.rst
  sources/tutorial-hpack.rst
  sources/nghttpx-howto.rst
  sources/h2load-howto.rst
  sources/libnghttp2_asio.rst
  sources/python-apiref.rst
  sources/building-android-binary.rst
  sources/contribute.rst
  _exts/rubydomain/LICENSE.rubydomain
  _exts/rubydomain/__init__.py
  _exts/rubydomain/rubydomain.py
  _themes/sphinx_rtd_theme/__init__.py
  _themes/sphinx_rtd_theme/breadcrumbs.html
  _themes/sphinx_rtd_theme/footer.html
  _themes/sphinx_rtd_theme/layout.html
  _themes/sphinx_rtd_theme/layout_old.html
  _themes/sphinx_rtd_theme/search.html
  _themes/sphinx_rtd_theme/searchbox.html
  _themes/sphinx_rtd_theme/static/css/badge_only.css
  _themes/sphinx_rtd_theme/static/css/theme.css
  _themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf
  _themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot
  _themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
  _themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf
  _themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff
  _themes/sphinx_rtd_theme/static/js/theme.js
  _themes/sphinx_rtd_theme/theme.conf
  _themes/sphinx_rtd_theme/versions.html
  ${MAN_PAGES}
  bash_completion/nghttp
  bash_completion/nghttpd
  bash_completion/nghttpx
  bash_completion/h2load
 )
 # Based on Makefile for Sphinx documentation
 # You can set these variables from the command line.
 set(SPHINXOPTS)
 set(SPHINXBUILD sphinx-build)
 set(PAPER)
 set(BUILDDIR    manual)
 # Internal variables.
 set(PAPEROPT_a4     -D latex_paper_size=a4)
 set(PAPEROPT_letter -D latex_paper_size=letter)
 set(ALLSPHINXOPTS   -d ${BUILDDIR}/doctrees ${PAPEROPT_${PAPER}} ${SPHINXOPTS} .)
 # "Please use `make <target>' where <target> is one of"
 # "  html       to make standalone HTML files"
 # "  dirhtml    to make HTML files named index.html in directories"
 # "  singlehtml to make a single large HTML file"
 # "  pickle     to make pickle files"
 # "  json       to make JSON files"
 # "  htmlhelp   to make HTML files and a HTML help project"
 # "  qthelp     to make HTML files and a qthelp project"
 # "  devhelp    to make HTML files and a Devhelp project"
 # "  epub       to make an epub"
 # "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
 # "  latexpdf   to make LaTeX files and run them through pdflatex"
 # "  text       to make text files"
 # "  man        to make manual pages"
 # "  changes    to make an overview of all changed/added/deprecated items"
 # "  linkcheck  to check all external links for integrity"
 # "  doctest    to run all doctests embedded in the documentation (if enabled)"
 # Copy files for out-of-tree builds
 if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
  set(RST_BUILD_FILES)
  foreach(rstfile IN LISTS RST_FILES)
    set(outfile "${CMAKE_CURRENT_BINARY_DIR}/${rstfile}")
    add_custom_command(OUTPUT "${outfile}"
      COMMAND ${CMAKE_COMMAND} -E copy
              "${CMAKE_CURRENT_SOURCE_DIR}/${rstfile}" "${outfile}"
      DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${rstfile}"
    )
    list(APPEND RST_BUILD_FILES "${outfile}")
  endforeach()
 else()
  set(RST_BUILD_FILES "${RST_FILES}")
 endif()
 set(apiref_SOURCES
  ${CMAKE_BINARY_DIR}/lib/includes/nghttp2/nghttp2ver.h
  ${CMAKE_SOURCE_DIR}/lib/includes/nghttp2/nghttp2.h
 )
 # Generates apiref.rst and other files
 add_custom_command(
  OUTPUT
    apiref.rst
    ${APIDOCS}
  COMMAND
    "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/mkapiref.py"
    apiref.rst macros.rst enums.rst types.rst .
    ${apiref_SOURCES}
  DEPENDS
    ${RST_BUILD_FILES}
    ${apiref_SOURCES}
 )
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${BUILDDIR}")
 # Invokes sphinx-build and prints the given messages when completed
 function(sphinxbuild builder)
  set(echo_commands)
  foreach(message IN LISTS ARGN)
    list(APPEND echo_commands COMMAND ${CMAKE_COMMAND} -E echo "${message}")
  endforeach()
  add_custom_target(${builder}
    COMMAND "${SPHINXBUILD}" -b ${builder} ${ALLSPHINXOPTS} "${BUILDDIR}/${builder}"
    COMMAND ${CMAKE_COMMAND} -E echo
    ${echo_commands}
    VERBATIM
    DEPENDS apiref.rst
  )
 endfunction()
 foreach(builder html dirhtml singlehtml)
  sphinxbuild(${builder}
    "Build finished. The HTML pages are in ${BUILDDIR}/${builder}.")
 endforeach()
 sphinxbuild(pickle  "Build finished; now you can process the pickle files.")
 sphinxbuild(json    "Build finished; now you can process the JSON files.")
 sphinxbuild(htmlhelp
  "Build finished; now you can run HTML Help Workshop with the"
  ".hhp project file in ${BUILDDIR}/htmlhelp."
 )
 sphinxbuild(qthelp
  "Build finished; now you can run \"qcollectiongenerator\" with the"
  ".qhcp project file in ${BUILDDIR}/qthelp, like this:"
  "# qcollectiongenerator ${BUILDDIR}/qthelp/nghttp2.qhcp"
  "To view the help file:"
  "# assistant -collectionFile ${BUILDDIR}/qthelp/nghttp2.qhc"
 )
 sphinxbuild(devhelp
  "Build finished."
  "To view the help file:"
  "# mkdir -p ~/.local/share/devhelp/nghttp2"
  "# ln -s ${BUILDDIR}/devhelp ~/.local/share/devhelp/nghttp2"
  "# devhelp"
 )
 sphinxbuild(epub    "Build finished. The epub file is in ${BUILDDIR}/epub.")
 sphinxbuild(latex
  "Build finished; the LaTeX files are in ${BUILDDIR}/latex."
  "Run `make' in that directory to run these through (pdf)latex"
  "(use `make latexpdf' here to do that automatically)."
 )
 # Invoke the Makefile generated by sphinx
 add_custom_target(latexpdf
  COMMAND ${CMAKE_COMMAND} -E echo "Running LaTeX files through pdflatex..."
  COMMAND make -C "${BUILDDIR}/latex" all-pdf
  COMMAND ${CMAKE_COMMAND} -E echo "pdflatex finished; the PDF files are in ${BUILDDIR}/latex."
  DEPENDS latex
 )
 sphinxbuild(text    "Build finished. The text files are in ${BUILDDIR}/text.")
 sphinxbuild(man     "Build finished. The manual pages are in ${BUILDDIR}/man.")
 sphinxbuild(changes "The overview file is in ${BUILDDIR}/changes.")
 sphinxbuild(linkcheck
  "Link check complete; look for any errors in the above output"
  "or in ${BUILDDIR}/linkcheck/output.txt."
 )
 sphinxbuild(doctest
  "Testing of doctests in the sources finished, look at the"
  "results in ${BUILDDIR}/doctest/output.txt."
 )
 foreach(_man_page IN LISTS MAN_PAGES)
  install(FILES ${_man_page}
    DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
  )
 endforeach()
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -27,11 +27,8 @@ APIDOCS= \
 	macros.rst \
 	enums.rst \
 	types.rst \
 	nghttp2_check_authority.rst \
 	nghttp2_check_header_name.rst \
 	nghttp2_check_header_value.rst \
 	nghttp2_check_method.rst \
 	nghttp2_check_path.rst \
 	nghttp2_hd_deflate_bound.rst \
 	nghttp2_hd_deflate_change_table_size.rst \
 	nghttp2_hd_deflate_del.rst \
@@ -40,7 +37,6 @@ APIDOCS= \
 	nghttp2_hd_deflate_get_num_table_entries.rst \
 	nghttp2_hd_deflate_get_table_entry.rst \
 	nghttp2_hd_deflate_hd.rst \
 	nghttp2_hd_deflate_hd_vec.rst \
 	nghttp2_hd_deflate_new.rst \
 	nghttp2_hd_deflate_new2.rst \
 	nghttp2_hd_inflate_change_table_size.rst \
@@ -51,64 +47,39 @@ APIDOCS= \
 	nghttp2_hd_inflate_get_num_table_entries.rst \
 	nghttp2_hd_inflate_get_table_entry.rst \
 	nghttp2_hd_inflate_hd.rst \
 	nghttp2_hd_inflate_hd2.rst \
 	nghttp2_hd_inflate_new.rst \
 	nghttp2_hd_inflate_new2.rst \
 	nghttp2_http2_strerror.rst \
 	nghttp2_is_fatal.rst \
 	nghttp2_nv_compare_name.rst \
 	nghttp2_option_del.rst \
 	nghttp2_option_new.rst \
 	nghttp2_option_set_builtin_recv_extension_type.rst \
 	nghttp2_option_set_max_deflate_dynamic_table_size.rst \
 	nghttp2_option_set_max_reserved_remote_streams.rst \
 	nghttp2_option_set_max_send_header_block_length.rst \
 	nghttp2_option_set_no_auto_ping_ack.rst \
 	nghttp2_option_set_no_auto_window_update.rst \
 	nghttp2_option_set_no_closed_streams.rst \
 	nghttp2_option_set_no_http_messaging.rst \
 	nghttp2_option_set_no_recv_client_magic.rst \
 	nghttp2_option_set_peer_max_concurrent_streams.rst \
 	nghttp2_option_set_user_recv_extension_type.rst \
 	nghttp2_option_set_max_outbound_ack.rst \
 	nghttp2_option_set_max_settings.rst \
 	nghttp2_pack_settings_payload.rst \
 	nghttp2_priority_spec_check_default.rst \
 	nghttp2_priority_spec_default_init.rst \
 	nghttp2_priority_spec_init.rst \
 	nghttp2_rcbuf_decref.rst \
 	nghttp2_rcbuf_get_buf.rst \
 	nghttp2_rcbuf_incref.rst \
 	nghttp2_rcbuf_is_static.rst \
 	nghttp2_select_next_protocol.rst \
 	nghttp2_session_callbacks_del.rst \
 	nghttp2_session_callbacks_new.rst \
 	nghttp2_session_callbacks_set_before_frame_send_callback.rst \
 	nghttp2_session_callbacks_set_data_source_read_length_callback.rst \
 	nghttp2_session_callbacks_set_error_callback.rst \
 	nghttp2_session_callbacks_set_error_callback2.rst \
 	nghttp2_session_callbacks_set_on_begin_frame_callback.rst \
 	nghttp2_session_callbacks_set_on_begin_headers_callback.rst \
 	nghttp2_session_callbacks_set_on_data_chunk_recv_callback.rst \
 	nghttp2_session_callbacks_set_on_extension_chunk_recv_callback.rst \
 	nghttp2_session_callbacks_set_on_frame_not_send_callback.rst \
 	nghttp2_session_callbacks_set_on_frame_recv_callback.rst \
 	nghttp2_session_callbacks_set_on_frame_send_callback.rst \
 	nghttp2_session_callbacks_set_on_header_callback.rst \
 	nghttp2_session_callbacks_set_on_header_callback2.rst \
 	nghttp2_session_callbacks_set_on_invalid_frame_recv_callback.rst \
 	nghttp2_session_callbacks_set_on_invalid_header_callback.rst \
 	nghttp2_session_callbacks_set_on_invalid_header_callback2.rst \
 	nghttp2_session_callbacks_set_on_stream_close_callback.rst \
 	nghttp2_session_callbacks_set_pack_extension_callback.rst \
 	nghttp2_session_callbacks_set_recv_callback.rst \
 	nghttp2_session_callbacks_set_select_padding_callback.rst \
 	nghttp2_session_callbacks_set_send_callback.rst \
 	nghttp2_session_callbacks_set_send_data_callback.rst \
 	nghttp2_session_callbacks_set_unpack_extension_callback.rst \
 	nghttp2_session_change_stream_priority.rst \
 	nghttp2_session_check_request_allowed.rst \
 	nghttp2_session_check_server_session.rst \
 	nghttp2_session_client_new.rst \
 	nghttp2_session_client_new2.rst \
 	nghttp2_session_client_new3.rst \
@@ -120,11 +91,7 @@ APIDOCS= \
 	nghttp2_session_find_stream.rst \
 	nghttp2_session_get_effective_local_window_size.rst \
 	nghttp2_session_get_effective_recv_data_length.rst \
 	nghttp2_session_get_hd_deflate_dynamic_table_size.rst \
 	nghttp2_session_get_hd_inflate_dynamic_table_size.rst \
 	nghttp2_session_get_last_proc_stream_id.rst \
 	nghttp2_session_get_local_settings.rst \
 	nghttp2_session_get_local_window_size.rst \
 	nghttp2_session_get_next_stream_id.rst \
 	nghttp2_session_get_outbound_queue_size.rst \
 	nghttp2_session_get_remote_settings.rst \
@@ -133,29 +100,28 @@ APIDOCS= \
 	nghttp2_session_get_stream_effective_local_window_size.rst \
 	nghttp2_session_get_stream_effective_recv_data_length.rst \
 	nghttp2_session_get_stream_local_close.rst \
 	nghttp2_session_get_stream_local_window_size.rst \
 	nghttp2_session_get_stream_remote_close.rst \
 	nghttp2_session_get_stream_remote_window_size.rst \
 	nghttp2_session_get_stream_user_data.rst \
 	nghttp2_session_mem_recv.rst \
 	nghttp2_session_mem_send.rst \
 	nghttp2_session_recv.rst \
 	nghttp2_session_change_stream_priority.rst \
 	nghttp2_session_check_request_allowed.rst \
 	nghttp2_session_check_server_session.rst \
 	nghttp2_session_resume_data.rst \
 	nghttp2_session_send.rst \
 	nghttp2_session_server_new.rst \
 	nghttp2_session_server_new2.rst \
 	nghttp2_session_server_new3.rst \
 	nghttp2_session_set_local_window_size.rst \
 	nghttp2_session_set_next_stream_id.rst \
 	nghttp2_session_set_stream_user_data.rst \
 	nghttp2_session_set_user_data.rst \
 	nghttp2_session_terminate_session.rst \
 	nghttp2_session_terminate_session2.rst \
 	nghttp2_session_upgrade.rst \
 	nghttp2_session_upgrade2.rst \
 	nghttp2_session_want_read.rst \
 	nghttp2_session_want_write.rst \
 	nghttp2_set_debug_vprintf_callback.rst \
 	nghttp2_stream_get_first_child.rst \
 	nghttp2_stream_get_next_sibling.rst \
 	nghttp2_stream_get_parent.rst \
@@ -164,12 +130,9 @@ APIDOCS= \
 	nghttp2_stream_get_sum_dependency_weight.rst \
 	nghttp2_stream_get_weight.rst \
 	nghttp2_strerror.rst \
 	nghttp2_submit_altsvc.rst \
 	nghttp2_submit_data.rst \
 	nghttp2_submit_extension.rst \
 	nghttp2_submit_goaway.rst \
 	nghttp2_submit_headers.rst \
 	nghttp2_submit_origin.rst \
 	nghttp2_submit_ping.rst \
 	nghttp2_submit_priority.rst \
 	nghttp2_submit_push_promise.rst \
@@ -182,19 +145,15 @@ APIDOCS= \
 	nghttp2_submit_window_update.rst \
 	nghttp2_version.rst
-RST_FILES = \
+EXTRA_DIST = \
 	mkapiref.py \
 	README.rst \
 	programmers-guide.rst \
 	$(APIDOCS) \
 	nghttp.1.rst \
 	nghttpd.1.rst \
 	nghttpx.1.rst \
-	h2load.1.rst
+	h2load.1.rst \
 EXTRA_DIST = \
 	CMakeLists.txt \
 	mkapiref.py \
 	$(RST_FILES) \
 	$(APIDOCS) \
 	sources/index.rst \
 	sources/tutorial-client.rst \
 	sources/tutorial-server.rst \
@@ -205,59 +164,23 @@ EXTRA_DIST = \
 	sources/python-apiref.rst \
 	sources/building-android-binary.rst \
 	sources/contribute.rst \
-	sources/security.rst \
+	_exts/sphinxcontrib/LICENSE.rubydomain \
-	_exts/rubydomain/LICENSE.rubydomain \
+	_exts/sphinxcontrib/__init__.py \
-	_exts/rubydomain/__init__.py \
+	_exts/sphinxcontrib/rubydomain.py \
 	_exts/rubydomain/rubydomain.py \
 	_themes/sphinx_rtd_theme/__init__.py \
 	_themes/sphinx_rtd_theme/breadcrumbs.html \
 	_themes/sphinx_rtd_theme/footer.html \
 	_themes/sphinx_rtd_theme/layout.html \
-	_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.mo \
+	_themes/sphinx_rtd_theme/layout_old.html \
 	_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/sphinx.pot \
 	_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.mo \
 	_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.po \
 	_themes/sphinx_rtd_theme/search.html \
 	_themes/sphinx_rtd_theme/searchbox.html \
 	_themes/sphinx_rtd_theme/static/css/badge_only.css \
 	_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff \
 	_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff2 \
 	_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff \
 	_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff2 \
 	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.eot \
 	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.svg \
 	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.ttf \
 	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff \
 	_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff2 \
 	_themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff \
 	_themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff2 \
 	_themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff \
 	_themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff2 \
 	_themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff \
 	_themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff2 \
 	_themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff \
 	_themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff2 \
 	_themes/sphinx_rtd_theme/static/css/theme.css \
-	_themes/sphinx_rtd_theme/static/js/badge_only.js \
+	_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf \
 	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot \
 	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg \
 	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf \
 	_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff \
 	_themes/sphinx_rtd_theme/static/js/theme.js \
 	_themes/sphinx_rtd_theme/theme.conf \
 	_themes/sphinx_rtd_theme/versions.html \
@@ -272,7 +195,7 @@ EXTRA_DIST = \
 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   ?= sphinx-build
+SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = manual
@@ -304,15 +227,13 @@ help:
 apiref.rst: \
 	$(top_builddir)/lib/includes/nghttp2/nghttp2ver.h \
-	$(top_srcdir)/lib/includes/nghttp2/nghttp2.h
+	$(top_builddir)/lib/includes/nghttp2/nghttp2.h
 	for i in $(RST_FILES); do [ -e $(builddir)/$$i ] || cp $(srcdir)/$$i $(builddir); done
 	$(PYTHON) $(top_srcdir)/doc/mkapiref.py \
 	apiref.rst macros.rst enums.rst types.rst . $^
 $(APIDOCS): apiref.rst
 clean-local:
 	if [ $(srcdir) != $(builddir) ]; then for i in $(RST_FILES); do rm -f $(builddir)/$$i; done fi
 	-rm -f apiref.rst
 	-rm -f $(APIDOCS)
 	-rm -rf $(BUILDDIR)/*
--- a/doc/_exts/sphinxcontrib/LICENSE.rubydomain
+++ b/doc/_exts/sphinxcontrib/LICENSE.rubydomain
--- a/doc/_exts/sphinxcontrib/init.py
+++ b/doc/_exts/sphinxcontrib/init.py
--- a/doc/_exts/sphinxcontrib/rubydomain.py
+++ b/doc/_exts/sphinxcontrib/rubydomain.py
@@ -13,17 +13,17 @@ import re
 from docutils import nodes
 from docutils.parsers.rst import directives
 from docutils.parsers.rst import Directive
 from sphinx import addnodes
 from sphinx import version_info
 from sphinx.roles import XRefRole
-from sphinx.locale import _
+from sphinx.locale import l_, _
 from sphinx.domains import Domain, ObjType, Index
 from sphinx.directives import ObjectDescription
 from sphinx.util.nodes import make_refnode
 from sphinx.util.compat import Directive
 from sphinx.util.docfields import Field, GroupedField, TypedField
 # REs for Ruby signatures
 rb_sig_re = re.compile(
    r'''^ ([\w.]*\.)?            # class name(s)
@@ -64,18 +64,18 @@ class RubyObject(ObjectDescription):
    }
    doc_field_types = [
-        TypedField('parameter', label=_('Parameters'),
+        TypedField('parameter', label=l_('Parameters'),
                   names=('param', 'parameter', 'arg', 'argument'),
                   typerolename='obj', typenames=('paramtype', 'type')),
-        TypedField('variable', label=_('Variables'), rolename='obj',
+        TypedField('variable', label=l_('Variables'), rolename='obj',
                   names=('var', 'ivar', 'cvar'),
                   typerolename='obj', typenames=('vartype',)),
-        GroupedField('exceptions', label=_('Raises'), rolename='exc',
+        GroupedField('exceptions', label=l_('Raises'), rolename='exc',
                     names=('raises', 'raise', 'exception', 'except'),
                     can_collapse=True),
-        Field('returnvalue', label=_('Returns'), has_arg=False,
+        Field('returnvalue', label=l_('Returns'), has_arg=False,
              names=('returns', 'return')),
-        Field('returntype', label=_('Return type'), has_arg=False,
+        Field('returntype', label=l_('Return type'), has_arg=False,
              names=('rtype',)),
    ]
@@ -231,8 +231,8 @@ class RubyObject(ObjectDescription):
        indextext = self.get_index_text(modname, name_cls)
        if indextext:
-            self.indexnode['entries'].append(
+            self.indexnode['entries'].append(('single', indextext,
-                _make_index('single', indextext, fullname, fullname))
+                                              fullname, fullname))
    def before_content(self):
        # needed for automatic qualification of members (reset in subclasses)
@@ -415,19 +415,11 @@ class RubyModule(Directive):
        # modindex currently
        if not noindex:
            indextext = _('%s (module)') % modname
-            inode = addnodes.index(entries=[_make_index(
+            inode = addnodes.index(entries=[('single', indextext,
-                'single', indextext, 'module-' + modname, modname)])
+                                             'module-' + modname, modname)])
            ret.append(inode)
        return ret
 def _make_index(entrytype, entryname, target, ignored, key=None):
    # Sphinx 1.4 introduced backward incompatible changes, it now
    # requires 5 tuples.  Last one is categorization key.  See
    # http://www.sphinx-doc.org/en/stable/extdev/nodes.html#sphinx.addnodes.index
    if version_info >= (1, 4, 0, '', 0):
        return (entrytype, entryname, target, ignored, key)
    else:
        return (entrytype, entryname, target, ignored)
 class RubyCurrentModule(Directive):
    """
@@ -482,8 +474,8 @@ class RubyModuleIndex(Index):
    """
    name = 'modindex'
-    localname = _('Ruby Module Index')
+    localname = l_('Ruby Module Index')
-    shortname = _('modules')
+    shortname = l_('modules')
    def generate(self, docnames=None):
        content = {}
@@ -493,7 +485,7 @@ class RubyModuleIndex(Index):
        # list of all modules, sorted by module name
        modules = sorted(_iteritems(self.domain.data['modules']),
                         key=lambda x: x[0].lower())
-        # sort out collapsible modules
+        # sort out collapsable modules
        prev_modname = ''
        num_toplevels = 0
        for modname, (docname, synopsis, platforms, deprecated) in modules:
@@ -550,17 +542,17 @@ class RubyDomain(Domain):
    name = 'rb'
    label = 'Ruby'
    object_types = {
-        'function':        ObjType(_('function'),         'func', 'obj'),
+        'function':        ObjType(l_('function'),         'func', 'obj'),
-        'global':          ObjType(_('global variable'),  'global', 'obj'),
+        'global':          ObjType(l_('global variable'),  'global', 'obj'),
-        'method':          ObjType(_('method'),           'meth', 'obj'),
+        'method':          ObjType(l_('method'),           'meth', 'obj'),
-        'class':           ObjType(_('class'),            'class', 'obj'),
+        'class':           ObjType(l_('class'),            'class', 'obj'),
-        'exception':       ObjType(_('exception'),        'exc', 'obj'),
+        'exception':       ObjType(l_('exception'),        'exc', 'obj'),
-        'classmethod':     ObjType(_('class method'),     'meth', 'obj'),
+        'classmethod':     ObjType(l_('class method'),     'meth', 'obj'),
-        'attr_reader':     ObjType(_('attribute'),        'attr', 'obj'),
+        'attr_reader':     ObjType(l_('attribute'),        'attr', 'obj'),
-        'attr_writer':     ObjType(_('attribute'),        'attr', 'obj'),
+        'attr_writer':     ObjType(l_('attribute'),        'attr', 'obj'),
-        'attr_accessor':   ObjType(_('attribute'),        'attr', 'obj'),
+        'attr_accessor':   ObjType(l_('attribute'),        'attr', 'obj'),
-        'const':           ObjType(_('const'),            'const', 'obj'),
+        'const':           ObjType(l_('const'),            'const', 'obj'),
-        'module':          ObjType(_('module'),           'mod', 'obj'),
+        'module':          ObjType(l_('module'),           'mod', 'obj'),
    }
    directives = {
--- a/doc/_themes/sphinx_rtd_theme/init.py
+++ b/doc/_themes/sphinx_rtd_theme/init.py
@@ -1,34 +1,17 @@
-"""
+"""Sphinx ReadTheDocs theme.
 Sphinx Read the Docs theme.
 From https://github.com/ryan-roemer/sphinx-bootstrap-theme.
 """
 import os
-from os import path
+VERSION = (0, 1, 9)
-import sphinx
+__version__ = ".".join(str(v) for v in VERSION)
 __version__ = '0.5.0'
 __version_full__ = __version__
 def get_html_theme_path():
    """Return list of HTML theme paths."""
-    cur_dir = path.abspath(path.dirname(path.dirname(__file__)))
+    cur_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
    return cur_dir
 # See http://www.sphinx-doc.org/en/stable/theming.html#distribute-your-theme-as-a-python-package
 def setup(app):
    if sphinx.version_info >= (1, 6, 0):
        # Register the theme that can be referenced without adding a theme path
        app.add_html_theme('sphinx_rtd_theme', path.abspath(path.dirname(__file__)))
    if sphinx.version_info >= (1, 8, 0):
        # Add Sphinx message catalog for newer versions of Sphinx
        # See http://www.sphinx-doc.org/en/master/extdev/appapi.html#sphinx.application.Sphinx.add_message_catalog
        rtd_locale_path = path.join(path.abspath(path.dirname(__file__)), 'locale')
        app.add_message_catalog('sphinx', rtd_locale_path)
    return {'parallel_read_safe': True, 'parallel_write_safe': True}
--- a/doc/_themes/sphinx_rtd_theme/breadcrumbs.html
+++ b/doc/_themes/sphinx_rtd_theme/breadcrumbs.html
@@ -6,79 +6,26 @@
 {% set suffix = source_suffix %}
 {% endif %}
 {% if meta is defined and meta is not none %}
 {% set check_meta = True %}
 {% else %}
 {% set check_meta = False %}
 {% endif %}
 {% if check_meta and 'github_url' in meta %}
 {% set display_github = True %}
 {% endif %}
 {% if check_meta and 'bitbucket_url' in meta %}
 {% set display_bitbucket = True %}
 {% endif %}
 {% if check_meta and 'gitlab_url' in meta %}
 {% set display_gitlab = True %}
 {% endif %}
 {% set display_vcs_links = display_vcs_links if display_vcs_links is defined else True %}
 <div role="navigation" aria-label="breadcrumbs navigation">
  <ul class="wy-breadcrumbs">
-    {% block breadcrumbs %}
+    <li><a href="{{ pathto(master_doc) }}">Docs</a> &raquo;</li>
      <li><a href="{{ pathto(master_doc) }}" class="icon icon-home"></a> &raquo;</li>
      {% for doc in parents %}
        <li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</li>
      {% endfor %}
    <li>{{ title }}</li>
    {% endblock %}
    {% block breadcrumbs_aside %}
    <li class="wy-breadcrumbs-aside">
-        {% if hasdoc(pagename) and display_vcs_links %}
+      {% if pagename != "search" %}
        {% if display_github %}
-            {% if check_meta and 'github_url' in meta %}
+          <a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/blob/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-github"> Edit on GitHub</a>
              <!-- User defined GitHub URL -->
              <a href="{{ meta['github_url'] }}" class="fa fa-github"> {{ _('Edit on GitHub') }}</a>
            {% else %}
              <a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/{{ theme_vcs_pageview_mode|default("blob") }}/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-github"> {{ _('Edit on GitHub') }}</a>
            {% endif %}
        {% elif display_bitbucket %}
-            {% if check_meta and 'bitbucket_url' in meta %}
+          <a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-bitbucket"> Edit on Bitbucket</a>
              <!-- User defined Bitbucket URL -->
              <a href="{{ meta['bitbucket_url'] }}" class="fa fa-bitbucket"> {{ _('Edit on Bitbucket') }}</a>
            {% else %}
              <a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}{{ suffix }}?mode={{ theme_vcs_pageview_mode|default("view") }}" class="fa fa-bitbucket"> {{ _('Edit on Bitbucket') }}</a>
            {% endif %}
          {% elif display_gitlab %}
            {% if check_meta and 'gitlab_url' in meta %}
              <!-- User defined GitLab URL -->
              <a href="{{ meta['gitlab_url'] }}" class="fa fa-gitlab"> {{ _('Edit on GitLab') }}</a>
            {% else %}
              <a href="https://{{ gitlab_host|default("gitlab.com") }}/{{ gitlab_user }}/{{ gitlab_repo }}/{{ theme_vcs_pageview_mode|default("blob") }}/{{ gitlab_version }}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-gitlab"> {{ _('Edit on GitLab') }}</a>
            {% endif %}
        {% elif show_source and source_url_prefix %}
-            <a href="{{ source_url_prefix }}{{ pagename }}{{ suffix }}">{{ _('View page source') }}</a>
+          <a href="{{ source_url_prefix }}{{ pagename }}{{ suffix }}">View page source</a>
        {% elif show_source and has_source and sourcename %}
-            <a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> {{ _('View page source') }}</a>
+          <a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> View page source</a>
        {% endif %}
      {% endif %}
    </li>
    {% endblock %}
  </ul>
  {% if (theme_prev_next_buttons_location == 'top' or theme_prev_next_buttons_location == 'both') and (next or prev) %}
  <div class="rst-breadcrumbs-buttons" role="navigation" aria-label="breadcrumb navigation">
      {% if next %}
        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n">{{ _('Next') }} <span class="fa fa-arrow-circle-right"></span></a>
      {% endif %}
      {% if prev %}
        <a href="{{ prev.link|e }}" class="btn btn-neutral float-left" title="{{ prev.title|striptags|e }}" accesskey="p"><span class="fa fa-arrow-circle-left"></span> {{ _('Previous') }}</a>
      {% endif %}
  </div>
  {% endif %}
  <hr/>
 </div>
--- a/doc/_themes/sphinx_rtd_theme/footer.html
+++ b/doc/_themes/sphinx_rtd_theme/footer.html
@@ -1,11 +1,11 @@
 <footer>
-  {% if (theme_prev_next_buttons_location == 'bottom' or theme_prev_next_buttons_location == 'both') and (next or prev) %}
+  {% if next or prev %}
    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
      {% if next %}
-        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n" rel="next">{{ _('Next') }} <span class="fa fa-arrow-circle-right"></span></a>
+        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
      {% endif %}
      {% if prev %}
-        <a href="{{ prev.link|e }}" class="btn btn-neutral float-left" title="{{ prev.title|striptags|e }}" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> {{ _('Previous') }}</a>
+        <a href="{{ prev.link|e }}" class="btn btn-neutral" title="{{ prev.title|striptags|e }}" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
      {% endif %}
    </div>
  {% endif %}
@@ -16,45 +16,34 @@
    <p>
    {%- if show_copyright %}
      {%- if hasdoc('copyright') %}
-        {% set path = pathto('copyright') %}
+        {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
        {% set copyright = copyright|e %}
        &copy; <a href="{{ path }}">{% trans %}Copyright{% endtrans %}</a> {{ copyright }}
      {%- else %}
-        {% set copyright = copyright|e %}
+        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
        &copy; {% trans %}Copyright{% endtrans %} {{ copyright }}
      {%- endif %}
    {%- endif %}
    {%- if build_id and build_url %}
      {% trans build_url=build_url, build_id=build_id %}
        <span class="build">
-        {# Translators: Build is a noun, not a verb #}
+          Build
        {% trans %}Build{% endtrans %}
          <a href="{{ build_url }}">{{ build_id }}</a>.
        </span>
      {% endtrans %}
    {%- elif commit %}
      {% trans commit=commit %}
        <span class="commit">
-        {# Translators: the phrase "revision" comes from Git, referring to a commit #}
+          Revision <code>{{ commit }}</code>.
        {% trans %}Revision{% endtrans %} <code>{{ commit }}</code>.
        </span>
-    {%- endif %}
+      {% endtrans %}
-    {%- if last_updated %}
+    {%- elif last_updated %}
      <span class="lastupdated">
      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
      </span>
    {%- endif %}
    </p>
  </div>
  {%- if show_sphinx %}
-    {% set sphinx_web = '<a href="https://www.sphinx-doc.org/">Sphinx</a>' %}
+  {% trans %}Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>{% endtrans %}.
    {% set readthedocs_web = '<a href="https://readthedocs.org">Read the Docs</a>'  %}
    {# Translators: the variable "sphinx_web" is a link to the Sphinx project documentation with the text "Sphinx" #}
    {% trans sphinx_web=sphinx_web, readthedocs_web=readthedocs_web %}Built with {{ sphinx_web }} using a{% endtrans %}
    {# Translators: "theme" refers to a theme for Sphinx, which alters the appearance of the generated documenation #}
    <a href="https://github.com/readthedocs/sphinx_rtd_theme">{% trans %}theme{% endtrans %}</a>
    {# Translators: this is always used as "provided by Read the Docs", and should not imply Read the Docs is an author of the generated documentation. #}
    {% trans %}provided by {{ readthedocs_web }}{% endtrans %}.
  {%- endif %}
  {%- block extrafooter %} {% endblock %}
--- a/doc/_themes/sphinx_rtd_theme/layout.html
+++ b/doc/_themes/sphinx_rtd_theme/layout.html
@@ -6,11 +6,10 @@
 {%- else %}
  {%- set titlesuffix = "" %}
 {%- endif %}
 {%- set lang_attr = 'en' if language == None else (language | replace('_', '-')) %}
 {%- set sphinx_writer = 'writer-html5' if html5_doctype else 'writer-html4' %}
 <!DOCTYPE html>
-<html class="{{ sphinx_writer }}" lang="{{ lang_attr }}" >
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
 <!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
 <head>
  <meta charset="utf-8">
  {{ metatags }}
@@ -19,100 +18,75 @@
  <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
  {% endblock %}
  {# CSS #}
  <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
  <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
  {%- for css in css_files %}
    {%- if css|attr("rel") %}
  <link rel="{{ css.rel }}" href="{{ pathto(css.filename, 1) }}" type="text/css"{% if css.title is not none %} title="{{ css.title }}"{% endif %} />
    {%- else %}
  <link rel="stylesheet" href="{{ pathto(css, 1) }}" type="text/css" />
    {%- endif %}
  {%- endfor %}
  {%- for cssfile in extra_css_files %}
    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
  {%- endfor %}
  {# FAVICON #}
  {% if favicon %}
    <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
  {% endif %}
  {# CANONICAL URL #}
  {% if theme_canonical_url %}
    <link rel="canonical" href="{{ theme_canonical_url }}{{ pagename }}.html"/>
  {% endif %}
-  {# JAVASCRIPTS #}
+  {# CSS #}
  {%- block scripts %}
  <!--[if lt IE 9]>
    <script src="{{ pathto('_static/js/html5shiv.min.js', 1) }}"></script>
  <![endif]-->
  {%- if not embedded %}
  {# XXX Sphinx 1.8.0 made this an external js-file, quick fix until we refactor the template to inherert more blocks directly from sphinx #}
    {% if sphinx_version >= "1.8.0" %}
      <script type="text/javascript" id="documentation_options" data-url_root="{{ pathto('', 1) }}" src="{{ pathto('_static/documentation_options.js', 1) }}"></script>
      {%- for scriptfile in script_files %}
        {{ js_tag(scriptfile) }}
      {%- endfor %}
    {% else %}
      <script type="text/javascript">
          var DOCUMENTATION_OPTIONS = {
              URL_ROOT:'{{ url_root }}',
              VERSION:'{{ release|e }}',
              LANGUAGE:'{{ language }}',
              COLLAPSE_INDEX:false,
              FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
              HAS_SOURCE:  {{ has_source|lower }},
              SOURCELINK_SUFFIX: '{{ sourcelink_suffix }}'
          };
      </script>
      {%- for scriptfile in script_files %}
        <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
      {%- endfor %}
    {% endif %}
    <script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
  {# OPENSEARCH #}
-    {%- if use_opensearch %}
+  {% if not embedded %}
-    <link rel="search" type="application/opensearchdescription+xml"
+    {% if use_opensearch %}
-          title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
+      <link rel="search" type="application/opensearchdescription+xml" title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}" href="{{ pathto('_static/opensearch.xml', 1) }}"/>
-          href="{{ pathto('_static/opensearch.xml', 1) }}"/>
+    {% endif %}
-    {%- endif %}
+
-  {%- endif %}
+  {% endif %}
-  {%- endblock %}
+
  {# RTD hosts this file, so just load on non RTD builds #}
  {% if not READTHEDOCS %}
    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
  {% endif %}
  {% for cssfile in css_files %}
    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
  {% endfor %}
  {% for cssfile in extra_css_files %}
    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
  {% endfor %}
  {%- block linktags %}
    {%- if hasdoc('about') %}
-    <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" />
+        <link rel="author" title="{{ _('About these documents') }}"
              href="{{ pathto('about') }}"/>
    {%- endif %}
    {%- if hasdoc('genindex') %}
-    <link rel="index" title="{{ _('Index') }}" href="{{ pathto('genindex') }}" />
+        <link rel="index" title="{{ _('Index') }}"
              href="{{ pathto('genindex') }}"/>
    {%- endif %}
    {%- if hasdoc('search') %}
-    <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}" />
+        <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}"/>
    {%- endif %}
    {%- if hasdoc('copyright') %}
-    <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" />
+        <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}"/>
    {%- endif %}
    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}"/>
    {%- if parents %}
        <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="{{ parents[-1].link|e }}"/>
    {%- endif %}
    {%- if next %}
-    <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}" />
+        <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}"/>
    {%- endif %}
    {%- if prev %}
-    <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}" />
+        <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}"/>
    {%- endif %}
  {%- endblock %}
  {%- block extrahead %} {% endblock %}
  {# Keep modernizr in head - http://modernizr.com/docs/#installing #}
  <script src="{{ pathto('_static/js/modernizr.min.js', 1) }}"></script>
 </head>
-<body class="wy-body-for-nav">
+<body class="wy-body-for-nav" role="document">
  {% block extrabody %} {% endblock %}
  <div class="wy-grid-for-nav">
    {# SIDE NAV, TOGGLES ON MOBILE #}
    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
      <div class="wy-side-scroll">
-        <div class="wy-side-nav-search" {% if theme_style_nav_header_background %} style="background: {{theme_style_nav_header_background}}" {% endif %}>
+        <div class="wy-side-nav-search">
          {% block sidebartitle %}
          {% if logo and theme_logo_only %}
@@ -122,10 +96,8 @@
          {% endif %}
          {% if logo %}
-            {# Not strictly valid HTML, but it's the only way to display/scale
+            {# Not strictly valid HTML, but it's the only way to display/scale it properly, without weird scripting or heaps of work #}
-               it properly, without weird scripting or heaps of work
+            <img src="{{ pathto('_static/' + logo, 1) }}" class="logo" />
            #}
            <img src="{{ pathto('_static/' + logo, 1) }}" class="logo" alt="{{ _('Logo') }}"/>
          {% endif %}
          </a>
@@ -146,65 +118,40 @@
          {% endblock %}
        </div>
        {% block navigation %}
        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
          {% block menu %}
-            {#
+            {% set toctree = toctree(maxdepth=4, collapse=theme_collapse_navigation, includehidden=True) %}
-              The singlehtml builder doesn't handle this toctree call when the
+            {% if toctree %}
-              toctree is empty. Skip building this for now.
+                {{ toctree }}
            #}
            {% if 'singlehtml' not in builder %}
              {% set global_toc = toctree(maxdepth=theme_navigation_depth|int,
                                          collapse=theme_collapse_navigation|tobool,
                                          includehidden=theme_includehidden|tobool,
                                          titles_only=theme_titles_only|tobool) %}
            {% endif %}
            {% if global_toc %}
              {{ global_toc }}
            {% else %}
                <!-- Local TOC -->
                <div class="local-toc">{{ toc }}</div>
            {% endif %}
          {% endblock %}
        </div>
        {% endblock %}
      </div>
    </nav>
    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
      {# MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #}
-      <nav class="wy-nav-top" aria-label="top navigation">
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
        {% block mobile_nav %}
        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
        <a href="{{ pathto(master_doc) }}">{{ project }}</a>
        {% endblock %}
      </nav>
      {# PAGE CONTENT #}
      <div class="wy-nav-content">
      {%- block content %}
        {% if theme_style_external_links|tobool %}
        <div class="rst-content style-external-links">
        {% else %}
        <div class="rst-content">
        {% endif %}
          {% include "breadcrumbs.html" %}
          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
          {%- block document %}
           <div itemprop="articleBody">
            {% block body %}{% endblock %}
           </div>
           {% if self.comments()|trim %}
           <div class="articleComments">
            {% block comments %}{% endblock %}
          </div>
           {% endif%}
          </div>
          {%- endblock %}
          {% include "footer.html" %}
        </div>
      {%- endblock %}
      </div>
    </section>
@@ -212,27 +159,35 @@
  </div>
  {% include "versions.html" %}
  {% if not embedded %}
    <script type="text/javascript">
-      jQuery(function () {
+        var DOCUMENTATION_OPTIONS = {
-          SphinxRtdTheme.Navigation.enable({{ 'true' if theme_sticky_navigation|tobool else 'false' }});
+            URL_ROOT:'{{ url_root }}',
-      });
+            VERSION:'{{ release|e }}',
-  </script>
+            COLLAPSE_INDEX:false,
-
+            FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
-  {# Do not conflict with RTD insertion of analytics script #}
+            HAS_SOURCE:  {{ has_source|lower }}
-  {% if not READTHEDOCS %}
+        };
    {% if theme_analytics_id %}
    <!-- Theme Analytics -->
    <script>
    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
    ga('create', '{{ theme_analytics_id }}', 'auto');
    ga('send', 'pageview');
    </script>
    {%- for scriptfile in script_files %}
      <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
    {%- endfor %}
  {% endif %}
  {# RTD hosts this file, so just load on non RTD builds #}
  {% if not READTHEDOCS %}
    <script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
  {% endif %}
  {# STICKY NAVIGATION #}
  {% if theme_sticky_navigation %}
  <script type="text/javascript">
      jQuery(function () {
          SphinxRtdTheme.StickyNav.enable();
      });
  </script>
  {% endif %}
  {%- block footer %} {% endblock %}
--- a/doc/_themes/sphinx_rtd_theme/layout_old.html
+++ b/doc/_themes/sphinx_rtd_theme/layout_old.html
@@ -0,0 +1,205 @@
 {#
    basic/layout.html
    ~~~~~~~~~~~~~~~~~
    Master layout template for Sphinx themes.
    :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
    :license: BSD, see LICENSE for details.
 #}
 {%- block doctype -%}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 {%- endblock %}
 {%- set reldelim1 = reldelim1 is not defined and ' &raquo;' or reldelim1 %}
 {%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %}
 {%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and
                         (sidebars != []) %}
 {%- set url_root = pathto('', 1) %}
 {# XXX necessary? #}
 {%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
 {%- if not embedded and docstitle %}
  {%- set titlesuffix = " &mdash; "|safe + docstitle|e %}
 {%- else %}
  {%- set titlesuffix = "" %}
 {%- endif %}
 {%- macro relbar() %}
    <div class="related">
      <h3>{{ _('Navigation') }}</h3>
      <ul>
        {%- for rellink in rellinks %}
        <li class="right" {% if loop.first %}style="margin-right: 10px"{% endif %}>
          <a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}"
             {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
          {%- if not loop.first %}{{ reldelim2 }}{% endif %}</li>
        {%- endfor %}
        {%- block rootrellink %}
        <li><a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a>{{ reldelim1 }}</li>
        {%- endblock %}
        {%- for parent in parents %}
          <li><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }}</a>{{ reldelim1 }}</li>
        {%- endfor %}
        {%- block relbaritems %} {% endblock %}
      </ul>
    </div>
 {%- endmacro %}
 {%- macro sidebar() %}
      {%- if render_sidebar %}
      <div class="sphinxsidebar">
        <div class="sphinxsidebarwrapper">
          {%- block sidebarlogo %}
          {%- if logo %}
            <p class="logo"><a href="{{ pathto(master_doc) }}">
              <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/>
            </a></p>
          {%- endif %}
          {%- endblock %}
          {%- if sidebars != None %}
            {#- new style sidebar: explicitly include/exclude templates #}
            {%- for sidebartemplate in sidebars %}
            {%- include sidebartemplate %}
            {%- endfor %}
          {%- else %}
            {#- old style sidebars: using blocks -- should be deprecated #}
            {%- block sidebartoc %}
            {%- include "localtoc.html" %}
            {%- endblock %}
            {%- block sidebarrel %}
            {%- include "relations.html" %}
            {%- endblock %}
            {%- block sidebarsourcelink %}
            {%- include "sourcelink.html" %}
            {%- endblock %}
            {%- if customsidebar %}
            {%- include customsidebar %}
            {%- endif %}
            {%- block sidebarsearch %}
            {%- include "searchbox.html" %}
            {%- endblock %}
          {%- endif %}
        </div>
      </div>
      {%- endif %}
 {%- endmacro %}
 {%- macro script() %}
    <script type="text/javascript">
      var DOCUMENTATION_OPTIONS = {
        URL_ROOT:    '{{ url_root }}',
        VERSION:     '{{ release|e }}',
        COLLAPSE_INDEX: false,
        FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
        HAS_SOURCE:  {{ has_source|lower }}
      };
    </script>
    {%- for scriptfile in script_files %}
    <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
    {%- endfor %}
 {%- endmacro %}
 {%- macro css() %}
    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
    {%- for cssfile in css_files %}
    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
    {%- endfor %}
 {%- endmacro %}
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset={{ encoding }}" />
    {{ metatags }}
    {%- block htmltitle %}
    <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
    {%- endblock %}
    {{ css() }}
    {%- if not embedded %}
    {{ script() }}
    {%- if use_opensearch %}
    <link rel="search" type="application/opensearchdescription+xml"
          title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
          href="{{ pathto('_static/opensearch.xml', 1) }}"/>
    {%- endif %}
    {%- if favicon %}
    <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
    {%- endif %}
    {%- endif %}
 {%- block linktags %}
    {%- if hasdoc('about') %}
    <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" />
    {%- endif %}
    {%- if hasdoc('genindex') %}
    <link rel="index" title="{{ _('Index') }}" href="{{ pathto('genindex') }}" />
    {%- endif %}
    {%- if hasdoc('search') %}
    <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}" />
    {%- endif %}
    {%- if hasdoc('copyright') %}
    <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" />
    {%- endif %}
    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}" />
    {%- if parents %}
    <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="{{ parents[-1].link|e }}" />
    {%- endif %}
    {%- if next %}
    <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}" />
    {%- endif %}
    {%- if prev %}
    <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}" />
    {%- endif %}
 {%- endblock %}
 {%- block extrahead %} {% endblock %}
  </head>
  <body>
 {%- block header %}{% endblock %}
 {%- block relbar1 %}{{ relbar() }}{% endblock %}
 {%- block content %}
  {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}
    <div class="document">
  {%- block document %}
      <div class="documentwrapper">
      {%- if render_sidebar %}
        <div class="bodywrapper">
      {%- endif %}
          <div class="body">
            {% block body %} {% endblock %}
          </div>
      {%- if render_sidebar %}
        </div>
      {%- endif %}
      </div>
  {%- endblock %}
  {%- block sidebar2 %}{{ sidebar() }}{% endblock %}
      <div class="clearer"></div>
    </div>
 {%- endblock %}
 {%- block relbar2 %}{{ relbar() }}{% endblock %}
 {%- block footer %}
    <div class="footer">
    {%- if show_copyright %}
      {%- if hasdoc('copyright') %}
        {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
      {%- else %}
        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
      {%- endif %}
    {%- endif %}
    {%- if last_updated %}
      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
    {%- endif %}
    {%- if show_sphinx %}
      {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
    {%- endif %}
    </div>
    <p>asdf asdf asdf asdf 22</p>
 {%- endblock %}
  </body>
 </html>
--- a/doc/_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.po
@@ -1,143 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Tom Kunze <transifex.com@tomabrafix.de>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2020-05-06 13:38-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Tom Kunze <transifex.com@tomabrafix.de>, 2019\n"
 "Language-Team: German (https://www.transifex.com/readthedocs/teams/101354/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 #: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
 msgid "Edit on GitHub"
 msgstr "Auf GitHub bearbeiten"
 #: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
 msgid "Edit on Bitbucket"
 msgstr "Auf Bitbucket bearbeiten"
 #: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
 msgid "Edit on GitLab"
 msgstr "Auf GitLab bearbeiten"
 #: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
 msgid "View page source"
 msgstr "Quelltext anzeigen"
 #: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
 msgid "Next"
 msgstr "Weiter"
 #: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
 msgid "Previous"
 msgstr "Zurück"
 #: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
 #: sphinx_rtd_theme/layout.html:96
 msgid "Copyright"
 msgstr "Copyright"
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:31
 msgid "Build"
 msgstr "Build"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Zuletzt aktualisiert am %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:52
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Erstellt mit %(sphinx_web)s mit einem"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:56
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "bereitgestellt von %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:79
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "%(docstitle)s durchsuchen"
 #: sphinx_rtd_theme/layout.html:87
 msgid "About these documents"
 msgstr "Über diese Dokumentation"
 #: sphinx_rtd_theme/layout.html:90
 msgid "Index"
 msgstr "Index"
 #: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Suche"
 #: sphinx_rtd_theme/layout.html:128
 msgid "Logo"
 msgstr "Logo"
 #: sphinx_rtd_theme/search.html:29
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr "Bitte aktiviere JavaScript, um die Suchfunktion zu nutzen."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:37
 msgid "Search Results"
 msgstr "Suchergebnisse"
 #: sphinx_rtd_theme/search.html:39
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "Es wurden keine mit deiner Suchanfrage übereinstimmenden Dokumente gefunden."
 " Achte darauf, dass alle Wörter richtig geschrieben sind und dass genug "
 "Kategorien ausgewählt sind."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Dokumentation durchsuchen"
 #: sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Versionen"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "Auf Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Projektübersicht"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Builds"
 #~ msgid "Docs"
 #~ msgstr "Dokumentation"
 #~ msgid "Free document hosting provided by"
 #~ msgstr "Kostenloses Dokumentationen-Hosting zur Verfügung gestellt von"
--- a/doc/_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.po
@@ -1,156 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2020-05-06 13:38-0600\n"
 "PO-Revision-Date: 2019-07-16 15:43-0600\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
 "Language-Team: en <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 #: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
 msgid "Edit on GitHub"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
 msgid "Edit on Bitbucket"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
 msgid "Edit on GitLab"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
 msgid "View page source"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
 msgid "Next"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
 msgid "Previous"
 msgstr ""
 #: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
 #: sphinx_rtd_theme/layout.html:96
 msgid "Copyright"
 msgstr ""
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:31
 msgid "Build"
 msgstr ""
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:37
 msgid "Revision"
 msgstr ""
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr ""
 #. the variable "sphinx_web" is a link to the Sphinx project documentation with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:52
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr ""
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documenation
 #: sphinx_rtd_theme/footer.html:54
 msgid "theme"
 msgstr ""
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:56
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:79
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:87
 msgid "About these documents"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:90
 msgid "Index"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:121
 msgid "Documentation Home"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:128
 msgid "Logo"
 msgstr ""
 #: sphinx_rtd_theme/search.html:29
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr ""
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:37
 msgid "Search Results"
 msgstr ""
 #: sphinx_rtd_theme/search.html:39
 msgid ""
 "Your search did not match any documents. Please make sure that all words "
 "are spelled correctly and that you've selected enough categories."
 msgstr ""
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr ""
 #: sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr ""
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr ""
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr ""
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr ""
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr ""
 #~ msgid "Docs"
 #~ msgstr ""
 #~ msgid "Free document hosting provided by"
 #~ msgstr ""
--- a/doc/_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.po
@@ -1,164 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Anthony <aj@ohess.org>, 2019
 # Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2020-05-06 13:38-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2020\n"
 "Language-Team: Spanish (https://www.transifex.com/readthedocs/teams/101354/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 #: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
 msgid "Edit on GitHub"
 msgstr "Editar en GitHub"
 #: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
 msgid "Edit on Bitbucket"
 msgstr "Editar en Bitbucket"
 #: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
 msgid "Edit on GitLab"
 msgstr "Editar en GitLab"
 #: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
 msgid "View page source"
 msgstr "Ver código fuente de la página"
 #: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
 msgid "Next"
 msgstr "Siguiente"
 #: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
 msgid "Previous"
 msgstr "Anterior"
 #: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
 #: sphinx_rtd_theme/layout.html:96
 msgid "Copyright"
 msgstr "Derechos de autor"
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:31
 msgid "Build"
 msgstr "Construido"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:37
 msgid "Revision"
 msgstr "Revisión"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Actualizado por última vez en %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:52
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Construido con %(sphinx_web)s usando un"
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documenation
 #: sphinx_rtd_theme/footer.html:54
 msgid "theme"
 msgstr "tema"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:56
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "proporcionado por %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:79
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Buscar en %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:87
 msgid "About these documents"
 msgstr "Sobre esta documentación"
 #: sphinx_rtd_theme/layout.html:90
 msgid "Index"
 msgstr "Índice"
 #: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Búsqueda"
 #: sphinx_rtd_theme/layout.html:121
 msgid "Documentation Home"
 msgstr "Inicio de Documentación"
 #: sphinx_rtd_theme/layout.html:128
 msgid "Logo"
 msgstr "Logotipo"
 #: sphinx_rtd_theme/search.html:29
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr ""
 "Por favor, active JavaScript para habilitar la funcionalidad de búsqueda."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:37
 msgid "Search Results"
 msgstr "Resultados de la búsqueda"
 #: sphinx_rtd_theme/search.html:39
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "Su búsqueda no coincide con ningún documento. Por favor, asegúrese de que "
 "todas las palabras estén correctamente escritas y que usted haya "
 "seleccionado las suficientes categorías."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Buscar documentos"
 #: sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Versiones"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "Descargas"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "En Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Página de Proyecto"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Construcciones"
 #~ msgid "Docs"
 #~ msgstr "Documentos"
 #~ msgid "Free document hosting provided by"
 #~ msgstr "Alojamiento gratuito de documentos proporcionado por"
--- a/doc/_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.po
@@ -1,155 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Anthony <aj@ohess.org>, 2020
 # Ivar Smolin <okul@linux.ee>, 2020
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2020-05-06 13:38-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>, 2020\n"
 "Language-Team: Estonian (https://www.transifex.com/readthedocs/teams/101354/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 #: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
 msgid "Edit on GitHub"
 msgstr "Muuda GitHubis"
 #: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
 msgid "Edit on Bitbucket"
 msgstr "Muuda Bitbucketis"
 #: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
 msgid "Edit on GitLab"
 msgstr "Muuda GitLabis"
 #: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
 msgid "View page source"
 msgstr "Vaata lehe lähtekoodi"
 #: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
 msgid "Next"
 msgstr "Järgmine"
 #: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
 msgid "Previous"
 msgstr "Eelmine"
 #: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
 #: sphinx_rtd_theme/layout.html:96
 msgid "Copyright"
 msgstr "Autoriõigus"
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:31
 msgid "Build"
 msgstr "Ehitus"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:37
 msgid "Revision"
 msgstr "Redaktsioon"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Viimati uuendatud  %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:52
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Ehitatud %(sphinx_web)s'iga,"
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documenation
 #: sphinx_rtd_theme/footer.html:54
 msgid "theme"
 msgstr "kujundusteema"
 #: sphinx_rtd_theme/layout.html:79
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Otsi dokumendist %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:87
 msgid "About these documents"
 msgstr "Nende dokumentide kirjeldused"
 #: sphinx_rtd_theme/layout.html:90
 msgid "Index"
 msgstr "Indeks"
 #: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Otsing"
 #: sphinx_rtd_theme/layout.html:121
 msgid "Documentation Home"
 msgstr "Dokumentatsiooni kodu"
 #: sphinx_rtd_theme/layout.html:128
 msgid "Logo"
 msgstr "Logo"
 #: sphinx_rtd_theme/search.html:29
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr "Otsimisfunktsiooni lubamiseks aktiveeri palun JavaScript"
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:37
 msgid "Search Results"
 msgstr "Otsingu tulemused"
 #: sphinx_rtd_theme/search.html:39
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "Sinu otsingule ei vastanud ükski dokument. Palun veendu, et kõik sisestatud "
 "sõnad on õigesti kirjutatud ja sa oled valikud piisaval hulgal kategooriaid."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Otsi dokumente"
 #: sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Versioonid"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "Allalaadimised"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "Saidil Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Projekti kodu"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Ehitused"
 #~ msgid "Docs"
 #~ msgstr "Dokumendid"
 #~ msgid "Free document hosting provided by"
 #~ msgstr "Dokumentatsiooni majutab tasuta"
--- a/doc/_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.po
@@ -1,154 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Radina Matic <radina.matic@gmail.com>, 2020
 # Anthony <aj@ohess.org>, 2020
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2020-05-06 13:38-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Anthony <aj@ohess.org>, 2020\n"
 "Language-Team: French (https://www.transifex.com/readthedocs/teams/101354/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 #: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
 msgid "Edit on GitHub"
 msgstr "Éditer sur GitHub"
 #: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
 msgid "Edit on Bitbucket"
 msgstr "Éditer sur Bitbucket"
 #: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
 msgid "Edit on GitLab"
 msgstr "Éditer sur GitLab"
 #: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
 msgid "View page source"
 msgstr "Afficher la source de la page"
 #: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
 msgid "Next"
 msgstr "Suivant"
 #: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
 msgid "Previous"
 msgstr "Précédent"
 #: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
 #: sphinx_rtd_theme/layout.html:96
 msgid "Copyright"
 msgstr "Droits d'auteur"
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:31
 msgid "Build"
 msgstr "Compilation"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:37
 msgid "Revision"
 msgstr "Révision"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Dernière mise à jour le %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:52
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Compilé avec %(sphinx_web)s en utilisant un"
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documenation
 #: sphinx_rtd_theme/footer.html:54
 msgid "theme"
 msgstr "thème"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:56
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "fourni par %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:79
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Rechercher dans %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:87
 msgid "About these documents"
 msgstr "À propos de cette documentation"
 #: sphinx_rtd_theme/layout.html:90
 msgid "Index"
 msgstr "Index"
 #: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Rechercher"
 #: sphinx_rtd_theme/layout.html:128
 msgid "Logo"
 msgstr "Logo"
 #: sphinx_rtd_theme/search.html:29
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr "Activez JavaScript pour accéder à la fonction de recherche."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:37
 msgid "Search Results"
 msgstr "Résultats de la recherche"
 #: sphinx_rtd_theme/search.html:39
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "Votre recherche ne correspond à aucun document. Assurez-vous que tous les "
 "mots sont correctement orthographiés et que vous avez sélectionné "
 "suffisamment de catégories."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Rechercher docs"
 #: sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Versions"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "Téléchargements"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Accueil du projet"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Compilations"
 #~ msgid "Docs"
 #~ msgstr "Docs"
 #~ msgid "Free document hosting provided by"
 #~ msgstr "Hébergement gratuit de documents fourni par"
--- a/doc/_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.po
@@ -1,157 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Jesse Tan, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2020-05-06 13:38-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Jesse Tan, 2019\n"
 "Language-Team: Dutch (https://www.transifex.com/readthedocs/teams/101354/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 #: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
 msgid "Edit on GitHub"
 msgstr "Bewerk op GitHub"
 #: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
 msgid "Edit on Bitbucket"
 msgstr "Bewerk op BitBucket"
 #: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
 msgid "Edit on GitLab"
 msgstr "Bewerk op GitLab"
 #: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
 msgid "View page source"
 msgstr "Bekijk paginabron"
 #: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
 msgid "Next"
 msgstr "Volgende"
 #: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
 msgid "Previous"
 msgstr "Vorige"
 #: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
 #: sphinx_rtd_theme/layout.html:96
 msgid "Copyright"
 msgstr "Copyright"
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:31
 msgid "Build"
 msgstr "Bouwresultaat"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:37
 msgid "Revision"
 msgstr "Revisie"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Laatste update op %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:52
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Gebouwd met %(sphinx_web)s met een"
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documenation
 #: sphinx_rtd_theme/footer.html:54
 msgid "theme"
 msgstr "thema"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:56
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "geleverd door %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:79
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Zoek binnen %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:87
 msgid "About these documents"
 msgstr "Over deze documenten"
 #: sphinx_rtd_theme/layout.html:90
 msgid "Index"
 msgstr "Index"
 #: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Zoek"
 #: sphinx_rtd_theme/layout.html:128
 msgid "Logo"
 msgstr "Logo"
 #: sphinx_rtd_theme/search.html:29
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr "Zet JavaScript aan om de zoekfunctie mogelijk te maken."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:37
 msgid "Search Results"
 msgstr "Zoekresultaten"
 #: sphinx_rtd_theme/search.html:39
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "Zoekpoging vond geen documenten. Zorg ervoor dat alle woorden correct zijn "
 "gespeld en dat voldoende categorieën zijn geselecteerd."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Zoek in documentatie"
 #: sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Versies"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "Downloads"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "Op Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Project Home"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Bouwresultaten"
 #~ msgid "Docs"
 #~ msgstr "Documentatie"
 #~ msgid "Free document hosting provided by"
 #~ msgstr "Gratis hosting voor documentatie verzorgd door"
--- a/doc/_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.po
@@ -1,159 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Rafael Fontenelle <rffontenelle@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2020-05-06 13:38-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>, 2020\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/readthedocs/teams/101354/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 #: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
 msgid "Edit on GitHub"
 msgstr "Editar no GitHub"
 #: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
 msgid "Edit on Bitbucket"
 msgstr "Editar no Bitbucket"
 #: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
 msgid "Edit on GitLab"
 msgstr "Editar no GitLab"
 #: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
 msgid "View page source"
 msgstr "Ver código-fonte da página"
 #: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
 msgid "Next"
 msgstr "Próximo"
 #: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
 msgid "Previous"
 msgstr "Anterior"
 #: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
 #: sphinx_rtd_theme/layout.html:96
 msgid "Copyright"
 msgstr "Copyright"
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:31
 msgid "Build"
 msgstr "Compilação"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:37
 msgid "Revision"
 msgstr "Revisão"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Última atualização em %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:52
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Compilado com %(sphinx_web)s usando um"
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documenation
 #: sphinx_rtd_theme/footer.html:54
 msgid "theme"
 msgstr "tema"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:56
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "fornecido por %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:79
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Pesquisar em %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:87
 msgid "About these documents"
 msgstr "Sobre esses documentos"
 #: sphinx_rtd_theme/layout.html:90
 msgid "Index"
 msgstr "Índice"
 #: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Pesquisar"
 #: sphinx_rtd_theme/layout.html:128
 msgid "Logo"
 msgstr "Logo"
 #: sphinx_rtd_theme/search.html:29
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr ""
 "Por favor, ative JavaScript para habilitar a funcionalidade de pesquisa."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:37
 msgid "Search Results"
 msgstr "Resultados da pesquisa"
 #: sphinx_rtd_theme/search.html:39
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "A sua pesquisa não encontrou nenhum documento correspondente. Verifique se "
 "todas as palavras estão escritas corretamente e se você selecionou "
 "categorias suficientes."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Pesquisar documentos"
 #: sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Versões"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "Downloads"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "No Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Página inicial"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Compilações"
 #~ msgid "Docs"
 #~ msgstr "Docs"
 #~ msgid "Free document hosting provided by"
 #~ msgstr "Hospedagem de documentos livres fornecida por"
--- a/doc/_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.po
@@ -1,158 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Dmitry Shachnev <mitya57@gmail.com>, 2019
 # lvv83 <vlozhkin83@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2020-05-06 13:38-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: lvv83 <vlozhkin83@gmail.com>, 2019\n"
 "Language-Team: Russian (https://www.transifex.com/readthedocs/teams/101354/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 #: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
 msgid "Edit on GitHub"
 msgstr "Редактировать на GitHub"
 #: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
 msgid "Edit on Bitbucket"
 msgstr "Редактировать на BitBucket"
 #: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
 msgid "Edit on GitLab"
 msgstr "Редактировать на GitLab"
 #: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
 msgid "View page source"
 msgstr "Просмотреть исходный код страницы"
 #: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
 msgid "Next"
 msgstr "Следующая"
 #: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
 msgid "Previous"
 msgstr "Предыдущая"
 #: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
 #: sphinx_rtd_theme/layout.html:96
 msgid "Copyright"
 msgstr "Авторские права"
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:31
 msgid "Build"
 msgstr "Сборка"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:37
 msgid "Revision"
 msgstr "Ревизия"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Последний раз обновлено %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:52
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Собрано при помощи %(sphinx_web)s с использованием"
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documenation
 #: sphinx_rtd_theme/footer.html:54
 msgid "theme"
 msgstr "темы,"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:56
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "предоставленной %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:79
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Поиск в %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:87
 msgid "About these documents"
 msgstr "Об этих документах"
 #: sphinx_rtd_theme/layout.html:90
 msgid "Index"
 msgstr "Алфавитный указатель"
 #: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Поиск"
 #: sphinx_rtd_theme/layout.html:128
 msgid "Logo"
 msgstr "Логотип"
 #: sphinx_rtd_theme/search.html:29
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr "Активируйте JavaScript, чтобы использовать функционал поиска."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:37
 msgid "Search Results"
 msgstr "Результаты поиска"
 #: sphinx_rtd_theme/search.html:39
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "По Вашему запросу не найдено результатов. Пожалуйста, проверьте, что все "
 "слова написаны правильно, и Вы выбрали нужные категории."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Поиск в документации"
 #: sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Версии"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "Загрузки"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "На Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Домашняя страница проекта"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Сборки"
 #~ msgid "Docs"
 #~ msgstr "Документация"
 #~ msgid "Free document hosting provided by"
 #~ msgstr "Бесплатный хостинг документов, предоставленный"
--- a/doc/_themes/sphinx_rtd_theme/locale/sphinx.pot
+++ b/doc/_themes/sphinx_rtd_theme/locale/sphinx.pot
@@ -1,149 +0,0 @@
 # Translations template for sphinx_rtd_theme.
 # Copyright (C) 2020 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2020-05-06 13:38-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 #: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
 msgid "Edit on GitHub"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
 msgid "Edit on Bitbucket"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
 msgid "Edit on GitLab"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
 msgid "View page source"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
 msgid "Next"
 msgstr ""
 #: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
 msgid "Previous"
 msgstr ""
 #: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
 #: sphinx_rtd_theme/layout.html:96
 msgid "Copyright"
 msgstr ""
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:31
 msgid "Build"
 msgstr ""
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:37
 msgid "Revision"
 msgstr ""
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr ""
 #. the variable "sphinx_web" is a link to the Sphinx project documentation with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:52
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr ""
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documenation
 #: sphinx_rtd_theme/footer.html:54
 msgid "theme"
 msgstr ""
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:56
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:79
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:87
 msgid "About these documents"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:90
 msgid "Index"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:121
 msgid "Documentation Home"
 msgstr ""
 #: sphinx_rtd_theme/layout.html:128
 msgid "Logo"
 msgstr ""
 #: sphinx_rtd_theme/search.html:29
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr ""
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:37
 msgid "Search Results"
 msgstr ""
 #: sphinx_rtd_theme/search.html:39
 msgid ""
 "Your search did not match any documents. Please make sure that all words "
 "are spelled correctly and that you've selected enough categories."
 msgstr ""
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr ""
 #: sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr ""
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr ""
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr ""
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr ""
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr ""
--- a/doc/_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.po
@@ -1,158 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # Daniel Holmberg <daniel.holmberg97@gmail.com>, 2020
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2020-05-06 13:38-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Daniel Holmberg <daniel.holmberg97@gmail.com>, 2020\n"
 "Language-Team: Swedish (https://www.transifex.com/readthedocs/teams/101354/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 #: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
 msgid "Edit on GitHub"
 msgstr "Editera på GitHub"
 #: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
 msgid "Edit on Bitbucket"
 msgstr "Editera på Bitbucket"
 #: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
 msgid "Edit on GitLab"
 msgstr "Editera på GitLab"
 #: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
 msgid "View page source"
 msgstr "Visa sidkälla"
 #: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
 msgid "Next"
 msgstr "Nästa"
 #: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
 msgid "Previous"
 msgstr "Tillbaka"
 #: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
 #: sphinx_rtd_theme/layout.html:96
 msgid "Copyright"
 msgstr "Upphovsrätt"
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:31
 msgid "Build"
 msgstr "Bygg"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:37
 msgid "Revision"
 msgstr "Ändra"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Senast uppdaterad %(last_updated)s."
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:52
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "Gjord med %(sphinx_web)s med hjälp av"
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documenation
 #: sphinx_rtd_theme/footer.html:54
 msgid "theme"
 msgstr "tema"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:56
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "erhållet av %(readthedocs_web)s"
 #: sphinx_rtd_theme/layout.html:79
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "Sök i %(docstitle)s"
 #: sphinx_rtd_theme/layout.html:87
 msgid "About these documents"
 msgstr "Om dessa dokument"
 #: sphinx_rtd_theme/layout.html:90
 msgid "Index"
 msgstr "Index"
 #: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Sök"
 #: sphinx_rtd_theme/layout.html:121
 msgid "Documentation Home"
 msgstr "Dokumentation Hem"
 #: sphinx_rtd_theme/layout.html:128
 msgid "Logo"
 msgstr "Logo"
 #: sphinx_rtd_theme/search.html:29
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr ""
 "Var vänlig och aktivera JavaScript för att möjliggöra sökfunktionaliteten."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:37
 msgid "Search Results"
 msgstr "Sökresultat"
 #: sphinx_rtd_theme/search.html:39
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "Din sökning gav inga träffar. Var vänlig och se till att alla ord är rätt "
 "stavade och att du har valt tillräckligt många kategorier."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Sök i dokumentationen"
 #: sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Versioner"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "Nerladdningar"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "På Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Projekt Hem"
 #~ msgid "Docs"
 #~ msgstr "Dokumentation"
 #~ msgid "Free document hosting provided by"
 #~ msgstr "Gratis dokumentations hysning erhållen av"
--- a/doc/_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.po
@@ -1,147 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # BouRock, 2020
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2020-05-06 13:38-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: BouRock, 2020\n"
 "Language-Team: Turkish (https://www.transifex.com/readthedocs/teams/101354/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 #: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
 msgid "Edit on GitHub"
 msgstr "GitHub'da Düzenle"
 #: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
 msgid "Edit on Bitbucket"
 msgstr "Bitbucket'ta Düzenle"
 #: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
 msgid "Edit on GitLab"
 msgstr "GitLab'ta Düzenle"
 #: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
 msgid "View page source"
 msgstr "Sayfa kaynağını görüntüle"
 #: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
 msgid "Next"
 msgstr "Sonraki"
 #: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
 msgid "Previous"
 msgstr "Önceki"
 #: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
 #: sphinx_rtd_theme/layout.html:96
 msgid "Copyright"
 msgstr "Telif hakkı"
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:31
 msgid "Build"
 msgstr "Oluşturma"
 #. the phrase "revision" comes from Git, referring to a commit
 #: sphinx_rtd_theme/footer.html:37
 msgid "Revision"
 msgstr "Gözden geçirme"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "Son olarak %(last_updated)s tarihinde güncellendi."
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documenation
 #: sphinx_rtd_theme/footer.html:54
 msgid "theme"
 msgstr "tema"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:56
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "kullanılarak %(readthedocs_web)s tarafından sağlanmasıyla oluşturuldu"
 #: sphinx_rtd_theme/layout.html:79
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "%(docstitle)s içinde ara"
 #: sphinx_rtd_theme/layout.html:87
 msgid "About these documents"
 msgstr "Bu belgeler hakkında"
 #: sphinx_rtd_theme/layout.html:90
 msgid "Index"
 msgstr "Dizin"
 #: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "Arama"
 #: sphinx_rtd_theme/layout.html:128
 msgid "Logo"
 msgstr "Logo"
 #: sphinx_rtd_theme/search.html:29
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr ""
 "Arama işlevselliğini etkinleştirmek için lütfen JavaScript'i etkinleştirin."
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:37
 msgid "Search Results"
 msgstr "Arama Sonuçları"
 #: sphinx_rtd_theme/search.html:39
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr ""
 "Aramanız hiçbir belgeyle eşleşmedi. Lütfen tüm kelimelerin doğru "
 "yazıldığından ve yeterli kategori seçtiğinizden emin olun."
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "Belgeleri arayın"
 #: sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "Sürümler"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "İndirmeler"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "Read the Docs Üzerinde"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "Proje Ana Sayfa"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "Oluşturmalar"
 #~ msgid "Free document hosting provided by"
 #~ msgstr "Ücretsiz belge barındırmayı sağlayan"
--- a/doc/_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.mo
+++ b/doc/_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.mo
--- a/doc/_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.po
+++ b/doc/_themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.po
@@ -1,151 +0,0 @@
 # English translations for sphinx_rtd_theme.
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the sphinx_rtd_theme
 # project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 # 
 # Translators:
 # 王赛 <wangsai@bootcss.com>, 2019
 # Anthony <aj@ohess.org>, 2020
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2020-05-06 13:38-0600\n"
 "PO-Revision-Date: 2019-07-16 21:44+0000\n"
 "Last-Translator: Anthony <aj@ohess.org>, 2020\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/readthedocs/teams/101354/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.8.0\n"
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 #: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
 msgid "Edit on GitHub"
 msgstr "在 GitHub 上修改"
 #: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
 msgid "Edit on Bitbucket"
 msgstr "在 Bitbucket 上修改"
 #: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
 msgid "Edit on GitLab"
 msgstr "在 GitLab 上修改"
 #: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
 msgid "View page source"
 msgstr "查看页面源码"
 #: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
 msgid "Next"
 msgstr "下一页"
 #: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
 msgid "Previous"
 msgstr "上一页"
 #: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
 #: sphinx_rtd_theme/layout.html:96
 msgid "Copyright"
 msgstr "版权所有"
 #. Build is a noun, not a verb
 #: sphinx_rtd_theme/footer.html:31
 msgid "Build"
 msgstr "构建"
 #: sphinx_rtd_theme/footer.html:41
 #, python-format
 msgid "Last updated on %(last_updated)s."
 msgstr "最后更新时间 %(last_updated)s。"
 #. the variable "sphinx_web" is a link to the Sphinx project documentation
 #. with
 #. the text "Sphinx"
 #: sphinx_rtd_theme/footer.html:52
 #, python-format
 msgid "Built with %(sphinx_web)s using a"
 msgstr "利用 %(sphinx_web)s 构建，使用了 "
 #. "theme" refers to a theme for Sphinx, which alters the appearance of the
 #. generated documenation
 #: sphinx_rtd_theme/footer.html:54
 msgid "theme"
 msgstr "主题"
 #. this is always used as "provided by Read the Docs", and should not imply
 #. Read the Docs is an author of the generated documentation.
 #: sphinx_rtd_theme/footer.html:56
 #, python-format
 msgid "provided by %(readthedocs_web)s"
 msgstr "由 %(readthedocs_web)s开发"
 #: sphinx_rtd_theme/layout.html:79
 #, python-format
 msgid "Search within %(docstitle)s"
 msgstr "在 %(docstitle)s中搜索"
 #: sphinx_rtd_theme/layout.html:87
 msgid "About these documents"
 msgstr "关于此文档"
 #: sphinx_rtd_theme/layout.html:90
 msgid "Index"
 msgstr "索引"
 #: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
 msgid "Search"
 msgstr "搜索"
 #: sphinx_rtd_theme/layout.html:128
 msgid "Logo"
 msgstr "Logo"
 #: sphinx_rtd_theme/search.html:29
 msgid "Please activate JavaScript to enable the search functionality."
 msgstr "请启用 JavaScript 以便使用搜索功能"
 #. Search is a noun, not a verb
 #: sphinx_rtd_theme/search.html:37
 msgid "Search Results"
 msgstr "搜索结果"
 #: sphinx_rtd_theme/search.html:39
 msgid ""
 "Your search did not match any documents. Please make sure that all words are"
 " spelled correctly and that you've selected enough categories."
 msgstr "您的搜索没有匹配到任何文档。请确保所有单词拼写正确，并选择了足够多的类别。"
 #: sphinx_rtd_theme/searchbox.html:4
 msgid "Search docs"
 msgstr "在文档中搜索"
 #: sphinx_rtd_theme/versions.html:11
 msgid "Versions"
 msgstr "版本列表"
 #: sphinx_rtd_theme/versions.html:17
 msgid "Downloads"
 msgstr "下载链接"
 #. The phrase "Read the Docs" is not translated
 #: sphinx_rtd_theme/versions.html:24
 msgid "On Read the Docs"
 msgstr "托管于 Read the Docs"
 #: sphinx_rtd_theme/versions.html:26
 msgid "Project Home"
 msgstr "项目首页"
 #: sphinx_rtd_theme/versions.html:29
 msgid "Builds"
 msgstr "构建"
 #~ msgid "Docs"
 #~ msgstr "文档"
 #~ msgid "Free document hosting provided by"
 #~ msgstr "此文档免费托管于"
--- a/doc/_themes/sphinx_rtd_theme/search.html
+++ b/doc/_themes/sphinx_rtd_theme/search.html
@@ -9,11 +9,7 @@
 #}
 {%- extends "layout.html" %}
 {% set title = _('Search') %}
-{% set display_vcs_links = False %}
+{% set script_files = script_files + ['_static/searchtools.js'] %}
 {%- block scripts %}
    {{ super() }}
    <script type="text/javascript" src="{{ pathto('_static/searchtools.js', 1) }}"></script>
 {%- endblock %}
 {% block footer %}
  <script type="text/javascript">
    jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
@@ -27,14 +23,13 @@
  <noscript>
  <div id="fallback" class="admonition warning">
    <p class="last">
-      {% trans trimmed %}Please activate JavaScript to enable the search
+      {% trans %}Please activate JavaScript to enable the search
      functionality.{% endtrans %}
    </p>
  </div>
  </noscript>
  {% if search_performed %}
    {# Translators: Search is a noun, not a verb #}
    <h2>{{ _('Search Results') }}</h2>
    {% if not search_results %}
      <p>{{ _('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.') }}</p>
--- a/doc/_themes/sphinx_rtd_theme/searchbox.html
+++ b/doc/_themes/sphinx_rtd_theme/searchbox.html
@@ -1,7 +1,7 @@
 {%- if builder != 'singlehtml' %}
 <div role="search">
  <form id="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
-    <input type="text" name="q" placeholder="{{ _('Search docs') }}" />
+    <input type="text" name="q" placeholder="Search docs" />
    <input type="hidden" name="check_keywords" value="yes" />
    <input type="hidden" name="area" value="default" />
  </form>
--- a/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css
+++ b/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css
@@ -1 +1,2 @@
-.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:after,.clearfix:before{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-style:normal;font-weight:400;src:url(fonts/fontawesome-webfont.eot?674f50d287a8c48dc19ba404d20fe713?#iefix) format("embedded-opentype"),url(fonts/fontawesome-webfont.woff2?af7ae505a9eed503f8b8e6982036873e) format("woff2"),url(fonts/fontawesome-webfont.woff?fee66e712a8a08eef5805a46892932ad) format("woff"),url(fonts/fontawesome-webfont.ttf?b06871f281fee6b241d60582ae9369b9) format("truetype"),url(fonts/fontawesome-webfont.svg?912ec66d7572ff821749319396470bde#FontAwesome) format("svg")}.fa:before{font-family:FontAwesome;font-style:normal;font-weight:400;line-height:1}.fa:before,a .fa{text-decoration:inherit}.fa:before,a .fa,li .fa{display:inline-block}li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-.8em}ul.fas li .fa{width:.8em}ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before,.icon-book:before{content:"\f02d"}.fa-caret-down:before,.icon-caret-down:before{content:"\f0d7"}.fa-caret-up:before,.icon-caret-up:before{content:"\f0d8"}.fa-caret-left:before,.icon-caret-left:before{content:"\f0d9"}.fa-caret-right:before,.icon-caret-right:before{content:"\f0da"}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;z-index:400}.rst-versions a{color:#2980b9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27ae60}.rst-versions .rst-current-version:after{clear:both;content:"";display:block}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book,.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#e74c3c;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#f1c40f;color:#000}.rst-versions.shift-up{height:auto;max-height:100%;overflow-y:scroll}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:grey;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:1px solid #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px;max-height:90%}.rst-versions.rst-badge .fa-book,.rst-versions.rst-badge .icon-book{float:none;line-height:30px}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book,.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge>.rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width:768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}}
+.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-weight:normal;font-style:normal;src:url("../font/fontawesome_webfont.eot");src:url("../font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("../font/fontawesome_webfont.woff") format("woff"),url("../font/fontawesome_webfont.ttf") format("truetype"),url("../font/fontawesome_webfont.svg#FontAwesome") format("svg")}.fa:before{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa{display:inline-block;text-decoration:inherit}li .fa{display:inline-block}li .fa-large:before,li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.fas li .fa{width:0.8em}ul.fas li .fa-large:before,ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before{content:""}.icon-book:before{content:""}.fa-caret-down:before{content:""}.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.icon-caret-up:before{content:""}.fa-caret-left:before{content:""}.icon-caret-left:before{content:""}.fa-caret-right:before{content:""}.icon-caret-right:before{content:""}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}
 /*# sourceMappingURL=badge_only.css.map */
--- a/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css.map
+++ b/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css.map
@@ -0,0 +1,7 @@
 {
 "version": 3,
 "mappings": "CAyDA,SAAY,EACV,qBAAsB,EAAE,UAAW,EAqDrC,QAAS,EARP,IAAK,EAAE,AAAC,EACR,+BAAS,EAEP,MAAO,EAAE,IAAK,EACd,MAAO,EAAE,CAAE,EACb,cAAO,EACL,IAAK,EAAE,GAAI,EC1Gb,SAkBC,EAjBC,UAAW,ECFJ,UAAW,EDGlB,UAAW,EAHqC,KAAM,EAItD,SAAU,EAJsD,KAAM,EAapE,EAAG,EAAE,qCAAwB,EAC7B,EAAG,EAAE,0PAAyE,ECZpF,SAAU,EACR,MAAO,EAAE,WAAY,EACrB,UAAW,EAAE,UAAW,EACxB,SAAU,EAAE,KAAM,EAClB,UAAW,EAAE,KAAM,EACnB,UAAW,EAAE,AAAC,EACd,cAAe,EAAE,MAAO,EAG1B,IAAK,EACH,MAAO,EAAE,WAAY,EACrB,cAAe,EAAE,MAAO,EAIxB,KAAG,EACD,MAAO,EAAE,WAAY,EACvB,sCAAiB,EAGf,IAAK,EAAE,MAAY,EAEvB,KAAM,EACJ,cAAe,EAAE,GAAI,EACrB,UAAW,EAAE,EAAG,EAChB,UAAW,EAAE,KAAM,EAEjB,YAAG,EACD,IAAK,EAAE,IAAI,EACb,oDAAiB,EAGf,aAAc,EAAE,OAAQ,EAG9B,cAAe,EACb,MAAO,EAAE,EAAO,EAElB,gBAAiB,EACf,MAAO,EAAE,EAAO,EAElB,oBAAqB,EACnB,MAAO,EAAE,EAAO,EAElB,sBAAuB,EACrB,MAAO,EAAE,EAAO,EAElB,kBAAmB,EACjB,MAAO,EAAE,EAAO,EAElB,oBAAqB,EACnB,MAAO,EAAE,EAAO,EAElB,oBAAqB,EACnB,MAAO,EAAE,EAAO,EAElB,sBAAuB,EACrB,MAAO,EAAE,EAAO,EAElB,qBAAsB,EACpB,MAAO,EAAE,EAAO,EAElB,uBAAwB,EACtB,MAAO,EAAE,EAAO,ECnElB,YAAa,EACX,OAAQ,EAAE,IAAK,EACf,KAAM,EAAE,AAAC,EACT,GAAI,EAAE,AAAC,EACP,IAAK,EC6E+B,IAAK,ED5EzC,IAAK,EEoC+B,MAAyB,EFnC7D,SAAU,EAAE,MAAkC,EAC9C,SAAU,EAAE,iBAAiC,EAC7C,UAAW,EE+CyB,sDAAM,EF9C1C,MAAO,EC+E6B,EAAG,ED9EvC,cAAC,EACC,IAAK,EE+B6B,MAAK,EF9BvC,cAAe,EAAE,GAAI,EACvB,6BAAgB,EACd,MAAO,EAAE,GAAI,EACf,iCAAoB,EAClB,MAAO,EAAE,GAAqB,EAC9B,eAAgB,EAAE,MAAkC,EACpD,MAAO,EAAE,IAAK,EACd,SAAU,EAAE,IAAK,EACjB,QAAS,EAAE,EAAG,EACd,KAAM,EAAE,MAAO,EACf,IAAK,EEX6B,MAAM,EL4F1C,IAAK,EAAE,AAAC,EACR,iFAAS,EAEP,MAAO,EAAE,IAAK,EACd,MAAO,EAAE,CAAE,EACb,uCAAO,EACL,IAAK,EAAE,GAAI,EGrFX,qCAAG,EACD,IAAK,EEgB2B,MAAyB,EFf3D,0CAAQ,EACN,IAAK,EAAE,GAAI,EACb,4CAAU,EACR,IAAK,EAAE,GAAI,EACb,iDAAiB,EACf,eAAgB,ECQgB,MAAI,EDPpC,IAAK,EEI2B,GAAM,EFHxC,wDAAwB,EACtB,eAAgB,EEmBgB,MAAO,EFlBvC,IAAK,ECzB2B,GAAI,ED0BxC,yCAA8B,EAC5B,MAAO,EAAE,IAAK,EAChB,gCAAmB,EACjB,QAAS,EAAE,EAAG,EACd,MAAO,EAAE,GAAqB,EAC9B,IAAK,EEP6B,GAAY,EFQ9C,MAAO,EAAE,GAAI,EACb,mCAAE,EACA,MAAO,EAAE,IAAK,EACd,KAAM,EAAE,EAAG,EACX,KAAM,EAAE,AAAC,EACT,KAAM,EAAE,KAAM,EACd,MAAO,EAAE,AAAC,EACV,SAAU,EAAE,gBAA6C,EAC3D,mCAAE,EACA,MAAO,EAAE,WAAY,EACrB,KAAM,EAAE,AAAC,EACT,qCAAC,EACC,MAAO,EAAE,WAAY,EACrB,MAAO,EAAE,EAAqB,EAC9B,IAAK,EEfyB,MAAyB,EFgB7D,sBAAW,EACT,IAAK,EAAE,GAAI,EACX,KAAM,EAAE,GAAI,EACZ,IAAK,EAAE,GAAI,EACX,GAAI,EAAE,GAAI,EACV,KAAM,EAAE,GAAI,EACZ,QAAS,ECkByB,IAAK,EDjBvC,iCAAU,EACR,IAAK,EAAE,GAAI,EACb,+BAAQ,EACN,IAAK,EAAE,GAAI,EACb,oDAA+B,EAC7B,SAAU,EAAE,IAAK,EACjB,6DAAQ,EACN,IAAK,EAAE,GAAI,EACb,+DAAU,EACR,IAAK,EAAE,GAAI,EACf,2CAAoB,EAClB,IAAK,EAAE,GAAI,EACX,KAAM,EAAE,GAAI,EACZ,UAAW,EAAE,GAAI,EACjB,MAAO,EAAE,IAAuB,EAChC,MAAO,EAAE,IAAK,EACd,SAAU,EAAE,KAAM,EGhDpB,mCAAsB,EHmDxB,YAAa,EACX,IAAK,EAAE,EAAG,EACV,MAAO,EAAE,GAAI,EACb,kBAAO,EACL,MAAO,EAAE,IAAK,EAClB,EAAG,EACD,IAAK,EAAE,GAAI,EACX,KAAM,EAAE,GAAI",
 "sources": ["../../../bower_components/wyrm/sass/wyrm_core/_mixin.sass","../../../bower_components/bourbon/dist/css3/_font-face.scss","../../../sass/_theme_badge_fa.sass","../../../sass/_theme_badge.sass","../../../bower_components/wyrm/sass/wyrm_core/_wy_variables.sass","../../../sass/_theme_variables.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_media.scss"],
 "names": [],
 "file": "badge_only.css"
 }
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff2
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff2
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff2
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff2
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.eot
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.eot
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.svg
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.svg
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.ttf
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.ttf
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff2
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff2
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff2
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff2
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff2
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff2
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff2
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff2
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff
--- a/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff2
+++ b/doc/_themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff2
--- a/doc/_themes/sphinx_rtd_theme/static/css/theme.css
+++ b/doc/_themes/sphinx_rtd_theme/static/css/theme.css
--- a/doc/_themes/sphinx_rtd_theme/static/css/theme.css.map
+++ b/doc/_themes/sphinx_rtd_theme/static/css/theme.css.map
--- a/doc/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf
+++ b/doc/_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf
--- a/doc/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf
+++ b/doc/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf
--- a/doc/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Regular.ttf
+++ b/doc/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Regular.ttf
--- a/doc/_themes/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf
+++ b/doc/_themes/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf
--- a/doc/_themes/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf
+++ b/doc/_themes/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf
--- a/doc/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf
+++ b/doc/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf
--- a/Show More
+++ b/Show More
`@@ -1 +1,2 @@`
	.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:after,.clearfix:before{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-style:normal;font-weight:400;src:url(fonts/fontawesome-webfont.eot?674f50d287a8c48dc19ba404d20fe713?#iefix) format("embedded-opentype"),url(fonts/fontawesome-webfont.woff2?af7ae505a9eed503f8b8e6982036873e) format("woff2"),url(fonts/fontawesome-webfont.woff?fee66e712a8a08eef5805a46892932ad) format("woff"),url(fonts/fontawesome-webfont.ttf?b06871f281fee6b241d60582ae9369b9) format("truetype"),url(fonts/fontawesome-webfont.svg?912ec66d7572ff821749319396470bde#FontAwesome) format("svg")}.fa:before{font-family:FontAwesome;font-style:normal;font-weight:400;line-height:1}.fa:before,a .fa{text-decoration:inherit}.fa:before,a .fa,li .fa{display:inline-block}li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-.8em}ul.fas li .fa{width:.8em}ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before,.icon-book:before{content:"\f02d"}.fa-caret-down:before,.icon-caret-down:before{content:"\f0d7"}.fa-caret-up:before,.icon-caret-up:before{content:"\f0d8"}.fa-caret-left:before,.icon-caret-left:before{content:"\f0d9"}.fa-caret-right:before,.icon-caret-right:before{content:"\f0da"}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;z-index:400}.rst-versions a{color:#2980b9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27ae60}.rst-versions .rst-current-version:after{clear:both;content:"";display:block}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book,.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#e74c3c;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#f1c40f;color:#000}.rst-versions.shift-up{height:auto;max-height:100%;overflow-y:scroll}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:grey;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:1px solid #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px;max-height:90%}.rst-versions.rst-badge .fa-book,.rst-versions.rst-badge .icon-book{float:none;line-height:30px}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book,.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge>.rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width:768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}}	.fa:before{-webkit-font-smoothing:antialiased}.clearfix{zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-weight:normal;font-style:normal;src:url("../font/fontawesome_webfont.eot");src:url("../font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("../font/fontawesome_webfont.woff") format("woff"),url("../font/fontawesome_webfont.ttf") format("truetype"),url("../font/fontawesome_webfont.svg#FontAwesome") format("svg")}.fa:before{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa{display:inline-block;text-decoration:inherit}li .fa{display:inline-block}li .fa-large:before,li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.fas li .fa{width:0.8em}ul.fas li .fa-large:before,ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before{content:""}.icon-book:before{content:""}.fa-caret-down:before{content:""}.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.icon-caret-up:before{content:""}.fa-caret-left:before{content:""}.icon-caret-left:before{content:""}.fa-caret-right:before{content:""}.icon-caret-right:before{content:""}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}
		`/# sourceMappingURL=badge_only.css.map /`