Update man pages

With androideabi-4.9, android build now supports threading.

.clang-format

@@ -0,0 +1,57 @@
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+ConstructorInitializerIndentWidth: 4
+AlignEscapedNewlinesLeft: false
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AlwaysBreakTemplateDeclarations: false
+AlwaysBreakBeforeMultilineStrings: false
+BreakBeforeBinaryOperators: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BinPackParameters: true
+ColumnLimit:     80
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+DerivePointerAlignment: false
+ExperimentalAutoDetectBinPacking: false
+IndentCaseLabels: false
+IndentWrappedFunctionNames: false
+IndentFunctionDeclarationAfterType: false
+MaxEmptyLinesToKeep: 1
+KeepEmptyLinesAtTheStartOfBlocks: true
+NamespaceIndentation: None
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakString: 1000
+PenaltyBreakFirstLessLess: 120
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+SpacesBeforeTrailingComments: 1
+Cpp11BracedListStyle: true
+Standard:        Cpp11
+IndentWidth:     2
+TabWidth:        8
+UseTab:          Never
+BreakBeforeBraces: Attach
+SpacesInParentheses: false
+SpacesInAngles:  false
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: true
+SpaceBeforeAssignmentOperators: true
+ContinuationIndentWidth: 4
+CommentPragmas:  '^ IWYU pragma:'
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+SpaceBeforeParens: ControlStatements
+DisableFormat:   false
+...
+

.gitignore

@@ -21,6 +21,7 @@ install-sh
 .libs
 lib/includes/nghttp2/nghttp2ver.h
 lib/libnghttp2.pc
+src/libnghttp2_asio.pc
 ltmain.sh
 stamp-h1
 .deps/
@@ -35,3 +36,14 @@ doc/nghttp2ver.h.rst
 doc/package_README.rst
 doc/tutorial-client.rst
 doc/tutorial-server.rst
+doc/nghttpx-howto.rst
+doc/h2load-howto.rst
+doc/tutorial-hpack.rst
+doc/python-apiref.rst
+doc/building-android-binary.rst
+doc/asio_http2.h.rst
+doc/libnghttp2_asio.rst
+doc/contribute.rst
+python/setup.py
+python/dist
+python/MANIFEST

.travis.yml

@@ -0,0 +1,37 @@
+language: cpp
+compiler:
+  - clang
+#Disable gcc build for the moment...
+#  - gcc
+before_install:
+  - $CC --version
+  - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
+  - sudo apt-get update -qq
+    #Install and use gcc-4.8 (don't build with gcc-4.6)
+    #libstdc++-4.8 is needed by Clang to build too
+  - sudo apt-get -qq install g++-4.8 libstdc++-4.8-dev
+  - >
+      sudo apt-get install --no-install-recommends -qq
+      autoconf
+      automake
+      autotools-dev
+      libtool
+      pkg-config
+      zlib1g-dev
+      libcunit1-dev
+      libssl-dev
+      libxml2-dev
+      libev-dev
+      libevent-dev
+      libjansson-dev
+      libjemalloc-dev
+  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
+  - $CC --version
+before_script:
+  - autoreconf -i
+  - automake
+  - autoconf
+  - ./configure --enable-werror
+script:
+  - make
+  - make check

COPYING

@@ -20,3 +20,22 @@ 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.
+
+[The text below was composed based on 1.2. License section of
+curl/libcurl project.]
+
+When contributing with code, you agree to put your changes and new
+code under the same license nghttp2 is already using unless stated and
+agreed otherwise.
+
+When changing existing source code, you do not alter the copyright of
+the original file(s).  The copyright will still be owned by the
+original creator(s) or those who have been assigned copyright by the
+original author(s).
+
+By submitting a patch to the nghttp2 project, you are assumed to have
+the right to the code and to be allowed by your employer or whatever
+to hand over that patch/code to us.  We will credit you for your
+changes as far as possible, to give credit but also to keep a trace
+back to who made what changes.  Please always provide us with your
+full real name when contributing!

Dockerfile.android

@@ -0,0 +1,103 @@
+# Dockerfile to build nghttp2 android binary
+#
+# $ sudo docker build -t nghttp2-android - < Dockerfile.android
+#
+# After successful build, android binaries are located under
+# /root/build/nghttp2.  You can copy the binary using docker cp.  For
+# example, to copy nghttpx binary to host file system location
+# /path/to/dest, do this:
+#
+# $ sudo docker run -v /path/to/dest:/out nghttp2-android cp /root/build/nghttp2/src/nghttpx /out
+
+FROM ubuntu
+
+MAINTAINER Tatsuhiro Tsujikawa
+
+ENV ANDROID_HOME /root/android
+ENV PREFIX $ANDROID_HOME/usr/local
+ENV TOOLCHAIN $ANDROID_HOME/toolchain
+ENV PATH $TOOLCHAIN/bin:$PATH
+
+# 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
+
+RUN apt-get update
+# genisoimage, libc6-i386 and lib32stdc++6 are required to decompress ndk.
+RUN apt-get install -y make binutils autoconf automake autotools-dev libtool \
+    pkg-config git curl dpkg-dev libxml2-dev \
+    genisoimage libc6-i386 lib32stdc++6
+
+WORKDIR /root/build
+RUN curl -L -O http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin
+RUN chmod a+x android-ndk-r10c-linux-x86_64.bin
+RUN ./android-ndk-r10c-linux-x86_64.bin
+
+WORKDIR /root/build/android-ndk-r10c
+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 \
+    --disable-shared \
+    --host=arm-linux-androideabi \
+    --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
+    --prefix=$PREFIX \
+    --without-libxml2 \
+    --disable-src \
+    --disable-examples \
+    CPPFLAGS="-I$PREFIX/include" \
+    PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
+    LDFLAGS="-L$PREFIX/lib" && \
+    make install
+
+WORKDIR /root/build
+RUN curl -L -O https://www.openssl.org/source/openssl-1.0.1j.tar.gz
+RUN tar xf openssl-1.0.1j.tar.gz
+WORKDIR /root/build/openssl-1.0.1j
+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/libev-4.19.tar.gz
+RUN curl -L -O https://gist.github.com/tatsuhiro-t/48c45f08950f587180ed/raw/80a8f003b5d1091eae497c5995bbaa68096e739b/libev-4.19-android.patch
+RUN tar xf libev-4.19.tar.gz
+WORKDIR /root/build/libev-4.19
+RUN patch -p1 < ../libev-4.19-android.patch
+RUN ./configure \
+    --host=arm-linux-androideabi \
+    --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
+    --prefix=$PREFIX \
+    --disable-shared \
+    --enable-static \
+    CPPFLAGS=-I$PREFIX/include \
+    LDFLAGS=-L$PREFIX/lib && \
+    make install
+
+WORKDIR /root/build
+RUN git clone https://github.com/tatsuhiro-t/nghttp2
+WORKDIR /root/build/nghttp2
+RUN autoreconf -i && \
+    ./configure \
+    --disable-shared \
+    --host=arm-linux-androideabi \
+    --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
+    --with-xml-prefix="$PREFIX" \
+    --without-libxml2 \
+    --disable-python-bindings \
+    --disable-examples \
+    --disable-threads \
+    LIBSPDYLAY_CFLAGS=-I$PREFIX/usr/local/include \
+    LIBSPDYLAY_LIBS="-L$PREFIX/usr/local/lib -lspdylay" \
+    CPPFLAGS="-I$PREFIX/include" \
+    CXXFLAGS="-fno-strict-aliasing" \
+    PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
+    LDFLAGS="-L$PREFIX/lib" && \
+    make && \
+    arm-linux-androideabi-strip src/nghttpx src/nghttpd src/nghttp

Makefile.am

@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 
@@ -20,10 +20,23 @@
 # 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 examples python tests doc
+SUBDIRS = lib third-party src examples python tests doc contrib
 
 ACLOCAL_AMFLAGS = -I m4
 
 dist_doc_DATA = README.rst
 
-EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-make
+EXTRA_DIST = nghttpx.conf.sample proxy.pac.sample android-config android-make \
+	Dockerfile.android
+
+.PHONY: clang-format
+
+# Format source files using clang-format.  Don't format source files
+# 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 \
+	src/*.{c,cc,h} src/includes/nghttp2/*.h examples/*.{c,cc} \
+	tests/*.{c,h}

android-config

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 #
 # Copyright (c) 2013 Tatsuhiro Tsujikawa
 #
@@ -36,6 +36,11 @@ PATH=$TOOLCHAIN/bin:$PATH
     --host=arm-linux-androideabi \
     --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
     --with-xml-prefix="$PREFIX" \
+    --without-libxml2 \
+    --disable-python-bindings \
+    --disable-examples \
+    CC=clang \
+    CXX=clang++ \
     CPPFLAGS="-I$PREFIX/include" \
     PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
     LDFLAGS="-L$PREFIX/lib"

android-make

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 #
 # Copyright (c) 2013 Tatsuhiro Tsujikawa
 #

configure.ac

@@ -1,4 +1,4 @@
-dnl nghttp2 - HTTP/2.0 C Library
+dnl nghttp2 - HTTP/2 C Library
 
 dnl Copyright (c) 2012, 2013 Tatsuhiro Tsujikawa
 
@@ -20,15 +20,19 @@ dnl NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 dnl LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 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 http://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html
+
 AC_PREREQ(2.61)
-AC_INIT([nghttp2], [0.3.1], [t-tujikawa@users.sourceforge.net])
+AC_INIT([nghttp2], [0.7.1], [t-tujikawa@users.sourceforge.net])
 LT_PREREQ([2.2.6])
 LT_INIT()
 dnl See versioning rule:
 dnl  http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST(LT_CURRENT, 2)
+AC_SUBST(LT_CURRENT, 8)
 AC_SUBST(LT_REVISION, 1)
-AC_SUBST(LT_AGE, 0)
+AC_SUBST(LT_AGE, 3)
 
 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"`
@@ -45,13 +49,26 @@ AC_CANONICAL_TARGET
 AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([subdir-objects])
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
 AC_CONFIG_HEADERS([config.h])
 
 dnl Checks for command-line options
-AC_ARG_ENABLE([maintainer-mode],
-    [AS_HELP_STRING([--enable-maintainer-mode],
+AC_ARG_ENABLE([werror],
+    [AS_HELP_STRING([--enable-werror],
                     [Turn on compile time warnings])],
-    [maintainer_mode=$enableval], [maintainer_mode=no])
+    [werror=$enableval], [werror=no])
+
+AC_ARG_ENABLE([debug],
+    [AS_HELP_STRING([--enable-debug],
+                    [Turn on debug output])],
+    [debug=$enableval], [debug=no])
+
+AC_ARG_ENABLE([threads],
+    [AS_HELP_STRING([--disable-threads],
+                    [Turn off threading in apps])],
+    [threads=$enableval], [threads=yes])
 
 AC_ARG_ENABLE([app],
     [AS_HELP_STRING([--enable-app],
@@ -63,6 +80,11 @@ AC_ARG_ENABLE([hpack-tools],
                     [Build HPACK tools [default=check]])],
     [request_hpack_tools=$enableval], [request_hpack_tools=check])
 
+AC_ARG_ENABLE([asio-lib],
+    [AS_HELP_STRING([--enable-asio-lib],
+                    [Build C++ libnghttp2_asio library [default=no]])],
+    [request_asio_lib=$enableval], [request_asio_lib=no])
+
 AC_ARG_ENABLE([examples],
     [AS_HELP_STRING([--enable-examples],
                     [Build examples [default=check]])],
@@ -74,15 +96,25 @@ AC_ARG_ENABLE([python-bindings],
     [request_python_bindings=$enableval], [request_python_bindings=check])
 
 AC_ARG_ENABLE([failmalloc],
-    [AS_HELP_STRING([--enable-failmalloc],
-                    [Build failmalloc test program [default=no]])],
-    [request_failmalloc=$enableval], [request_failmalloc=no])
+    [AS_HELP_STRING([--disable-failmalloc],
+                    [Do not build failmalloc test program])],
+    [request_failmalloc=$enableval], [request_failmalloc=yes])
 
 AC_ARG_WITH([libxml2],
     [AS_HELP_STRING([--with-libxml2],
                     [Use libxml2 [default=check]])],
     [request_libxml2=$withval], [request_libxml2=check])
 
+AC_ARG_WITH([jemalloc],
+    [AS_HELP_STRING([--with-jemalloc],
+                    [Use jemalloc [default=check]])],
+    [request_jemalloc=$withval], [request_jemalloc=check])
+
+AC_ARG_WITH([spdylay],
+    [AS_HELP_STRING([--with-spdylay],
+                    [Use spdylay [default=check]])],
+    [request_spdylay=$withval], [request_spdylay=check])
+
 AC_ARG_WITH([cython],
     [AS_HELP_STRING([--with-cython=PATH],
                     [Use cython in given PATH])],
@@ -112,14 +144,29 @@ 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])
+else
+  AC_DEFINE([_U_], , [Hint to the compiler that a function parameters is not used])
+fi
+
 AX_CXX_COMPILE_STDCXX_11([noext], [optional])
 
+AC_LANG_PUSH(C++)
+
 # Check that std::chrono::steady_clock is available. In particular,
 # gcc 4.6 does not have one, but has monotonic_clock which is the old
 # name existed in the pre-standard draft. If steady_clock is not
 # available, don't define HAVE_STEADY_CLOCK and replace steady_clock
 # with monotonic_clock.
-AC_LANG_PUSH(C++)
 AC_MSG_CHECKING([whether std::chrono::steady_clock is available])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
 [[
@@ -132,49 +179,71 @@ auto tp = std::chrono::steady_clock::now();
                [Define to 1 if you have the `std::chrono::steady_clock`.])
      AC_MSG_RESULT([yes])],
     [AC_MSG_RESULT([no])])
+
+# Check that std::future is available.
+AC_MSG_CHECKING([whether std::future is available])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+[[
+#include <vector>
+#include <future>
+]],
+[[
+std::vector<std::future<int>> v;
+]])],
+    [AC_DEFINE([HAVE_STD_FUTURE], [1],
+               [Define to 1 if you have the `std::future`.])
+     have_std_future=yes
+     AC_MSG_RESULT([yes])],
+    [have_std_future=no
+     AC_MSG_RESULT([no])])
+
 AC_LANG_POP()
 
 # Checks for libraries.
 
 # Additional libraries required for tests.
-TESTS_LIBS=
+TESTLDFLAGS=
 
 # Additional libraries required for programs under src directory.
-SRC_LIBS=
+APPLDFLAGS=
 
 LIBS_OLD=$LIBS
 # Search for dlsym function, which is used in tests. Linux needs -ldl,
 # but netbsd does not need it.
 AC_SEARCH_LIBS([dlsym], [dl])
-TESTS_LIBS="$LIBS $TESTS_LIBS"
+TESTLDFLAGS="$LIBS $TESTLDFLAGS"
 LIBS=$LIBS_OLD
 
 LIBS_OLD=$LIBS
 AC_SEARCH_LIBS([clock_gettime], [rt],
                [AC_DEFINE([HAVE_CLOCK_GETTIME], [1],
                           [Define to 1 if you have the `clock_gettime`.])])
-SRC_LIBS="$LIBS $SRC_LIBS"
+APPLDFLAGS="$LIBS $APPLDFLAGS"
 LIBS=$LIBS_OLD
 
 case "$host" in
   *android*)
     android_build=yes
-    # android does not need -pthread, but needs followng 2 libs for C++
-    SRC_LIBS="$SRC_LIBS -lstdc++ -lsupc++"
+    # android does not need -pthread, but needs followng 3 libs for C++
+    APPLDFLAGS="$APPLDFLAGS -lstdc++ -latomic -lsupc++"
     ;;
   *)
-    SRC_LIBS="$SRC_LIBS -pthread"
+    PTHREAD_LDFLAGS="-pthread"
+    APPLDFLAGS="$APPLDFLAGS $PTHREAD_LDFLAGS"
     ;;
 esac
 
 # zlib
 if test "x$android_build" = "xyes"; then
   # Use zlib provided by NDK
-  LIBS="-lz $LIBS"
+  APPLDFLAGS="-lz $APPLDFLAGS"
+  have_zlib=yes
 else
-  PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.3])
-  LIBS="$ZLIB_LIBS $LIBS"
-  CFLAGS="$CFLAGS $ZLIB_CFLAGS"
+  PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.3], [have_zlib=yes], [have_zlib=no])
+
+  if test "x${have_zlib}" = "xno"; then
+    AC_MSG_NOTICE($ZLIB_PKG_ERRORS)
+  fi
 fi
 
 # cunit
@@ -206,6 +275,22 @@ fi
 
 AM_CONDITIONAL([HAVE_CUNIT], [ test "x${have_cunit}" = "xyes" ])
 
+# libev (for src)
+# libev does not have pkg-config file.  Check it in an old way.
+LIBS_OLD=$LIBS
+# 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=
+    AC_SUBST([LIBEV_LIBS])
+    AC_SUBST([LIBEV_CFLAGS])
+  fi
+fi
+LIBS=$LIBS_OLD
+
 # openssl (for src)
 PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.0.1],
                   [have_openssl=yes], [have_openssl=no])
@@ -213,7 +298,7 @@ if test "x${have_openssl}" = "xno"; then
   AC_MSG_NOTICE($OPENSSL_PKG_ERRORS)
 fi
 
-# libevent_openssl (for src)
+# libevent_openssl (for examples)
 # 2.0.8 is required because we use evconnlistener_set_error_cb()
 PKG_CHECK_MODULES([LIBEVENT_OPENSSL], [libevent_openssl >= 2.0.8],
                   [have_libevent_openssl=yes], [have_libevent_openssl=no])
@@ -221,10 +306,13 @@ if test "x${have_libevent_openssl}" = "xno"; then
   AC_MSG_NOTICE($LIBEVENT_OPENSSL_PKG_ERRORS)
 fi
 
-# jansson (for hdtest/deflatehd and hdtest/inflatehd)
+# jansson (for src/nghttp, src/deflatehd and src/inflatehd)
 PKG_CHECK_MODULES([JANSSON], [jansson >= 2.5],
                   [have_jansson=yes], [have_jansson=no])
-if test "x${have_jansson}" == "xno"; then
+if test "x${have_jansson}" == "xyes"; then
+  AC_DEFINE([HAVE_JANSSON], [1],
+            [Define to 1 if you have `libjansson` library.])
+else
   AC_MSG_NOTICE($JANSSON_PKG_ERRORS)
 fi
 
@@ -244,23 +332,71 @@ fi
 
 AM_CONDITIONAL([HAVE_LIBXML2], [ test "x${have_libxml2}" = "xyes" ])
 
-# spdylay (for src/nghttpx)
-PKG_CHECK_MODULES([LIBSPDYLAY], [libspdylay >= 1.2.3],
-                  [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 will be disabled.])
+# jemalloc
+have_jemalloc=no
+if test "x${request_jemalloc}" != "xno"; then
+  LIBS_OLD=$LIBS
+  AC_SEARCH_LIBS([malloc_stats_print], [jemalloc], [have_jemalloc=yes], [],
+                 [$PTHREAD_LDFLAGS])
+  LIBS=$LIBS_OLD
+  if test "x${have_jemalloc}" = "xyes" &&
+     test "x${ac_cv_search_malloc_stats_print}" != "xnone required"; then
+    JEMALLOC_LIBS=${ac_cv_search_malloc_stats_print}
+    AC_SUBST([JEMALLOC_LIBS])
+  fi
 fi
+
+if test "x${request_jemalloc}" = "xyes" &&
+   test "x${have_jemalloc}" != "xyes"; then
+  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.0],
+                    [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" ])
 
-# The nghttp, nghttpd and nghttpx under src depend on OpenSSL and
-# libevent_openssl
+# Check Boost Asio library
+have_asio_lib=no
+
+if test "x${request_asio_lib}" = "xyes"; then
+  AX_BOOST_BASE([1.54.0], [have_boost_base=yes], [have_boost_base=no])
+
+  if test "x${have_boost_base}" = "xyes"; then
+    AX_BOOST_ASIO()
+    AX_BOOST_SYSTEM()
+    AX_BOOST_THREAD()
+
+    if test "x${ax_cv_boost_asio}" = "xyes" &&
+       test "x${ax_cv_boost_system}" = "xyes" &&
+       test "x${ax_cv_boost_thread}" = "xyes"; then
+      have_asio_lib=yes
+    fi
+  fi
+fi
+
+# The nghttp, nghttpd and nghttpx under src depend on zlib, OpenSSL
+# and libev
 enable_app=no
 if test "x${request_app}" != "xno" &&
+   test "x${have_zlib}" = "xyes" &&
    test "x${have_openssl}" = "xyes" &&
-   test "x${have_libevent_openssl}" = "xyes"; then
+   test "x${have_libev}" = "xyes"; then
   enable_app=yes
 fi
 
@@ -285,6 +421,16 @@ fi
 
 AM_CONDITIONAL([ENABLE_HPACK_TOOLS], [ test "x${enable_hpack_tools}" = "xyes" ])
 
+# C++ library libnghttp2_asio
+
+enable_asio_lib=no
+if test "x${request_asio_lib}" != "xno" &&
+   test "x${have_asio_lib}" = "xyes"; then
+  enable_asio_lib=yes
+fi
+
+AM_CONDITIONAL([ENABLE_ASIO_LIB], [ test "x${enable_asio_lib}" = "xyes" ])
+
 # The example programs depend on OpenSSL and libevent_openssl
 enable_examples=no
 if test "x${request_examples}" != "xno" &&
@@ -317,7 +463,16 @@ fi
 AM_CONDITIONAL([ENABLE_PYTHON_BINDINGS],
                [test "x${enable_python_bindings}" = "xyes"])
 
+# Produce cython conditional, so that we can distribute generated C
+# source
+AM_CONDITIONAL([HAVE_CYTHON], [test "x${CYTHON}" != "x"])
+
 # failmalloc tests
+enable_failmalloc=no
+if test "x${request_failmalloc}" = "xyes"; then
+  enable_failmalloc=yes
+fi
+
 AM_CONDITIONAL([ENABLE_FAILMALLOC], [ test "x${enable_failmalloc}" = "xyes" ])
 
 # Checks for header files.
@@ -352,17 +507,40 @@ AC_CHECK_TYPES([ptrdiff_t])
 AC_C_BIGENDIAN
 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>]])
+
+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.])
+fi
+
 # Checks for library functions.
 if test "x$cross_compiling" != "xyes"; then
   AC_FUNC_MALLOC
 fi
 AC_CHECK_FUNCS([ \
+  _Exit \
+  accept4 \
   getpwnam \
   memmove \
   memset \
   timegm \
 ])
 
+# timerfd_create was added in linux kernel 2.6.25
+
+AC_CHECK_FUNC([timerfd_create],
+              [have_timerfd_create=yes], [have_timerfd_create=no])
+
+
+# Checks for epoll availability, primarily for examples/tiny-nghttpd
+AX_HAVE_EPOLL([have_epoll=yes], [have_epoll=no])
+
+AM_CONDITIONAL([ENABLE_TINY_NGHTTPD],
+               [ test "x${have_epoll}" = "xyes" &&
+                 test "x${have_timerfd_create}" = "xyes"])
+
 dnl Windows library for winsock2
 case "${host}" in
   *mingw*)
@@ -370,20 +548,58 @@ case "${host}" in
     ;;
 esac
 
-if test "x$maintainer_mode" != "xno"; then
-    CFLAGS="$CFLAGS -Wall -Wextra -Werror"
-    CFLAGS="$CFLAGS -Wmissing-prototypes -Wstrict-prototypes"
-    CFLAGS="$CFLAGS -Wmissing-declarations -Wpointer-arith"
-    CFLAGS="$CFLAGS -Wdeclaration-after-statement"
-    CFLAGS="$CFLAGS -Wformat-security"
-    CFLAGS="$CFLAGS -Wwrite-strings -Wshadow -Winline -Wnested-externs"
-    CFLAGS="$CFLAGS -Wfloat-equal -Wundef -Wendif-labels -Wempty-body"
-    CFLAGS="$CFLAGS -Wcast-align -Wclobbered -Wvla"
-    CFLAGS="$CFLAGS -Wno-unused-parameter"
+ac_save_CFLAGS=$CFLAGS
+CFLAGS=
+
+if test "x$werror" != "xno"; then
+    AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])
+    AX_CHECK_COMPILE_FLAG([-Wextra], [CFLAGS="$CFLAGS -Wextra"])
+    AX_CHECK_COMPILE_FLAG([-Werror], [CFLAGS="$CFLAGS -Werror"])
+    AX_CHECK_COMPILE_FLAG([-Wmissing-prototypes], [CFLAGS="$CFLAGS -Wmissing-prototypes"])
+    AX_CHECK_COMPILE_FLAG([-Wstrict-prototypes], [CFLAGS="$CFLAGS -Wstrict-prototypes"])
+    AX_CHECK_COMPILE_FLAG([-Wmissing-declarations], [CFLAGS="$CFLAGS -Wmissing-declarations"])
+    AX_CHECK_COMPILE_FLAG([-Wpointer-arith], [CFLAGS="$CFLAGS -Wpointer-arith"])
+    AX_CHECK_COMPILE_FLAG([-Wdeclaration-after-statement], [CFLAGS="$CFLAGS -Wdeclaration-after-statement"])
+    AX_CHECK_COMPILE_FLAG([-Wformat-security], [CFLAGS="$CFLAGS -Wformat-security"])
+    AX_CHECK_COMPILE_FLAG([-Wwrite-strings], [CFLAGS="$CFLAGS -Wwrite-strings"])
+    AX_CHECK_COMPILE_FLAG([-Wshadow], [CFLAGS="$CFLAGS -Wshadow"])
+    AX_CHECK_COMPILE_FLAG([-Winline], [CFLAGS="$CFLAGS -Winline"])
+    AX_CHECK_COMPILE_FLAG([-Wnested-externs], [CFLAGS="$CFLAGS -Wnested-externs"])
+    AX_CHECK_COMPILE_FLAG([-Wfloat-equal], [CFLAGS="$CFLAGS -Wfloat-equal"])
+    AX_CHECK_COMPILE_FLAG([-Wundef], [CFLAGS="$CFLAGS -Wundef"])
+    AX_CHECK_COMPILE_FLAG([-Wendif-labels], [CFLAGS="$CFLAGS -Wendif-labels"])
+    AX_CHECK_COMPILE_FLAG([-Wempty-body], [CFLAGS="$CFLAGS -Wempty-body"])
+    AX_CHECK_COMPILE_FLAG([-Wcast-align], [CFLAGS="$CFLAGS -Wcast-align"])
+    AX_CHECK_COMPILE_FLAG([-Wclobbered], [CFLAGS="$CFLAGS -Wclobbered"])
+    AX_CHECK_COMPILE_FLAG([-Wvla], [CFLAGS="$CFLAGS -Wvla"])
+    AX_CHECK_COMPILE_FLAG([-Wpragmas], [CFLAGS="$CFLAGS -Wpragmas"])
+    AX_CHECK_COMPILE_FLAG([-Wunreachable-code], [CFLAGS="$CFLAGS -Wunreachable-code"])
+    AX_CHECK_COMPILE_FLAG([-Waddress], [CFLAGS="$CFLAGS -Waddress"])
+    AX_CHECK_COMPILE_FLAG([-Wattributes], [CFLAGS="$CFLAGS -Wattributes"])
+    AX_CHECK_COMPILE_FLAG([-Wdiv-by-zero], [CFLAGS="$CFLAGS -Wdiv-by-zero"])
+    AX_CHECK_COMPILE_FLAG([-Wshorten-64-to-32], [CFLAGS="$CFLAGS -Wshorten-64-to-32"])
+
+    # Only work with Clang for the moment
+    AX_CHECK_COMPILE_FLAG([-Wheader-guard], [CFLAGS="$CFLAGS -Wheader-guard"])
 fi
 
-AC_SUBST([TESTS_LIBS])
-AC_SUBST([SRC_LIBS])
+WARNCFLAGS=$CFLAGS
+CFLAGS=$ac_save_CFLAGS
+
+AC_SUBST([WARNCFLAGS])
+
+if test "x$debug" != "xno"; then
+    AC_DEFINE([DEBUGBUILD], [1], [Define to 1 to enable debug output.])
+fi
+
+# Some platform does not have working std::future.  We disable
+# threading for those platforms to exclude std::future use.
+if test "x$threads" != "xyes" || test "x$have_std_future" != "xyes"; then
+    AC_DEFINE([NOTHREADS], [1], [Define to 1 if you want to disable threads.])
+fi
+
+AC_SUBST([TESTLDFLAGS])
+AC_SUBST([APPLDFLAGS])
 
 AC_CONFIG_FILES([
   Makefile
@@ -395,16 +611,28 @@ AC_CONFIG_FILES([
   tests/testdata/Makefile
   third-party/Makefile
   src/Makefile
+  src/includes/Makefile
+  src/libnghttp2_asio.pc
   examples/Makefile
   python/Makefile
+  python/setup.py
   doc/Makefile
   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/contribute.rst
+  contrib/Makefile
 ])
 AC_OUTPUT
 
@@ -415,6 +643,7 @@ AC_MSG_NOTICE([summary of build options:
     Install prefix: ${prefix}
     C compiler:     ${CC}
     CFLAGS:         ${CFLAGS}
+    WARNCFLAGS:     ${WARNCFLAGS}
     LDFLAGS:        ${LDFLAGS}
     LIBS:           ${LIBS}
     CPPFLAGS:       ${CPPFLAGS}
@@ -423,22 +652,34 @@ AC_MSG_NOTICE([summary of build options:
     CXXFLAGS:       ${CXXFLAGS}
     CXXCPP:         ${CXXCPP}
     Library types:  Shared=${enable_shared}, Static=${enable_static}
-    Python:         ${PYTHON}
-    PYTHON_VERSION: ${PYTHON_VERSION}
-    pyexecdir:      ${pyexecdir}
-    Python-dev:     ${have_python_dev}
-    PYTHON_CPPFLAGS:${PYTHON_CPPFLAGS}
-    PYTHON_LDFLAGS: ${PYTHON_LDFLAGS}
-    Cython:         ${CYTHON}
-    CUnit:          ${have_cunit}
-    OpenSSL:        ${have_openssl}
-    Libxml2:        ${have_libxml2}
-    Libevent(SSL):  ${have_libevent_openssl}
-    Spdylay:        ${have_spdylay}
-    Jansson:        ${have_jansson}
-    Applications:   ${enable_app}
-    HPACK tools:    ${enable_hpack_tools}
-    Examples:       ${enable_examples}
-    Python bindings:${enable_python_bindings}
-    Failmalloc:     ${request_failmalloc}
+    Python:
+      Python:         ${PYTHON}
+      PYTHON_VERSION: ${PYTHON_VERSION}
+      pyexecdir:      ${pyexecdir}
+      Python-dev:     ${have_python_dev}
+      PYTHON_CPPFLAGS:${PYTHON_CPPFLAGS}
+      PYTHON_LDFLAGS: ${PYTHON_LDFLAGS}
+      Cython:         ${CYTHON}
+    Test:
+      CUnit:          ${have_cunit}
+      Failmalloc:     ${enable_failmalloc}
+    Libs:
+      OpenSSL:        ${have_openssl}
+      Libxml2:        ${have_libxml2}
+      Libev:          ${have_libev}
+      Libevent(SSL):  ${have_libevent_openssl}
+      Spdylay:        ${have_spdylay}
+      Jansson:        ${have_jansson}
+      Jemalloc:       ${have_jemalloc}
+      Boost CPPFLAGS: ${BOOST_CPPFLAGS}
+      Boost LDFLAGS:  ${BOOST_LDFLAGS}
+      Boost::ASIO:    ${BOOST_ASIO_LIB}
+      Boost::System:  ${BOOST_SYSTEM_LIB}
+      Boost::Thread:  ${BOOST_THREAD_LIB}
+    Features:
+      Applications:   ${enable_app}
+      HPACK tools:    ${enable_hpack_tools}
+      Libnghttp2_asio:${enable_asio_lib}
+      Examples:       ${enable_examples}
+      Python bindings:${enable_python_bindings}
 ])

contrib/.gitignore

@@ -0,0 +1 @@
+nghttpx-init

contrib/Makefile.am

@@ -0,0 +1,39 @@
+# nghttp2 - HTTP/2 C Library
+
+# Copyright (c) 2014 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 = nghttpx-init.in nghttpx-logrotate
+
+edit = sed -e 's|@bindir[@]|$(bindir)|g'
+
+nghttpx-init: Makefile
+	rm -f $@ $@.tmp
+	$(edit) $(srcdir)/$@.in > $@.tmp
+	chmod +x $@.tmp
+	mv $@.tmp $@
+
+nghttpx-init: $(srcdir)/nghttpx-init.in
+
+all-local: nghttpx-init
+
+clean-local:
+	-rm -f nghttpx-init nghttpx-init.tmp

contrib/nghttpx-init.in

@@ -0,0 +1,173 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          nghttpx
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: nghttpx initscript
+# Description:       nghttpx initscript
+### END INIT INFO
+
+# Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
+#
+# Do NOT "set -e"
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
+DESC="HTTP/2 reverse proxy"
+NAME=nghttpx
+# Depending on the configuration, binary may be located under @sbindir@
+DAEMON=@bindir@/$NAME
+PIDFILE=/var/run/$NAME.pid
+DAEMON_ARGS="--conf /etc/nghttpx/nghttpx.conf --pid-file=$PIDFILE"
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+	# Return
+	#   0 if daemon has been started
+	#   1 if daemon was already running
+	#   2 if daemon could not be started
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+		$DAEMON_ARGS \
+		|| return 2
+	# Add code here, if necessary, that waits for the process to be ready
+	# to handle requests from services started subsequently which depend
+	# on this one.  As a last resort, sleep for some time.
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+	# Return
+	#   0 if daemon has been stopped
+	#   1 if daemon was already stopped
+	#   2 if daemon could not be stopped
+	#   other if a failure occurred
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+
+	# Wait for children to finish too if this is a daemon that forks
+	# and if the daemon is only ever run from this initscript.
+	# If the above conditions are not satisfied then add some other code
+	# that waits for the process to drop all resources that could be
+	# needed by services started subsequently.  A last resort is to
+	# sleep for some time.
+	#start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
+	#[ "$?" = 2 ] && return 2
+	# Many daemons don't delete their pidfiles when they exit.
+	rm -f $PIDFILE
+	return "$RETVAL"
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+	#
+	# If the daemon can reload its configuration without
+	# restarting (for example, when it is sent a SIGHUP),
+	# then implement that here.
+	#
+	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+	return 0
+}
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  status)
+       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+       ;;
+  upgrade)
+        log_daemon_msg "Upgrade $DESC" "$NAME"
+        pid=`pidofproc -p $PIDFILE $NAME`
+        case "$?" in
+                0) echo "Sending USR2 signal to $pid"
+                   kill -USR2 $pid
+                   echo "Waiting for new binary..."
+                   sleep 5
+                   echo "Sending QUIT signal to $pid"
+                   kill -QUIT $pid
+                   log_end_msg 0
+                   ;;
+                *) echo "pidofproc() failed"
+                   log_end_msg 1
+                   ;;
+        esac
+        ;;
+  #reload|force-reload)
+	#
+	# If do_reload() is not implemented then leave this commented out
+	# and leave 'force-reload' as an alias for 'restart'.
+	#
+	#log_daemon_msg "Reloading $DESC" "$NAME"
+	#do_reload
+	#log_end_msg $?
+	#;;
+  restart|force-reload)
+	#
+	# If the "reload" option is implemented then remove the
+	# 'force-reload' alias
+	#
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		case "$?" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 1 ;; # Old process is still running
+			*) log_end_msg 1 ;; # Failed to start
+		esac
+		;;
+	  *)
+	  	# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload|upgrade}" >&2
+	exit 3
+	;;
+esac
+
+:

contrib/nghttpx-logrotate

@@ -0,0 +1,18 @@
+/var/log/nghttpx/*.log {
+        weekly
+        missingok
+        rotate 52
+        compress
+        delaycompress
+        notifempty
+        create 0640 www-data adm
+        sharedscripts
+        prerotate
+                if [ -d /etc/logrotate.d/httpd-prerotate ]; then \
+                        run-parts /etc/logrotate.d/httpd-prerotate; \
+                fi \
+        endscript
+        postrotate
+                [ -s /run/nghttpx.pid ] && kill -USR1 `cat /run/nghttpx.pid`
+        endscript
+}

doc/Makefile.am

@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 
@@ -21,15 +21,26 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-man_MANS = nghttp.1 nghttpd.1 nghttpx.1
+man_MANS = nghttp.1 nghttpd.1 nghttpx.1 h2load.1
 
 EXTRA_DIST = \
 	mkapiref.py \
 	README.rst \
 	apiref-header.rst \
+	nghttp.1.rst \
+	nghttpd.1.rst \
+	nghttpx.1.rst \
+	h2load.1.rst \
 	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 \
 	_themes/sphinx_rtd_theme/footer.html \
 	_themes/sphinx_rtd_theme/theme.conf \
 	_themes/sphinx_rtd_theme/layout_old.html \
@@ -165,7 +176,7 @@ text:
 	@echo
 	@echo "Build finished. The text files are in $(BUILDDIR)/text."
 
-man:
+man: apiref.rst
 	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
 	@echo
 	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."

doc/_themes/sphinx_rtd_theme/breadcrumbs.html

@@ -7,9 +7,9 @@
     <li>{{ title }}</li>
       <li class="wy-breadcrumbs-aside">
         {% if display_github %}
-          <a href="https://github.com/{{ github_user }}/{{ github_repo }}/blob/{{ github_version }}{{ conf_py_path }}{{ pagename }}.rst" class="fa fa-github"> Edit on GitHub</a>
+          <a href="https://github.com/{{ github_user }}/{{ github_repo }}/blob/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ source_suffix }}" class="fa fa-github"> Edit on GitHub</a>
         {% elif display_bitbucket %}
-          <a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}.rst" class="fa fa-bitbucket"> Edit on Bitbucket</a>
+          <a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}{{ source_suffix }}" class="fa fa-bitbucket"> Edit on Bitbucket</a>
         {% elif show_source and has_source and sourcename %}
           <a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> View page source</a>
         {% endif %}

doc/_themes/sphinx_rtd_theme/footer.html

@@ -2,7 +2,7 @@
   {% 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 }}"/>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 }}">Next <span class="fa fa-arrow-circle-right"></span></a>
       {% endif %}
       {% if prev %}
         <a href="{{ prev.link|e }}" class="btn btn-neutral" title="{{ prev.title|striptags|e }}"><span class="fa fa-arrow-circle-left"></span> Previous</a>
@@ -28,5 +28,6 @@
     </p>
   </div>
 
-  {% trans %}<a href="https://github.com/snide/sphinx_rtd_theme">Sphinx theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>{% endtrans %}
+  {% 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 %}.
+  
 </footer>

doc/_themes/sphinx_rtd_theme/layout.html

@@ -23,43 +23,19 @@
   {% endif %}
 
   {# CSS #}
-  <link href='https://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,700|Inconsolata:400,700' rel='stylesheet' type='text/css'>
+  <link href='https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic|Roboto+Slab:400,700|Inconsolata:400,700&subset=latin,cyrillic' rel='stylesheet' type='text/css'>
 
-  {# JS #}
+  {# OPENSEARCH #}
   {% if not embedded %}
-
-    <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 %}
-
     {% 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 %}
 
   {% endif %}
 
-  {# RTD hosts these file themselves, so just load on non RTD builds #}
+  {# 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" />
-    <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 %}
 
   {% for cssfile in css_files %}
@@ -94,6 +70,7 @@
   {%- endblock %}
   {%- block extrahead %} {% endblock %}
 
+  {# Keep modernizr in head - http://modernizr.com/docs/#installing #}
   <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
 
 </head>
@@ -105,18 +82,22 @@
     {# SIDE NAV, TOGGLES ON MOBILE #}
     <nav data-toggle="wy-nav-shift" class="wy-nav-side">
       <div class="wy-side-nav-search">
-        <a href="{{ pathto(master_doc) }}" class="fa fa-home"> {{ project }}</a>
+        {% block sidebartitle %}
+          <a href="{{ pathto(master_doc) }}" class="fa fa-home"> {{ project }}</a>
+        {% endblock %}
         {% include "searchbox.html" %}
       </div>
 
       <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-        {% set toctree = toctree(maxdepth=2, collapse=False, includehidden=True) %}
-        {% if toctree %}
-            {{ toctree }}
-        {% else %}
-            <!-- Local TOC -->
-            <div class="local-toc">{{ toc }}</div>
-        {% endif %}
+        {% block menu %}
+          {% set toctree = toctree(maxdepth=2, collapse=False, includehidden=True) %}
+          {% if toctree %}
+              {{ toctree }}
+          {% else %}
+              <!-- Local TOC -->
+              <div class="local-toc">{{ toc }}</div>
+          {% endif %}
+        {% endblock %}
       </div>
       &nbsp;
     </nav>
@@ -134,7 +115,7 @@
       <div class="wy-nav-content">
         <div class="rst-content">
           {% include "breadcrumbs.html" %}
-          <div role="main">
+          <div role="main" class="document">
             {% block body %}{% endblock %}
           </div>
           {% include "footer.html" %}
@@ -145,5 +126,39 @@
 
   </div>
   {% include "versions.html" %}
+
+  {% if not embedded %}
+
+    <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 %}
+
+  {% 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 %}
+
 </body>
 </html>

doc/_themes/sphinx_rtd_theme/search.html

@@ -10,7 +10,7 @@
 {%- extends "layout.html" %}
 {% set title = _('Search') %}
 {% set script_files = script_files + ['_static/searchtools.js'] %}
-{% block extrahead %}
+{% block footer %}
   <script type="text/javascript">
     jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
   </script>

doc/_themes/sphinx_rtd_theme/searchbox.html

@@ -1,7 +1,9 @@
+{%- if builder != 'singlehtml' %}
 <div role="search">
-  <form id ="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
+  <form id="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
     <input type="text" name="q" placeholder="Search docs" />
     <input type="hidden" name="check_keywords" value="yes" />
     <input type="hidden" name="area" value="default" />
   </form>
 </div>
+{%- endif %}

doc/_themes/sphinx_rtd_theme/static/css/badge_only.css

@@ -1 +1,2 @@
-.font-smooth,.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:"\f02d"}.icon-book:before{content:"\f02d"}.fa-caret-down:before{content:"\f0d7"}.icon-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.icon-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.icon-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.icon-caret-right:before{content:"\f0da"}.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}}
+.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 */

doc/apiref-header.rst

@@ -14,9 +14,20 @@ The header files are also available online: :doc:`nghttp2.h` and
 Remarks
 -------
 
-Do not call `nghttp2_session_send`, `nghttp2_session_recv` or
-`nghttp2_session_mem_recv` from the nghttp2 callback functions
-directly or indirectly. It will lead to the crash. You can submit
-requests or frames in the callbacks then call `nghttp2_session_send`,
-`nghttp2_session_recv` or `nghttp2_session_mem_recv` outside of the
-callbacks.
+Do not call `nghttp2_session_send()`, `nghttp2_session_mem_send()`,
+`nghttp2_session_recv()` or `nghttp2_session_mem_recv()` from the
+nghttp2 callback functions directly or indirectly. It will lead to the
+crash.  You can submit requests or frames in the callbacks then call
+these functions outside the callbacks.
+
+Currently, `nghttp2_session_send()` and `nghttp2_session_mem_send()`
+do not send client connection preface
+(:macro:`NGHTTP2_CLIENT_CONNECTION_PREFACE`).  The applications are
+responsible to send it before sending any HTTP/2 frames using these
+functions if :type:`nghttp2_session` is configured as client.
+Similarly, `nghttp2_session_recv()` and `nghttp2_session_mem_recv()`
+do not consume client connection preface unless
+`nghttp2_option_set_recv_client_preface()` is used with nonzero option
+value.  The applications are responsible to receive it before calling
+these functions if :type:`nghttp2_session` is configured as server and
+`nghttp2_option_set_recv_client_preface()` is not used.

doc/asio_http2.h.rst.in

@@ -0,0 +1,5 @@
+asio_http2.h
+============
+
+.. literalinclude:: @top_srcdir@/src/includes/nghttp2/asio_http2.h
+   :language: cpp

doc/building-android-binary.rst.in

@@ -0,0 +1 @@
+.. include:: @top_srcdir@/doc/sources/building-android-binary.rst

doc/conf.py.in

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 
@@ -64,7 +64,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'nghttp2'
-copyright = u'2012, 2014, Tatsuhiro Tsujikawa'
+copyright = u'2012, 2015, Tatsuhiro Tsujikawa'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -155,7 +155,7 @@ html_theme_path = ['@top_srcdir@/doc/_themes']
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-#html_use_smartypants = True
+html_use_smartypants = False
 
 # Custom sidebar templates, maps document names to template names.
 html_sidebars = {
@@ -242,6 +242,12 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'nghttp2', u'nghttp2 Documentation',
+    ('nghttp.1', 'nghttp', u'HTTP/2 experimental client',
+     [u'Tatsuhiro Tsujikawa'], 1),
+    ('nghttpd.1', 'nghttpd', u'HTTP/2 experimental server',
+     [u'Tatsuhiro Tsujikawa'], 1),
+    ('nghttpx.1', 'nghttpx', u'HTTP/2 experimental proxy',
+     [u'Tatsuhiro Tsujikawa'], 1),
+    ('h2load.1', 'h2load', u'HTTP/2 benchmarking tool',
      [u'Tatsuhiro Tsujikawa'], 1)
 ]

doc/contribute.rst.in

@@ -0,0 +1 @@
+.. include:: @top_srcdir@/doc/sources/contribute.rst

doc/h2load-howto.rst.in

@@ -0,0 +1 @@
+.. include:: @top_srcdir@/doc/sources/h2load-howto.rst

doc/h2load.1

@@ -0,0 +1,146 @@
+.\" Man page generated from reStructuredText.
+.
+.TH "H2LOAD" "1" "January 11, 2015" "0.7.1" "nghttp2"
+.SH NAME
+h2load \- HTTP/2 benchmarking tool
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.sp
+\fBh2load\fP [OPTIONS]... [URI]...
+.SH DESCRIPTION
+.sp
+benchmarking tool for HTTP/2 and SPDY server
+.INDENT 0.0
+.TP
+.B <URI>
+Specify  URI to  access.   Multiple  URIs can  be
+specified.  URIs are used  in this order for each
+client.   All URIs  are used,  then first  URI is
+used and  then 2nd URI,  and so on.   The scheme,
+host and port in the subsequent URIs, if present,
+are  ignored.  Those  in the  first URI  are used
+solely.
+.UNINDENT
+.SH OPTIONS:
+.INDENT 0.0
+.TP
+.B \-n, \-\-requests=<N>
+Number of requests.
+.sp
+Default: \fB1\fP
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-c, \-\-clients=<N>
+Number of concurrent clients.
+.sp
+Default: \fB1\fP
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-t, \-\-threads=<N>
+Number of native threads.
+.sp
+Default: \fB1\fP
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-i, \-\-input\-file=<FILE>
+Path of  a file with multiple  URIs are seperated
+by EOLs.   This option will disable  URIs getting
+from command\-line.   If \(aq\-\(aq  is given  as <FILE>,
+URIs will be  read from stdin.  URIs  are used in
+this order  for each client.  All  URIs are used,
+then first URI  is used and then 2nd  URI, and so
+on.  The scheme, host  and port in the subsequent
+URIs,  if present,  are  ignored.   Those in  the
+first URI are used solely.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-m, \-\-max\-concurrent\-streams=(auto|<N>)
+Max concurrent streams to  issue per session.  If
+"auto"  is given,  the  number of  given URIs  is
+used.
+.sp
+Default: \fBauto\fP
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-w, \-\-window\-bits=<N>
+Sets  the stream  level  initial  window size  to
+(2**<N>)\-1.  For SPDY, 2**<N> is used instead.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-W, \-\-connection\-window\-bits=<N>
+Sets the connection level  initial window size to
+(2**<N>)\-1.  For  SPDY, if  <N> is  strictly less
+than  16,  this  option  is  ignored.   Otherwise
+2**<N> is used for SPDY.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-H, \-\-header=<HEADER>
+Add/Override a header to the requests.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-p, \-\-no\-tls\-proto=<PROTOID>
+Specify  ALPN identifier  of the  protocol to  be
+used  when accessing  http  URI without  SSL/TLS.
+Available protocols: spdy/2, spdy/3, spdy/3.1 and
+h2c\-14
+.sp
+Default: \fBh2c\-14\fP
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-v, \-\-verbose
+Output debug information.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-version
+Display version information and exit.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-h, \-\-help
+Display this help and exit.
+.UNINDENT
+.SH SEE ALSO
+.sp
+\fInghttp(1)\fP, \fInghttpd(1)\fP, \fInghttpx(1)\fP
+.SH AUTHOR
+Tatsuhiro Tsujikawa
+.SH COPYRIGHT
+2012, 2015, Tatsuhiro Tsujikawa
+.\" Generated by docutils manpage writer.
+.

doc/h2load.1.rst

@@ -0,0 +1,106 @@
+
+h2load(1)
+=========
+
+SYNOPSIS
+--------
+
+**h2load** [OPTIONS]... [URI]...
+
+DESCRIPTION
+-----------
+
+benchmarking tool for HTTP/2 and SPDY server
+
+.. describe:: <URI>
+
+    Specify  URI to  access.   Multiple  URIs can  be
+    specified.  URIs are used  in this order for each
+    client.   All URIs  are used,  then first  URI is
+    used and  then 2nd URI,  and so on.   The scheme,
+    host and port in the subsequent URIs, if present,
+    are  ignored.  Those  in the  first URI  are used
+    solely.
+
+OPTIONS:
+--------
+
+.. option:: -n, --requests=<N>
+
+    Number of requests.
+
+    Default: ``1``
+
+.. option:: -c, --clients=<N>
+
+    Number of concurrent clients.
+
+    Default: ``1``
+
+.. option:: -t, --threads=<N>
+
+    Number of native threads.
+
+    Default: ``1``
+
+.. option:: -i, --input-file=<FILE>
+
+    Path of  a file with multiple  URIs are seperated
+    by EOLs.   This option will disable  URIs getting
+    from command-line.   If '-'  is given  as <FILE>,
+    URIs will be  read from stdin.  URIs  are used in
+    this order  for each client.  All  URIs are used,
+    then first URI  is used and then 2nd  URI, and so
+    on.  The scheme, host  and port in the subsequent
+    URIs,  if present,  are  ignored.   Those in  the
+    first URI are used solely.
+
+.. option:: -m, --max-concurrent-streams=(auto|<N>)
+
+    Max concurrent streams to  issue per session.  If
+    "auto"  is given,  the  number of  given URIs  is
+    used.
+
+    Default: ``auto``
+
+.. option:: -w, --window-bits=<N>
+
+    Sets  the stream  level  initial  window size  to
+    (2**<N>)-1.  For SPDY, 2\*\*<N> is used instead.
+
+.. option:: -W, --connection-window-bits=<N>
+
+    Sets the connection level  initial window size to
+    (2**<N>)-1.  For  SPDY, if  <N> is  strictly less
+    than  16,  this  option  is  ignored.   Otherwise
+    2**<N> is used for SPDY.
+
+.. option:: -H, --header=<HEADER>
+
+    Add/Override a header to the requests.
+
+.. option:: -p, --no-tls-proto=<PROTOID>
+
+    Specify  ALPN identifier  of the  protocol to  be
+    used  when accessing  http  URI without  SSL/TLS.
+    Available protocols: spdy/2, spdy/3, spdy/3.1 and
+    h2c-14
+
+    Default: ``h2c-14``
+
+.. option:: -v, --verbose
+
+    Output debug information.
+
+.. option:: --version
+
+    Display version information and exit.
+
+.. option:: -h, --help
+
+    Display this help and exit.
+
+SEE ALSO
+--------
+
+:manpage:`nghttp(1)`, :manpage:`nghttpd(1)`, :manpage:`nghttpx(1)`

doc/h2load.h2r

@@ -0,0 +1,4 @@
+SEE ALSO
+--------
+
+:manpage:`nghttp(1)`, :manpage:`nghttpd(1)`, :manpage:`nghttpx(1)`

doc/libnghttp2_asio.rst.in

@@ -0,0 +1 @@
+.. include:: @top_srcdir@/doc/sources/libnghttp2_asio.rst

doc/mkapiref.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 

doc/nghttp.1

@@ -1,90 +1,217 @@
-.\" nghttp2 manual page
-.TH nghttp2 "1" "January 2014" "nghttp2" "User Commands"
+.\" Man page generated from reStructuredText.
+.
+.TH "NGHTTP" "1" "January 11, 2015" "0.7.1" "nghttp2"
 .SH NAME
-nghttp2 \- HTTP2 experimental client
+nghttp \- HTTP/2 experimental client
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
 .SH SYNOPSIS
-\fBnghttp\fP [\fIOPTIONS\fP] \fIURI\fP...
+.sp
+\fBnghttp\fP [OPTIONS]... <URI>...
 .SH DESCRIPTION
-Experimental client for HTTP 2.0.
-.SH OPTIONS
+.sp
+HTTP/2 experimental client
+.INDENT 0.0
 .TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Print debug information such as reception/
-transmission of frames and name/value pairs.
+.B <URI>
+Specify URI to access.
+.UNINDENT
+.SH OPTIONS:
+.INDENT 0.0
 .TP
-\fB\-n\fR, \fB\-\-null\-out\fR
+.B \-v, \-\-verbose
+Print  debug information  such  as reception  and
+transmission  of  frames  and  name/value  pairs.
+Specifying this  option multiple  times increases
+verbosity.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-n, \-\-null\-out
 Discard downloaded data.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-O\fR, \fB\-\-remote\-name\fR
-Save download data in the current directory.
-The filename is dereived from URI. If URI
-ends with '/', 'index.html' is used as a
-filename. Not implemented yet.
+.B \-O, \-\-remote\-name
+Save download data in the current directory.  The
+filename is dereived from  URI.  If URI ends with
+\(aq\fI/\fP\(aq,  \(aqindex.html\(aq is  used as  a filename.   Not
+implemented yet.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-t\fR, \fB\-\-timeout=\fR<N>
+.B \-t, \-\-timeout=<N>
 Timeout each request after <N> seconds.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-w\fR, \fB\-\-window\-bits=\fR<N>
-Sets the stream level initial window size
-to 2**<N>\-1.
+.B \-w, \-\-window\-bits=<N>
+Sets  the stream  level  initial  window size  to
+2**<N>\-1.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-W\fR, \fB\-\-connection\-window\-bits=\fR<N>
-Sets the connection level initial window
-size to 2**<N>\-1.
+.B \-W, \-\-connection\-window\-bits=<N>
+Sets the connection level  initial window size to
+2**<N>\-1.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-a\fR, \fB\-\-get\-assets\fR
-Download assets such as stylesheets, images
-and script files linked from the downloaded
-resource. Only links whose origins are the
-same with the linking resource will be
-downloaded.
+.B \-a, \-\-get\-assets
+Download assets  such as stylesheets,  images and
+script files linked from the downloaded resource.
+Only links  whose origins  are the same  with the
+linking  resource  will  be  downloaded.   nghttp
+prioritizes  resources  using  HTTP/2  dependency
+based priority.  The priority order, from highest
+to lowest,  is html  itself, css,  javascript and
+images.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-s\fR, \fB\-\-stat\fR
+.B \-s, \-\-stat
 Print statistics.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-H\fR, \fB\-\-header\fR
-Add a header to the requests.
+.B \-H, \-\-header=<HEADER>
+Add   a  header   to   the  requests.    Example:
+\fI\%\-H\fP\(aq:method: PUT\(aq
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-\-cert=\fR<CERT>
-Use the specified client certificate file.
-The file must be in PEM format.
+.B \-\-cert=<CERT>
+Use the  specified client certificate  file.  The
+file must be in PEM format.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-\-key=\fR<KEY>
-Use the client private key file. The file
-must be in PEM format.
+.B \-\-key=<KEY>
+Use the  client private key file.   The file must
+be in PEM format.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-d\fR, \fB\-\-data=\fR<FILE>
-Post FILE to server. If \- is given, data
-will be read from stdin.
+.B \-d, \-\-data=<FILE>
+Post FILE to  server. If \(aq\-\(aq is  given, data will
+be read from stdin.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-m\fR, \fB\-\-multiply=\fR<N> Request each URI <N> times. By default, same
-URI is not requested twice. This option
-disables it too.
+.B \-m, \-\-multiply=<N>
+Request each URI <N> times.  By default, same URI
+is not requested twice.   This option disables it
+too.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-f\fR, \fB\-\-no\-flow\-control\fR
-Disables connection and stream level flow
-controls.
+.B \-u, \-\-upgrade
+Perform HTTP Upgrade for  HTTP/2.  This option is
+ignored if the request  URI has https scheme.  If
+\fI\-d\fP is used, the HTTP upgrade request is performed
+with OPTIONS method.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-u\fR, \fB\-\-upgrade\fR
-Perform HTTP Upgrade for HTTP/2.0. This
-option is ignored if the request URI has
-https scheme.
-If \fB\-d\fR is used, the HTTP upgrade request is
-performed with OPTIONS method.
+.B \-p, \-\-weight=<WEIGHT>
+Sets  priority  group  weight.  The  valid  value
+range is [1, 256], inclusive.
+.sp
+Default: \fB16\fP
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-p\fR, \fB\-\-pri=\fR<PRIORITY>
-Sets stream priority. Default: 1073741824
+.B \-M, \-\-peer\-max\-concurrent\-streams=<N>
+Use <N>  as SETTINGS_MAX_CONCURRENT_STREAMS value
+of  remote  endpoint  as  if it  is  received  in
+SETTINGS frame.   The default is large  enough as
+it is seen as unlimited.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-M\fR, \fB\-\-peer\-max\-concurrent\-streams=\fR<N>
-Use <N> as SETTINGS_MAX_CONCURRENT_STREAMS
-value of remote endpoint as if it is
-received in SETTINGS frame. The default
-is large enough as it is seen as unlimited.
-.TP
-\fB\-c\fR, \fB\-\-header\-table\-size=\fR<N>
+.B \-c, \-\-header\-table\-size=<N>
 Specify decoder header table size.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-\-color\fR
+.B \-b, \-\-padding=<N>
+Add  at most  <N>  bytes to  a  frame payload  as
+padding.  Specify 0 to disable padding.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-r, \-\-har=<FILE>
+Output  HTTP transactions  <FILE> in  HAR format.
+If \(aq\-\(aq is given, data is written to stdout.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-color
 Force colored log output.
-.SH "SEE ALSO"
-nghttpd(1), nghttpx(1)
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-continuation
+Send large header to test CONTINUATION.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-no\-content\-length
+Don\(aqt send content\-length header field.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-no\-dep
+Don\(aqt  send  dependency  based priority  hint  to
+server.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-dep\-idle
+Use  idle  streams  as anchor  nodes  to  express
+priority.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-version
+Display version information and exit.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-h, \-\-help
+Display this help and exit.
+.UNINDENT
+.SH SEE ALSO
+.sp
+\fInghttpd(1)\fP, \fInghttpx(1)\fP, \fIh2load(1)\fP
+.SH AUTHOR
+Tatsuhiro Tsujikawa
+.SH COPYRIGHT
+2012, 2015, Tatsuhiro Tsujikawa
+.\" Generated by docutils manpage writer.
+.

doc/nghttp.1.rst

@@ -0,0 +1,163 @@
+
+nghttp(1)
+=========
+
+SYNOPSIS
+--------
+
+**nghttp** [OPTIONS]... <URI>...
+
+DESCRIPTION
+-----------
+
+HTTP/2 experimental client
+
+.. describe:: <URI>
+
+    Specify URI to access.
+
+OPTIONS:
+--------
+
+.. option:: -v, --verbose
+
+    Print  debug information  such  as reception  and
+    transmission  of  frames  and  name/value  pairs.
+    Specifying this  option multiple  times increases
+    verbosity.
+
+.. option:: -n, --null-out
+
+    Discard downloaded data.
+
+.. option:: -O, --remote-name
+
+    Save download data in the current directory.  The
+    filename is dereived from  URI.  If URI ends with
+    '*/*',  'index.html' is  used as  a filename.   Not
+    implemented yet.
+
+.. option:: -t, --timeout=<N>
+
+    Timeout each request after <N> seconds.
+
+.. option:: -w, --window-bits=<N>
+
+    Sets  the stream  level  initial  window size  to
+    2\*\*<N>-1.
+
+.. option:: -W, --connection-window-bits=<N>
+
+    Sets the connection level  initial window size to
+    2\*\*<N>-1.
+
+.. option:: -a, --get-assets
+
+    Download assets  such as stylesheets,  images and
+    script files linked from the downloaded resource.
+    Only links  whose origins  are the same  with the
+    linking  resource  will  be  downloaded.   nghttp
+    prioritizes  resources  using  HTTP/2  dependency
+    based priority.  The priority order, from highest
+    to lowest,  is html  itself, css,  javascript and
+    images.
+
+.. option:: -s, --stat
+
+    Print statistics.
+
+.. option:: -H, --header=<HEADER>
+
+    Add   a  header   to   the  requests.    Example:
+    :option:`-H`\':method: PUT'
+
+.. option:: --cert=<CERT>
+
+    Use the  specified client certificate  file.  The
+    file must be in PEM format.
+
+.. option:: --key=<KEY>
+
+    Use the  client private key file.   The file must
+    be in PEM format.
+
+.. option:: -d, --data=<FILE>
+
+    Post FILE to  server. If '-' is  given, data will
+    be read from stdin.
+
+.. option:: -m, --multiply=<N>
+
+    Request each URI <N> times.  By default, same URI
+    is not requested twice.   This option disables it
+    too.
+
+.. option:: -u, --upgrade
+
+    Perform HTTP Upgrade for  HTTP/2.  This option is
+    ignored if the request  URI has https scheme.  If
+    :option:`-d` is used, the HTTP upgrade request is performed
+    with OPTIONS method.
+
+.. option:: -p, --weight=<WEIGHT>
+
+    Sets  priority  group  weight.  The  valid  value
+    range is [1, 256], inclusive.
+
+    Default: ``16``
+
+.. option:: -M, --peer-max-concurrent-streams=<N>
+
+    Use <N>  as SETTINGS_MAX_CONCURRENT_STREAMS value
+    of  remote  endpoint  as  if it  is  received  in
+    SETTINGS frame.   The default is large  enough as
+    it is seen as unlimited.
+
+.. option:: -c, --header-table-size=<N>
+
+    Specify decoder header table size.
+
+.. option:: -b, --padding=<N>
+
+    Add  at most  <N>  bytes to  a  frame payload  as
+    padding.  Specify 0 to disable padding.
+
+.. option:: -r, --har=<FILE>
+
+    Output  HTTP transactions  <FILE> in  HAR format.
+    If '-' is given, data is written to stdout.
+
+.. option:: --color
+
+    Force colored log output.
+
+.. option:: --continuation
+
+    Send large header to test CONTINUATION.
+
+.. option:: --no-content-length
+
+    Don't send content-length header field.
+
+.. option:: --no-dep
+
+    Don't  send  dependency  based priority  hint  to
+    server.
+
+.. option:: --dep-idle
+
+    Use  idle  streams  as anchor  nodes  to  express
+    priority.
+
+.. option:: --version
+
+    Display version information and exit.
+
+.. option:: -h, --help
+
+    Display this help and exit.
+
+SEE ALSO
+--------
+
+:manpage:`nghttpd(1)`, :manpage:`nghttpx(1)`, :manpage:`h2load(1)`

doc/nghttp.h2r

@@ -0,0 +1,4 @@
+SEE ALSO
+--------
+
+:manpage:`nghttpd(1)`, :manpage:`nghttpx(1)`, :manpage:`h2load(1)`

doc/nghttpd.1

@@ -1,55 +1,162 @@
-.\" nghttpd manual page
-.TH nghttpd "1" "January 2014" "nghttpd" "User Commands"
+.\" Man page generated from reStructuredText.
+.
+.TH "NGHTTPD" "1" "January 11, 2015" "0.7.1" "nghttp2"
 .SH NAME
-nghttpd \- HTTP 2.0 experimental server
+nghttpd \- HTTP/2 experimental server
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
 .SH SYNOPSIS
-\fBnghttpd\fP [\fIOPTIONS\fP...] [\fIPRIVATE_KEY\fP \fICERT\fP]
+.sp
+\fBnghttpd\fP [OPTION]... <PORT> [<PRIVATE_KEY> <CERT>]
 .SH DESCRIPTION
-Experimental HTTP 2.0 server.
-.SH "Positional arguments"
+.sp
+HTTP/2 experimental server
+.INDENT 0.0
 .TP
-\fIPRIVATE_KEY\fP
-Set path to server's private key. Required
-unless either \fB\-p\fR or \fB\-\-client\fR is specified.
+.B <PORT>
+Specify listening port number.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fICERT\fP
-Set path to server's certificate. Required
-unless either \fB\-p\fR or \fB\-\-client\fR is specified.
-.SH OPTIONS
+.B <PRIVATE_KEY>
+Set  path  to  server\(aqs  private  key.   Required
+unless \fI\%\-\-no\-tls\fP is specified.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-D\fR, \fB\-\-daemon\fR
-Run in a background. If \fB\-D\fR is used, the
-current working directory is changed to '/'.
-Therefore if this option is used, \fB\-d\fR option
-must be specified.
+.B <CERT>
+Set  path  to   server\(aqs  certificate.   Required
+unless \fI\%\-\-no\-tls\fP is specified.
+.UNINDENT
+.SH OPTIONS:
+.INDENT 0.0
 .TP
-\fB\-V\fR, \fB\-\-verify\-client\fR
-The server sends a client certificate
-request. If the client did not return a
-certificate, the handshake is terminated.
-Currently, this option just requests a
-client certificate and does not verify it.
+.B \-D, \-\-daemon
+Run in a background.  If  \fI\-D\fP is used, the current
+working directory  is changed to  \(aq\fI/\fP\(aq.  Therefore
+if  this  option  is  used,  \fI\%\-d\fP  option  must  be
+specified.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-d\fR, \fB\-\-htdocs=\fR<PATH>
-Specify document root. If this option is
-not specified, the document root is the
-current working directory.
+.B \-V, \-\-verify\-client
+The  server sends  a client  certificate request.
+If the  client did not return  a certificate, the
+handshake is terminated.   Currently, this option
+just requests  a client certificate and  does not
+verify it.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Print debug information such as reception/
+.B \-d, \-\-htdocs=<PATH>
+Specify  document root.   If this  option is  not
+specified,  the  document  root  is  the  current
+working directory.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-v, \-\-verbose
+Print  debug   information  such   as  reception/
 transmission of frames and name/value pairs.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-\-no\-tls\fR
+.B \-\-no\-tls
 Disable SSL/TLS.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-f\fR, \fB\-\-no\-flow\-control\fR
-Disables connection and stream level flow
-controls.
+.B \-c, \-\-header\-table\-size=<N>
+Specify decoder header table size.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-\-color\fR
+.B \-\-color
 Force colored log output.
+.UNINDENT
+.INDENT 0.0
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-Print this help.
-.SH "SEE ALSO"
-nghttp(1), nghttpx(1)
+.B \-p, \-\-push=<PATH>=<PUSH_PATH,...>
+Push  resources   <PUSH_PATH>s  when   <PATH>  is
+requested.  This option can be used repeatedly to
+specify multiple push configurations.  <PATH> and
+<PUSH_PATH>s are relative  to document root.  See
+\fI\%\-\-htdocs\fP    option.      Example:    \fI\-p\fP/=/foo.png
+\fI\-p\fP/doc=/bar.css
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-b, \-\-padding=<N>
+Add  at most  <N>  bytes to  a  frame payload  as
+padding.  Specify 0 to disable padding.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-n, \-\-workers=<CORE>
+Set the number of worker threads.
+.sp
+Default: \fB1\fP
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-e, \-\-error\-gzip
+Make error response gzipped.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-dh\-param\-file=<PATH>
+Path to  file that contains DH  parameters in PEM
+format.  Without  this option, DHE  cipher suites
+are not available.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-early\-response
+Start  sending response  when request  HEADERS is
+received,   rather  than   complete  request   is
+received.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-version
+Display version information and exit.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-h, \-\-help
+Display this help and exit.
+.UNINDENT
+.SH SEE ALSO
+.sp
+\fInghttp(1)\fP, \fInghttpx(1)\fP, \fIh2load(1)\fP
+.SH AUTHOR
+Tatsuhiro Tsujikawa
+.SH COPYRIGHT
+2012, 2015, Tatsuhiro Tsujikawa
+.\" Generated by docutils manpage writer.
+.

doc/nghttpd.1.rst

@@ -0,0 +1,117 @@
+
+nghttpd(1)
+==========
+
+SYNOPSIS
+--------
+
+**nghttpd** [OPTION]... <PORT> [<PRIVATE_KEY> <CERT>]
+
+DESCRIPTION
+-----------
+
+HTTP/2 experimental server
+
+.. describe:: <PORT>
+
+    Specify listening port number.
+
+.. describe:: <PRIVATE_KEY>
+
+    Set  path  to  server's  private  key.   Required
+    unless :option:`--no-tls` is specified.
+
+.. describe:: <CERT>
+
+    Set  path  to   server's  certificate.   Required
+    unless :option:`--no-tls` is specified.
+
+OPTIONS:
+--------
+
+.. option:: -D, --daemon
+
+    Run in a background.  If  :option:`-D` is used, the current
+    working directory  is changed to  '*/*'.  Therefore
+    if  this  option  is  used,  :option:`-d`  option  must  be
+    specified.
+
+.. option:: -V, --verify-client
+
+    The  server sends  a client  certificate request.
+    If the  client did not return  a certificate, the
+    handshake is terminated.   Currently, this option
+    just requests  a client certificate and  does not
+    verify it.
+
+.. option:: -d, --htdocs=<PATH>
+
+    Specify  document root.   If this  option is  not
+    specified,  the  document  root  is  the  current
+    working directory.
+
+.. option:: -v, --verbose
+
+    Print  debug   information  such   as  reception/
+    transmission of frames and name/value pairs.
+
+.. option:: --no-tls
+
+    Disable SSL/TLS.
+
+.. option:: -c, --header-table-size=<N>
+
+    Specify decoder header table size.
+
+.. option:: --color
+
+    Force colored log output.
+
+.. option:: -p, --push=<PATH>=<PUSH_PATH,...>
+
+    Push  resources   <PUSH_PATH>s  when   <PATH>  is
+    requested.  This option can be used repeatedly to
+    specify multiple push configurations.  <PATH> and
+    <PUSH_PATH>s are relative  to document root.  See
+    :option:`--htdocs`    option.      Example:    :option:`\-p`/=/foo.png
+    :option:`-p`\/doc=/bar.css
+
+.. option:: -b, --padding=<N>
+
+    Add  at most  <N>  bytes to  a  frame payload  as
+    padding.  Specify 0 to disable padding.
+
+.. option:: -n, --workers=<CORE>
+
+    Set the number of worker threads.
+
+    Default: ``1``
+
+.. option:: -e, --error-gzip
+
+    Make error response gzipped.
+
+.. option:: --dh-param-file=<PATH>
+
+    Path to  file that contains DH  parameters in PEM
+    format.  Without  this option, DHE  cipher suites
+    are not available.
+
+.. option:: --early-response
+
+    Start  sending response  when request  HEADERS is
+    received,   rather  than   complete  request   is
+    received.
+
+.. option:: --version
+
+    Display version information and exit.
+
+.. option:: -h, --help
+
+    Display this help and exit.
+
+SEE ALSO
+--------
+
+:manpage:`nghttp(1)`, :manpage:`nghttpx(1)`, :manpage:`h2load(1)`

doc/nghttpd.h2r

@@ -0,0 +1,4 @@
+SEE ALSO
+--------
+
+:manpage:`nghttp(1)`, :manpage:`nghttpx(1)`, :manpage:`h2load(1)`

doc/nghttpx-howto.rst.in

@@ -0,0 +1 @@
+.. include:: @top_srcdir@/doc/sources/nghttpx-howto.rst

doc/nghttpx.1.rst

@@ -0,0 +1,694 @@
+
+nghttpx(1)
+==========
+
+SYNOPSIS
+--------
+
+**nghttpx** [OPTIONS]... [<PRIVATE_KEY> <CERT>]
+
+DESCRIPTION
+-----------
+
+A reverse proxy for HTTP/2, HTTP/1 and SPDY.
+
+.. describe:: <PRIVATE_KEY>
+
+    Set  path  to  server's  private  key.   Required
+    unless  :option:`-p`\,  :option:`--client`  or  :option:`\--frontend-no-tls`  are
+    given.
+
+.. describe:: <CERT>
+
+    Set  path  to   server's  certificate.   Required
+    unless  :option:`-p`\,  :option:`--client`  or  :option:`\--frontend-no-tls`  are
+    given.
+
+OPTIONS:
+--------
+
+The options are categorized into several groups.
+
+Connections:
+~~~~~~~~~~~~
+
+.. option:: -b, --backend=<HOST,PORT>
+
+    Set backend  host and port.  For  HTTP/1 backend,
+    multiple  backend   addresses  are   accepted  by
+    repeating this  option.  HTTP/2 backend  does not
+    support multiple backend  addresses and the first
+    occurrence of this option is used.
+
+    Default: ``127.0.0.1,80``
+
+.. option:: -f, --frontend=<HOST,PORT>
+
+    Set frontend host and port.  If <HOST> is '\*', it
+    assumes  all addresses  including  both IPv4  and
+    IPv6.
+
+    Default: ``*,3000``
+
+.. option:: --backlog=<NUM>
+
+    Set  listen  backlog  size.    If  :option:`-1`  is  given,
+    libevent will choose suitable value.
+
+    Default: ``128``
+
+.. option:: --backend-ipv4
+
+    Resolve backend hostname to IPv4 address only.
+
+.. option:: --backend-ipv6
+
+    Resolve backend hostname to IPv6 address only.
+
+.. option:: --backend-http-proxy-uri=<URI>
+
+    Specify     proxy     URI     in     the     form
+    http://[<USER>:<PASS>@]<PROXY>:<PORT>.     If   a
+    proxy requires authentication, specify <USER> and
+    <PASS>.    Note  that   they  must   be  properly
+    percent-encoded.   This proxy  is  used when  the
+    backend  connection  is  HTTP/2.  First,  make  a
+    CONNECT request  to the proxy and  it connects to
+    the  backend on  behalf of  nghttpx.  This  forms
+    tunnel.   After  that, nghttpx  performs  SSL/TLS
+    handshake with the downstream through the tunnel.
+    The timeouts  when connecting and  making CONNECT
+    request       can      be       specified      by
+    :option:`--backend-read-timeout`                        and
+    :option:`--backend-write-timeout` options.
+
+
+Performance:
+~~~~~~~~~~~~
+
+.. option:: -n, --workers=<CORES>
+
+    Set the number of worker threads.
+
+    Default: ``1``
+
+.. option:: --read-rate=<RATE>
+
+    Set  maximum   average  read  rate   on  frontend
+    connection.  Setting 0 to  this option means read
+    rate is unlimited.
+
+    Default: ``0``
+
+.. option:: --read-burst=<SIZE>
+
+    Set   maximum  read   burst   size  on   frontend
+    connection.  Setting 0 to  this option means read
+    burst size is unlimited.
+
+    Default: ``0``
+
+.. option:: --write-rate=<RATE>
+
+    Set  maximum  average   write  rate  on  frontend
+    connection.  Setting 0 to this option means write
+    rate is unlimited.
+
+    Default: ``0``
+
+.. option:: --write-burst=<SIZE>
+
+    Set   maximum  write   burst  size   on  frontend
+    connection.  Setting 0 to this option means write
+    burst size is unlimited.
+
+    Default: ``0``
+
+.. option:: --worker-read-rate=<RATE>
+
+    Set  maximum   average  read  rate   on  frontend
+    connection per worker.  Setting  0 to this option
+    means  read rate  is unlimited.   Not implemented
+    yet.
+
+    Default: ``0``
+
+.. option:: --worker-read-burst=<SIZE>
+
+    Set   maximum  read   burst   size  on   frontend
+    connection per worker.  Setting  0 to this option
+    means   read  burst   size  is   unlimited.   Not
+    implemented yet.
+
+    Default: ``0``
+
+.. option:: --worker-write-rate=<RATE>
+
+    Set  maximum  average   write  rate  on  frontend
+    connection per worker.  Setting  0 to this option
+    means write  rate is unlimited.   Not implemented
+    yet.
+
+    Default: ``0``
+
+.. option:: --worker-write-burst=<SIZE>
+
+    Set   maximum  write   burst  size   on  frontend
+    connection per worker.  Setting  0 to this option
+    means  write   burst  size  is   unlimited.   Not
+    implemented yet.
+
+    Default: ``0``
+
+.. option:: --worker-frontend-connections=<NUM>
+
+    Set  maximum number  of simultaneous  connections
+    frontend accepts.  Setting 0 means unlimited.
+
+    Default: ``0``
+
+.. option:: --backend-http1-connections-per-host=<NUM>
+
+    Set maximum  number of backend  concurrent HTTP/1
+    connections per host.   This option is meaningful
+    when :option:`-s` option  is used.  To limit  the number of
+    connections  per frontend  for default  mode, use
+    :option:`--backend-http1-connections-per-frontend`\.
+
+    Default: ``8``
+
+.. option:: --backend-http1-connections-per-frontend=<NUM>
+
+    Set maximum  number of backend  concurrent HTTP/1
+    connections  per frontend.   This option  is only
+    used for  default mode.   0 means  unlimited.  To
+    limit  the number  of  connections  per host  for
+    HTTP/2  or  SPDY  proxy  mode  (-s  option),  use
+    :option:`--backend-http1-connections-per-host`\.
+
+    Default: ``0``
+
+.. option:: --rlimit-nofile=<N>
+
+    Set maximum number  of open files (RLIMIT_NOFILE)
+    to <N>.  If 0 is  given, nghttpx does not set the
+    limit.
+
+    Default: ``0``
+
+
+Timeout:
+~~~~~~~~
+
+.. option:: --frontend-http2-read-timeout=<SEC>
+
+    Specify read timeout for HTTP/2 and SPDY frontend
+    connection.
+
+    Default: ``180``
+
+.. option:: --frontend-read-timeout=<SEC>
+
+    Specify  read   timeout  for   HTTP/1.1  frontend
+    connection.
+
+    Default: ``180``
+
+.. option:: --frontend-write-timeout=<SEC>
+
+    Specify   write   timeout    for   all   frontend
+    connections.
+
+    Default: ``30``
+
+.. option:: --stream-read-timeout=<SEC>
+
+    Specify read timeout for HTTP/2 and SPDY streams.
+    0 means no timeout.
+
+    Default: ``0``
+
+.. option:: --stream-write-timeout=<SEC>
+
+    Specify  write   timeout  for  HTTP/2   and  SPDY
+    streams.  0 means no timeout.
+
+    Default: ``0``
+
+.. option:: --backend-read-timeout=<SEC>
+
+    Specify read timeout for backend connection.
+
+    Default: ``180``
+
+.. option:: --backend-write-timeout=<SEC>
+
+    Specify write timeout for backend connection.
+
+    Default: ``30``
+
+.. option:: --backend-keep-alive-timeout=<SEC>
+
+    Specify    keep-alive    timeout   for    backend
+    connection.
+
+    Default: ``600``
+
+.. option:: --listener-disable-timeout=<SEC>
+
+    After  accepting  connection  failed,  connection
+    listener is disabled for a given time in seconds.
+    Specifying 0 disables this feature.
+
+    Default: ``0``
+
+
+SSL/TLS:
+~~~~~~~~
+
+.. option:: --ciphers=<SUITE>
+
+    Set  allowed  cipher  list.  The  format  of  the
+    string  is described  in OpenSSL  ciphers(1).
+
+.. option:: -k, --insecure
+
+    Don't verify backend  server's certificate if :option:`-p`\,
+    :option:`--client`   or   :option:`\--http2-bridge`  are   given   and
+    :option:`--backend-no-tls` is not given.
+
+.. option:: --cacert=<PATH>
+
+    Set path  to trusted  CA certificate file  if :option:`-p`\,
+    :option:`--client`   or   :option:`\--http2-bridge`  are   given   and
+    :option:`--backend-no-tls` is not given.   The file must be
+    in   PEM  format.    It   can  contain   multiple
+    certificates.    If   the   linked   OpenSSL   is
+    configured to load system wide certificates, they
+    are loaded at startup regardless of this option.
+
+.. option:: --private-key-passwd-file=<FILEPATH>
+
+    Path  to  file  that contains  password  for  the
+    server's private  key.  If none is  given and the
+    private  key  is   password  protected  it'll  be
+    requested interactively.
+
+.. option:: --subcert=<KEYPATH>:<CERTPATH>
+
+    Specify  additional certificate  and private  key
+    file.  nghttpx will  choose certificates based on
+    the hostname  indicated by  client using  TLS SNI
+    extension.   This  option  can be  used  multiple
+    times.
+
+.. option:: --backend-tls-sni-field=<HOST>
+
+    Explicitly  set  the  content   of  the  TLS  SNI
+    extension.  This will default to the backend HOST
+    name.
+
+.. option:: --dh-param-file=<PATH>
+
+    Path to  file that contains DH  parameters in PEM
+    format.  Without  this option, DHE  cipher suites
+    are not available.
+
+.. option:: --npn-list=<LIST>
+
+    Comma delimited list  of ALPN protocol identifier
+    sorted in  the order  of preference.   That means
+    most  desirable protocol  comes  first.  This  is
+    used in both ALPN and NPN.  The parameter must be
+    delimited by  a single  comma only and  any white
+    spaces are treated as a part of protocol string.
+
+    Default: ``h2-16,h2-14,spdy/3.1,http/1.1``
+
+.. option:: --verify-client
+
+    Require and verify client certificate.
+
+.. option:: --verify-client-cacert=<PATH>
+
+    Path  to file  that contains  CA certificates  to
+    verify client  certificate.  The file must  be in
+    PEM    format.    It    can   contain    multiple
+    certificates.
+
+.. option:: --client-private-key-file=<PATH>
+
+    Path  to file  that contains  client private  key
+    used in backend client authentication.
+
+.. option:: --client-cert-file=<PATH>
+
+    Path  to file  that  contains client  certificate
+    used in backend client authentication.
+
+.. option:: --tls-proto-list=<LIST>
+
+    Comma delimited  list of  SSL/TLS protocol  to be
+    enabled.  The following  protocols are available:
+    TLSv1.2, TLSv1.1 and  TLSv1.0.  The name matching
+    is   done   in  case-insensitive   manner.    The
+    parameter  must be  delimited by  a single  comma
+    only and any  white spaces are treated  as a part
+    of protocol string.
+
+    Default: ``TLSv1.2,TLSv1.1``
+
+.. option:: --tls-ticket-key-file=<FILE>
+
+    Path to  file that contains 48  bytes random data
+    to construct TLS session ticket parameters.  This
+    options  can   be  used  repeatedly   to  specify
+    multiple ticket parameters.  If several files are
+    given, only the first key  is used to encrypt TLS
+    session  tickets.  Other  keys  are accepted  but
+    server will  issue new session ticket  with first
+    key.  This  allows session key  rotation.  Please
+    note   that   key   rotation   does   not   occur
+    automatically.   User should  rearrange files  or
+    change   options  values   and  restart   nghttpx
+    gracefully.   If opening  or  reading given  file
+    fails, all  loaded keys  are discarded and  it is
+    treated as if  none of this option  is given.  If
+    this  option is  not given  or an  error occurred
+    while opening or reading a file, key is generated
+    automatically and renewed every 12hrs.  At most 2
+    keys are stored in memory.
+
+
+HTTP/2 and SPDY:
+~~~~~~~~~~~~~~~~
+
+.. option:: -c, --http2-max-concurrent-streams=<NUM>
+
+    Set the maximum number  of the concurrent streams
+    in one HTTP/2 and SPDY session.
+
+    Default: ``100``
+
+.. option:: --frontend-http2-window-bits=<N>
+
+    Sets the per-stream initial window size of HTTP/2
+    SPDY frontend  connection.  For HTTP/2,  the size
+    is 2**<N>-1.  For SPDY, the size is 2\*\*<N>.
+
+    Default: ``16``
+
+.. option:: --frontend-http2-connection-window-bits=<N>
+
+    Sets the per-connection window size of HTTP/2 and
+    SPDY frontend  connection.  For HTTP/2,  the size
+    is 2**<N>-1. For SPDY, the size is 2\*\*<N>.
+
+    Default: ``16``
+
+.. option:: --frontend-no-tls
+
+    Disable SSL/TLS on frontend connections.
+
+.. option:: --backend-http2-window-bits=<N>
+
+    Sets the  initial window  size of  HTTP/2 backend
+    connection to 2**<N>-1.
+
+    Default: ``16``
+
+.. option:: --backend-http2-connection-window-bits=<N>
+
+    Sets  the per-connection  window  size of  HTTP/2
+    backend connection to 2\*\*<N>-1.
+
+    Default: ``16``
+
+.. option:: --backend-no-tls
+
+    Disable SSL/TLS on backend connections.
+
+.. option:: --http2-no-cookie-crumbling
+
+    Don't crumble cookie header field.
+
+.. option:: --padding=<N>
+
+    Add at most  <N> bytes to a  HTTP/2 frame payload
+    as padding.  Specify 0  to disable padding.  This
+    option  is meant  for debugging  purpose and  not
+    intended to enhance protocol security.
+
+
+Mode:
+~~~~~
+
+.. describe:: (default mode)
+
+    Accept  HTTP/2, SPDY  and HTTP/1.1  over SSL/TLS.
+    If :option:`--frontend-no-tls`  is used, accept  HTTP/2 and
+    HTTP/1.1.  The  incoming HTTP/1.1  connection can
+    be upgraded to HTTP/2  through HTTP Upgrade.  The
+    protocol to the backend is HTTP/1.1.
+
+.. option:: -s, --http2-proxy
+
+    Like default mode, but enable secure proxy mode.
+
+.. option:: --http2-bridge
+
+    Like  default  mode,  but  communicate  with  the
+    backend  in   HTTP/2  over  SSL/TLS.    Thus  the
+    incoming all connections  are converted to HTTP/2
+    connection  and  relayed  to  the  backend.   See
+    :option:`--backend-http-proxy-uri` option if you are behind
+    the  proxy and  want  to connect  to the  outside
+    HTTP/2 proxy.
+
+.. option:: --client
+
+    Accept HTTP/2 and  HTTP/1.1 without SSL/TLS.  The
+    incoming HTTP/1.1  connection can be  upgraded to
+    HTTP/2  connection  through  HTTP  Upgrade.   The
+    protocol  to  the  backend  is  HTTP/2.   To  use
+    nghttpx  as  a  forward   proxy,  use  :option:`-p`  option
+    instead.
+
+.. option:: -p, --client-proxy
+
+    Like :option:`--client`  option, but  it also  requires the
+    request path  from frontend  must be  an absolute
+    URI, suitable for use as a forward proxy.
+
+
+Logging:
+~~~~~~~~
+
+.. option:: -L, --log-level=<LEVEL>
+
+    Set the  severity level  of log  output.  <LEVEL>
+    must  be one  of  INFO, NOTICE,  WARN, ERROR  and
+    FATAL.
+
+    Default: ``NOTICE``
+
+.. option:: --accesslog-file=<PATH>
+
+    Set path  to write  access log.  To  reopen file,
+    send USR1 signal to nghttpx.
+
+.. option:: --accesslog-syslog
+
+    Send  access log  to syslog.   If this  option is
+    used, :option:`--accesslog-file` option is ignored.
+
+.. option:: --accesslog-format=<FORMAT>
+
+    Specify  format  string   for  access  log.   The
+    default format is combined format.  The following
+    variables are available:
+
+    * $remote_addr: client IP address.
+    * $time_local: local time in Common Log format.
+    * $time_iso8601: local time in ISO 8601 format.
+    * $request: HTTP request line.
+    * $status: HTTP response status code.
+    * $body_bytes_sent: the  number of bytes  sent to
+      client as response body.
+    * $http_<VAR>: value of HTTP request header <VAR>
+      where '_' in <VAR> is replaced with '-'.
+    * $remote_port: client  port.
+    * $server_port: server port.
+    * $request_time:   request  processing   time  in
+      seconds with milliseconds resolution.
+    * $pid: PID of the running process.
+    * $alpn:  ALPN identifier  of the  protocol which
+      generates  the response.   For HTTP/1,  ALPN is
+      always http/1.1, regardless of minor version.
+
+
+    Default: ``$remote_addr - - [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent"``
+
+.. option:: --errorlog-file=<PATH>
+
+    Set  path to  write error  log.  To  reopen file,
+    send USR1 signal to nghttpx.
+
+    Default: ``/dev/stderr``
+
+.. option:: --errorlog-syslog
+
+    Send  error log  to  syslog.  If  this option  is
+    used, :option:`--errorlog-file` option is ignored.
+
+.. option:: --syslog-facility=<FACILITY>
+
+    Set syslog facility to <FACILITY>.
+
+    Default: ``daemon``
+
+
+Misc:
+~~~~~
+
+.. option:: --add-x-forwarded-for
+
+    Append  X-Forwarded-For   header  field   to  the
+    downstream request.
+
+.. option:: --strip-incoming-x-forwarded-for
+
+    Strip  X-Forwarded-For  header field from inbound
+    client requests.
+
+.. option:: --no-via
+
+    Don't append to Via  header field.  If Via header
+    field is received, it is left unaltered.
+
+.. option:: --no-location-rewrite
+
+    Don't   rewrite   location    header   field   on
+    :option:`--http2-bridge`\, :option:`--client`  and default  mode.  For
+    :option:`--http2-proxy`  and :option:`\--client-proxy`  mode, location
+    header field  will not  be altered  regardless of
+    this option.
+
+.. option:: --altsvc=<PROTOID,PORT[,HOST,[ORIGIN]]>
+
+    Specify  protocol ID,  port, host  and origin  of
+    alternative  service.   <HOST> and  <ORIGIN>  are
+    optional.  They are  advertised in alt-svc header
+    field or HTTP/2 ALTSVC frame.  This option can be
+    used   multiple   times   to   specify   multiple
+    alternative services.  Example: :option:`--altsvc`\=h2,443
+
+.. option:: --add-response-header=<HEADER>
+
+    Specify  additional   header  field  to   add  to
+    response  header set.   This option  just appends
+    header field  and won't replace  anything already
+    set.  This  option can  be used several  times to
+    specify multiple header fields.
+    Example: :option:`--add-response-header`\="foo: bar"
+
+.. option:: --frontend-http2-dump-request-header=<PATH>
+
+    Dumps request headers received by HTTP/2 frontend
+    to  the file  denoted in  <PATH>.  The  output is
+    done  in  HTTP/1  header field  format  and  each
+    header block is followed  by an empty line.  This
+    option is  not thread safe  and MUST NOT  be used
+    with option :option:`-n`\<N>, where <N> >= 2.
+
+.. option:: --frontend-http2-dump-response-header=<PATH>
+
+    Dumps response headers  sent from HTTP/2 frontend
+    to  the file  denoted in  <PATH>.  The  output is
+    done  in  HTTP/1  header field  format  and  each
+    header block is followed  by an empty line.  This
+    option is  not thread safe  and MUST NOT  be used
+    with option :option:`-n`\<N>, where <N> >= 2.
+
+.. option:: -o, --frontend-frame-debug
+
+    Print HTTP/2 frames in  frontend to stderr.  This
+    option is  not thread safe  and MUST NOT  be used
+    with option :option:`-n`\=N, where N >= 2.
+
+.. option:: -D, --daemon
+
+    Run in a background.  If  :option:`-D` is used, the current
+    working directory is changed to '*/*'.
+
+.. option:: --pid-file=<PATH>
+
+    Set path to save PID of this program.
+
+.. option:: --user=<USER>
+
+    Run  this  program  as <USER>.   This  option  is
+    intended to be used to drop root privileges.
+
+.. option:: --conf=<PATH>
+
+    Load configuration from <PATH>.
+
+    Default: ``/etc/nghttpx/nghttpx.conf``
+
+.. option:: -v, --version
+
+    Print version and exit.
+
+.. option:: -h, --help
+
+    Print this help and exit.
+
+FILES
+-----
+
+*/etc/nghttpx/nghttpx.conf*
+  The default configuration file path nghttpx searches at startup.
+  The configuration file path can be changed using :option:`--conf`
+  option.
+
+  Those lines which are staring ``#`` are treated as comment.
+
+  The option name in the configuration file is the long command-line
+  option name with leading ``--`` stripped (e.g., ``frontend``).  Put
+  ``=`` between option name and value.  Don't put extra leading or
+  trailing spaces.
+
+  The options which do not take argument in the command-line *take*
+  argument in the configuration file.  Specify ``yes`` as an argument
+  (e.g., ``http2-proxy=yes``).  If other string is given, it is
+  ignored.
+
+  To specify private key and certificate file which are given as
+  positional arguments in commnad-line, use ``private-key-file`` and
+  ``certificate-file``.
+
+  :option:`--conf` option cannot be used in the configuration file and
+  will be ignored if specified.
+
+SIGNALS
+-------
+
+SIGQUIT
+  Shutdown gracefully.  First accept pending connections and stop
+  accepting connection.  After all connections are handled, nghttpx
+  exits.
+
+SIGUSR1
+  Reopen log files.
+
+SIGUSR2
+  Fork and execute nghttpx.  It will execute the binary in the same
+  path with same command-line arguments and environment variables.
+  After new process comes up, sending SIGQUIT to the original process
+  to perform hot swapping.
+
+SEE ALSO
+--------
+
+:manpage:`nghttp(1)`, :manpage:`nghttpd(1)`, :manpage:`h2load(1)`

doc/nghttpx.h2r

@@ -0,0 +1,48 @@
+FILES
+-----
+
+*/etc/nghttpx/nghttpx.conf*
+  The default configuration file path nghttpx searches at startup.
+  The configuration file path can be changed using :option:`--conf`
+  option.
+
+  Those lines which are staring ``#`` are treated as comment.
+
+  The option name in the configuration file is the long command-line
+  option name with leading ``--`` stripped (e.g., ``frontend``).  Put
+  ``=`` between option name and value.  Don't put extra leading or
+  trailing spaces.
+
+  The options which do not take argument in the command-line *take*
+  argument in the configuration file.  Specify ``yes`` as an argument
+  (e.g., ``http2-proxy=yes``).  If other string is given, it is
+  ignored.
+
+  To specify private key and certificate file which are given as
+  positional arguments in commnad-line, use ``private-key-file`` and
+  ``certificate-file``.
+
+  :option:`--conf` option cannot be used in the configuration file and
+  will be ignored if specified.
+
+SIGNALS
+-------
+
+SIGQUIT
+  Shutdown gracefully.  First accept pending connections and stop
+  accepting connection.  After all connections are handled, nghttpx
+  exits.
+
+SIGUSR1
+  Reopen log files.
+
+SIGUSR2
+  Fork and execute nghttpx.  It will execute the binary in the same
+  path with same command-line arguments and environment variables.
+  After new process comes up, sending SIGQUIT to the original process
+  to perform hot swapping.
+
+SEE ALSO
+--------
+
+:manpage:`nghttp(1)`, :manpage:`nghttpd(1)`, :manpage:`h2load(1)`

doc/python-apiref.rst.in

@@ -0,0 +1 @@
+.. include:: @top_srcdir@/doc/sources/python-apiref.rst

doc/sources/building-android-binary.rst

@@ -0,0 +1,135 @@
+Building Android binary
+=======================
+
+In this article, we briefly describe how to build Android binary using
+`Android NDK <http://developer.android.com/tools/sdk/ndk/index.html>`_
+cross-compiler on Debian Linux.
+
+The easiest way to build android binary is use Dockerfile.android.
+See Dockerfile.android for more details.  If you cannot use
+Dockerfile.android for whatever reason, continue to read the rest of
+this article.
+
+We offer ``android-config`` and ``android-make`` scripts to make the
+build easier.  To make these script work, NDK toolchain must be
+installed in the following way.  First, let us introduce
+``ANDROID_HOME`` environment variable.  We need to install toolchain
+under ``$ANDROID_HOME/toolchain``.  An user can freely choose the path
+for ``ANDROID_HOME``.  For example, to install toolchain under
+``$ANDROID_HOME/toolchain``, do this in the the directory where NDK is
+unpacked::
+
+    $ build/tools/make-standalone-toolchain.sh \
+      --install-dir=$ANDROID_HOME/toolchain \
+      --toolchain=arm-linux-androideabi-4.9 \
+      --llvm-version=3.5 \
+      --platform=android-16
+
+The additional flag ``--system=linux-x86_64`` may be required if you
+are using x86_64 system.
+
+The platform level is not important here because we don't use Android
+specific C/C++ API.
+
+The dependent libraries, such as OpenSSL and libev should be built
+with the toolchain and installed under ``$ANDROID_HOME/usr/local``.
+We recommend to build these libraries as static library to make the
+deployment easier.  libxml2 support is currently disabled.
+
+We use zlib which comes with Android NDK, so we don't have to build it
+by ourselves.
+
+If SPDY support is required for nghttpx and h2load, build and install
+spdylay as well.
+
+Before running ``android-config`` and ``android-make``,
+``ANDROID_HOME`` environment variable must be set to point to the
+correct path.  Also add ``$ANDROID_HOME/toolchain/bin`` to ``PATH``::
+
+    $ export PATH=$PATH:$ANDROID_HOME/toolchain/bin
+
+To configure OpenSSL, use the following script:
+
+.. code-block:: sh
+
+    #!/bin/sh
+
+    if [ -z "$ANDROID_HOME" ]; then
+        echo 'No $ANDROID_HOME specified.'
+        exit 1
+    fi
+    PREFIX=$ANDROID_HOME/usr/local
+    TOOLCHAIN=$ANDROID_HOME/toolchain
+    PATH=$TOOLCHAIN/bin:$PATH
+
+    export CROSS_COMPILE=$TOOLCHAIN/bin/arm-linux-androideabi-
+    ./Configure --prefix=$PREFIX android
+
+And run ``make install`` to build and install.
+
+We cannot compile libev without modification.  Apply `this patch
+<https://gist.github.com/tatsuhiro-t/48c45f08950f587180ed>`_ before
+configuring libev.  This patch is for libev-4.19.  After applying the
+patch, to configure libev, use the following script:
+
+.. code-block:: sh
+
+    #!/bin/sh
+
+    if [ -z "$ANDROID_HOME" ]; then
+        echo 'No $ANDROID_HOME specified.'
+        exit 1
+    fi
+    PREFIX=$ANDROID_HOME/usr/local
+    TOOLCHAIN=$ANDROID_HOME/toolchain
+    PATH=$TOOLCHAIN/bin:$PATH
+
+    ./configure \
+        --host=arm-linux-androideabi \
+        --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
+        --prefix=$PREFIX \
+        --disable-shared \
+        --enable-static \
+        CPPFLAGS=-I$PREFIX/include \
+        LDFLAGS=-L$PREFIX/lib
+
+And run ``make install`` to build and install.
+
+To configure spdylay, use the following script:
+
+.. code-block:: sh
+
+    if [ -z "$ANDROID_HOME" ]; then
+	echo 'No $ANDROID_HOME specified.'
+	exit 1
+    fi
+    PREFIX=$ANDROID_HOME/usr/local
+    TOOLCHAIN=$ANDROID_HOME/toolchain
+    PATH=$TOOLCHAIN/bin:$PATH
+
+    ./configure \
+	--disable-shared \
+	--host=arm-linux-androideabi \
+	--build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` \
+	--prefix=$PREFIX \
+	--without-libxml2 \
+	--disable-src \
+	--disable-examples \
+	CPPFLAGS="-I$PREFIX/include" \
+	PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
+	LDFLAGS="-L$PREFIX/lib"
+
+And run ``make install`` to build and install.  After spdylay
+installation, edit $ANDROID_HOME/usr/local/lib/pkgconfig/libspdylay.pc
+and remove the following line::
+
+    Requires.private: zlib
+
+After prerequisite libraries are prepared, run ``android-config`` and
+then ``android-make`` to compile nghttp2 source files.
+
+If all went well, application binaries, such as nghttpx, are created
+under src directory.  Strip debugging information from the binary
+using the following command::
+
+    $ arm-linux-androideabi-strip src/nghttpx

doc/sources/contribute.rst

@@ -0,0 +1,57 @@
+Contribution Guidelines
+=======================
+
+[This text was composed based on 1.2. License section of curl/libcurl
+project.]
+
+When contributing with code, you agree to put your changes and new
+code under the same license nghttp2 is already using unless stated and
+agreed otherwise.
+
+When changing existing source code, you do not alter the copyright of
+the original file(s).  The copyright will still be owned by the
+original creator(s) or those who have been assigned copyright by the
+original author(s).
+
+By submitting a patch to the nghttp2 project, you are assumed to have
+the right to the code and to be allowed by your employer or whatever
+to hand over that patch/code to us.  We will credit you for your
+changes as far as possible, to give credit but also to keep a trace
+back to who made what changes.  Please always provide us with your
+full real name when contributing!
+
+Coding style
+------------
+
+We use clang-format to format source code consistently.  The
+clang-format configuration file .clang-format is located at the root
+directory.  Since clang-format produces slightly different results
+between versions, we currently use clang-format which comes with
+clang-3.5.
+
+To detect any violation to the coding style, we recommend to setup git
+pre-commit hook to check coding style of the changes you introduced.
+The pre-commit file is located at the root directory.  Copy it under
+.git/hooks and make sure that it is executable.  The pre-commit script
+uses clang-format-diff.py to detect any style errors.  If it is not in
+your PATH or it exists under different name (e.g.,
+clang-format-diff-3.5 in debian), either add it to PATH variable or
+add git option ``clangformatdiff.binary`` to point to the script.
+
+For emacs users, integrating clang-format to emacs is very easy.
+clang-format.el should come with clang distribution.  If it is not
+found, download it from `here
+<https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format/clang-format.el>`_.
+And add these lines to your .emacs file:
+
+.. code-block:: lisp
+
+    ;; From
+    ;; https://code.google.com/p/chromium/wiki/Emacs#Use_Google's_C++_style!
+    (load "/<path/to>/clang-format.el")
+    (add-hook 'c-mode-common-hook
+         (function (lambda () (local-set-key (kbd "TAB")
+                                             'clang-format-region))))
+
+You can find other editor integration in
+http://clang.llvm.org/docs/ClangFormat.html.

doc/sources/h2load-howto.rst

@@ -0,0 +1,90 @@
+h2load - HTTP/2 benchmarking tool - HOW-TO
+==========================================
+
+h2load is benchmarking tool for HTTP/2.  If built with
+spdylay (http://tatsuhiro-t.github.io/spdylay/) library, it also
+supports SPDY protocol.  It supports SSL/TLS and clear text for both
+HTTP/2 and SPDY.
+
+Basic Usage
+-----------
+
+In order to set benchmark settings, specify following 3 options.
+
+``-n``
+    The number of total requests.  Default: 1
+
+``-c``
+    The number of concurrent clients.  Default: 1
+
+``-m``
+   The max concurrent streams to issue per client.
+   If ``auto`` is given, the number of given URIs is used.
+   Default: ``auto``
+
+Here is a command-line to perform benchmark to URI \https://localhost
+using total 100000 requests, 100 concurrent clients and 10 max
+concurrent streams::
+
+    $ h2load -n100000 -c100 -m10 https://localhost
+
+The benchmarking result looks like this::
+
+    finished in 0 sec, 385 millisec and 851 microsec, 2591 req/s, 1689 kbytes/s
+    requests: 1000 total, 1000 started, 1000 done, 1000 succeeded, 0 failed, 0 errored
+    status codes: 1000 2xx, 0 3xx, 0 4xx, 0 5xx
+    traffic: 667500 bytes total, 28700 bytes headers, 612000 bytes data
+
+The number of ``failed`` is the number of requests returned with non
+2xx status.  The number of ``error`` is the number of ``failed`` plus
+the number of requests which failed with connection error.
+
+The number of ``total`` in ``traffic`` is the received application
+data.  If SSL/TLS is used, this number is calculated after decryption.
+The number of ``headers`` is the sum of payload size of response
+HEADERS (or SYN_REPLY for SPDY).  This number comes before
+decompressing header block.  The number of ``data`` is the sum of
+response body.
+
+Flow Control
+------------
+
+HTTP/2 and SPDY/3 or later employ flow control and it may affect
+benchmarking results.  To adjust receiver flow control window size,
+there is following options:
+
+``-w``
+   Sets  the stream  level  initial  window size  to
+   (2**<N>)-1.  For SPDY, 2**<N> is used instead.
+
+``-W``
+   Sets the connection level  initial window size to
+   (2**<N>)-1.  For  SPDY, if  <N> is  strictly less
+   than  16,  this  option  is  ignored.   Otherwise
+   2**<N> is used for SPDY.
+
+Multi-Threading
+---------------
+
+Sometimes benchmarking client itself becomes a bottleneck.  To remedy
+this situation, use ``-t`` option to specify the number of native
+thread to use.
+
+``-t``
+    The number of native threads. Default: 1
+
+Selecting protocol for clear text
+---------------------------------
+
+By default, if \http:// URI is given, HTTP/2 protocol is used.  To
+change the protocol to use for clear text, use ``-p`` option.
+
+Multiple URIs
+-------------
+
+If multiple URIs are specified, they are used in round robin manner.
+
+.. note::
+
+    Please note that h2load uses sheme, host and port in the first URI
+    and ignores those parts in the rest of the URIs.

doc/sources/index.rst

@@ -3,11 +3,11 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-nghttp2 - HTTP/2.0 C Library
+nghttp2 - HTTP/2 C Library
 ============================
 
 This is an experimental implementation of Hypertext Transfer Protocol
-version 2.0.
+version 2.
 
 The project is hosted at `github.com/tatsuhiro-t/nghttp2 <https://github.com/tatsuhiro-t/nghttp2>`_.
 
@@ -17,24 +17,34 @@ Contents:
    :maxdepth: 2
 
    package_README
+   contribute
+   building-android-binary
    tutorial-client
    tutorial-server
+   tutorial-hpack
+   nghttp.1
+   nghttpd.1
+   nghttpx.1
+   h2load.1
+   nghttpx-howto
+   h2load-howto
    apiref
+   libnghttp2_asio
+   python-apiref
    nghttp2.h
    nghttp2ver.h
+   asio_http2.h
    Source <https://github.com/tatsuhiro-t/nghttp2>
    Issues <https://github.com/tatsuhiro-t/nghttp2/issues>
+   nghttp2.org <https://nghttp2.org/>
 
 Released Versions
 =================
 
-* `v0.3.0 <released-versions/v0.3.0/>`_ `(Download v0.3.0) <https://github.com/tatsuhiro-t/nghttp2/releases/tag/v0.3.0>`_
-* `v0.2.0 <released-versions/v0.2.0/>`_ `(Download v0.2.0) <https://github.com/tatsuhiro-t/nghttp2/releases/tag/v0.2.0>`_
-* `v0.1.0 <released-versions/v0.1.0/>`_ `(Download v0.1.0) <https://github.com/tatsuhiro-t/nghttp2/releases/tag/v0.1.0>`_
-
+https://github.com/tatsuhiro-t/nghttp2/releases
 
 Resources
 ---------
 
-* http://tools.ietf.org/html/draft-ietf-httpbis-http2-09
-* http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-05
+* http://tools.ietf.org/html/draft-ietf-httpbis-http2-14
+* http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-09

doc/sources/libnghttp2_asio.rst

@@ -0,0 +1,228 @@
+libnghttp2_asio: High level HTTP/2 C++ library
+==============================================
+
+libnghttp2_asio is C++ library built on top of libnghttp2 and provides
+high level abstraction API to build HTTP/2 applications.  It depends
+on Boost::ASIO library and OpenSSL.  Currently libnghttp2_asio
+provides server side API.
+
+libnghttp2_asio is not built by default.  Use ``--enable-asio-lib``
+configure flag to build libnghttp2_asio.  The required Boost libraries
+are:
+
+* Boost::Asio
+* Boost::System
+* Boost::Thread
+
+To use libnghttp2_asio, first include following header file:
+
+.. code-block:: cpp
+
+    #include <nghttp2/asio_http2.h>
+
+Also take a look at that header file :doc:`asio_http2.h`.
+
+Server API
+----------
+
+Server API is designed to build HTTP/2 server very easily to utilize
+C++11 anonymous function and closure.  The bare minimum example of
+HTTP/2 server looks like this:
+
+.. code-block:: cpp
+
+    #include <nghttp2/asio_http2.h>
+
+    using namespace nghttp2::asio_http2;
+    using namespace nghttp2::asio_http2::server;
+
+    int main(int argc, char *argv[]) {
+      http2 server;
+
+      server.listen("*", 3000, [](const std::shared_ptr<request> &req,
+                                  const std::shared_ptr<response> &res) {
+        res->write_head(200);
+        res->end("hello, world");
+      });
+    }
+
+First we instantiate ``nghttp2::asio_http2::server::http2`` object.
+Then call ``nghttp2::asio_http2::server::http2::listen`` function with
+address and port to listen to and callback function, namely "request
+callback", invoked when request arrives.
+
+The ``req`` and ``res`` represent HTTP request and response
+respectively.  ``nghttp2::asio_http2_::server::response::write_head``
+constructs HTTP response header fields.  The first argument is HTTP
+status code, in the above example, which is 200.  The second argument,
+which is omitted in the above example, is additional header fields to
+send.
+
+``nghttp2::asio_http2::server::response::end`` sends responde body.
+In the above example, we send string "hello, world".
+
+Serving static files and enabling SSL/TLS
++++++++++++++++++++++++++++++++++++++++++
+
+In this example, we serve a couple of static files and also enable
+SSL/TLS.
+
+.. code-block:: cpp
+
+    #include <nghttp2/asio_http2.h>
+
+    using namespace nghttp2::asio_http2;
+    using namespace nghttp2::asio_http2::server;
+
+    int main(int argc, char *argv[]) {
+      http2 server;
+
+      server.tls("server.key", "server.crt");
+
+      server.listen("*", 3000, [](const std::shared_ptr<request> &req,
+                                  const std::shared_ptr<response> &res) {
+        if (req->path() == "/" || req->path() == "/index.html") {
+          res->write_head(200);
+          res->end(file_reader("index.html"));
+        } else {
+          res->write_head(404);
+          res->end("<html><head><title>404</title></head>"
+                   "<body>404 Not Found</body></html>");
+        }
+      });
+    }
+
+Specifying path to private key file and certificate file in
+``nghttp2::asio_http2::server::http2::tls`` will enable SSL/TLS.  Both
+files must be in PEM format.
+
+In the above example, if request path is either "/" or "/index.html",
+we serve index.html file in the current working directory.
+``nghttp2::asio_http2::server::response::end`` has overload to take
+function of type ``nghttp2::asio_http2::read_cb`` and application pass
+its implementation to generate response body.  For the convenience,
+libnghttp2_asio library provides ``nghttp2::asio_http2::file_reader``
+function to generate function to server static file.
+
+Server push
++++++++++++
+
+Server push is also supported.
+
+.. code-block:: cpp
+
+    #include <nghttp2/asio_http2.h>
+
+    using namespace nghttp2::asio_http2;
+    using namespace nghttp2::asio_http2::server;
+
+    int main(int argc, char *argv[]) {
+      http2 server;
+
+      server.tls("server.key", "server.crt");
+
+      server.listen("*", 3000, [](const std::shared_ptr<request> &req,
+                                  const std::shared_ptr<response> &res) {
+        if (req->path() == "/") {
+          req->push("GET", "/my.css");
+
+          res->write_head(200);
+          res->end(file_reader("index.html"));
+
+          return;
+        }
+
+        if (req->path() == "/my.css") {
+          res->write_head(200);
+          res->end(file_reader("my.css"));
+
+          return;
+        }
+
+        res->write_head(404);
+        res->end("<html><head><title>404</title></head>"
+                 "<body>404 Not Found</body></html>");
+      });
+    }
+
+When client requested "/", we push "/my.css".  To push resource, call
+``nghttp2::asio_http2::server::request::push`` function with desired
+method and path.  Later, the callback will be called with the pushed
+resource "/my.css".
+
+Enable multi-threading
+++++++++++++++++++++++
+
+Enabling multi-threading is very easy.  Just call
+``nghttp2::asio_http2::server::http2::num_threads`` function with the
+desired number of threads:
+
+.. code-block:: cpp
+
+    http2 server;
+
+    // Use 4 native threads
+    server.num_threads(4);
+
+Run blocking tasks in background thread
++++++++++++++++++++++++++++++++++++++++
+
+The request callback is called in the same thread where HTTP request
+is handled.  And many connections shares the same thread, we cannot
+directly run blocking tasks in request callback.
+
+To run blocking tasks, use
+``nghttp2::asio_http2::server::request::run_task``.  The passed
+callback will be executed in the different thread from the thread
+where request callback was executed.  So application can perform
+blocking task there.  The example follows:
+
+.. code-block:: cpp
+
+    #include <unistd.h>
+    #include <nghttp2/asio_http2.h>
+
+    using namespace nghttp2::asio_http2;
+    using namespace nghttp2::asio_http2::server;
+
+    int main(int argc, char *argv[]) {
+      http2 server;
+
+      server.num_concurrent_tasks(16);
+
+      server.listen("*", 3000, [](const std::shared_ptr<request> &req,
+                                  const std::shared_ptr<response> &res) {
+        req->run_task([res](channel &channel) {
+          // executed in different thread than the thread where
+          // request callback was executed.
+
+          // using res directly here is not safe.  Capturing it by
+          // value is safe because it is std::shared_ptr.
+
+          sleep(1);
+
+          channel.post([res]() {
+            // executed in the same thread where request callback
+            // was executed.
+            res->write_head(200);
+            res->end("hello, world");
+          });
+        });
+      });
+    }
+
+First we set the number of background threads which run tasks.  By
+default it is set to 1.  In this example, we set it to 16, so at most
+16 tasks can be executed concurrently without blocking handling new
+requests.
+
+We call ``req->run_task()`` to execute task in background thread.  In
+the passed callback, we just simply sleeps 1 second.  After sleep is
+over, we schedule another callback to send response to the client.
+Since the callback passed to ``req->run_task()`` is executed in the
+different thread from the thread where request callback is called,
+using ``req`` or ``res`` object directly there may cause undefined
+behaviour.  To avoid this issue, we can use
+``nghttp2::asio_http2::channel::post`` by supplying a callback which
+in turn get called in the same thread where request callback was
+called.

doc/sources/nghttpx-howto.rst

@@ -0,0 +1,295 @@
+nghttpx - HTTP/2 proxy - HOW-TO
+===============================
+
+nghttpx is a proxy translating protocols between HTTP/2 and other
+protocols (e.g., HTTP/1, SPDY).  It operates in several modes and each
+mode may require additional programs to work with.  This article
+describes each operation mode and explains the intended use-cases.  It
+also covers some useful options later.
+
+Default mode
+------------
+
+If nghttpx is invoked without any ``-s``, ``-p`` and ``--client``, it
+operates in default mode.  In this mode, nghttpx frontend listens for
+HTTP/2 requests and translates them to HTTP/1 requests.  Thus it works
+as reverse proxy (gateway) for HTTP/2 clients to HTTP/1 web server.
+HTTP/1 requests are also supported in frontend as a fallback.  If
+nghttpx is linked with spdylay library and frontend connection is
+SSL/TLS, the frontend also supports SPDY protocol.
+
+By default, this mode's frontend connection is encrypted using
+SSL/TLS.  So server's private key and certificate must be supplied to
+the command line (or through configuration file).  In this case, the
+fontend protocol selection will is done via ALPN or NPN.
+
+With ``--frontend-no-tls`` option, user can turn off SSL/TLS in
+frontend connection.  In this case, SPDY protocol is not available
+even if spdylay library is liked to nghttpx.  HTTP/2 and HTTP/1 are
+available on the frontend and a HTTP/1 connection can be upgraded to
+HTTP/2 using HTTP Upgrade.  Starting HTTP/2 connection by sending
+HTTP/2 connection preface is also supported.
+
+The backend is supposed to be HTTP/1 Web server.  For example, to make
+nghttpx listen to encrypted HTTP/2 requests at port 8443, and a
+backend HTTP/1 web server is configured to listen to HTTP/1 request at
+port 8080 in the same host, run nghttpx command-line like this::
+
+    $ nghttpx -f0.0.0.0,8443 -b127.0.0.1,8080 /path/to/server.key /path/to/server.crt
+
+Then HTTP/2 enabled client can access to the nghttpx in HTTP/2.  For
+example, you can send GET request to the server using nghttp::
+
+    $ nghttp -nv https://localhost:8443/
+
+HTTP/2 proxy mode
+-----------------
+
+If nghttpx is invoked with ``-s`` option, it operates in HTTP/2 proxy
+mode.  The supported protocols in frontend and backend connections are
+the same in `default mode`_.  The difference is that this mode acts
+like forward proxy and assumes the backend is HTTP/1 proxy server
+(e.g., squid, traffic server).  So HTTP/1 request must include
+absolute URI in request line.
+
+By default, frontend connection is encrypted.  So this mode is also
+called secure proxy.  If nghttpx is linked with spdylay, it supports
+SPDY protocols and it works as so called SPDY proxy.
+
+With ``--frontend-no-tls`` option, SSL/TLS is turned off in frontend
+connection, so the connection gets insecure.
+
+The backend must be HTTP/1 proxy server.  nghttpx only supports
+multiple backend server addresses.  It translates incoming requests to
+HTTP/1 request to backend server.  The backend server performs real
+proxy work for each request, for example, dispatching requests to the
+origin server and caching contents.
+
+For example, to make nghttpx listen to encrypted HTTP/2 requests at
+port 8443, and a backend HTTP/1 proxy server is configured to listen
+to HTTP/1 request at port 8080 in the same host, run nghttpx
+command-line like this::
+
+    $ nghttpx -s -f'*,8443' -b127.0.0.1,8080 /path/to/server.key /path/to/server.crt
+
+At the time of this writing, Firefox nightly supports HTTP/2 proxy.
+Chromium can use nghttpx as secure (SPDY) proxy and will support
+HTTP/2 proxy in the near future.
+
+To make Firefox nightly or Chromium use nghttpx as HTTP/2 or SPDY
+proxy, user has to create proxy.pac script file like this:
+
+.. code-block:: javascript
+
+    function FindProxyForURL(url, host) {
+        return "HTTPS SERVERADDR:PORT";
+    }
+
+``SERVERADDR`` and ``PORT`` is the hostname/address and port of the
+machine nghttpx is running.  Please note that both Firefox nightly and
+Chromium require valid certificate for secure proxy.
+
+For Firefox nightly, open Preference window and select Advanced then
+click Network tab.  Clicking Connection Settings button will show the
+dialog.  Select "Automatic proxy configuration URL" and enter the path
+to proxy.pac file, something like this::
+
+    file:///path/to/proxy.pac
+
+For Chromium, use following command-line::
+
+    $ google-chrome --proxy-pac-url=file:///path/to/proxy.pac --use-npn
+
+As HTTP/1 proxy server, Squid may work as out-of-box.  Traffic server
+requires to be configured as forward proxy.  Here is the minimum
+configuration items to edit::
+
+    CONFIG proxy.config.reverse_proxy.enabled INT 0
+    CONFIG proxy.config.url_remap.remap_required INT 0
+
+Consult Traffic server `documentation
+<https://docs.trafficserver.apache.org/en/latest/admin/forward-proxy.en.html>`_
+to know how to configure traffic server as forward proxy and its
+security implications.
+
+Client mode
+-----------
+
+If nghttpx is invoked with ``--client`` option, it operates in client
+mode.  In this mode, nghttpx listens for plain, unencrypted HTTP/2 and
+HTTP/1 requests and translates them to encrypted HTTP/2 requests to
+the backend.  User cannot enable SSL/TLS in frontend connection.
+
+HTTP/1 frontend connection can be upgraded to HTTP/2 using HTTP
+Upgrade.  To disable SSL/TLS in backend connection, use
+``--backend-no-tls`` option.
+
+The backend connection is created one per worker (thread).
+
+The backend server is supporsed to be a HTTP/2 web server (e.g.,
+nghttpd).  The one use-case of this mode is utilize existing HTTP/1
+clients to test HTTP/2 deployment.  Suppose that HTTP/2 web server
+listens to port 80 without encryption.  Then run nghttpx as client
+mode to access to that web server::
+
+    $ nghttpx --client -f127.0.0.1,8080 -b127.0.0.1,80 --backend-no-tls
+
+.. note::
+
+    You may need ``-k`` option if HTTP/2 server enables SSL/TLS and
+    its certificate is self-signed. But please note that it is
+    insecure.
+
+Then you can use curl to access HTTP/2 server via nghttpx::
+
+    $ curl http://localhost:8080/
+
+Client proxy mode
+-----------------
+
+If nghttpx is invoked with ``-p`` option, it operates in client proxy
+mode.  This mode behaves like `client mode`_, but it works like
+forward proxy.  So HTTP/1 request must include absolute URI in request
+line.
+
+HTTP/1 frontend connection can be upgraded to HTTP/2 using HTTP
+Upgrade.  To disable SSL/TLS in backend connection, use
+``--backend-no-tls`` option.
+
+The backend connection is created one per worker (thread).
+
+The backend server must be a HTTP/2 proxy.  You can use nghttpx in
+`HTTP/2 proxy mode`_ as backend server.  The one use-case of this mode
+is utilize existing HTTP/1 clients to test HTTP/2 connections between
+2 proxies. The another use-case is use this mode to aggregate local
+HTTP/1 connections to one HTTP/2 backend encrypted connection.  This
+makes HTTP/1 clients which does not support secure proxy can use
+secure HTTP/2 proxy via nghttpx client mode.
+
+Suppose that HTTP/2 proxy listens to port 8443, just like we saw in
+`HTTP/2 proxy mode`_.  To run nghttpx in client proxy mode to access
+that server, invoke nghttpx like this::
+
+    $ nghttpx -p -f127.0.0.1,8080 -b127.0.0.1,8443
+
+.. note::
+
+    You may need ``-k`` option if HTTP/2 server's certificate is
+    self-signed. But please note that it is insecure.
+
+Then you can use curl to issue HTTP request via HTTP/2 proxy::
+
+    $ curl --http-proxy=http://localhost:8080 http://www.google.com/
+
+You can configure web browser to use localhost:8080 as forward
+proxy.
+
+HTTP/2 bridge mode
+------------------
+
+If nghttpx is invoked with ``--http2-bridge`` option, it operates in
+HTTP/2 bridge mode.  The supported protocols in frontend connections
+are the same in `default mode`_.  The protocol in backend is HTTP/2
+only.
+
+With ``--frontend-no-tls`` option, SSL/TLS is turned off in frontend
+connection, so the connection gets insecure.  To disable SSL/TLS in
+backend connection, use ``--backend-no-tls`` option.
+
+The backend server is supporsed to be a HTTP/2 web server or HTTP/2
+proxy.  If backend server is HTTP/2 proxy, use
+``--no-location-rewrite`` option to disable rewriting location header
+field.
+
+The use-case of this mode is aggregate the incoming connections to one
+HTTP/2 connection.  One backend HTTP/2 connection is created per
+worker (thread).
+
+Disable SSL/TLS
+---------------
+
+In `default mode`_, `HTTP/2 proxy mode`_ and `HTTP/2 bridge mode`_,
+frontend connections are encrypted with SSL/TLS by default.  To turn
+off SSL/TLS, use ``--frontend-no-tls`` option.  If this option is
+used, the private key and certificate are not required to run nghttpx.
+
+In `client mode`_, `client proxy mode`_ and `HTTP/2 bridge mode`_,
+backend connections are encrypted with SSL/TLS by default.  To turn
+off SSL/TLS, use ``--backend-no-tls`` option.
+
+Specifying additional CA certificate
+------------------------------------
+
+By default, nghttpx tries to read CA certificate from system.  But
+depending on the system you use, this may fail or is not supported.
+To specify CA certificate manually, use ``--cacert`` option.  The
+specified file must be PEM format and can contain multiple
+certificates.
+
+By default, nghttpx validates server's certificate.  If you want to
+turn off this validation, knowing this is really insecure and what you
+are doing, you can use ``-k`` option to disable certificate
+validation.
+
+Read/write rate limit
+---------------------
+
+nghttpx supports transfer rate limiting on frontend connections.  You
+can do rate limit per frontend connection for reading and writeing
+individually.
+
+To perform rate limit for reading, use ``--read-rate`` and
+``--read-burst`` options.  For writing, use ``--write-rate`` and
+``--write-burst``.
+
+Please note that rate limit is performed on top of TCP and nothing to
+do with HTTP/2 flow control.
+
+Rewriting location header field
+-------------------------------
+
+nghttpx automatically rewrites location response header field if the
+following all conditions satisfy:
+
+* URI in location header field is not absolute URI or is not https URI.
+* URI in location header field includes non empty host component.
+* host (without port) in URI in location header field must match the
+  host appearing in :authority or host header field.
+
+When rewrite happens, URI scheme and port are replaced with the ones
+used in frontend, and host is replaced with which appears in
+:authority or host request header field.  :authority header field has
+precedence.  If the above conditions are not met with the host value
+in :authority header field, rewrite is retried with the value in host
+header field.
+
+Hot swapping
+------------
+
+nghttpx supports hot swapping using signals.  The hot swapping in
+nghttpx is multi step process.  First send USR2 signal to nghttpx
+process.  It will do fork and execute new executable, using same
+command-line arguments and environment variables.  At this point, both
+current and new processes can accept requests.  To gracefully shutdown
+current process, send QUIT signal to current nghttpx process.  When
+all existing frontend connections are done, the current process will
+exit.  At this point, only new nghttpx process exists and serves
+incoming requests.
+
+Re-opening log files
+--------------------
+
+When rotating log files, it is desirable to re-open log files after
+log rotation daemon renamed existing log files.  To tell nghttpx to
+re-open log files, send USR1 signal to nghttpx process.  It will
+re-open files specified by ``--accesslog-file`` and
+``--errorlog-file`` options.
+
+Multiple HTTP/1 backend addresses
+---------------------------------
+
+nghttpx supports multiple HTTP/1 backend addresses.  To specify them,
+just use ``-b`` option repeatedly.  For example, to use backend1:8080
+and backend2:8080, use command-line like this: ``-bbackend1,8080
+-bbackend2,8080``.  Please note that HTTP/2 backend only supports 1
+backend address.

doc/sources/python-apiref.rst

@@ -0,0 +1,319 @@
+Python API Reference
+====================
+
+.. py:module:: nghttp2
+
+nghttp2 offers some high level Python API to C library.  The bindings
+currently provide HPACK compressor and decompressor classes and HTTP/2
+server class.
+
+The extension module is called ``nghttp2``.
+
+``make`` will build the bindings.  The target Python version is
+determined by configure script.  If the detected Python version is not
+what you expect, specify a path to Python executable in ``PYTHON``
+variable as an argument to configure script (e.g., ``./configure
+PYTHON=/usr/bin/python3.4``).
+
+HPACK API
+---------
+
+.. py:class:: HDDeflater(hd_table_bufsize_max=DEFLATE_MAX_HEADER_TABLE_SIZE)
+
+   This class is used to perform header compression.  The
+   *hd_table_bufsize_max* limits the usage of header table in the
+   given amount of bytes.  The default value is
+   :py:data:`DEFLATE_MAX_HEADER_TABLE_SIZE`.  This is necessary
+   because the deflater and inflater share the same amount of header
+   table and the inflater decides that number.  The deflater may not
+   want to use all header table size because of limited memory
+   availability.  In that case, *hd_table_bufsize_max* can be used to
+   cap the upper limit of table size whatever the header table size is
+   chosen by the inflater.
+
+   .. py:method:: deflate(headers)
+
+      Deflates the *headers*. The *headers* must be sequence of tuple
+      of name/value pair, which are byte strings (not unicode string).
+
+      This method returns the deflated header block in byte string.
+      Raises the exception if any error occurs.
+
+   .. py:method:: set_no_refset(no_refset)
+
+      Tells the deflater not to use reference set if *no_refset* is
+      evaluated to ``True``.  If that happens, on each subsequent
+      invocation of :py:meth:`deflate()`, deflater will clear up
+      refersent set.
+
+   .. py:method:: change_table_size(hd_table_bufsize_max)
+
+      Changes header table size to *hd_table_bufsize_max* byte.  if
+      *hd_table_bufsize_max* is strictly larger than
+      ``hd_table_bufsize_max`` given in constructor,
+      ``hd_table_bufsize_max`` is used as header table size instead.
+
+      Raises the exception if any error occurs.
+
+   .. py:method:: get_hd_table()
+
+      Returns copy of current dynamic header table.
+
+The following example shows how to deflate header name/value pairs:
+
+.. code-block:: python
+
+   import binascii, nghttp2
+
+   deflater = nghttp2.HDDeflater()
+
+   res = deflater.deflate([(b'foo', b'bar'),
+                           (b'baz', b'buz')])
+
+   print(binascii.b2a_hex(res))
+
+
+.. py:class:: HDInflater()
+
+   This class is used to perform header decompression.
+
+   .. py:method:: inflate(data)
+
+      Inflates the deflated header block *data*. The *data* must be
+      byte string.
+
+      Raises the exception if any error occurs.
+
+   .. py:method:: change_table_size(hd_table_bufsize_max)
+
+      Changes header table size to *hd_table_bufsize_max* byte.
+
+      Raises the exception if any error occurs.
+
+   .. py:method:: get_hd_table()
+
+      Returns copy of current dynamic header table.
+
+The following example shows how to inflate deflated header block:
+
+.. code-block:: python
+
+   deflater = nghttp2.HDDeflater()
+
+   data = deflater.deflate([(b'foo', b'bar'),
+                            (b'baz', b'buz')])
+
+   inflater = nghttp2.HDInflater()
+
+   hdrs = inflater.inflate(data)
+
+   print(hdrs)
+
+
+.. py:function:: print_hd_table(hdtable)
+
+   Convenient function to print *hdtable* to the standard output.  The
+   *hdtable* is the one retrieved by
+   :py:meth:`HDDeflater.get_hd_table()` or
+   :py:meth:`HDInflater.get_hd_table()`.  This function does not work
+   if header name/value cannot be decoded using UTF-8 encoding.
+
+   In output, ``s=N`` means the entry occupies ``N`` bytes in header
+   table.  If ``r=y``, then the entry is in the reference set.
+
+.. py:data:: DEFAULT_HEADER_TABLE_SIZE
+
+   The default header table size, which is 4096 as per HTTP/2
+   specification.
+
+.. py:data:: DEFLATE_MAX_HEADER_TABLE_SIZE
+
+   The default header table size for deflater.  The initial value
+   is 4096.
+
+HTTP/2 servers
+--------------
+
+.. note::
+
+   We use :py:mod:`asyncio` for HTTP/2 server classes.  Therefore,
+   Python 3.4 or later is required to use these objects.  To
+   explicitly configure nghttp2 build to use Python 3.4, specify the
+   ``PYTHON`` variable to the path to Python 3.4 executable when
+   invoking configure script like this::
+
+       $ ./configure PYTHON=/usr/bin/python3.4
+
+.. py:class:: HTTP2Server(address, RequestHandlerClass, ssl=None)
+
+   This class builds on top of the :py:mod:`asyncio` event loop.  On
+   construction, *RequestHandlerClass* must be given, which must be a
+   subclass of :py:class:`BaseRequestHandler` class.
+
+   The *address* must be a tuple of hostname/IP address and port to
+   bind.  If hostname/IP address is ``None``, all interfaces are
+   assumed.
+
+   To enable SSL/TLS, specify instance of :py:class:`ssl.SSLContext`
+   in *ssl*.  Before passing *ssl* to
+   :py:func:`BaseEventLoop.create_server`, ALPN protocol identifiers
+   are set using :py:meth:`ssl.SSLContext.set_npn_protocols`.
+
+   To disable SSL/TLS, omit *ssl* or specify ``None``.
+
+   .. py:method:: serve_forever()
+
+      Runs server and processes incoming requests forever.
+
+.. py:class:: BaseRequestHandler(http2, stream_id)
+
+   The class is used to handle the single HTTP/2 stream.  By default,
+   it does not nothing.  It must be subclassed to handle each event
+   callback method.
+
+   The first callback method invoked is :py:meth:`on_headers()`. It is
+   called when HEADERS frame, which includes request header fields, is
+   arrived.
+
+   If request has request body, :py:meth:`on_data()` is invoked for
+   each chunk of received data chunk.
+
+   When whole request is received, :py:meth:`on_request_done()` is
+   invoked.
+
+   When stream is closed, :py:meth:`on_close()` is called.
+
+   The application can send response using :py:meth:`send_response()`
+   method.  It can be used in :py:meth:`on_headers()`,
+   :py:meth:`on_data()` or :py:meth:`on_request_done()`.
+
+   The application can push resource using :py:meth:`push()` method.
+   It must be used before :py:meth:`send_response()` call.
+
+   A :py:class:`BaseRequestHandler` has the following instance
+   variables:
+
+   .. py:attribute:: client_address
+
+      Contains a tuple of the form ``(host, port)`` referring to the
+      client's address.
+
+   .. py:attribute:: stream_id
+
+      Stream ID of this stream
+
+   .. py:attribute:: scheme
+
+      Scheme of the request URI.  This is a value of ``:scheme``
+      header field.
+
+   .. py:attribute:: method
+
+      Method of this stream.  This is a value of ``:method`` header
+      field.
+
+   .. py:attribute:: host
+
+      This is a value of ``:authority`` or ``host`` header field.
+
+   .. py:attribute:: path
+
+      This is a value of ``:path`` header field.
+
+   A :py:class:`BaseRequestHandler` has the following methods:
+
+   .. py:method:: on_headers()
+
+      Called when request HEADERS is arrived.  By default, this method
+      does nothing.
+
+   .. py:method:: on_data(data)
+
+      Called when a chunk of request body *data* is arrived.  This
+      method will be called multiple times until all data are
+      received.  By default, this method does nothing.
+
+   .. py:method:: on_request_done()
+
+      Called when whole request was received.  By default, this method
+      does nothing.
+
+   .. py:method:: on_close(error_code)
+
+      Called when stream is about to close.  The *error_code*
+      indicates the reason of closure.  If it is ``0``, the stream is
+      going to close without error.
+
+   .. py:method:: send_response(status=200, headers=None, body=None)
+
+      Send response.  The *status* is HTTP status code.  The *headers*
+      is additional response headers.  The *:status* header field will
+      be appended by the library.  The *body* is the response body.
+      It could be ``None`` if response body is empty. Or it must be
+      instance of either ``str``, ``bytes`` or :py:class:`io.IOBase`.
+      If instance of ``str`` is specified, it will be encoded using
+      UTF-8.
+
+      The *headers* is a list of tuple of the form ``(name,
+      value)``. The ``name`` and ``value`` can be either byte string
+      or unicode string.  In the latter case, they will be encoded
+      using UTF-8.
+
+      Raises the exception if any error occurs.
+
+   .. py:method:: push(path, method='GET', request_headers=None, status=200, headers=None, body=None)
+
+      Push a specified resource.  The *path* is a path portion of
+      request URI for this resource.  The *method* is a method to
+      access this resource.  The *request_headers* is additional
+      request headers to access this resource.  The ``:scheme``,
+      ``:method``, ``:authority`` and ``:path`` are appended by the
+      library.  The ``:scheme`` and ``:authority`` are inherited from
+      request header fields of the associated stream.
+
+      The *status* is HTTP status code.  The *headers* is additional
+      response headers.  The ``:status`` header field is appended by
+      the library.  The *body* is the response body.  It could be
+      ``None`` if response body is empty.  Or it must be instance of
+      either ``str``, ``bytes`` or ``io.IOBase``.  If instance of
+      ``str`` is specified, it is encoded using UTF-8.
+
+      The headers and request_headers are a list of tuple of the form
+      ``(name, value)``. The ``name`` and ``value`` can be either byte
+      string or unicode string.  In the latter case, they will be
+      encoded using UTF-8.
+
+      Returns an instance of ``RequestHandlerClass`` specified in
+      :py:class:`HTTP2Server` constructor for the pushed resource.
+
+      Raises the exception if any error occurs.
+
+The following example illustrates :py:class:`HTTP2Server` and
+:py:class:`BaseRequestHandler` usage:
+
+.. code-block:: python
+
+    #!/usr/bin/env python
+
+    import io, ssl
+    import nghttp2
+
+    class Handler(nghttp2.BaseRequestHandler):
+
+        def on_headers(self):
+            self.push(path='/css/style.css',
+                      request_headers = [('content-type', 'text/css')],
+                      status=200,
+                      body='body{margin:0;}')
+
+            self.send_response(status=200,
+                               headers = [('content-type', 'text/plain')],
+                               body=io.BytesIO(b'nghttp2-python FTW'))
+
+    ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
+    ctx.options = ssl.OP_ALL | ssl.OP_NO_SSLv2
+    ctx.load_cert_chain('server.crt', 'server.key')
+
+    # give None to ssl to make the server non-SSL/TLS
+    server = nghttp2.HTTP2Server(('127.0.0.1', 8443), Handler, ssl=ctx)
+    server.serve_forever()

doc/sources/tutorial-client.rst

@@ -1,7 +1,7 @@
-Tutorial: HTTP/2.0 client
+Tutorial: HTTP/2 client
 =========================
 
-In this tutorial, we are going to write very primitive HTTP/2.0
+In this tutorial, we are going to write very primitive HTTP/2
 client. The complete source code, `libevent-client.c`_, is attached at
 the end of this page.  It also resides in examples directory in the
 archive or repository.
@@ -19,15 +19,13 @@ function ``main()`` and ``run()``, which is not so relevant to nghttp2
 library use. The one thing you should look at is setup NPN callback.
 The NPN callback is used for the client to select the next application
 protocol over the SSL/TLS transport. In this tutorial, we use
-`nghttp2_select_next_protocol()` function to select the HTTP/2.0
+`nghttp2_select_next_protocol()` function to select the HTTP/2
 protocol the library supports::
 
-    static int select_next_proto_cb(SSL* ssl,
-                                    unsigned char **out, unsigned char *outlen,
-                                    const unsigned char *in, unsigned int inlen,
-                                    void *arg)
-    {
-      if(nghttp2_select_next_protocol(out, outlen, in, inlen) <= 0) {
+    static int select_next_proto_cb(SSL *ssl _U_, unsigned char **out,
+                                    unsigned char *outlen, const unsigned char *in,
+                                    unsigned int inlen, void *arg _U_) {
+      if (nghttp2_select_next_protocol(out, outlen, in, inlen) <= 0) {
         errx(1, "Server did not advertise " NGHTTP2_PROTO_VERSION_ID);
       }
       return SSL_TLSEXT_ERR_OK;
@@ -36,23 +34,23 @@ protocol the library supports::
 The callback is set to the SSL_CTX object using
 ``SSL_CTX_set_next_proto_select_cb()`` function::
 
-    static SSL_CTX* create_ssl_ctx(void)
-    {
+    static SSL_CTX *create_ssl_ctx(void) {
       SSL_CTX *ssl_ctx;
       ssl_ctx = SSL_CTX_new(SSLv23_client_method());
-      if(!ssl_ctx) {
+      if (!ssl_ctx) {
         errx(1, "Could not create SSL/TLS context: %s",
              ERR_error_string(ERR_get_error(), NULL));
       }
       SSL_CTX_set_options(ssl_ctx,
-                          SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_COMPRESSION |
-                          SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
+                          SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 |
+                              SSL_OP_NO_COMPRESSION |
+                              SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
       SSL_CTX_set_next_proto_select_cb(ssl_ctx, select_next_proto_cb, NULL);
       return ssl_ctx;
     }
 
 We use ``http2_session_data`` structure to store the data related to
-the HTTP/2.0 session::
+the HTTP/2 session::
 
     typedef struct {
       nghttp2_session *session;
@@ -91,25 +89,22 @@ respectively.
 Then we call function ``initiate_connection()`` to start connecting to
 the remote server::
 
-    static void initiate_connection(struct event_base *evbase,
-                                    SSL_CTX *ssl_ctx,
+    static void initiate_connection(struct event_base *evbase, SSL_CTX *ssl_ctx,
                                     const char *host, uint16_t port,
-                                    http2_session_data *session_data)
-    {
+                                    http2_session_data *session_data) {
       int rv;
       struct bufferevent *bev;
       SSL *ssl;
 
       ssl = create_ssl(ssl_ctx);
-      bev = bufferevent_openssl_socket_new(evbase, -1, ssl,
-                                           BUFFEREVENT_SSL_CONNECTING,
-                                           BEV_OPT_DEFER_CALLBACKS |
-                                           BEV_OPT_CLOSE_ON_FREE);
+      bev = bufferevent_openssl_socket_new(
+          evbase, -1, ssl, BUFFEREVENT_SSL_CONNECTING,
+          BEV_OPT_DEFER_CALLBACKS | BEV_OPT_CLOSE_ON_FREE);
       bufferevent_setcb(bev, readcb, writecb, eventcb, session_data);
       rv = bufferevent_socket_connect_hostname(bev, session_data->dnsbase,
                                                AF_UNSPEC, host, port);
 
-      if(rv != 0) {
+      if (rv != 0) {
         errx(1, "Could not connect to the remote host %s", host);
       }
       session_data->bev = bev;
@@ -122,10 +117,9 @@ The ``eventcb()`` is invoked by libevent event loop when an event
 (e.g., connection has been established, timeout, etc) happens on the
 underlying network socket::
 
-    static void eventcb(struct bufferevent *bev, short events, void *ptr)
-    {
-      http2_session_data *session_data = (http2_session_data*)ptr;
-      if(events & BEV_EVENT_CONNECTED) {
+    static void eventcb(struct bufferevent *bev, short events, void *ptr) {
+      http2_session_data *session_data = (http2_session_data *)ptr;
+      if (events & BEV_EVENT_CONNECTED) {
         int fd = bufferevent_getfd(bev);
         int val = 1;
         fprintf(stderr, "Connected\n");
@@ -133,16 +127,16 @@ underlying network socket::
         initialize_nghttp2_session(session_data);
         send_client_connection_header(session_data);
         submit_request(session_data);
-        if(session_send(session_data) != 0) {
+        if (session_send(session_data) != 0) {
           delete_http2_session_data(session_data);
         }
         return;
       }
-      if(events & BEV_EVENT_EOF) {
+      if (events & BEV_EVENT_EOF) {
         warnx("Disconnected from the remote host");
-      } else if(events & BEV_EVENT_ERROR) {
+      } else if (events & BEV_EVENT_ERROR) {
         warnx("Network error");
-      } else if(events & BEV_EVENT_TIMEOUT) {
+      } else if (events & BEV_EVENT_TIMEOUT) {
         warnx("Timeout");
       }
       delete_http2_session_data(session_data);
@@ -154,18 +148,31 @@ event, we just simply tear down the connection. The
 finished successfully. We first initialize nghttp2 session object in
 ``initialize_nghttp2_session()`` function::
 
-    static void initialize_nghttp2_session(http2_session_data *session_data)
-    {
-      nghttp2_session_callbacks callbacks = {0};
+    static void initialize_nghttp2_session(http2_session_data *session_data) {
+      nghttp2_session_callbacks *callbacks;
 
-      callbacks.send_callback = send_callback;
-      callbacks.before_frame_send_callback = before_frame_send_callback;
-      callbacks.on_frame_recv_callback = on_frame_recv_callback;
-      callbacks.on_data_chunk_recv_callback = on_data_chunk_recv_callback;
-      callbacks.on_stream_close_callback = on_stream_close_callback;
-      callbacks.on_header_callback = on_header_callback;
-      callbacks.on_begin_headers_callback = on_begin_headers_callback;
-      nghttp2_session_client_new(&session_data->session, &callbacks, session_data);
+      nghttp2_session_callbacks_new(&callbacks);
+
+      nghttp2_session_callbacks_set_send_callback(callbacks, send_callback);
+
+      nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
+                                                           on_frame_recv_callback);
+
+      nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
+          callbacks, on_data_chunk_recv_callback);
+
+      nghttp2_session_callbacks_set_on_stream_close_callback(
+          callbacks, on_stream_close_callback);
+
+      nghttp2_session_callbacks_set_on_header_callback(callbacks,
+                                                       on_header_callback);
+
+      nghttp2_session_callbacks_set_on_begin_headers_callback(
+          callbacks, on_begin_headers_callback);
+
+      nghttp2_session_client_new(&session_data->session, callbacks, session_data);
+
+      nghttp2_session_callbacks_del(callbacks);
     }
 
 Since we are creating client, we use `nghttp2_session_client_new()` to
@@ -176,25 +183,22 @@ The `delete_http2_session_data()` destroys ``session_data`` and frees
 its bufferevent, so it closes underlying connection as well. It also
 calls `nghttp2_session_del()` to delete nghttp2 session object.
 
-We begin HTTP/2.0 communication by sending client connection header,
+We begin HTTP/2 communication by sending client connection preface,
 which is 24 bytes magic byte sequence
-(:macro:`NGHTTP2_CLIENT_CONNECTION_HEADER`) followed by SETTINGS
-frame.  The transmission of client connection header is done in
+(:macro:`NGHTTP2_CLIENT_CONNECTION_PREFACE`) and SETTINGS frame.  The
+transmission of client connection header is done in
 ``send_client_connection_header()``::
 
-    static void send_client_connection_header(http2_session_data *session_data)
-    {
+    static void send_client_connection_header(http2_session_data *session_data) {
       nghttp2_settings_entry iv[1] = {
-        { NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100 }
-      };
+          {NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100}};
       int rv;
 
-      bufferevent_write(session_data->bev,
-                        NGHTTP2_CLIENT_CONNECTION_HEADER,
-                        NGHTTP2_CLIENT_CONNECTION_HEADER_LEN);
-      rv = nghttp2_submit_settings(session_data->session, NGHTTP2_FLAG_NONE,
-                                   iv, ARRLEN(iv));
-      if(rv != 0) {
+      bufferevent_write(session_data->bev, NGHTTP2_CLIENT_CONNECTION_PREFACE,
+                        NGHTTP2_CLIENT_CONNECTION_PREFACE_LEN);
+      rv = nghttp2_submit_settings(session_data->session, NGHTTP2_FLAG_NONE, iv,
+                                   ARRLEN(iv));
+      if (rv != 0) {
         errx(1, "Could not submit SETTINGS: %s", nghttp2_strerror(rv));
       }
     }
@@ -211,26 +215,26 @@ used, which is described about later.
 After the transmission of client connection header, we enqueue HTTP
 request in ``submit_request()`` function::
 
-    static void submit_request(http2_session_data *session_data)
-    {
-      int rv;
+    static void submit_request(http2_session_data *session_data) {
+      int32_t stream_id;
       http2_stream_data *stream_data = session_data->stream_data;
       const char *uri = stream_data->uri;
       const struct http_parser_url *u = stream_data->u;
       nghttp2_nv hdrs[] = {
-        MAKE_NV2(":method", "GET"),
-        MAKE_NV(":scheme",
-                &uri[u->field_data[UF_SCHEMA].off], u->field_data[UF_SCHEMA].len),
-        MAKE_NV(":authority", stream_data->authority, stream_data->authoritylen),
-        MAKE_NV(":path", stream_data->path, stream_data->pathlen)
-      };
+          MAKE_NV2(":method", "GET"),
+          MAKE_NV(":scheme", &uri[u->field_data[UF_SCHEMA].off],
+                  u->field_data[UF_SCHEMA].len),
+          MAKE_NV(":authority", stream_data->authority, stream_data->authoritylen),
+          MAKE_NV(":path", stream_data->path, stream_data->pathlen)};
       fprintf(stderr, "Request headers:\n");
       print_headers(stderr, hdrs, ARRLEN(hdrs));
-      rv = nghttp2_submit_request(session_data->session, NGHTTP2_PRI_DEFAULT,
-                                  hdrs, ARRLEN(hdrs), NULL, stream_data);
-      if(rv != 0) {
-        errx(1, "Could not submit HTTP request: %s", nghttp2_strerror(rv));
+      stream_id = nghttp2_submit_request(session_data->session, NULL, hdrs,
+                                         ARRLEN(hdrs), NULL, stream_data);
+      if (stream_id < 0) {
+        errx(1, "Could not submit HTTP request: %s", nghttp2_strerror(stream_id));
       }
+
+      stream_data->stream_id = stream_id;
     }
 
 We build HTTP request header fields in ``hdrs`` which is an array of
@@ -239,25 +243,31 @@ We build HTTP request header fields in ``hdrs`` which is an array of
 we use `nghttp2_submit_request()` function. The `stream_data` is
 passed in *stream_user_data* parameter. It is used in nghttp2
 callbacks which we'll describe about later.
+`nghttp2_submit_request()` returns the newly assigned stream ID for
+this request.
 
 The next bufferevent callback is ``readcb()``, which is invoked when
 data is available to read in the bufferevent input buffer::
 
-    static void readcb(struct bufferevent *bev, void *ptr)
-    {
-      http2_session_data *session_data = (http2_session_data*)ptr;
-      int rv;
+    static void readcb(struct bufferevent *bev, void *ptr) {
+      http2_session_data *session_data = (http2_session_data *)ptr;
+      ssize_t readlen;
       struct evbuffer *input = bufferevent_get_input(bev);
       size_t datalen = evbuffer_get_length(input);
       unsigned char *data = evbuffer_pullup(input, -1);
-      rv = nghttp2_session_mem_recv(session_data->session, data, datalen);
-      if(rv < 0) {
-        warnx("Fatal error: %s", nghttp2_strerror(rv));
+
+      readlen = nghttp2_session_mem_recv(session_data->session, data, datalen);
+      if (readlen < 0) {
+        warnx("Fatal error: %s", nghttp2_strerror((int)readlen));
         delete_http2_session_data(session_data);
         return;
       }
-      evbuffer_drain(input, rv);
-      if(session_send(session_data) != 0) {
+      if (evbuffer_drain(input, readlen) != 0) {
+        warnx("Fatal error: evbuffer_drain failed");
+        delete_http2_session_data(session_data);
+        return;
+      }
+      if (session_send(session_data) != 0) {
         delete_http2_session_data(session_data);
         return;
       }
@@ -270,12 +280,11 @@ invoke nghttp2 callbacks and also queue frames. Since there may be
 pending frames, we call ``session_send()`` function to send those
 frames. The ``session_send()`` function is defined as follows::
 
-    static int session_send(http2_session_data *session_data)
-    {
+    static int session_send(http2_session_data *session_data) {
       int rv;
 
       rv = nghttp2_session_send(session_data->session);
-      if(rv != 0) {
+      if (rv != 0) {
         warnx("Fatal error: %s", nghttp2_strerror(rv));
         return -1;
       }
@@ -283,17 +292,13 @@ frames. The ``session_send()`` function is defined as follows::
     }
 
 The `nghttp2_session_send()` function serializes the frame into wire
-format and call :member:`nghttp2_session_callbacks.send_callback` with
-it. We set ``send_callback()`` function to
-:member:`nghttp2_session_callbacks.send_callback` in
-``initialize_nghttp2_session()`` function described earlier. It is
-defined as follows::
+format and call ``send_callback()`` function of type
+:type:`nghttp2_send_callback`.  The ``send_callback()`` is defined as
+follows::
 
-    static ssize_t send_callback(nghttp2_session *session,
-                                 const uint8_t *data, size_t length,
-                                 int flags, void *user_data)
-    {
-      http2_session_data *session_data = (http2_session_data*)user_data;
+    static ssize_t send_callback(nghttp2_session *session _U_, const uint8_t *data,
+                                 size_t length, int flags _U_, void *user_data) {
+      http2_session_data *session_data = (http2_session_data *)user_data;
       struct bufferevent *bev = session_data->bev;
       bufferevent_write(bev, data, length);
       return length;
@@ -303,25 +308,23 @@ Since we use bufferevent to abstract network I/O, we just write the
 data to the bufferevent object. Note that `nghttp2_session_send()`
 continues to write all frames queued so far. If we were writing the
 data to the non-blocking socket directly using ``write()`` system call
-in the :member:`nghttp2_session_callbacks.send_callback`, we will
-surely get ``EAGAIN`` or ``EWOULDBLOCK`` since the socket has limited
-send buffer. If that happens, we can return
-:macro:`NGHTTP2_ERR_WOULDBLOCK` to signal the nghttp2 library to stop
-sending further data. But writing to the bufferevent, we have to
-regulate the amount data to be buffered by ourselves to avoid possible
-huge memory consumption. In this example client, we do not limit
-anything. To see how to regulate the amount of buffered data, see the
-``send_callback()`` in the server tutorial.
+in the ``send_callback()``, we will surely get ``EAGAIN`` or
+``EWOULDBLOCK`` since the socket has limited send buffer. If that
+happens, we can return :macro:`NGHTTP2_ERR_WOULDBLOCK` to signal the
+nghttp2 library to stop sending further data. But writing to the
+bufferevent, we have to regulate the amount data to be buffered by
+ourselves to avoid possible huge memory consumption. In this example
+client, we do not limit anything. To see how to regulate the amount of
+buffered data, see the ``send_callback()`` in the server tutorial.
 
 The third bufferevent callback is ``writecb()``, which is invoked when
 all data written in the bufferevent output buffer have been sent::
 
-    static void writecb(struct bufferevent *bev, void *ptr)
-    {
-      http2_session_data *session_data = (http2_session_data*)ptr;
-      if(nghttp2_session_want_read(session_data->session) == 0 &&
-         nghttp2_session_want_write(session_data->session) == 0 &&
-         evbuffer_get_length(bufferevent_get_output(session_data->bev)) == 0) {
+    static void writecb(struct bufferevent *bev _U_, void *ptr) {
+      http2_session_data *session_data = (http2_session_data *)ptr;
+      if (nghttp2_session_want_read(session_data->session) == 0 &&
+          nghttp2_session_want_write(session_data->session) == 0 &&
+          evbuffer_get_length(bufferevent_get_output(session_data->bev)) == 0) {
         delete_http2_session_data(session_data);
       }
     }
@@ -344,62 +347,19 @@ We have already described about nghttp2 callback ``send_callback()``.
 Let's describe remaining nghttp2 callbacks we setup in
 ``initialize_nghttp2_setup()`` function.
 
-The `before_frame_send_callback()` function is invoked when a frame is
-about to be sent::
-
-    static int before_frame_send_callback
-    (nghttp2_session *session, const nghttp2_frame *frame, void *user_data)
-    {
-      http2_session_data *session_data = (http2_session_data*)user_data;
-      http2_stream_data *stream_data;
-
-      if(frame->hd.type == NGHTTP2_HEADERS &&
-         frame->headers.cat == NGHTTP2_HCAT_REQUEST) {
-        stream_data =
-          (http2_stream_data*)nghttp2_session_get_stream_user_data
-          (session, frame->hd.stream_id);
-        if(stream_data == session_data->stream_data) {
-          stream_data->stream_id = frame->hd.stream_id;
-        }
-      }
-      return 0;
-    }
-
-Remember that we have not get stream ID when we submit HTTP request
-using `nghttp2_submit_request()`. Since nghttp2 library reorders the
-request based on priority and stream ID must be monotonically
-increased, the stream ID is not assigned just before transmission.
-The one of the purpose of this callback is get the stream ID assigned
-to the frame. First we check that the frame is HEADERS frame. Since
-HEADERS has several meanings in HTTP/2.0, we check that it is request
-HEADERS (which means that the first HEADERS frame to create a stream).
-The assigned stream ID is ``frame->hd.stream_id``.  Recall that we
-passed ``stream_data`` in the *stream_user_data* parameter of
-`nghttp2_submit_request()` function. We can get it using
-`nghttp2_session_get_stream_user_data()` function. To really sure that
-this HEADERS frame is the request HEADERS we have queued, we check
-that ``session_data->stream_data`` and ``stream_data`` returned from
-`nghttp2_session_get_stream_user_data()` are pointing the same
-location. In this example program, we just only uses 1 stream, it is
-unnecessary to compare them, but real applications surely deal with
-multiple streams, and *stream_user_data* is very handy to identify
-which HEADERS we are seeing in the callback. Therefore we just show
-how to use it here.
-
 Each request header name/value pair is emitted via
 ``on_header_callback`` function::
 
-    static int on_header_callback(nghttp2_session *session,
-                                  const nghttp2_frame *frame,
-                                  const uint8_t *name, size_t namelen,
-                                  const uint8_t *value, size_t valuelen,
-                                  void *user_data)
-    {
-      http2_session_data *session_data = (http2_session_data*)user_data;
-      switch(frame->hd.type) {
+    static int on_header_callback(nghttp2_session *session _U_,
+                                  const nghttp2_frame *frame, const uint8_t *name,
+                                  size_t namelen, const uint8_t *value,
+                                  size_t valuelen, uint8_t flags _U_,
+                                  void *user_data) {
+      http2_session_data *session_data = (http2_session_data *)user_data;
+      switch (frame->hd.type) {
       case NGHTTP2_HEADERS:
-        if(frame->headers.cat == NGHTTP2_HCAT_RESPONSE &&
-           session_data->stream_data->stream_id == frame->hd.stream_id) {
+        if (frame->headers.cat == NGHTTP2_HCAT_RESPONSE &&
+            session_data->stream_data->stream_id == frame->hd.stream_id) {
           /* Print response headers for the initiated request. */
           print_header(stderr, name, namelen, value, valuelen);
           break;
@@ -408,19 +368,18 @@ Each request header name/value pair is emitted via
       return 0;
     }
 
-In this turotial, we just print the name/value pair.
+In this tutorial, we just print the name/value pair.
 
 After all name/value pairs are emitted for a frame,
 ``on_frame_recv_callback`` function is called::
 
-    static int on_frame_recv_callback(nghttp2_session *session,
-                                      const nghttp2_frame *frame, void *user_data)
-    {
-      http2_session_data *session_data = (http2_session_data*)user_data;
-      switch(frame->hd.type) {
+    static int on_frame_recv_callback(nghttp2_session *session _U_,
+                                      const nghttp2_frame *frame, void *user_data) {
+      http2_session_data *session_data = (http2_session_data *)user_data;
+      switch (frame->hd.type) {
       case NGHTTP2_HEADERS:
-        if(frame->headers.cat == NGHTTP2_HCAT_RESPONSE &&
-           session_data->stream_data->stream_id == frame->hd.stream_id) {
+        if (frame->headers.cat == NGHTTP2_HCAT_RESPONSE &&
+            session_data->stream_data->stream_id == frame->hd.stream_id) {
           fprintf(stderr, "All headers received\n");
         }
         break;
@@ -436,13 +395,12 @@ its stream ID.
 The ``on_data_chunk_recv_callback()`` function is invoked when a chunk
 of data is received from the remote peer::
 
-    static int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
-                                           int32_t stream_id,
+    static int on_data_chunk_recv_callback(nghttp2_session *session _U_,
+                                           uint8_t flags _U_, int32_t stream_id,
                                            const uint8_t *data, size_t len,
-                                           void *user_data)
-    {
-      http2_session_data *session_data = (http2_session_data*)user_data;
-      if(session_data->stream_data->stream_id == stream_id) {
+                                           void *user_data) {
+      http2_session_data *session_data = (http2_session_data *)user_data;
+      if (session_data->stream_data->stream_id == stream_id) {
         fwrite(data, len, 1, stdout);
       }
       return 0;
@@ -456,19 +414,17 @@ some binary data.
 The ``on_stream_close_callback()`` function is invoked when the stream
 is about to close::
 
-    static int on_stream_close_callback(nghttp2_session *session,
-                                        int32_t stream_id,
+    static int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
                                         nghttp2_error_code error_code,
-                                        void *user_data)
-    {
-      http2_session_data *session_data = (http2_session_data*)user_data;
+                                        void *user_data) {
+      http2_session_data *session_data = (http2_session_data *)user_data;
       int rv;
 
-      if(session_data->stream_data->stream_id == stream_id) {
-        fprintf(stderr, "Stream %d closed with error_code=%d\n",
-                stream_id, error_code);
+      if (session_data->stream_data->stream_id == stream_id) {
+        fprintf(stderr, "Stream %d closed with error_code=%d\n", stream_id,
+                error_code);
         rv = nghttp2_session_terminate_session(session, NGHTTP2_NO_ERROR);
-        if(rv != 0) {
+        if (rv != 0) {
           return NGHTTP2_ERR_CALLBACK_FAILURE;
         }
       }
@@ -479,6 +435,6 @@ If the stream ID matches the one we initiated, it means that its
 stream is going to be closed. Since we have finished to get the
 resource we want (or the stream was reset by RST_STREAM from the
 remote peer), we call `nghttp2_session_terminate_session()` to
-commencing the closure of the HTTP/2.0 session gracefully. If you have
+commencing the closure of the HTTP/2 session gracefully. If you have
 some data associated for the stream to be closed, you may delete it
 here.

doc/sources/tutorial-hpack.rst

@@ -0,0 +1,118 @@
+Tutorial: HPACK API
+===================
+
+In this tutorial, we describe basic use of HPACK API in nghttp2
+library.  We briefly describe APIs for deflating and inflating header
+fields.  The example of using these APIs are presented as complete
+source code `deflate.c`_.
+
+Deflating (encoding) headers
+----------------------------
+
+First we need to initialize :type:`nghttp2_hd_deflater` object using
+`nghttp2_hd_deflate_new()` function::
+
+    int nghttp2_hd_deflate_new(nghttp2_hd_deflater **deflater_ptr,
+                               size_t deflate_hd_table_bufsize_max);
+
+This function allocates :type:`nghttp2_hd_deflater` object and
+initializes it and assigns its pointer to ``*deflater_ptr`` passed by
+parameter.  The *deflate_hd_table_bufsize_max* is the upper bound of
+header table size the deflater will use.  This will limit the memory
+usage in deflater object for dynamic header table.  If you doubt, just
+specify 4096 here, which is the default upper bound of dynamic header
+table buffer size.
+
+To encode header fields, `nghttp2_hd_deflate_hd()` function::
+
+    ssize_t nghttp2_hd_deflate_hd(nghttp2_hd_deflater *deflater,
+                                  uint8_t *buf, size_t buflen,
+                                  const nghttp2_nv *nva, size_t nvlen);
+
+The *deflater* is the deflater object initialized by
+`nghttp2_hd_deflate_new()` function described above.  The *buf* is a
+pointer to buffer to store encoded byte string.  The *buflen* is
+capacity of *buf*.  The *nva* is a pointer to :type:`nghttp2_nv`,
+which is an array of header fields to deflate.  The *nvlen* is the
+number of header fields which *nva* contains.
+
+It is important to initialize and assign all members of
+:type:`nghttp2_nv`.  If a header field should not be inserted in
+dynamic header table for a security reason, set
+:macro:`NGHTTP2_NV_FLAG_NO_INDEX` flag in :member:`nghttp2_nv.flags`.
+
+`nghttp2_hd_deflate_hd()` processes all headers given in *nva*.  The
+*nva* must include all request or response header fields to be sent in
+one HEADERS (or optionally following (multiple) CONTINUATION
+frame(s)).  The *buf* must have enough space to store the encoded
+result.  Otherwise, the function will fail.  To estimate the upper
+bound of encoded result, use `nghttp2_hd_deflate_bound()` function::
+
+    size_t nghttp2_hd_deflate_bound(nghttp2_hd_deflater *deflater,
+                                    const nghttp2_nv *nva, size_t nvlen);
+
+Pass this function with the same paramters *deflater*, *nva* and
+*nvlen* which will be passed to `nghttp2_hd_deflate_hd()`.
+
+The subsequent call of `nghttp2_hd_deflate_hd()` will use current
+encoder state and perform differential encoding which is the
+fundamental compression gain for HPACK.
+
+Once `nghttp2_hd_deflate_hd()` fails, it cannot be undone and its
+further call with the same deflater object shall fail.  So it is very
+important to use `nghttp2_hd_deflate_bound()` to know the required
+size of buffer.
+
+To delete :type:`nghttp2_hd_deflater` object, use `nghttp2_hd_deflate_del()`
+function.
+
+Inflating (decoding) headers
+----------------------------
+
+We use :type:`nghttp2_hd_inflater` object to inflate compressed header
+data.  To initialize the object, use `nghttp2_hd_inflate_new()`::
+
+    int nghttp2_hd_inflate_new(nghttp2_hd_inflater **inflater_ptr);
+
+To inflate header data, use `nghttp2_hd_inflate_hd()` function::
+
+    ssize_t nghttp2_hd_inflate_hd(nghttp2_hd_inflater *inflater,
+                                  nghttp2_nv *nv_out, int *inflate_flags,
+                                  uint8_t *in, size_t inlen, int in_final);
+
+The *inflater* is the inflater object initialized above.  The *nv_out*
+is a pointer to :type:`nghttp2_nv` to store the result.  The *in* is a
+pointer to input data and *inlen* is its length.  The caller is not
+required to specify whole deflated header data to *in* at once.  It
+can call this function multiple times for portion of the data in
+streaming way.  If *in_final* is nonzero, it tells the function that
+the passed data is the final sequence of deflated header data.  The
+*inflate_flags* is output parameter and successful call of this
+function stores a set of flags in it.  It will be described later.
+
+This function returns when each header field is inflated.  When this
+happens, the function sets :macro:`NGHTTP2_HD_INFLATE_EMIT` flag to
+*inflate_flag* parameter and header field is stored in *nv_out*.  The
+return value indicates the number of data read from *in* to processed
+so far.  It may be less than *inlen*.  The caller should call the
+function repeatedly until all data are processed by adjusting *in* and
+*inlen* with the processed bytes.
+
+If *in_final* is nonzero and all given data was processed, the
+function sets :macro:`NGHTTP2_HD_INFLATE_FINAL` flag to
+*inflate_flag*.  If the caller sees this flag set, call
+`nghttp2_hd_inflate_end_headers()` function.
+
+If *in_final* is zero and :macro:`NGHTTP2_HD_INFLATE_EMIT` flag is not
+set, it indicates that all given data was processed.  The caller is
+required to pass subsequent data.
+
+It is important to note that the function may produce one or more
+header fields even if *inlen* is 0 when *in_final* is nonzero, due to
+differential encoding.
+
+The example use of `nghttp2_hd_inflate_hd()` is shown in
+`inflate_header_block()` function in `deflate.c`_.
+
+To delete :type:`nghttp2_hd_inflater` object, use `nghttp2_hd_inflate_del()`
+function.

doc/sources/tutorial-server.rst

@@ -1,47 +1,45 @@
-Tutorial: HTTP/2.0 server
+Tutorial: HTTP/2 server
 =========================
 
 In this tutorial, we are going to write single-threaded, event-based
-HTTP/2.0 web server, which supports HTTPS only. It can handle
-concurrent multiple requests, but only GET method is supported. The
+HTTP/2 web server, which supports HTTPS only. It can handle
+concurrent multiple requests, but only the GET method is supported. The
 complete source code, `libevent-server.c`_, is attached at the end of
 this page.  It also resides in examples directory in the archive or
 repository.
 
-This simple server takes 3 arguments, a port number to listen to, a
-path to SSL/TLS private key file and certificate file.  Its synopsis
-is like this::
+This simple server takes 3 arguments, a port number to listen to, a path to
+your SSL/TLS private key file and a path to your certificate file.  Its
+synopsis is like this::
 
     $ libevent-server PORT /path/to/server.key /path/to/server.crt
 
 We use libevent in this tutorial to handle networking I/O.  Please
 note that nghttp2 itself does not depend on libevent.
 
-First we do some setup routine for libevent and OpenSSL library in
-function ``main()`` and ``run()``, which is not so relevant to nghttp2
-library use. The one thing you should look at is setup NPN callback.
-The NPN callback is used for the server to advertise the application
-protocols the server supports to a client.  In this example program,
-when creating ``SSL_CTX`` object, we stores the application protocol
-name in the wire format of NPN in statically allocated buffer. This is
-safe because we only create 1 ``SSL_CTX`` object in the entire program
-life time::
+First we create a setup routine for libevent and OpenSSL in the functions
+``main()`` and ``run()``. One thing in there you should look at, is the setup
+of the NPN callback.  The NPN callback is used for the server to advertise
+which application protocols the server supports to a client.  In this example
+program, when creating ``SSL_CTX`` object, we store the application protocol
+name in the wire format of NPN in a statically allocated buffer. This is safe
+because we only create one ``SSL_CTX`` object in the program's entire life
+time::
 
     static unsigned char next_proto_list[256];
     static size_t next_proto_list_len;
 
-    static int next_proto_cb(SSL *s, const unsigned char **data, unsigned int *len,
-                             void *arg)
-    {
+    static int next_proto_cb(SSL *s _U_, const unsigned char **data,
+                             unsigned int *len, void *arg _U_) {
       *data = next_proto_list;
-      *len = next_proto_list_len;
+      *len = (unsigned int)next_proto_list_len;
       return SSL_TLSEXT_ERR_OK;
     }
 
-
-    static SSL_CTX* create_ssl_ctx(const char *key_file, const char *cert_file)
-    {
+    static SSL_CTX *create_ssl_ctx(const char *key_file, const char *cert_file) {
       SSL_CTX *ssl_ctx;
+      EC_KEY *ecdh;
+
       ssl_ctx = SSL_CTX_new(SSLv23_server_method());
 
       ...
@@ -55,25 +53,25 @@ life time::
       return ssl_ctx;
     }
 
-The wire format of NPN is a sequence of length prefixed string. The
-exactly one byte is used to specify the length of each protocol
-identifier.  In this tutorial, we advertise the HTTP/2.0 protocol the
-nghttp2 library supports. The nghttp2 library exports its identifier
-in :macro:`NGHTTP2_PROTO_VERSION_ID`. The ``next_proto_cb()`` function
-is the server-side NPN callback. In OpenSSL implementation, we just
-assign the pointer to the NPN buffers we filled earlier. The NPN
-callback function is set to ``SSL_CTX`` object using
+The wire format of NPN is a sequence of length prefixed string. Exactly one
+byte is used to specify the length of each protocol identifier.  In this
+tutorial, we advertise the specific HTTP/2 protocol version the current
+nghttp2 library supports. The nghttp2 library exports its identifier in
+:macro:`NGHTTP2_PROTO_VERSION_ID`. The ``next_proto_cb()`` function is the
+server-side NPN callback. In the OpenSSL implementation, we just assign the
+pointer to the NPN buffers we filled in earlier. The NPN callback function is
+set to the ``SSL_CTX`` object using
 ``SSL_CTX_set_next_protos_advertised_cb()``.
 
-We use ``app_content`` structure to store the application-wide data::
+We use the ``app_content`` structure to store application-wide data::
 
     struct app_context {
       SSL_CTX *ssl_ctx;
       struct event_base *evbase;
     };
 
-We use ``http2_session_data`` structure to store the session-level
-(which corresponds to 1 HTTP/2.0 connection) data::
+We use the ``http2_session_data`` structure to store session-level
+(which corresponds to one HTTP/2 connection) data::
 
     typedef struct http2_session_data {
       struct http2_stream_data root;
@@ -81,11 +79,9 @@ We use ``http2_session_data`` structure to store the session-level
       app_context *app_ctx;
       nghttp2_session *session;
       char *client_addr;
-      size_t handshake_leftlen;
     } http2_session_data;
 
-We use ``http2_stream_data`` structure to store the stream-level
-data::
+We use the ``http2_stream_data`` structure to store stream-level data::
 
     typedef struct http2_stream_data {
       struct http2_stream_data *prev, *next;
@@ -94,26 +90,21 @@ data::
       int fd;
     } http2_stream_data;
 
-1 HTTP/2.0 session can have multiple streams.  We manage these
-multiple streams by intrusive doubly linked list to add and remove the
-object in O(1). The first element of this list is pointed by the
-``root->next`` in ``http2_session_data``.  Initially, ``root->next``
-is ``NULL``. The ``handshake_leftlen`` member of
-``http2_session_data`` is used to track the number of bytes remaining
-when receiving first 24 bytes magic value
-(:macro:`NGHTTP2_CLIENT_CONNECTION_HEADER`) from the client.  We use
-libevent's bufferevent structure to perform network I/O. Notice that
-bufferevent object is in ``http2_session_data`` and not in
-``http2_stream_data``. This is because ``http2_stream_data`` is just a
-logical stream multiplexed over the single connection managed by
-bufferevent in ``http2_session_data``.
+A single HTTP/2 session can have multiple streams.  We manage these
+multiple streams with a doubly linked list.  The first element of this
+list is pointed to by the ``root->next`` in ``http2_session_data``.
+Initially, ``root->next`` is ``NULL``.  We use libevent's bufferevent
+structure to perform network I/O.  Note that the bufferevent object is
+kept in ``http2_session_data`` and not in ``http2_stream_data``.  This
+is because ``http2_stream_data`` is just a logical stream multiplexed
+over the single connection managed by bufferevent in
+``http2_session_data``.
 
-We first create listener object to accept incoming connections.
-We use libevent's ``struct evconnlistener`` for this purpose::
+We first create a listener object to accept incoming connections.  We use
+libevent's ``struct evconnlistener`` for this purpose::
 
     static void start_listen(struct event_base *evbase, const char *service,
-                             app_context *app_ctx)
-    {
+                             app_context *app_ctx) {
       int rv;
       struct addrinfo hints;
       struct addrinfo *res, *rp;
@@ -124,196 +115,188 @@ We use libevent's ``struct evconnlistener`` for this purpose::
       hints.ai_flags = AI_PASSIVE;
     #ifdef AI_ADDRCONFIG
       hints.ai_flags |= AI_ADDRCONFIG;
-    #endif // AI_ADDRCONFIG
+    #endif /* AI_ADDRCONFIG */
 
       rv = getaddrinfo(NULL, service, &hints, &res);
-      if(rv != 0) {
+      if (rv != 0) {
         errx(1, NULL);
       }
-      for(rp = res; rp; rp = rp->ai_next) {
+      for (rp = res; rp; rp = rp->ai_next) {
         struct evconnlistener *listener;
-        listener = evconnlistener_new_bind(evbase, acceptcb, app_ctx,
-                                           LEV_OPT_CLOSE_ON_FREE |
-                                           LEV_OPT_REUSEABLE, -1,
-                                           rp->ai_addr, rp->ai_addrlen);
-        if(listener) {
+        listener = evconnlistener_new_bind(
+            evbase, acceptcb, app_ctx, LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE,
+            16, rp->ai_addr, rp->ai_addrlen);
+        if (listener) {
+          freeaddrinfo(res);
+
           return;
         }
       }
       errx(1, "Could not start listener");
     }
 
-We specify ``acceptcb`` callback which is called when a new connection
-is accepted::
+We specify the ``acceptcb`` callback which is called when a new connection is
+accepted::
 
-    static void acceptcb(struct evconnlistener *listener, int fd,
-                         struct sockaddr *addr, int addrlen, void *arg)
-    {
-      app_context *app_ctx = (app_context*)arg;
+    static void acceptcb(struct evconnlistener *listener _U_, int fd,
+                         struct sockaddr *addr, int addrlen, void *arg) {
+      app_context *app_ctx = (app_context *)arg;
       http2_session_data *session_data;
 
       session_data = create_http2_session_data(app_ctx, fd, addr, addrlen);
-      bufferevent_setcb(session_data->bev, handshake_readcb, NULL, eventcb,
-                        session_data);
+
+      bufferevent_setcb(session_data->bev, readcb, writecb, eventcb, session_data);
     }
 
-Here we create ``http2_session_data`` object. The bufferevent for this
-connection is also initialized at this time. We specify 2 callbacks
-for the bufferevent: ``handshake_readcb`` and ``eventcb``.
+Here we create the ``http2_session_data`` object. The bufferevent for
+this connection is also initialized at this time. We specify three
+callbacks for the bufferevent: ``readcb``, ``writecb`` and
+``eventcb``.
 
-The ``eventcb()`` is invoked by libevent event loop when an event
+The ``eventcb()`` callback is invoked by the libevent event loop when an event
 (e.g., connection has been established, timeout, etc) happens on the
 underlying network socket::
 
-    static void eventcb(struct bufferevent *bev, short events, void *ptr)
-    {
-      http2_session_data *session_data = (http2_session_data*)ptr;
-      if(events & BEV_EVENT_CONNECTED) {
+    static void eventcb(struct bufferevent *bev _U_, short events, void *ptr) {
+      http2_session_data *session_data = (http2_session_data *)ptr;
+      if (events & BEV_EVENT_CONNECTED) {
         fprintf(stderr, "%s connected\n", session_data->client_addr);
+
+        initialize_nghttp2_session(session_data);
+
+        if (send_server_connection_header(session_data) != 0) {
+          delete_http2_session_data(session_data);
+          return;
+        }
+
         return;
       }
-      if(events & BEV_EVENT_EOF) {
+      if (events & BEV_EVENT_EOF) {
         fprintf(stderr, "%s EOF\n", session_data->client_addr);
-      } else if(events & BEV_EVENT_ERROR) {
+      } else if (events & BEV_EVENT_ERROR) {
         fprintf(stderr, "%s network error\n", session_data->client_addr);
-      } else if(events & BEV_EVENT_TIMEOUT) {
+      } else if (events & BEV_EVENT_TIMEOUT) {
         fprintf(stderr, "%s timeout\n", session_data->client_addr);
       }
       delete_http2_session_data(session_data);
     }
 
-For ``BEV_EVENT_EOF``, ``BEV_EVENT_ERROR`` and ``BEV_EVENT_TIMEOUT``
-event, we just simply tear down the connection. The
-``delete_http2_session_data()`` function destroys
-``http2_session_data`` object and thus its bufferevent member. As a
-result, the underlying connection is closed.  The
+For the ``BEV_EVENT_EOF``, ``BEV_EVENT_ERROR`` and
+``BEV_EVENT_TIMEOUT`` events, we just simply tear down the connection.
+The ``delete_http2_session_data()`` function destroys the
+``http2_session_data`` object and thus also its bufferevent member.
+As a result, the underlying connection is closed.  The
 ``BEV_EVENT_CONNECTED`` event is invoked when SSL/TLS handshake is
-finished successfully.
+finished successfully.  Now we are ready to start the HTTP/2
+communication.
 
-The ``handshake_readcb()`` is a callback function to handle 24 bytes
-magic byte string from a client, since nghttp2 library does not handle
-it::
-
-    static void handshake_readcb(struct bufferevent *bev, void *ptr)
-    {
-      http2_session_data *session_data = (http2_session_data*)ptr;
-      uint8_t data[24];
-      struct evbuffer *input = bufferevent_get_input(session_data->bev);
-      int readlen = evbuffer_remove(input, data, session_data->handshake_leftlen);
-      const char *conhead = NGHTTP2_CLIENT_CONNECTION_HEADER;
-
-      if(memcmp(conhead + NGHTTP2_CLIENT_CONNECTION_HEADER_LEN
-                - session_data->handshake_leftlen, data, readlen) != 0) {
-        delete_http2_session_data(session_data);
-        return;
-      }
-      session_data->handshake_leftlen -= readlen;
-      if(session_data->handshake_leftlen == 0) {
-        bufferevent_setcb(session_data->bev, readcb, writecb, eventcb, ptr);
-        /* Process pending data in buffer since they are not notified
-           further */
-        initialize_nghttp2_session(session_data);
-        if(send_server_connection_header(session_data) != 0) {
-          delete_http2_session_data(session_data);
-          return;
-        }
-        if(session_recv(session_data) != 0) {
-          delete_http2_session_data(session_data);
-          return;
-        }
-      }
-    }
-
-We check that the received byte string matches
-:macro:`NGHTTP2_CLIENT_CONNECTION_HEADER`.  When they match, the
-connection state is ready for starting HTTP/2.0 communication. First
-we change the callback functions for the bufferevent object. We use
-same ``eventcb`` as before. But we specify new ``readcb`` and
-``writecb`` function to handle HTTP/2.0 communication. We describe
-these 2 functions later.
-
-We initialize nghttp2 session object which is done in
+We initialize a nghttp2 session object which is done in
 ``initialize_nghttp2_session()``::
 
-    static void initialize_nghttp2_session(http2_session_data *session_data)
-    {
-      nghttp2_session_callbacks callbacks = {0};
+    static void initialize_nghttp2_session(http2_session_data *session_data) {
+      nghttp2_option *option;
+      nghttp2_session_callbacks *callbacks;
 
-      callbacks.send_callback = send_callback;
-      callbacks.on_frame_recv_callback = on_frame_recv_callback;
-      callbacks.on_stream_close_callback = on_stream_close_callback;
-      callbacks.on_header_callback = on_header_callback;
-      callbacks.on_begin_headers_callback = on_begin_headers_callback;
-      nghttp2_session_server_new(&session_data->session, &callbacks, session_data);
+      nghttp2_option_new(&option);
+
+      /* Tells nghttp2_session object that it handles client connection
+         preface */
+      nghttp2_option_set_recv_client_preface(option, 1);
+
+      nghttp2_session_callbacks_new(&callbacks);
+
+      nghttp2_session_callbacks_set_send_callback(callbacks, send_callback);
+
+      nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
+                                                           on_frame_recv_callback);
+
+      nghttp2_session_callbacks_set_on_stream_close_callback(
+          callbacks, on_stream_close_callback);
+
+      nghttp2_session_callbacks_set_on_header_callback(callbacks,
+                                                       on_header_callback);
+
+      nghttp2_session_callbacks_set_on_begin_headers_callback(
+          callbacks, on_begin_headers_callback);
+
+      nghttp2_session_server_new2(&session_data->session, callbacks, session_data,
+                                  option);
+
+      nghttp2_session_callbacks_del(callbacks);
+      nghttp2_option_del(option);
     }
 
-Since we are creating server, nghttp2 session object is created using
-`nghttp2_session_server_new()` function. We registers 5 callbacks to
-nghttp2 session object. We'll talk about these callbacks later.
+Since we are creating a server and uses options, the nghttp2 session
+object is created using `nghttp2_session_server_new2()` function.  We
+registers five callbacks for nghttp2 session object.  We'll talk about
+these callbacks later.  Our server only speaks HTTP/2.  In this case,
+we use `nghttp2_option_set_recv_client_preface()` to make
+:type:`nghttp2_session` object handle client connection preface, which
+saves some lines of application code.
 
-After initialization of nghttp2 session object, we are going to send
-server connection header in ``send_server_connection_header()``::
+After initialization of the nghttp2 session object, we are going to send
+a server connection header in ``send_server_connection_header()``::
 
-    static int send_server_connection_header(http2_session_data *session_data)
-    {
+    static int send_server_connection_header(http2_session_data *session_data) {
       nghttp2_settings_entry iv[1] = {
-        { NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100 }
-      };
+          {NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100}};
       int rv;
 
-      rv = nghttp2_submit_settings(session_data->session, NGHTTP2_FLAG_NONE,
-                                   iv, ARRLEN(iv));
-      if(rv != 0) {
+      rv = nghttp2_submit_settings(session_data->session, NGHTTP2_FLAG_NONE, iv,
+                                   ARRLEN(iv));
+      if (rv != 0) {
         warnx("Fatal error: %s", nghttp2_strerror(rv));
         return -1;
       }
       return 0;
     }
 
-The server connection header is SETTINGS frame. We specify
-SETTINGS_MAX_CONCURRENT_STREAMS to 100 in SETTINGS frame.  To queue
+The server connection header is a SETTINGS frame. We specify
+SETTINGS_MAX_CONCURRENT_STREAMS to 100 in the SETTINGS frame.  To queue
 the SETTINGS frame for the transmission, we use
 `nghttp2_submit_settings()`. Note that `nghttp2_submit_settings()`
-function only queues the frame and not actually send it. All
-``nghttp2_submit_*()`` family functions have this property. To
-actually send the frame, `nghttp2_session_send()` is used, which is
-described about later.
+function only queues the frame and it does not actually send it. All
+functions in the ``nghttp2_submit_*()`` family have this property. To
+actually send the frame, `nghttp2_session_send()` should be used, as
+described later.
 
-Since bufferevent may buffer more than first 24 bytes from the client,
-we have to process them here since libevent won't invoke callback
-functions for these pending data. To process received data, we call
+Since bufferevent may buffer more than the first 24 bytes from the client, we
+have to process them here since libevent won't invoke callback functions for
+this pending data. To process the received data, we call the
 ``session_recv()`` function::
 
-    static int session_recv(http2_session_data *session_data)
-    {
-      int rv;
+    static int session_recv(http2_session_data *session_data) {
+      ssize_t readlen;
       struct evbuffer *input = bufferevent_get_input(session_data->bev);
       size_t datalen = evbuffer_get_length(input);
       unsigned char *data = evbuffer_pullup(input, -1);
-      rv = nghttp2_session_mem_recv(session_data->session, data, datalen);
-      if(rv < 0) {
-        warnx("Fatal error: %s", nghttp2_strerror(rv));
+
+      readlen = nghttp2_session_mem_recv(session_data->session, data, datalen);
+      if (readlen < 0) {
+        warnx("Fatal error: %s", nghttp2_strerror((int)readlen));
         return -1;
       }
-      evbuffer_drain(input, rv);
-      if(session_send(session_data) != 0) {
+      if (evbuffer_drain(input, readlen) != 0) {
+        warnx("Fatal error: evbuffer_drain failed");
+        return -1;
+      }
+      if (session_send(session_data) != 0) {
         return -1;
       }
       return 0;
     }
 
-In this function, we feed all unprocessed, received data to nghttp2
-session object using `nghttp2_session_mem_recv()` function. The
-`nghttp2_session_mem_recv()` processes the received data and may
-invoke nghttp2 callbacks and also queue outgoing frames. Since there
-may be pending frames, we call ``session_send()`` function to send
-those frames. The ``session_send()`` function is defined as follows::
+In this function, we feed all unprocessed but already received data to the
+nghttp2 session object using the `nghttp2_session_mem_recv()` function. The
+`nghttp2_session_mem_recv()` function processes the data and may invoke the
+nghttp2 callbacks and also queue outgoing frames. Since there may be pending
+outgoing frames, we call ``session_send()`` function to send off those
+frames. The ``session_send()`` function is defined as follows::
 
-    static int session_send(http2_session_data *session_data)
-    {
+    static int session_send(http2_session_data *session_data) {
       int rv;
       rv = nghttp2_session_send(session_data->session);
-      if(rv != 0) {
+      if (rv != 0) {
         warnx("Fatal error: %s", nghttp2_strerror(rv));
         return -1;
       }
@@ -321,21 +304,17 @@ those frames. The ``session_send()`` function is defined as follows::
     }
 
 The `nghttp2_session_send()` function serializes the frame into wire
-format and call :member:`nghttp2_session_callbacks.send_callback` with
-it. We set ``send_callback()`` function to
-:member:`nghttp2_session_callbacks.send_callback` in
-``initialize_nghttp2_session()`` function described earlier. It is
-defined as follows::
+format and calls ``send_callback()`` of type
+:type:`nghttp2_send_callback`.  The ``send_callback()`` is defined as
+follows::
 
-    static ssize_t send_callback(nghttp2_session *session,
-                                 const uint8_t *data, size_t length,
-                                 int flags, void *user_data)
-    {
-      http2_session_data *session_data = (http2_session_data*)user_data;
+    static ssize_t send_callback(nghttp2_session *session _U_, const uint8_t *data,
+                                 size_t length, int flags _U_, void *user_data) {
+      http2_session_data *session_data = (http2_session_data *)user_data;
       struct bufferevent *bev = session_data->bev;
       /* Avoid excessive buffering in server side. */
-      if(evbuffer_get_length(bufferevent_get_output(session_data->bev)) >=
-         OUTPUT_WOULDBLOCK_THRESHOLD) {
+      if (evbuffer_get_length(bufferevent_get_output(session_data->bev)) >=
+          OUTPUT_WOULDBLOCK_THRESHOLD) {
         return NGHTTP2_ERR_WOULDBLOCK;
       }
       bufferevent_write(bev, data, length);
@@ -345,26 +324,24 @@ defined as follows::
 Since we use bufferevent to abstract network I/O, we just write the
 data to the bufferevent object. Note that `nghttp2_session_send()`
 continues to write all frames queued so far. If we were writing the
-data to the non-blocking socket directly using ``write()`` system call
-in the :member:`nghttp2_session_callbacks.send_callback`, we will
-surely get ``EAGAIN`` or ``EWOULDBLOCK`` since the socket has limited
-send buffer. If that happens, we can return
-:macro:`NGHTTP2_ERR_WOULDBLOCK` to signal the nghttp2 library to stop
-sending further data. But writing to the bufferevent, we have to
-regulate the amount data to be buffered by ourselves to avoid possible
-huge memory consumption. To achieve this, we check the size of output
-buffer and if it is more than or equal to
-``OUTPUT_WOULDBLOCK_THRESHOLD`` bytes, we stop writing data and return
-:macro:`NGHTTP2_ERR_WOULDBLOCK` to tell the library to stop calling
-send_callback.
+data to a non-blocking socket directly using ``write()`` system call
+in the ``send_callback()``, we would surely get ``EAGAIN`` or
+``EWOULDBLOCK`` back since the socket has limited send buffer. If that
+happens, we can return :macro:`NGHTTP2_ERR_WOULDBLOCK` to signal the
+nghttp2 library to stop sending further data. But when writing to the
+bufferevent, we have to regulate the amount data to get buffered
+ourselves to avoid using huge amounts of memory. To achieve this, we
+check the size of the output buffer and if it reaches more than or
+equal to ``OUTPUT_WOULDBLOCK_THRESHOLD`` bytes, we stop writing data
+and return :macro:`NGHTTP2_ERR_WOULDBLOCK` to tell the library to stop
+calling send_callback.
 
 The next bufferevent callback is ``readcb()``, which is invoked when
 data is available to read in the bufferevent input buffer::
 
-    static void readcb(struct bufferevent *bev, void *ptr)
-    {
-      http2_session_data *session_data = (http2_session_data*)ptr;
-      if(session_recv(session_data) != 0) {
+    static void readcb(struct bufferevent *bev _U_, void *ptr) {
+      http2_session_data *session_data = (http2_session_data *)ptr;
+      if (session_recv(session_data) != 0) {
         delete_http2_session_data(session_data);
         return;
       }
@@ -373,59 +350,56 @@ data is available to read in the bufferevent input buffer::
 In this function, we just call ``session_recv()`` to process incoming
 data.
 
-The third bufferevent callback is ``writecb()``, which is invoked when
-all data written in the bufferevent output buffer have been sent::
+The third bufferevent callback is ``writecb()``, which is invoked when all
+data in the bufferevent output buffer has been sent::
 
-    static void writecb(struct bufferevent *bev, void *ptr)
-    {
-      http2_session_data *session_data = (http2_session_data*)ptr;
-      if(evbuffer_get_length(bufferevent_get_output(bev)) > 0) {
+    static void writecb(struct bufferevent *bev, void *ptr) {
+      http2_session_data *session_data = (http2_session_data *)ptr;
+      if (evbuffer_get_length(bufferevent_get_output(bev)) > 0) {
         return;
       }
-      if(nghttp2_session_want_read(session_data->session) == 0 &&
-         nghttp2_session_want_write(session_data->session) == 0) {
+      if (nghttp2_session_want_read(session_data->session) == 0 &&
+          nghttp2_session_want_write(session_data->session) == 0) {
         delete_http2_session_data(session_data);
         return;
       }
-      if(session_send(session_data) != 0) {
+      if (session_send(session_data) != 0) {
         delete_http2_session_data(session_data);
         return;
       }
     }
 
-First we check whether we should drop connection or not. The nghttp2
-session object keeps track of reception and transmission of GOAWAY
-frame and other error conditions as well. Using these information,
-nghttp2 session object will tell whether the connection should be
-dropped or not. More specifically, both `nghttp2_session_want_read()`
-and `nghttp2_session_want_write()` return 0, we have no business in
-the connection. But since we are using bufferevent and its deferred
-callback option, the bufferevent output buffer may contain the pending
-data when the ``writecb()`` is called. To handle this situation, we
-also check whether the output buffer is empty or not. If these
-conditions are met, we drop connection.
+First we check whether we should drop the connection or not. The nghttp2
+session object keeps track of reception and transmission of GOAWAY frames and
+other error conditions as well. Using this information, the nghttp2 session
+object will tell whether the connection should be dropped or not. More
+specifically, if both `nghttp2_session_want_read()` and
+`nghttp2_session_want_write()` return 0, we have no business left in the
+connection. But since we are using bufferevent and its deferred callback
+option, the bufferevent output buffer may contain pending data when the
+``writecb()`` is called. To handle this, we check whether the output buffer is
+empty or not. If all these conditions are met, we drop connection.
 
-Otherwise, we call ``session_send()`` to process pending output
-data. Remember that in ``send_callback()``, we may not write all data
-to bufferevent to avoid excessive buffering. We continue process
-pending data when output buffer becomes empty.
+Otherwise, we call ``session_send()`` to process the pending output
+data. Remember that in ``send_callback()``, we must not write all data to
+bufferevent to avoid excessive buffering. We continue processing pending data
+when the output buffer becomes empty.
 
-We have already described about nghttp2 callback ``send_callback()``.
-Let's describe remaining nghttp2 callbacks we setup in
+We have already described the nghttp2 callback ``send_callback()``.  Let's
+learn about the remaining nghttp2 callbacks we setup in
 ``initialize_nghttp2_setup()`` function.
 
-The ``on_begin_headers_callback()`` function is invoked when reception
-of header block in HEADERS or PUSH_PROMISE frame is started::
+The ``on_begin_headers_callback()`` function is invoked when the reception of
+a header block in HEADERS or PUSH_PROMISE frame is started::
 
     static int on_begin_headers_callback(nghttp2_session *session,
                                          const nghttp2_frame *frame,
-                                         void *user_data)
-    {
-      http2_session_data *session_data = (http2_session_data*)user_data;
+                                         void *user_data) {
+      http2_session_data *session_data = (http2_session_data *)user_data;
       http2_stream_data *stream_data;
 
-      if(frame->hd.type != NGHTTP2_HEADERS ||
-         frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
+      if (frame->hd.type != NGHTTP2_HEADERS ||
+          frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
         return 0;
       }
       stream_data = create_http2_stream_data(session_data, frame->hd.stream_id);
@@ -434,40 +408,40 @@ of header block in HEADERS or PUSH_PROMISE frame is started::
       return 0;
     }
 
-We only interested in HEADERS frame in this function. Since HEADERS
-frame has several roles in HTTP/2.0 protocol, we check that it is a
-request HEADERS, which opens new stream. If frame is request HEADERS,
-then we create ``http2_stream_data`` object to store stream related
-data. We associate created ``http2_stream_data`` object to the stream
-in nghttp2 session object using `nghttp2_set_stream_user_data()` in
-order to get the object without searching through doubly linked list.
+We are only interested in the HEADERS frame in this function. Since the
+HEADERS frame has several roles in the HTTP/2 protocol, we check that it is a
+request HEADERS, which opens new stream. If the frame is a request HEADERS, we
+create a ``http2_stream_data`` object to store the stream related data. We
+associate the created ``http2_stream_data`` object with the stream in the
+nghttp2 session object using `nghttp2_set_stream_user_data()` to get the
+object without searching through the doubly linked list.
 
-In this example server, we want to serve files relative to the current
-working directory the program was invoked. Each header name/value pair
-is emitted via ``on_header_callback`` function, which is called after
+In this example server, we want to serve files relative to the current working
+directory in which the program was invoked. Each header name/value pair is
+emitted via ``on_header_callback`` function, which is called after
 ``on_begin_headers_callback()``::
 
     static int on_header_callback(nghttp2_session *session,
-                                  const nghttp2_frame *frame,
-                                  const uint8_t *name, size_t namelen,
-                                  const uint8_t *value, size_t valuelen,
-                                  void *user_data)
-    {
+                                  const nghttp2_frame *frame, const uint8_t *name,
+                                  size_t namelen, const uint8_t *value,
+                                  size_t valuelen, uint8_t flags _U_,
+                                  void *user_data _U_) {
       http2_stream_data *stream_data;
       const char PATH[] = ":path";
-      switch(frame->hd.type) {
+      switch (frame->hd.type) {
       case NGHTTP2_HEADERS:
-        if(frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
+        if (frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
           break;
         }
-        stream_data = nghttp2_session_get_stream_user_data(session,
-                                                           frame->hd.stream_id);
-        if(stream_data->request_path) {
+        stream_data =
+            nghttp2_session_get_stream_user_data(session, frame->hd.stream_id);
+        if (!stream_data || stream_data->request_path) {
           break;
         }
-        if(namelen == sizeof(PATH) - 1 && memcmp(PATH, name, namelen) == 0) {
+        if (namelen == sizeof(PATH) - 1 && memcmp(PATH, name, namelen) == 0) {
           size_t j;
-          for(j = 0; j < valuelen && value[j] != '?'; ++j);
+          for (j = 0; j < valuelen && value[j] != '?'; ++j)
+            ;
           stream_data->request_path = percent_decode(value, j);
         }
         break;
@@ -475,29 +449,28 @@ is emitted via ``on_header_callback`` function, which is called after
       return 0;
     }
 
-We search ``:path`` header field in request headers and keep the
-requested path in ``http2_stream_data`` object. In this example
-program, we ignore ``:method`` header field and always treat the
-request as GET request.
+We search for the ``:path`` header field among the request headers and store
+the requested path in the ``http2_stream_data`` object. In this example
+program, we ignore ``:method`` header field and always treat the request as a
+GET request.
 
 The ``on_frame_recv_callback()`` function is invoked when a frame is
 fully received::
 
     static int on_frame_recv_callback(nghttp2_session *session,
-                                      const nghttp2_frame *frame, void *user_data)
-    {
-      http2_session_data *session_data = (http2_session_data*)user_data;
+                                      const nghttp2_frame *frame, void *user_data) {
+      http2_session_data *session_data = (http2_session_data *)user_data;
       http2_stream_data *stream_data;
-      switch(frame->hd.type) {
+      switch (frame->hd.type) {
       case NGHTTP2_DATA:
       case NGHTTP2_HEADERS:
         /* Check that the client request has finished */
-        if(frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-          stream_data = nghttp2_session_get_stream_user_data(session,
-                                                             frame->hd.stream_id);
+        if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
+          stream_data =
+              nghttp2_session_get_stream_user_data(session, frame->hd.stream_id);
           /* For DATA and HEADERS frame, this callback may be called after
              on_stream_close_callback. Check that stream still alive. */
-          if(!stream_data) {
+          if (!stream_data) {
             return 0;
           }
           return on_request_recv(session, session_data, stream_data);
@@ -509,81 +482,81 @@ fully received::
       return 0;
     }
 
-First we retrieve ``http2_stream_data`` object associated to the
-stream in ``on_begin_headers_callback()``. It is done using
-`nghttp2_session_get_stream_user_data()`. If the requested path cannot
-be served for some reasons (e.g., file is not found), we send 404
-response, which is done in ``error_reply()``.  Otherwise, we open
-requested file and send its content. We send 1 header field
-``:status`` as a response header.
+First we retrieve the ``http2_stream_data`` object associated with the stream
+in ``on_begin_headers_callback()``. It is done using
+`nghttp2_session_get_stream_user_data()`. If the requested path cannot be
+served for some reason (e.g., file is not found), we send a 404 response,
+which is done in ``error_reply()``.  Otherwise, we open the requested file and
+send its content. We send the header field ``:status`` as a single response
+header.
 
-Sending content of a file is done in ``send_response()`` function::
+Sending the content of the file is done in ``send_response()`` function::
 
     static int send_response(nghttp2_session *session, int32_t stream_id,
-                             nghttp2_nv *nva, size_t nvlen, int fd)
-    {
+                             nghttp2_nv *nva, size_t nvlen, int fd) {
       int rv;
       nghttp2_data_provider data_prd;
       data_prd.source.fd = fd;
       data_prd.read_callback = file_read_callback;
 
       rv = nghttp2_submit_response(session, stream_id, nva, nvlen, &data_prd);
-      if(rv != 0) {
+      if (rv != 0) {
         warnx("Fatal error: %s", nghttp2_strerror(rv));
         return -1;
       }
       return 0;
     }
 
-The nghttp2 library uses :type:`nghttp2_data_provider` structure to
+The nghttp2 library uses the :type:`nghttp2_data_provider` structure to
 send entity body to the remote peer. The ``source`` member of this
 structure is a union and it can be either void pointer or int which is
 intended to be used as file descriptor. In this example server, we use
-file descriptor. We also set ``file_read_callback()`` callback
-function to read content of the file::
+the file descriptor. We also set the ``file_read_callback()`` callback
+function to read the contents of the file::
 
-    static ssize_t file_read_callback
-    (nghttp2_session *session, int32_t stream_id,
-     uint8_t *buf, size_t length, int *eof,
-     nghttp2_data_source *source, void *user_data)
-    {
+    static ssize_t file_read_callback(nghttp2_session *session _U_,
+                                      int32_t stream_id _U_, uint8_t *buf,
+                                      size_t length, uint32_t *data_flags,
+                                      nghttp2_data_source *source,
+                                      void *user_data _U_) {
       int fd = source->fd;
       ssize_t r;
-      while((r = read(fd, buf, length)) == -1 && errno == EINTR);
-      if(r == -1) {
+      while ((r = read(fd, buf, length)) == -1 && errno == EINTR)
+        ;
+      if (r == -1) {
         return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
       }
-      if(r == 0) {
-        *eof = 1;
+      if (r == 0) {
+        *data_flags |= NGHTTP2_DATA_FLAG_EOF;
       }
       return r;
     }
 
-If error happens while reading file, we return
-:macro:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`. This tells the library
-to send RST_STREAM to the stream.  When all data is read, set 1 to
-``*eof`` to tell the nghttp2 library that we have finished reading
-file.
+If an error happens while reading the file, we return
+:macro:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  This tells the
+library to send RST_STREAM to the stream.  When all data has been read, set
+the :macro:`NGHTTP2_DATA_FLAG_EOF` flag to ``*data_flags`` to tell the
+nghttp2 library that we have finished reading the file.
 
-The `nghttp2_submit_response()` is used to send response to the remote
-peer.
+The `nghttp2_submit_response()` function is used to send the response to the
+remote peer.
 
 The ``on_stream_close_callback()`` function is invoked when the stream
 is about to close::
 
-    static int on_stream_close_callback(nghttp2_session *session,
-                                        int32_t stream_id,
-                                        nghttp2_error_code error_code,
-                                        void *user_data)
-    {
-      http2_session_data *session_data = (http2_session_data*)user_data;
+    static int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
+                                        uint32_t error_code _U_, void *user_data) {
+      http2_session_data *session_data = (http2_session_data *)user_data;
       http2_stream_data *stream_data;
 
       stream_data = nghttp2_session_get_stream_user_data(session, stream_id);
+      if (!stream_data) {
+        return 0;
+      }
       remove_stream(session_data, stream_data);
       delete_http2_stream_data(stream_data);
       return 0;
     }
 
-We destroy ``http2_stream_data`` object in this function since the
-stream is about to close and we no longer use that object.
+We destroy the ``http2_stream_data`` object in this function since the stream
+is about to close and we no longer use that object.

doc/tutorial-hpack.rst.in

@@ -0,0 +1,6 @@
+.. include:: @top_srcdir@/doc/sources/tutorial-hpack.rst
+
+deflate.c
+---------
+
+.. literalinclude:: @top_srcdir@/examples/deflate.c

examples/.gitignore

@@ -1,3 +1,8 @@
 client
 libevent-client
 libevent-server
+deflate
+asio-sv
+tiny-nghttpd
+asio-sv2
+asio-sv3

examples/Makefile.am

@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 
@@ -23,10 +23,12 @@
 
 if ENABLE_EXAMPLES
 
+AM_CFLAGS = $(WARNCFLAGS)
 AM_CPPFLAGS = \
 	-Wall \
 	-I$(top_srcdir)/lib/includes \
 	-I$(top_builddir)/lib/includes \
+	-I$(top_srcdir)/src/includes \
 	-I$(top_srcdir)/third-party \
 	@LIBEVENT_OPENSSL_CFLAGS@ \
 	@OPENSSL_CFLAGS@ \
@@ -38,7 +40,7 @@ LDADD = \
 	$(top_builddir)/lib/libnghttp2.la \
 	$(top_builddir)/third-party/libhttp-parser.la
 
-noinst_PROGRAMS = client libevent-client libevent-server
+noinst_PROGRAMS = client libevent-client libevent-server deflate
 
 client_SOURCES = client.c
 
@@ -46,4 +48,39 @@ libevent_client_SOURCES = libevent-client.c
 
 libevent_server_SOURCES = libevent-server.c
 
+deflate_SOURCES = deflate.c
+
+if ENABLE_TINY_NGHTTPD
+
+noinst_PROGRAMS += tiny-nghttpd
+
+tiny_nghttpd_SOURCES = tiny-nghttpd.c
+
+endif # ENABLE_TINY_NGHTTPD
+
+if ENABLE_ASIO_LIB
+
+noinst_PROGRAMS += asio-sv asio-sv2 asio-sv3
+
+ASIOCPPFLAGS = ${BOOST_CPPFLAGS} ${AM_CPPFLAGS}
+ASIOLDFLAGS = @JEMALLOC_LIBS@
+ASIOLDADD = $(top_builddir)/src/libnghttp2_asio.la
+
+asio_sv_SOURCES = asio-sv.cc
+asio_sv_CPPFLAGS = ${ASIOCPPFLAGS}
+asio_sv_LDFLAGS = ${ASIOLDFLAGS}
+asio_sv_LDADD = ${ASIOLDADD}
+
+asio_sv2_SOURCES = asio-sv2.cc
+asio_sv2_CPPFLAGS = ${ASIOCPPFLAGS}
+asio_sv2_LDFLAGS = ${ASIOLDFLAGS}
+asio_sv2_LDADD = ${ASIOLDADD}
+
+asio_sv3_SOURCES = asio-sv3.cc
+asio_sv3_CPPFLAGS = ${ASIOCPPFLAGS}
+asio_sv3_LDFLAGS = ${ASIOLDFLAGS}
+asio_sv3_LDADD = ${ASIOLDADD}
+
+endif # ENABLE_ASIO_LIB
+
 endif # ENABLE_EXAMPLES

examples/asio-sv.cc

@@ -0,0 +1,75 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2014 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.
+ */
+// We wrote this code based on the original code which has the
+// following license:
+//
+// main.cpp
+// ~~~~~~~~
+//
+// Copyright (c) 2003-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <iostream>
+#include <string>
+
+#include <nghttp2/asio_http2.h>
+
+using namespace nghttp2::asio_http2;
+using namespace nghttp2::asio_http2::server;
+
+int main(int argc, char *argv[]) {
+  try {
+    // Check command line arguments.
+    if (argc < 3) {
+      std::cerr << "Usage: asio-sv <port> <threads> <private-key-file> "
+                << "<cert-file>\n";
+      return 1;
+    }
+
+    uint16_t port = std::stoi(argv[1]);
+    std::size_t num_threads = std::stoi(argv[2]);
+
+    http2 server;
+
+    server.num_threads(num_threads);
+
+    if (argc >= 5) {
+      server.tls(argv[3], argv[4]);
+    }
+
+    server.listen("*", port, [](const std::shared_ptr<request> &req,
+                                const std::shared_ptr<response> &res) {
+      res->write_head(200, {header{"foo", "bar"}});
+      res->end("hello, world");
+    });
+  } catch (std::exception &e) {
+    std::cerr << "exception: " << e.what() << "\n";
+  }
+
+  return 0;
+}

examples/asio-sv2.cc

@@ -0,0 +1,107 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2014 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.
+ */
+// We wrote this code based on the original code which has the
+// following license:
+//
+// main.cpp
+// ~~~~~~~~
+//
+// Copyright (c) 2003-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <iostream>
+#include <string>
+
+#include <nghttp2/asio_http2.h>
+
+using namespace nghttp2::asio_http2;
+using namespace nghttp2::asio_http2::server;
+
+int main(int argc, char *argv[]) {
+  try {
+    // Check command line arguments.
+    if (argc < 4) {
+      std::cerr << "Usage: asio-sv2 <port> <threads> <doc-root> "
+                << "<private-key-file> <cert-file>\n";
+      return 1;
+    }
+
+    uint16_t port = std::stoi(argv[1]);
+    std::size_t num_threads = std::stoi(argv[2]);
+    std::string docroot = argv[3];
+
+    http2 server;
+
+    server.num_threads(num_threads);
+
+    if (argc >= 6) {
+      server.tls(argv[4], argv[5]);
+    }
+
+    server.listen("*", port, [&docroot](const std::shared_ptr<request> &req,
+                                        const std::shared_ptr<response> &res) {
+      auto path = percent_decode(req->path());
+      if (!check_path(path)) {
+        res->write_head(404);
+        res->end();
+        return;
+      }
+
+      if (path == "/") {
+        path = "/index.html";
+      }
+
+      path = docroot + path;
+      auto fd = open(path.c_str(), O_RDONLY);
+      if (fd == -1) {
+        res->write_head(404);
+        res->end();
+        return;
+      }
+
+      auto headers = std::vector<header>();
+
+      struct stat stbuf;
+      if (stat(path.c_str(), &stbuf) == 0) {
+        headers.push_back(
+            header{"content-length", std::to_string(stbuf.st_size)});
+        headers.push_back(
+            header{"last-modified", http_date(stbuf.st_mtim.tv_sec)});
+      }
+      res->write_head(200, std::move(headers));
+      res->end(file_reader_from_fd(fd));
+    });
+  } catch (std::exception &e) {
+    std::cerr << "exception: " << e.what() << "\n";
+  }
+
+  return 0;
+}

examples/asio-sv3.cc

@@ -0,0 +1,142 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2014 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.
+ */
+// We wrote this code based on the original code which has the
+// following license:
+//
+// main.cpp
+// ~~~~~~~~
+//
+// Copyright (c) 2003-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+#include <unistd.h>
+#include <iostream>
+#include <string>
+#include <deque>
+
+#include <nghttp2/asio_http2.h>
+
+using namespace nghttp2::asio_http2;
+using namespace nghttp2::asio_http2::server;
+
+int main(int argc, char *argv[]) {
+  try {
+    // Check command line arguments.
+    if (argc < 4) {
+      std::cerr << "Usage: asio-sv3 <port> <threads> <tasks> "
+                << " <private-key-file> <cert-file>\n";
+      return 1;
+    }
+
+    uint16_t port = std::stoi(argv[1]);
+    std::size_t num_threads = std::stoi(argv[2]);
+    std::size_t num_concurrent_tasks = std::stoi(argv[3]);
+
+    http2 server;
+
+    server.num_threads(num_threads);
+
+    if (argc >= 5) {
+      server.tls(argv[4], argv[5]);
+    }
+
+    server.num_concurrent_tasks(num_concurrent_tasks);
+
+    server.listen("*", port, [](const std::shared_ptr<request> &req,
+                                const std::shared_ptr<response> &res) {
+      res->write_head(200);
+
+      auto msgq = std::make_shared<std::deque<std::string>>();
+
+      res->end([msgq](uint8_t * buf, std::size_t len)
+                   -> std::pair<ssize_t, bool> {
+        if (msgq->empty()) {
+          // if msgq is empty, tells the library that don't call
+          // this callback until we call res->resume().  This is
+          // done by returing std::make_pair(0, false).
+          return std::make_pair(0, false);
+        }
+        auto msg = std::move(msgq->front());
+        msgq->pop_front();
+
+        if (msg.empty()) {
+          // The empty message signals the end of response in
+          // this simple protocol.
+          return std::make_pair(0, true);
+        }
+
+        auto nwrite = std::min(len, msg.size());
+        std::copy(std::begin(msg), std::begin(msg) + nwrite, buf);
+        if (msg.size() > nwrite) {
+          msgq->push_front(msg.substr(nwrite));
+        }
+        return std::make_pair(nwrite, false);
+      });
+
+      req->run_task([res, msgq](channel &channel) {
+        // executed in different thread from request callback
+        // was called.
+
+        // Using res and msgq is not safe inside this callback.
+        // But using them in callback passed to channel::post is
+        // safe.
+
+        // We just emit simple message "message N\n" in every 1
+        // second and 3 times in total.
+        for (std::size_t i = 0; i < 3; ++i) {
+          msgq->push_back("message " + std::to_string(i + 1) + "\n");
+
+          channel.post([res]() {
+            // executed in same thread where
+            // request callback was called.
+
+            // Tells library we have new message.
+            res->resume();
+          });
+
+          sleep(1);
+        }
+
+        // Send empty message to signal the end of response
+        // body.
+        msgq->push_back("");
+
+        channel.post([res]() {
+          // executed in same thread where request
+          // callback was called.
+          res->resume();
+        });
+
+      });
+
+    });
+  } catch (std::exception &e) {
+    std::cerr << "exception: " << e.what() << "\n";
+  }
+
+  return 0;
+}

examples/client.c

@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
@@ -26,6 +26,10 @@
  * This program is written to show how to use nghttp2 API in C and
  * intentionally made simple.
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* !HAVE_CONFIG_H */
+
 #include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -44,20 +48,21 @@
 
 #include <openssl/ssl.h>
 #include <openssl/err.h>
+#include <openssl/conf.h>
 
-enum {
-  IO_NONE,
-  WANT_READ,
-  WANT_WRITE
-};
+enum { IO_NONE, WANT_READ, WANT_WRITE };
 
-#define MAKE_NV(NAME, VALUE)                                            \
-  {(uint8_t*)NAME, (uint8_t*)VALUE,                                     \
-      (uint16_t)(sizeof(NAME) - 1), (uint16_t)(sizeof(VALUE) - 1) }
+#define MAKE_NV(NAME, VALUE)                                                   \
+  {                                                                            \
+    (uint8_t *) NAME, (uint8_t *)VALUE, sizeof(NAME) - 1, sizeof(VALUE) - 1,   \
+        NGHTTP2_NV_FLAG_NONE                                                   \
+  }
 
-#define MAKE_NV_CS(NAME, VALUE)                                         \
-  {(uint8_t*)NAME, (uint8_t*)VALUE,                                     \
-      (uint16_t)(sizeof(NAME) - 1), (uint16_t)(strlen(VALUE)) }
+#define MAKE_NV_CS(NAME, VALUE)                                                \
+  {                                                                            \
+    (uint8_t *) NAME, (uint8_t *)VALUE, sizeof(NAME) - 1, strlen(VALUE),       \
+        NGHTTP2_NV_FLAG_NONE                                                   \
+  }
 
 struct Connection {
   SSL *ssl;
@@ -72,8 +77,6 @@ struct Connection {
 };
 
 struct Request {
-  /* The gzip stream inflater for the compressed response. */
-  nghttp2_gzip *inflater;
   char *host;
   /* In this program, path contains query component as well. */
   char *path;
@@ -100,10 +103,9 @@ struct URI {
  * Returns copy of string |s| with the length |len|. The returned
  * string is NULL-terminated.
  */
-static char* strcopy(const char *s, size_t len)
-{
+static char *strcopy(const char *s, size_t len) {
   char *dst;
-  dst = malloc(len+1);
+  dst = malloc(len + 1);
   memcpy(dst, s, len);
   dst[len] = '\0';
   return dst;
@@ -112,8 +114,7 @@ static char* strcopy(const char *s, size_t len)
 /*
  * Prints error message |msg| and exit.
  */
-static void die(const char *msg)
-{
+static void die(const char *msg) {
   fprintf(stderr, "FATAL: %s\n", msg);
   exit(EXIT_FAILURE);
 }
@@ -122,8 +123,7 @@ static void die(const char *msg)
  * Prints error containing the function name |func| and message |msg|
  * and exit.
  */
-static void dief(const char *func, const char *msg)
-{
+static void dief(const char *func, const char *msg) {
   fprintf(stderr, "FATAL: %s: %s\n", func, msg);
   exit(EXIT_FAILURE);
 }
@@ -132,64 +132,31 @@ static void dief(const char *func, const char *msg)
  * Prints error containing the function name |func| and error code
  * |error_code| and exit.
  */
-static void diec(const char *func, int error_code)
-{
+static void diec(const char *func, int error_code) {
   fprintf(stderr, "FATAL: %s: error_code=%d, msg=%s\n", func, error_code,
           nghttp2_strerror(error_code));
   exit(EXIT_FAILURE);
 }
 
-static char CONTENT_LENGTH[] = "content-encoding";
-static size_t CONTENT_LENGTH_LEN = sizeof(CONTENT_LENGTH) - 1;
-static char GZIP[] = "gzip";
-static size_t GZIP_LEN = sizeof(GZIP) - 1;
-
-/*
- * Check response is content-encoding: gzip. We need this because
- * HTTP/2.0 client is required to support gzip.
- */
-static void check_gzip(struct Request *req, nghttp2_nv *nva, size_t nvlen)
-{
-  size_t i;
-  if(req->inflater) {
-    return;
-  }
-  for(i = 0; i < nvlen; ++i) {
-    if(CONTENT_LENGTH_LEN == nva[i].namelen &&
-       memcmp(CONTENT_LENGTH, nva[i].name, nva[i].namelen) == 0 &&
-       GZIP_LEN == nva[i].valuelen &&
-       memcmp(GZIP, nva[i].value, nva[i].valuelen) == 0) {
-      int rv;
-      rv = nghttp2_gzip_inflate_new(&req->inflater);
-      if(rv != 0) {
-        die("Can't allocate inflate stream.");
-      }
-      break;
-    }
-  }
-}
-
 /*
  * The implementation of nghttp2_send_callback type. Here we write
  * |data| with size |length| to the network and return the number of
  * bytes actually written. See the documentation of
  * nghttp2_send_callback for the details.
  */
-static ssize_t send_callback(nghttp2_session *session,
-                             const uint8_t *data, size_t length, int flags,
-                             void *user_data)
-{
+static ssize_t send_callback(nghttp2_session *session _U_, const uint8_t *data,
+                             size_t length, int flags _U_, void *user_data) {
   struct Connection *connection;
-  ssize_t rv;
-  connection = (struct Connection*)user_data;
+  int rv;
+  connection = (struct Connection *)user_data;
   connection->want_io = IO_NONE;
   ERR_clear_error();
-  rv = SSL_write(connection->ssl, data, length);
-  if(rv < 0) {
+  rv = SSL_write(connection->ssl, data, (int)length);
+  if (rv <= 0) {
     int err = SSL_get_error(connection->ssl, rv);
-    if(err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ) {
-      connection->want_io = (err == SSL_ERROR_WANT_READ ?
-                             WANT_READ : WANT_WRITE);
+    if (err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ) {
+      connection->want_io =
+          (err == SSL_ERROR_WANT_READ ? WANT_READ : WANT_WRITE);
       rv = NGHTTP2_ERR_WOULDBLOCK;
     } else {
       rv = NGHTTP2_ERR_CALLBACK_FAILURE;
@@ -204,64 +171,39 @@ static ssize_t send_callback(nghttp2_session *session,
  * |length| bytes. Returns the number of bytes stored in |buf|. See
  * the documentation of nghttp2_recv_callback for the details.
  */
-static ssize_t recv_callback(nghttp2_session *session,
-                             uint8_t *buf, size_t length, int flags,
-                             void *user_data)
-{
+static ssize_t recv_callback(nghttp2_session *session _U_, uint8_t *buf,
+                             size_t length, int flags _U_, void *user_data) {
   struct Connection *connection;
-  ssize_t rv;
-  connection = (struct Connection*)user_data;
+  int rv;
+  connection = (struct Connection *)user_data;
   connection->want_io = IO_NONE;
   ERR_clear_error();
-  rv = SSL_read(connection->ssl, buf, length);
-  if(rv < 0) {
+  rv = SSL_read(connection->ssl, buf, (int)length);
+  if (rv < 0) {
     int err = SSL_get_error(connection->ssl, rv);
-    if(err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ) {
-      connection->want_io = (err == SSL_ERROR_WANT_READ ?
-                             WANT_READ : WANT_WRITE);
+    if (err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ) {
+      connection->want_io =
+          (err == SSL_ERROR_WANT_READ ? WANT_READ : WANT_WRITE);
       rv = NGHTTP2_ERR_WOULDBLOCK;
     } else {
       rv = NGHTTP2_ERR_CALLBACK_FAILURE;
     }
-  } else if(rv == 0) {
+  } else if (rv == 0) {
     rv = NGHTTP2_ERR_EOF;
   }
   return rv;
 }
 
-/*
- * The implementation of nghttp2_before_frame_send_callback type.  We
- * use this function to get stream ID of the request. This is because
- * stream ID is not known when we submit the request
- * (nghttp2_submit_request).
- */
-static int before_frame_send_callback(nghttp2_session *session,
-                                      const nghttp2_frame *frame,
-                                      void *user_data)
-{
-  if(frame->hd.type == NGHTTP2_HEADERS &&
-     frame->headers.cat == NGHTTP2_HCAT_REQUEST) {
-    struct Request *req;
-    int32_t stream_id = frame->hd.stream_id;
-    req = nghttp2_session_get_stream_user_data(session, stream_id);
-    if(req && req->stream_id == -1) {
-      req->stream_id = stream_id;
-      printf("[INFO] Stream ID = %d\n", stream_id);
-    }
-  }
-  return 0;
-}
-
 static int on_frame_send_callback(nghttp2_session *session,
-                                  const nghttp2_frame *frame, void *user_data)
-{
+                                  const nghttp2_frame *frame,
+                                  void *user_data _U_) {
   size_t i;
-  switch(frame->hd.type) {
+  switch (frame->hd.type) {
   case NGHTTP2_HEADERS:
-    if(nghttp2_session_get_stream_user_data(session, frame->hd.stream_id)) {
+    if (nghttp2_session_get_stream_user_data(session, frame->hd.stream_id)) {
       const nghttp2_nv *nva = frame->headers.nva;
       printf("[INFO] C ----------------------------> S (HEADERS)\n");
-      for(i = 0; i < frame->headers.nvlen; ++i) {
+      for (i = 0; i < frame->headers.nvlen; ++i) {
         fwrite(nva[i].name, nva[i].namelen, 1, stdout);
         printf(": ");
         fwrite(nva[i].value, nva[i].valuelen, 1, stdout);
@@ -280,19 +222,18 @@ static int on_frame_send_callback(nghttp2_session *session,
 }
 
 static int on_frame_recv_callback(nghttp2_session *session,
-                                  const nghttp2_frame *frame, void *user_data)
-{
+                                  const nghttp2_frame *frame,
+                                  void *user_data _U_) {
   size_t i;
-  switch(frame->hd.type) {
+  switch (frame->hd.type) {
   case NGHTTP2_HEADERS:
-    if(frame->headers.cat == NGHTTP2_HCAT_RESPONSE) {
+    if (frame->headers.cat == NGHTTP2_HCAT_RESPONSE) {
       const nghttp2_nv *nva = frame->headers.nva;
       struct Request *req;
       req = nghttp2_session_get_stream_user_data(session, frame->hd.stream_id);
-      if(req) {
-        check_gzip(req, frame->headers.nva, frame->headers.nvlen);
+      if (req) {
         printf("[INFO] C <---------------------------- S (HEADERS)\n");
-        for(i = 0; i < frame->headers.nvlen; ++i) {
+        for (i = 0; i < frame->headers.nvlen; ++i) {
           fwrite(nva[i].name, nva[i].namelen, 1, stdout);
           printf(": ");
           fwrite(nva[i].value, nva[i].valuelen, 1, stdout);
@@ -317,19 +258,17 @@ static int on_frame_recv_callback(nghttp2_session *session,
  * fetch 1 resource in this program, after reception of the response,
  * we submit GOAWAY and close the session.
  */
-static int on_stream_close_callback(nghttp2_session *session,
-                                    int32_t stream_id,
-                                    nghttp2_error_code error_code,
-                                    void *user_data)
-{
+static int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
+                                    uint32_t error_code _U_,
+                                    void *user_data _U_) {
   struct Request *req;
   req = nghttp2_session_get_stream_user_data(session, stream_id);
-  if(req) {
+  if (req) {
     int rv;
-    rv = nghttp2_submit_goaway(session, NGHTTP2_FLAG_NONE, NGHTTP2_NO_ERROR,
-                               NULL, 0);
-    if(rv != 0) {
-      diec("nghttp2_submit_goaway", rv);
+    rv = nghttp2_session_terminate_session(session, NGHTTP2_NO_ERROR);
+
+    if (rv != 0) {
+      diec("nghttp2_session_terminate_session", rv);
     }
   }
   return 0;
@@ -341,35 +280,17 @@ static int on_stream_close_callback(nghttp2_session *session,
  * The implementation of nghttp2_on_data_chunk_recv_callback type. We
  * use this function to print the received response body.
  */
-static int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
-                                       int32_t stream_id,
+static int on_data_chunk_recv_callback(nghttp2_session *session,
+                                       uint8_t flags _U_, int32_t stream_id,
                                        const uint8_t *data, size_t len,
-                                       void *user_data)
-{
+                                       void *user_data _U_) {
   struct Request *req;
   req = nghttp2_session_get_stream_user_data(session, stream_id);
-  if(req) {
+  if (req) {
     printf("[INFO] C <---------------------------- S (DATA chunk)\n"
-           "%lu bytes\n", (unsigned long int)len);
-    if(req->inflater) {
-      while(len > 0) {
-        uint8_t out[MAX_OUTLEN];
-        size_t outlen = MAX_OUTLEN;
-        size_t tlen = len;
-        int rv;
-        rv = nghttp2_gzip_inflate(req->inflater, out, &outlen, data, &tlen);
-        if(rv == -1) {
-          nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE, stream_id,
-                                    NGHTTP2_INTERNAL_ERROR);
-          break;
-        }
-        fwrite(out, 1, outlen, stdout);
-        data += tlen;
-        len -= tlen;
-      }
-    } else {
-      fwrite(data, 1, len, stdout);
-    }
+           "%lu bytes\n",
+           (unsigned long int)len);
+    fwrite(data, 1, len, stdout);
     printf("\n");
   }
   return 0;
@@ -381,34 +302,38 @@ static int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
  * always required. Since we use nghttp2_session_recv(), the
  * recv_callback is also required.
  */
-static void setup_nghttp2_callbacks(nghttp2_session_callbacks *callbacks)
-{
-  memset(callbacks, 0, sizeof(nghttp2_session_callbacks));
-  callbacks->send_callback = send_callback;
-  callbacks->recv_callback = recv_callback;
-  callbacks->before_frame_send_callback = before_frame_send_callback;
-  callbacks->on_frame_send_callback = on_frame_send_callback;
-  callbacks->on_frame_recv_callback = on_frame_recv_callback;
-  callbacks->on_stream_close_callback = on_stream_close_callback;
-  callbacks->on_data_chunk_recv_callback = on_data_chunk_recv_callback;
+static void setup_nghttp2_callbacks(nghttp2_session_callbacks *callbacks) {
+  nghttp2_session_callbacks_set_send_callback(callbacks, send_callback);
+
+  nghttp2_session_callbacks_set_recv_callback(callbacks, recv_callback);
+
+  nghttp2_session_callbacks_set_on_frame_send_callback(callbacks,
+                                                       on_frame_send_callback);
+
+  nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
+                                                       on_frame_recv_callback);
+
+  nghttp2_session_callbacks_set_on_stream_close_callback(
+      callbacks, on_stream_close_callback);
+
+  nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
+      callbacks, on_data_chunk_recv_callback);
 }
 
 /*
  * Callback function for TLS NPN. Since this program only supports
- * HTTP/2.0 protocol, if server does not offer HTTP/2.0 the nghttp2
+ * HTTP/2 protocol, if server does not offer HTTP/2 the nghttp2
  * library supports, we terminate program.
  */
-static int select_next_proto_cb(SSL* ssl,
-                                unsigned char **out, unsigned char *outlen,
-                                const unsigned char *in, unsigned int inlen,
-                                void *arg)
-{
+static int select_next_proto_cb(SSL *ssl _U_, unsigned char **out,
+                                unsigned char *outlen, const unsigned char *in,
+                                unsigned int inlen, void *arg _U_) {
   int rv;
-  /* nghttp2_select_next_protocol() selects HTTP/2.0 protocol the
+  /* nghttp2_select_next_protocol() selects HTTP/2 protocol the
      nghttp2 library supports. */
   rv = nghttp2_select_next_protocol(out, outlen, in, inlen);
-  if(rv <= 0) {
-    die("Server did not advertise HTTP/2.0 protocol");
+  if (rv <= 0) {
+    die("Server did not advertise HTTP/2 protocol");
   }
   return SSL_TLSEXT_ERR_OK;
 }
@@ -416,25 +341,23 @@ static int select_next_proto_cb(SSL* ssl,
 /*
  * Setup SSL/TLS context.
  */
-static void init_ssl_ctx(SSL_CTX *ssl_ctx)
-{
+static void init_ssl_ctx(SSL_CTX *ssl_ctx) {
   /* Disable SSLv2 and enable all workarounds for buggy servers */
-  SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL|SSL_OP_NO_SSLv2);
+  SSL_CTX_set_options(ssl_ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2);
   SSL_CTX_set_mode(ssl_ctx, SSL_MODE_AUTO_RETRY);
   SSL_CTX_set_mode(ssl_ctx, SSL_MODE_RELEASE_BUFFERS);
   /* Set NPN callback */
   SSL_CTX_set_next_proto_select_cb(ssl_ctx, select_next_proto_cb, NULL);
 }
 
-static void ssl_handshake(SSL *ssl, int fd)
-{
+static void ssl_handshake(SSL *ssl, int fd) {
   int rv;
-  if(SSL_set_fd(ssl, fd) == 0) {
+  if (SSL_set_fd(ssl, fd) == 0) {
     dief("SSL_set_fd", ERR_error_string(ERR_get_error(), NULL));
   }
   ERR_clear_error();
   rv = SSL_connect(ssl);
-  if(rv <= 0) {
+  if (rv <= 0) {
     dief("SSL_connect", ERR_error_string(ERR_get_error(), NULL));
   }
 }
@@ -443,8 +366,7 @@ static void ssl_handshake(SSL *ssl, int fd)
  * Connects to the host |host| and port |port|.  This function returns
  * the file descriptor of the client socket.
  */
-static int connect_to(const char *host, uint16_t port)
-{
+static int connect_to(const char *host, uint16_t port) {
   struct addrinfo hints;
   int fd = -1;
   int rv;
@@ -455,17 +377,18 @@ static int connect_to(const char *host, uint16_t port)
   hints.ai_family = AF_UNSPEC;
   hints.ai_socktype = SOCK_STREAM;
   rv = getaddrinfo(host, service, &hints, &res);
-  if(rv != 0) {
+  if (rv != 0) {
     dief("getaddrinfo", gai_strerror(rv));
   }
-  for(rp = res; rp; rp = rp->ai_next) {
+  for (rp = res; rp; rp = rp->ai_next) {
     fd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-    if(fd == -1) {
+    if (fd == -1) {
       continue;
     }
-    while((rv = connect(fd, rp->ai_addr, rp->ai_addrlen)) == -1 &&
-          errno == EINTR);
-    if(rv == 0) {
+    while ((rv = connect(fd, rp->ai_addr, rp->ai_addrlen)) == -1 &&
+           errno == EINTR)
+      ;
+    if (rv == 0) {
       break;
     }
     close(fd);
@@ -475,25 +398,25 @@ static int connect_to(const char *host, uint16_t port)
   return fd;
 }
 
-static void make_non_block(int fd)
-{
+static void make_non_block(int fd) {
   int flags, rv;
-  while((flags = fcntl(fd, F_GETFL, 0)) == -1 && errno == EINTR);
-  if(flags == -1) {
+  while ((flags = fcntl(fd, F_GETFL, 0)) == -1 && errno == EINTR)
+    ;
+  if (flags == -1) {
     dief("fcntl", strerror(errno));
   }
-  while((rv = fcntl(fd, F_SETFL, flags | O_NONBLOCK)) == -1 && errno == EINTR);
-  if(rv == -1) {
+  while ((rv = fcntl(fd, F_SETFL, flags | O_NONBLOCK)) == -1 && errno == EINTR)
+    ;
+  if (rv == -1) {
     dief("fcntl", strerror(errno));
   }
 }
 
-static void set_tcp_nodelay(int fd)
-{
+static void set_tcp_nodelay(int fd) {
   int val = 1;
   int rv;
   rv = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &val, (socklen_t)sizeof(val));
-  if(rv == -1) {
+  if (rv == -1) {
     dief("setsockopt", strerror(errno));
   }
 }
@@ -501,15 +424,14 @@ static void set_tcp_nodelay(int fd)
 /*
  * Update |pollfd| based on the state of |connection|.
  */
-static void ctl_poll(struct pollfd *pollfd, struct Connection *connection)
-{
+static void ctl_poll(struct pollfd *pollfd, struct Connection *connection) {
   pollfd->events = 0;
-  if(nghttp2_session_want_read(connection->session) ||
-     connection->want_io == WANT_READ) {
+  if (nghttp2_session_want_read(connection->session) ||
+      connection->want_io == WANT_READ) {
     pollfd->events |= POLLIN;
   }
-  if(nghttp2_session_want_write(connection->session) ||
-     connection->want_io == WANT_WRITE) {
+  if (nghttp2_session_want_write(connection->session) ||
+      connection->want_io == WANT_WRITE) {
     pollfd->events |= POLLOUT;
   }
 }
@@ -519,66 +441,61 @@ static void ctl_poll(struct pollfd *pollfd, struct Connection *connection)
  * function does not send packets; just append the request to the
  * internal queue in |connection->session|.
  */
-static void submit_request(struct Connection *connection, struct Request *req)
-{
-  int pri = 0;
-  int rv;
-  const nghttp2_nv nva[] = {
-    /* Make sure that the last item is NULL */
-    MAKE_NV(":method", "GET"),
-    MAKE_NV_CS(":path", req->path),
-    MAKE_NV(":scheme", "https"),
-    MAKE_NV_CS(":authority", req->hostport),
-    MAKE_NV("accept", "*/*"),
-    MAKE_NV("user-agent", "nghttp2/"NGHTTP2_VERSION)
-  };
-  rv = nghttp2_submit_request(connection->session, pri,
-                              nva, sizeof(nva)/sizeof(nva[0]), NULL, req);
-  if(rv != 0) {
-    diec("nghttp2_submit_request", rv);
+static void submit_request(struct Connection *connection, struct Request *req) {
+  int32_t stream_id;
+  /* Make sure that the last item is NULL */
+  const nghttp2_nv nva[] = {MAKE_NV(":method", "GET"),
+                            MAKE_NV_CS(":path", req->path),
+                            MAKE_NV(":scheme", "https"),
+                            MAKE_NV_CS(":authority", req->hostport),
+                            MAKE_NV("accept", "*/*"),
+                            MAKE_NV("user-agent", "nghttp2/" NGHTTP2_VERSION)};
+
+  stream_id = nghttp2_submit_request(connection->session, NULL, nva,
+                                     sizeof(nva) / sizeof(nva[0]), NULL, req);
+
+  if (stream_id < 0) {
+    diec("nghttp2_submit_request", stream_id);
   }
+
+  req->stream_id = stream_id;
+  printf("[INFO] Stream ID = %d\n", stream_id);
 }
 
 /*
  * Performs the network I/O.
  */
-static void exec_io(struct Connection *connection)
-{
+static void exec_io(struct Connection *connection) {
   int rv;
   rv = nghttp2_session_recv(connection->session);
-  if(rv != 0) {
+  if (rv != 0) {
     diec("nghttp2_session_recv", rv);
   }
   rv = nghttp2_session_send(connection->session);
-  if(rv != 0) {
+  if (rv != 0) {
     diec("nghttp2_session_send", rv);
   }
 }
 
-static void request_init(struct Request *req, const struct URI *uri)
-{
+static void request_init(struct Request *req, const struct URI *uri) {
   req->host = strcopy(uri->host, uri->hostlen);
   req->port = uri->port;
   req->path = strcopy(uri->path, uri->pathlen);
   req->hostport = strcopy(uri->hostport, uri->hostportlen);
   req->stream_id = -1;
-  req->inflater = NULL;
 }
 
-static void request_free(struct Request *req)
-{
+static void request_free(struct Request *req) {
   free(req->host);
   free(req->path);
   free(req->hostport);
-  nghttp2_gzip_inflate_del(req->inflater);
 }
 
 /*
  * Fetches the resource denoted by |uri|.
  */
-static void fetch_uri(const struct URI *uri)
-{
-  nghttp2_session_callbacks callbacks;
+static void fetch_uri(const struct URI *uri) {
+  nghttp2_session_callbacks *callbacks;
   int fd;
   SSL_CTX *ssl_ctx;
   SSL *ssl;
@@ -590,20 +507,18 @@ static void fetch_uri(const struct URI *uri)
 
   request_init(&req, uri);
 
-  setup_nghttp2_callbacks(&callbacks);
-
   /* Establish connection and setup SSL */
   fd = connect_to(req.host, req.port);
-  if(fd == -1) {
+  if (fd == -1) {
     die("Could not open file descriptor");
   }
   ssl_ctx = SSL_CTX_new(SSLv23_client_method());
-  if(ssl_ctx == NULL) {
+  if (ssl_ctx == NULL) {
     dief("SSL_CTX_new", ERR_error_string(ERR_get_error(), NULL));
   }
   init_ssl_ctx(ssl_ctx);
   ssl = SSL_new(ssl_ctx);
-  if(ssl == NULL) {
+  if (ssl == NULL) {
     dief("SSL_new", ERR_error_string(ERR_get_error(), NULL));
   }
   /* To simplify the program, we perform SSL/TLS handshake in blocking
@@ -614,17 +529,32 @@ static void fetch_uri(const struct URI *uri)
   connection.want_io = IO_NONE;
 
   /* Send connection header in blocking I/O mode */
-  SSL_write(ssl, NGHTTP2_CLIENT_CONNECTION_HEADER,
-            NGHTTP2_CLIENT_CONNECTION_HEADER_LEN);
+  rv = SSL_write(ssl, NGHTTP2_CLIENT_CONNECTION_PREFACE,
+                 NGHTTP2_CLIENT_CONNECTION_PREFACE_LEN);
+  if (rv <= 0) {
+    dief("SSL_write failed: could not send connection preface",
+         ERR_error_string(ERR_get_error(), NULL));
+  }
 
   /* Here make file descriptor non-block */
   make_non_block(fd);
   set_tcp_nodelay(fd);
 
   printf("[INFO] SSL/TLS handshake completed\n");
-  rv = nghttp2_session_client_new(&connection.session, &callbacks,
-                                  &connection);
-  if(rv != 0) {
+
+  rv = nghttp2_session_callbacks_new(&callbacks);
+
+  if (rv != 0) {
+    diec("nghttp2_session_callbacks_new", rv);
+  }
+
+  setup_nghttp2_callbacks(callbacks);
+
+  rv = nghttp2_session_client_new(&connection.session, callbacks, &connection);
+
+  nghttp2_session_callbacks_del(callbacks);
+
+  if (rv != 0) {
     diec("nghttp2_session_client_new", rv);
   }
 
@@ -635,16 +565,16 @@ static void fetch_uri(const struct URI *uri)
   ctl_poll(pollfds, &connection);
 
   /* Event loop */
-  while(nghttp2_session_want_read(connection.session) ||
-        nghttp2_session_want_write(connection.session)) {
+  while (nghttp2_session_want_read(connection.session) ||
+         nghttp2_session_want_write(connection.session)) {
     int nfds = poll(pollfds, npollfds, -1);
-    if(nfds == -1) {
+    if (nfds == -1) {
       dief("poll", strerror(errno));
     }
-    if(pollfds[0].revents & (POLLIN | POLLOUT)) {
+    if (pollfds[0].revents & (POLLIN | POLLOUT)) {
       exec_io(&connection);
     }
-    if((pollfds[0].revents & POLLHUP) || (pollfds[0].revents & POLLERR)) {
+    if ((pollfds[0].revents & POLLHUP) || (pollfds[0].revents & POLLERR)) {
       die("Connection error");
     }
     ctl_poll(pollfds, &connection);
@@ -660,96 +590,94 @@ static void fetch_uri(const struct URI *uri)
   request_free(&req);
 }
 
-static int parse_uri(struct URI *res, const char *uri)
-{
+static int parse_uri(struct URI *res, const char *uri) {
   /* We only interested in https */
   size_t len, i, offset;
   int ipv6addr = 0;
   memset(res, 0, sizeof(struct URI));
   len = strlen(uri);
-  if(len < 9 || memcmp("https://", uri, 8) != 0) {
+  if (len < 9 || memcmp("https://", uri, 8) != 0) {
     return -1;
   }
   offset = 8;
   res->host = res->hostport = &uri[offset];
   res->hostlen = 0;
-  if(uri[offset] == '[') {
+  if (uri[offset] == '[') {
     /* IPv6 literal address */
     ++offset;
     ++res->host;
     ipv6addr = 1;
-    for(i = offset; i < len; ++i) {
-      if(uri[i] == ']') {
-        res->hostlen = i-offset;
-        offset = i+1;
+    for (i = offset; i < len; ++i) {
+      if (uri[i] == ']') {
+        res->hostlen = i - offset;
+        offset = i + 1;
         break;
       }
     }
   } else {
     const char delims[] = ":/?#";
-    for(i = offset; i < len; ++i) {
-      if(strchr(delims, uri[i]) != NULL) {
+    for (i = offset; i < len; ++i) {
+      if (strchr(delims, uri[i]) != NULL) {
         break;
       }
     }
-    res->hostlen = i-offset;
+    res->hostlen = i - offset;
     offset = i;
   }
-  if(res->hostlen == 0) {
+  if (res->hostlen == 0) {
     return -1;
   }
   /* Assuming https */
   res->port = 443;
-  if(offset < len) {
-    if(uri[offset] == ':') {
+  if (offset < len) {
+    if (uri[offset] == ':') {
       /* port */
       const char delims[] = "/?#";
       int port = 0;
       ++offset;
-      for(i = offset; i < len; ++i) {
-        if(strchr(delims, uri[i]) != NULL) {
+      for (i = offset; i < len; ++i) {
+        if (strchr(delims, uri[i]) != NULL) {
           break;
         }
-        if('0' <= uri[i] && uri[i] <= '9') {
+        if ('0' <= uri[i] && uri[i] <= '9') {
           port *= 10;
-          port += uri[i]-'0';
-          if(port > 65535) {
+          port += uri[i] - '0';
+          if (port > 65535) {
             return -1;
           }
         } else {
           return -1;
         }
       }
-      if(port == 0) {
+      if (port == 0) {
         return -1;
       }
       offset = i;
       res->port = port;
     }
   }
-  res->hostportlen = uri+offset+ipv6addr-res->host;
-  for(i = offset; i < len; ++i) {
-    if(uri[i] == '#') {
+  res->hostportlen = uri + offset + ipv6addr - res->host;
+  for (i = offset; i < len; ++i) {
+    if (uri[i] == '#') {
       break;
     }
   }
-  if(i-offset == 0) {
+  if (i - offset == 0) {
     res->path = "/";
     res->pathlen = 1;
   } else {
     res->path = &uri[offset];
-    res->pathlen = i-offset;
+    res->pathlen = i - offset;
   }
   return 0;
 }
 
-int main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
   struct URI uri;
   struct sigaction act;
   int rv;
 
-  if(argc < 2) {
+  if (argc < 2) {
     die("Specify a https URI");
   }
 
@@ -757,11 +685,13 @@ int main(int argc, char **argv)
   act.sa_handler = SIG_IGN;
   sigaction(SIGPIPE, &act, 0);
 
+  OPENSSL_config(NULL);
+  OpenSSL_add_all_algorithms();
   SSL_load_error_strings();
   SSL_library_init();
 
   rv = parse_uri(&uri, argv[1]);
-  if(rv != 0) {
+  if (rv != 0) {
     die("parse_uri failed");
   }
   fetch_uri(&uri);

examples/deflate.c

@@ -0,0 +1,206 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2014 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.
+ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* !HAVE_CONFIG_H */
+
+#include <stdio.h>
+#include <string.h>
+
+#include <nghttp2/nghttp2.h>
+
+#define MAKE_NV(K, V)                                                          \
+  {                                                                            \
+    (uint8_t *) K, (uint8_t *)V, sizeof(K) - 1, sizeof(V) - 1,                 \
+        NGHTTP2_NV_FLAG_NONE                                                   \
+  }
+
+static void deflate(nghttp2_hd_deflater *deflater,
+                    nghttp2_hd_inflater *inflater, const nghttp2_nv *const nva,
+                    size_t nvlen);
+
+static int inflate_header_block(nghttp2_hd_inflater *inflater, uint8_t *in,
+                                size_t inlen, int final);
+
+int main(int argc _U_, char **argv _U_) {
+  int rv;
+  nghttp2_hd_deflater *deflater;
+  nghttp2_hd_inflater *inflater;
+  /* Define 1st header set.  This is looks like a HTTP request. */
+  nghttp2_nv nva1[] = {
+      MAKE_NV(":scheme", "https"), MAKE_NV(":authority", "example.org"),
+      MAKE_NV(":path", "/"), MAKE_NV("user-agent", "libnghttp2"),
+      MAKE_NV("accept-encoding", "gzip, deflate")};
+  /* Define 2nd header set */
+  nghttp2_nv nva2[] = {MAKE_NV(":scheme", "https"),
+                       MAKE_NV(":authority", "example.org"),
+                       MAKE_NV(":path", "/stylesheet/style.css"),
+                       MAKE_NV("user-agent", "libnghttp2"),
+                       MAKE_NV("accept-encoding", "gzip, deflate"),
+                       MAKE_NV("referer", "https://example.org")};
+
+  rv = nghttp2_hd_deflate_new(&deflater, 4096);
+
+  if (rv != 0) {
+    fprintf(stderr, "nghttp2_hd_deflate_init failed with error: %s\n",
+            nghttp2_strerror(rv));
+    exit(EXIT_FAILURE);
+  }
+
+  rv = nghttp2_hd_inflate_new(&inflater);
+
+  if (rv != 0) {
+    fprintf(stderr, "nghttp2_hd_inflate_init failed with error: %s\n",
+            nghttp2_strerror(rv));
+    exit(EXIT_FAILURE);
+  }
+
+  /* Encode and decode 1st header set */
+  deflate(deflater, inflater, nva1, sizeof(nva1) / sizeof(nva1[0]));
+
+  /* Encode and decode 2nd header set, using differential encoding
+     using state after encoding 1st header set. */
+  deflate(deflater, inflater, nva2, sizeof(nva2) / sizeof(nva2[0]));
+
+  nghttp2_hd_inflate_del(inflater);
+  nghttp2_hd_deflate_del(deflater);
+
+  return 0;
+}
+
+static void deflate(nghttp2_hd_deflater *deflater,
+                    nghttp2_hd_inflater *inflater, const nghttp2_nv *const nva,
+                    size_t nvlen) {
+  ssize_t rv;
+  uint8_t *buf;
+  size_t buflen;
+  size_t outlen;
+  size_t i;
+  size_t sum;
+
+  sum = 0;
+
+  for (i = 0; i < nvlen; ++i) {
+    sum += nva[i].namelen + nva[i].valuelen;
+  }
+
+  printf("Input (%zu byte(s)):\n\n", sum);
+
+  for (i = 0; i < nvlen; ++i) {
+    fwrite(nva[i].name, nva[i].namelen, 1, stdout);
+    printf(": ");
+    fwrite(nva[i].value, nva[i].valuelen, 1, stdout);
+    printf("\n");
+  }
+
+  buflen = nghttp2_hd_deflate_bound(deflater, nva, nvlen);
+  buf = malloc(buflen);
+
+  rv = nghttp2_hd_deflate_hd(deflater, buf, buflen, nva, nvlen);
+
+  if (rv < 0) {
+    fprintf(stderr, "nghttp2_hd_deflate_hd() failed with error: %s\n",
+            nghttp2_strerror((int)rv));
+
+    free(buf);
+
+    exit(EXIT_FAILURE);
+  }
+
+  outlen = rv;
+
+  printf("\nDeflate (%zu byte(s), ratio %.02f):\n\n", outlen,
+         sum == 0 ? 0 : (double)outlen / sum);
+
+  for (i = 0; i < outlen; ++i) {
+    if ((i & 0x0fu) == 0) {
+      printf("%08zX: ", i);
+    }
+
+    printf("%02X ", buf[i]);
+
+    if (((i + 1) & 0x0fu) == 0) {
+      printf("\n");
+    }
+  }
+
+  printf("\n\nInflate:\n\n");
+
+  /* We pass 1 to final parameter, because buf contains whole deflated
+     header data. */
+  rv = inflate_header_block(inflater, buf, outlen, 1);
+
+  if (rv != 0) {
+    free(buf);
+
+    exit(EXIT_FAILURE);
+  }
+
+  printf("\n-----------------------------------------------------------"
+         "--------------------\n");
+
+  free(buf);
+}
+
+int inflate_header_block(nghttp2_hd_inflater *inflater, uint8_t *in,
+                         size_t inlen, int final) {
+  ssize_t rv;
+
+  for (;;) {
+    nghttp2_nv nv;
+    int inflate_flags = 0;
+    size_t proclen;
+
+    rv = nghttp2_hd_inflate_hd(inflater, &nv, &inflate_flags, in, inlen, final);
+
+    if (rv < 0) {
+      fprintf(stderr, "inflate failed with error code %zd", rv);
+      return -1;
+    }
+
+    proclen = rv;
+
+    in += proclen;
+    inlen -= proclen;
+
+    if (inflate_flags & NGHTTP2_HD_INFLATE_EMIT) {
+      fwrite(nv.name, nv.namelen, 1, stderr);
+      fprintf(stderr, ": ");
+      fwrite(nv.value, nv.valuelen, 1, stderr);
+      fprintf(stderr, "\n");
+    }
+
+    if (inflate_flags & NGHTTP2_HD_INFLATE_FINAL) {
+      nghttp2_hd_inflate_end_headers(inflater);
+      break;
+    }
+
+    if ((inflate_flags & NGHTTP2_HD_INFLATE_EMIT) == 0 && inlen == 0) {
+      break;
+    }
+  }
+
+  return 0;
+}

examples/libevent-client.c

@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
@@ -22,6 +22,10 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* !HAVE_CONFIG_H */
+
 #include <sys/types.h>
 #include <unistd.h>
 #include <sys/socket.h>
@@ -32,6 +36,7 @@
 
 #include <openssl/ssl.h>
 #include <openssl/err.h>
+#include <openssl/conf.h>
 
 #include <event.h>
 #include <event2/event.h>
@@ -42,7 +47,7 @@
 
 #include "http-parser/http_parser.h"
 
-#define ARRLEN(x) (sizeof(x)/sizeof(x[0]))
+#define ARRLEN(x) (sizeof(x) / sizeof(x[0]))
 
 typedef struct {
   /* The NULL-terminated URI string to retreive. */
@@ -69,9 +74,8 @@ typedef struct {
   http2_stream_data *stream_data;
 } http2_session_data;
 
-static http2_stream_data* create_http2_stream_data(const char *uri,
-                                                   struct http_parser_url *u)
-{
+static http2_stream_data *create_http2_stream_data(const char *uri,
+                                                   struct http_parser_url *u) {
   /* MAX 5 digits (max 65535) + 1 ':' + 1 NULL (because of snprintf) */
   size_t extra = 7;
   http2_stream_data *stream_data = malloc(sizeof(http2_stream_data));
@@ -82,29 +86,29 @@ static http2_stream_data* create_http2_stream_data(const char *uri,
 
   stream_data->authoritylen = u->field_data[UF_HOST].len;
   stream_data->authority = malloc(stream_data->authoritylen + extra);
-  memcpy(stream_data->authority,
-         &uri[u->field_data[UF_HOST].off], u->field_data[UF_HOST].len);
-  if(u->field_set & (1 << UF_PORT)) {
+  memcpy(stream_data->authority, &uri[u->field_data[UF_HOST].off],
+         u->field_data[UF_HOST].len);
+  if (u->field_set & (1 << UF_PORT)) {
     stream_data->authoritylen +=
-      snprintf(stream_data->authority + u->field_data[UF_HOST].len, extra,
-               ":%u", u->port);
+        snprintf(stream_data->authority + u->field_data[UF_HOST].len, extra,
+                 ":%u", u->port);
   }
 
   stream_data->pathlen = 0;
-  if(u->field_set & (1 << UF_PATH)) {
+  if (u->field_set & (1 << UF_PATH)) {
     stream_data->pathlen = u->field_data[UF_PATH].len;
   }
-  if(u->field_set & (1 << UF_QUERY)) {
+  if (u->field_set & (1 << UF_QUERY)) {
     /* +1 for '?' character */
     stream_data->pathlen += u->field_data[UF_QUERY].len + 1;
   }
-  if(stream_data->pathlen > 0) {
+  if (stream_data->pathlen > 0) {
     stream_data->path = malloc(stream_data->pathlen);
-    if(u->field_set & (1 << UF_PATH)) {
-      memcpy(stream_data->path,
-             &uri[u->field_data[UF_PATH].off], u->field_data[UF_PATH].len);
+    if (u->field_set & (1 << UF_PATH)) {
+      memcpy(stream_data->path, &uri[u->field_data[UF_PATH].off],
+             u->field_data[UF_PATH].len);
     }
-    if(u->field_set & (1 << UF_QUERY)) {
+    if (u->field_set & (1 << UF_QUERY)) {
       memcpy(stream_data->path + u->field_data[UF_PATH].len + 1,
              &uri[u->field_data[UF_QUERY].off], u->field_data[UF_QUERY].len);
     }
@@ -114,16 +118,15 @@ static http2_stream_data* create_http2_stream_data(const char *uri,
   return stream_data;
 }
 
-static void delete_http2_stream_data(http2_stream_data *stream_data)
-{
+static void delete_http2_stream_data(http2_stream_data *stream_data) {
   free(stream_data->path);
   free(stream_data->authority);
   free(stream_data);
 }
 
 /* Initializes |session_data| */
-static http2_session_data *create_http2_session_data(struct event_base *evbase)
-{
+static http2_session_data *
+create_http2_session_data(struct event_base *evbase) {
   http2_session_data *session_data = malloc(sizeof(http2_session_data));
 
   memset(session_data, 0, sizeof(http2_session_data));
@@ -131,11 +134,10 @@ static http2_session_data *create_http2_session_data(struct event_base *evbase)
   return session_data;
 }
 
-static void delete_http2_session_data(http2_session_data *session_data)
-{
+static void delete_http2_session_data(http2_session_data *session_data) {
   SSL *ssl = bufferevent_openssl_get_ssl(session_data->bev);
 
-  if(ssl) {
+  if (ssl) {
     SSL_shutdown(ssl);
   }
   bufferevent_free(session_data->bev);
@@ -144,17 +146,15 @@ static void delete_http2_session_data(http2_session_data *session_data)
   session_data->dnsbase = NULL;
   nghttp2_session_del(session_data->session);
   session_data->session = NULL;
-  if(session_data->stream_data) {
+  if (session_data->stream_data) {
     delete_http2_stream_data(session_data->stream_data);
     session_data->stream_data = NULL;
   }
   free(session_data);
 }
 
-static void print_header(FILE *f,
-                         const uint8_t *name, size_t namelen,
-                         const uint8_t *value, size_t valuelen)
-{
+static void print_header(FILE *f, const uint8_t *name, size_t namelen,
+                         const uint8_t *value, size_t valuelen) {
   fwrite(name, namelen, 1, f);
   fprintf(f, ": ");
   fwrite(value, valuelen, 1, f);
@@ -164,13 +164,10 @@ static void print_header(FILE *f,
 /* Print HTTP headers to |f|. Please note that this function does not
    take into account that header name and value are sequence of
    octets, therefore they may contain non-printable characters. */
-static void print_headers(FILE *f, nghttp2_nv *nva, size_t nvlen)
-{
+static void print_headers(FILE *f, nghttp2_nv *nva, size_t nvlen) {
   size_t i;
-  for(i = 0; i < nvlen; ++i) {
-    print_header(f,
-                 nva[i].name, nva[i].namelen,
-                 nva[i].value, nva[i].valuelen);
+  for (i = 0; i < nvlen; ++i) {
+    print_header(f, nva[i].name, nva[i].namelen, nva[i].value, nva[i].valuelen);
   }
   fprintf(f, "\n");
 }
@@ -178,51 +175,26 @@ static void print_headers(FILE *f, nghttp2_nv *nva, size_t nvlen)
 /* nghttp2_send_callback. Here we transmit the |data|, |length| bytes,
    to the network. Because we are using libevent bufferevent, we just
    write those bytes into bufferevent buffer. */
-static ssize_t send_callback(nghttp2_session *session,
-                             const uint8_t *data, size_t length,
-                             int flags, void *user_data)
-{
-  http2_session_data *session_data = (http2_session_data*)user_data;
+static ssize_t send_callback(nghttp2_session *session _U_, const uint8_t *data,
+                             size_t length, int flags _U_, void *user_data) {
+  http2_session_data *session_data = (http2_session_data *)user_data;
   struct bufferevent *bev = session_data->bev;
   bufferevent_write(bev, data, length);
   return length;
 }
 
-/* nghttp2_before_frame_send_callback: Called when nghttp2 library is
-   about to send a frame. We use this callback to get stream ID of new
-   stream. Since HEADERS in HTTP/2.0 has several roles, we check that
-   it is a HTTP request HEADERS. */
-static int before_frame_send_callback
-(nghttp2_session *session, const nghttp2_frame *frame, void *user_data)
-{
-  http2_session_data *session_data = (http2_session_data*)user_data;
-  http2_stream_data *stream_data;
-
-  if(frame->hd.type == NGHTTP2_HEADERS &&
-     frame->headers.cat == NGHTTP2_HCAT_REQUEST) {
-    stream_data =
-      (http2_stream_data*)nghttp2_session_get_stream_user_data
-      (session, frame->hd.stream_id);
-    if(stream_data == session_data->stream_data) {
-      stream_data->stream_id = frame->hd.stream_id;
-    }
-  }
-  return 0;
-}
-
 /* nghttp2_on_header_callback: Called when nghttp2 library emits
    single header name/value pair. */
-static int on_header_callback(nghttp2_session *session,
-                              const nghttp2_frame *frame,
-                              const uint8_t *name, size_t namelen,
-                              const uint8_t *value, size_t valuelen,
-                              void *user_data)
-{
-  http2_session_data *session_data = (http2_session_data*)user_data;
-  switch(frame->hd.type) {
+static int on_header_callback(nghttp2_session *session _U_,
+                              const nghttp2_frame *frame, const uint8_t *name,
+                              size_t namelen, const uint8_t *value,
+                              size_t valuelen, uint8_t flags _U_,
+                              void *user_data) {
+  http2_session_data *session_data = (http2_session_data *)user_data;
+  switch (frame->hd.type) {
   case NGHTTP2_HEADERS:
-    if(frame->headers.cat == NGHTTP2_HCAT_RESPONSE &&
-       session_data->stream_data->stream_id == frame->hd.stream_id) {
+    if (frame->headers.cat == NGHTTP2_HCAT_RESPONSE &&
+        session_data->stream_data->stream_id == frame->hd.stream_id) {
       /* Print response headers for the initiated request. */
       print_header(stderr, name, namelen, value, valuelen);
       break;
@@ -233,15 +205,14 @@ static int on_header_callback(nghttp2_session *session,
 
 /* nghttp2_on_begin_headers_callback: Called when nghttp2 library gets
    started to receive header block. */
-static int on_begin_headers_callback(nghttp2_session *session,
+static int on_begin_headers_callback(nghttp2_session *session _U_,
                                      const nghttp2_frame *frame,
-                                     void *user_data)
-{
-  http2_session_data *session_data = (http2_session_data*)user_data;
-  switch(frame->hd.type) {
+                                     void *user_data) {
+  http2_session_data *session_data = (http2_session_data *)user_data;
+  switch (frame->hd.type) {
   case NGHTTP2_HEADERS:
-    if(frame->headers.cat == NGHTTP2_HCAT_RESPONSE &&
-       session_data->stream_data->stream_id == frame->hd.stream_id) {
+    if (frame->headers.cat == NGHTTP2_HCAT_RESPONSE &&
+        session_data->stream_data->stream_id == frame->hd.stream_id) {
       fprintf(stderr, "Response headers for stream ID=%d:\n",
               frame->hd.stream_id);
     }
@@ -252,14 +223,13 @@ static int on_begin_headers_callback(nghttp2_session *session,
 
 /* nghttp2_on_frame_recv_callback: Called when nghttp2 library
    received a complete frame from the remote peer. */
-static int on_frame_recv_callback(nghttp2_session *session,
-                                  const nghttp2_frame *frame, void *user_data)
-{
-  http2_session_data *session_data = (http2_session_data*)user_data;
-  switch(frame->hd.type) {
+static int on_frame_recv_callback(nghttp2_session *session _U_,
+                                  const nghttp2_frame *frame, void *user_data) {
+  http2_session_data *session_data = (http2_session_data *)user_data;
+  switch (frame->hd.type) {
   case NGHTTP2_HEADERS:
-    if(frame->headers.cat == NGHTTP2_HCAT_RESPONSE &&
-       session_data->stream_data->stream_id == frame->hd.stream_id) {
+    if (frame->headers.cat == NGHTTP2_HCAT_RESPONSE &&
+        session_data->stream_data->stream_id == frame->hd.stream_id) {
       fprintf(stderr, "All headers received\n");
     }
     break;
@@ -272,13 +242,12 @@ static int on_frame_recv_callback(nghttp2_session *session,
    is meant to the stream we initiated, print the received data in
    stdout, so that the user can redirect its output to the file
    easily. */
-static int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
-                                       int32_t stream_id,
+static int on_data_chunk_recv_callback(nghttp2_session *session _U_,
+                                       uint8_t flags _U_, int32_t stream_id,
                                        const uint8_t *data, size_t len,
-                                       void *user_data)
-{
-  http2_session_data *session_data = (http2_session_data*)user_data;
-  if(session_data->stream_data->stream_id == stream_id) {
+                                       void *user_data) {
+  http2_session_data *session_data = (http2_session_data *)user_data;
+  if (session_data->stream_data->stream_id == stream_id) {
     fwrite(data, len, 1, stdout);
   }
   return 0;
@@ -288,19 +257,17 @@ static int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
    closed. This example program only deals with 1 HTTP request (1
    stream), if it is closed, we send GOAWAY and tear down the
    session */
-static int on_stream_close_callback(nghttp2_session *session,
-                                    int32_t stream_id,
-                                    nghttp2_error_code error_code,
-                                    void *user_data)
-{
-  http2_session_data *session_data = (http2_session_data*)user_data;
+static int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
+                                    uint32_t error_code,
+                                    void *user_data) {
+  http2_session_data *session_data = (http2_session_data *)user_data;
   int rv;
 
-  if(session_data->stream_data->stream_id == stream_id) {
-    fprintf(stderr, "Stream %d closed with error_code=%d\n",
-            stream_id, error_code);
+  if (session_data->stream_data->stream_id == stream_id) {
+    fprintf(stderr, "Stream %d closed with error_code=%d\n", stream_id,
+            error_code);
     rv = nghttp2_session_terminate_session(session, NGHTTP2_NO_ERROR);
-    if(rv != 0) {
+    if (rv != 0) {
       return NGHTTP2_ERR_CALLBACK_FAILURE;
     }
   }
@@ -308,115 +275,127 @@ static int on_stream_close_callback(nghttp2_session *session,
 }
 
 /* NPN TLS extension client callback. We check that server advertised
-   the HTTP/2.0 protocol the nghttp2 library supports. If not, exit
+   the HTTP/2 protocol the nghttp2 library supports. If not, exit
    the program. */
-static int select_next_proto_cb(SSL* ssl,
-                                unsigned char **out, unsigned char *outlen,
-                                const unsigned char *in, unsigned int inlen,
-                                void *arg)
-{
-  if(nghttp2_select_next_protocol(out, outlen, in, inlen) <= 0) {
+static int select_next_proto_cb(SSL *ssl _U_, unsigned char **out,
+                                unsigned char *outlen, const unsigned char *in,
+                                unsigned int inlen, void *arg _U_) {
+  if (nghttp2_select_next_protocol(out, outlen, in, inlen) <= 0) {
     errx(1, "Server did not advertise " NGHTTP2_PROTO_VERSION_ID);
   }
   return SSL_TLSEXT_ERR_OK;
 }
 
 /* Create SSL_CTX. */
-static SSL_CTX* create_ssl_ctx(void)
-{
+static SSL_CTX *create_ssl_ctx(void) {
   SSL_CTX *ssl_ctx;
   ssl_ctx = SSL_CTX_new(SSLv23_client_method());
-  if(!ssl_ctx) {
+  if (!ssl_ctx) {
     errx(1, "Could not create SSL/TLS context: %s",
          ERR_error_string(ERR_get_error(), NULL));
   }
   SSL_CTX_set_options(ssl_ctx,
-                      SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_COMPRESSION |
-                      SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
+                      SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 |
+                          SSL_OP_NO_COMPRESSION |
+                          SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
   SSL_CTX_set_next_proto_select_cb(ssl_ctx, select_next_proto_cb, NULL);
   return ssl_ctx;
 }
 
 /* Create SSL object */
-static SSL* create_ssl(SSL_CTX *ssl_ctx)
-{
+static SSL *create_ssl(SSL_CTX *ssl_ctx) {
   SSL *ssl;
   ssl = SSL_new(ssl_ctx);
-  if(!ssl) {
+  if (!ssl) {
     errx(1, "Could not create SSL/TLS session object: %s",
          ERR_error_string(ERR_get_error(), NULL));
   }
   return ssl;
 }
 
-static void initialize_nghttp2_session(http2_session_data *session_data)
-{
-  nghttp2_session_callbacks callbacks = {0};
+static void initialize_nghttp2_session(http2_session_data *session_data) {
+  nghttp2_session_callbacks *callbacks;
 
-  callbacks.send_callback = send_callback;
-  callbacks.before_frame_send_callback = before_frame_send_callback;
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-  callbacks.on_data_chunk_recv_callback = on_data_chunk_recv_callback;
-  callbacks.on_stream_close_callback = on_stream_close_callback;
-  callbacks.on_header_callback = on_header_callback;
-  callbacks.on_begin_headers_callback = on_begin_headers_callback;
-  nghttp2_session_client_new(&session_data->session, &callbacks, session_data);
+  nghttp2_session_callbacks_new(&callbacks);
+
+  nghttp2_session_callbacks_set_send_callback(callbacks, send_callback);
+
+  nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
+                                                       on_frame_recv_callback);
+
+  nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
+      callbacks, on_data_chunk_recv_callback);
+
+  nghttp2_session_callbacks_set_on_stream_close_callback(
+      callbacks, on_stream_close_callback);
+
+  nghttp2_session_callbacks_set_on_header_callback(callbacks,
+                                                   on_header_callback);
+
+  nghttp2_session_callbacks_set_on_begin_headers_callback(
+      callbacks, on_begin_headers_callback);
+
+  nghttp2_session_client_new(&session_data->session, callbacks, session_data);
+
+  nghttp2_session_callbacks_del(callbacks);
 }
 
-static void send_client_connection_header(http2_session_data *session_data)
-{
+static void send_client_connection_header(http2_session_data *session_data) {
   nghttp2_settings_entry iv[1] = {
-    { NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100 }
-  };
+      {NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100}};
   int rv;
 
-  bufferevent_write(session_data->bev,
-                    NGHTTP2_CLIENT_CONNECTION_HEADER,
-                    NGHTTP2_CLIENT_CONNECTION_HEADER_LEN);
-  rv = nghttp2_submit_settings(session_data->session, NGHTTP2_FLAG_NONE,
-                               iv, ARRLEN(iv));
-  if(rv != 0) {
+  bufferevent_write(session_data->bev, NGHTTP2_CLIENT_CONNECTION_PREFACE,
+                    NGHTTP2_CLIENT_CONNECTION_PREFACE_LEN);
+  rv = nghttp2_submit_settings(session_data->session, NGHTTP2_FLAG_NONE, iv,
+                               ARRLEN(iv));
+  if (rv != 0) {
     errx(1, "Could not submit SETTINGS: %s", nghttp2_strerror(rv));
   }
 }
 
-#define MAKE_NV(NAME, VALUE, VALUELEN)                                  \
-  { (uint8_t*)NAME, (uint8_t*)VALUE, sizeof(NAME) - 1, VALUELEN }
+#define MAKE_NV(NAME, VALUE, VALUELEN)                                         \
+  {                                                                            \
+    (uint8_t *) NAME, (uint8_t *)VALUE, sizeof(NAME) - 1, VALUELEN,            \
+        NGHTTP2_NV_FLAG_NONE                                                   \
+  }
 
-#define MAKE_NV2(NAME, VALUE)                                           \
-  { (uint8_t*)NAME, (uint8_t*)VALUE, sizeof(NAME) - 1, sizeof(VALUE) - 1 }
+#define MAKE_NV2(NAME, VALUE)                                                  \
+  {                                                                            \
+    (uint8_t *) NAME, (uint8_t *)VALUE, sizeof(NAME) - 1, sizeof(VALUE) - 1,   \
+        NGHTTP2_NV_FLAG_NONE                                                   \
+  }
 
 /* Send HTTP request to the remote peer */
-static void submit_request(http2_session_data *session_data)
-{
-  int rv;
+static void submit_request(http2_session_data *session_data) {
+  int32_t stream_id;
   http2_stream_data *stream_data = session_data->stream_data;
   const char *uri = stream_data->uri;
   const struct http_parser_url *u = stream_data->u;
   nghttp2_nv hdrs[] = {
-    MAKE_NV2(":method", "GET"),
-    MAKE_NV(":scheme",
-            &uri[u->field_data[UF_SCHEMA].off], u->field_data[UF_SCHEMA].len),
-    MAKE_NV(":authority", stream_data->authority, stream_data->authoritylen),
-    MAKE_NV(":path", stream_data->path, stream_data->pathlen)
-  };
+      MAKE_NV2(":method", "GET"),
+      MAKE_NV(":scheme", &uri[u->field_data[UF_SCHEMA].off],
+              u->field_data[UF_SCHEMA].len),
+      MAKE_NV(":authority", stream_data->authority, stream_data->authoritylen),
+      MAKE_NV(":path", stream_data->path, stream_data->pathlen)};
   fprintf(stderr, "Request headers:\n");
   print_headers(stderr, hdrs, ARRLEN(hdrs));
-  rv = nghttp2_submit_request(session_data->session, NGHTTP2_PRI_DEFAULT,
-                              hdrs, ARRLEN(hdrs), NULL, stream_data);
-  if(rv != 0) {
-    errx(1, "Could not submit HTTP request: %s", nghttp2_strerror(rv));
+  stream_id = nghttp2_submit_request(session_data->session, NULL, hdrs,
+                                     ARRLEN(hdrs), NULL, stream_data);
+  if (stream_id < 0) {
+    errx(1, "Could not submit HTTP request: %s", nghttp2_strerror(stream_id));
   }
+
+  stream_data->stream_id = stream_id;
 }
 
 /* Serialize the frame and send (or buffer) the data to
    bufferevent. */
-static int session_send(http2_session_data *session_data)
-{
+static int session_send(http2_session_data *session_data) {
   int rv;
 
   rv = nghttp2_session_send(session_data->session);
-  if(rv != 0) {
+  if (rv != 0) {
     warnx("Fatal error: %s", nghttp2_strerror(rv));
     return -1;
   }
@@ -427,21 +406,25 @@ static int session_send(http2_session_data *session_data)
    of bufferevent and feed them to nghttp2 library. This may invoke
    nghttp2 callbacks. It may also queues the frame in nghttp2 session
    context. To send them, we call session_send() in the end. */
-static void readcb(struct bufferevent *bev, void *ptr)
-{
-  http2_session_data *session_data = (http2_session_data*)ptr;
-  int rv;
+static void readcb(struct bufferevent *bev, void *ptr) {
+  http2_session_data *session_data = (http2_session_data *)ptr;
+  ssize_t readlen;
   struct evbuffer *input = bufferevent_get_input(bev);
   size_t datalen = evbuffer_get_length(input);
   unsigned char *data = evbuffer_pullup(input, -1);
-  rv = nghttp2_session_mem_recv(session_data->session, data, datalen);
-  if(rv < 0) {
-    warnx("Fatal error: %s", nghttp2_strerror(rv));
+
+  readlen = nghttp2_session_mem_recv(session_data->session, data, datalen);
+  if (readlen < 0) {
+    warnx("Fatal error: %s", nghttp2_strerror((int)readlen));
     delete_http2_session_data(session_data);
     return;
   }
-  evbuffer_drain(input, rv);
-  if(session_send(session_data) != 0) {
+  if (evbuffer_drain(input, readlen) != 0) {
+    warnx("Fatal error: evbuffer_drain failed");
+    delete_http2_session_data(session_data);
+    return;
+  }
+  if (session_send(session_data) != 0) {
     delete_http2_session_data(session_data);
     return;
   }
@@ -451,12 +434,11 @@ static void readcb(struct bufferevent *bev, void *ptr)
    receiving GOAWAY, we check the some conditions on the nghttp2
    library and output buffer of bufferevent. If it indicates we have
    no business to this session, tear down the connection. */
-static void writecb(struct bufferevent *bev, void *ptr)
-{
-  http2_session_data *session_data = (http2_session_data*)ptr;
-  if(nghttp2_session_want_read(session_data->session) == 0 &&
-     nghttp2_session_want_write(session_data->session) == 0 &&
-     evbuffer_get_length(bufferevent_get_output(session_data->bev)) == 0) {
+static void writecb(struct bufferevent *bev _U_, void *ptr) {
+  http2_session_data *session_data = (http2_session_data *)ptr;
+  if (nghttp2_session_want_read(session_data->session) == 0 &&
+      nghttp2_session_want_write(session_data->session) == 0 &&
+      evbuffer_get_length(bufferevent_get_output(session_data->bev)) == 0) {
     delete_http2_session_data(session_data);
   }
 }
@@ -466,10 +448,9 @@ static void writecb(struct bufferevent *bev, void *ptr)
    peer verification. After SSL/TLS handshake is over, initialize
    nghttp2 library session, and send client connection header. Then
    send HTTP request. */
-static void eventcb(struct bufferevent *bev, short events, void *ptr)
-{
-  http2_session_data *session_data = (http2_session_data*)ptr;
-  if(events & BEV_EVENT_CONNECTED) {
+static void eventcb(struct bufferevent *bev, short events, void *ptr) {
+  http2_session_data *session_data = (http2_session_data *)ptr;
+  if (events & BEV_EVENT_CONNECTED) {
     int fd = bufferevent_getfd(bev);
     int val = 1;
     fprintf(stderr, "Connected\n");
@@ -477,41 +458,38 @@ static void eventcb(struct bufferevent *bev, short events, void *ptr)
     initialize_nghttp2_session(session_data);
     send_client_connection_header(session_data);
     submit_request(session_data);
-    if(session_send(session_data) != 0) {
+    if (session_send(session_data) != 0) {
       delete_http2_session_data(session_data);
     }
     return;
   }
-  if(events & BEV_EVENT_EOF) {
+  if (events & BEV_EVENT_EOF) {
     warnx("Disconnected from the remote host");
-  } else if(events & BEV_EVENT_ERROR) {
+  } else if (events & BEV_EVENT_ERROR) {
     warnx("Network error");
-  } else if(events & BEV_EVENT_TIMEOUT) {
+  } else if (events & BEV_EVENT_TIMEOUT) {
     warnx("Timeout");
   }
   delete_http2_session_data(session_data);
 }
 
 /* Start connecting to the remote peer |host:port| */
-static void initiate_connection(struct event_base *evbase,
-                                SSL_CTX *ssl_ctx,
+static void initiate_connection(struct event_base *evbase, SSL_CTX *ssl_ctx,
                                 const char *host, uint16_t port,
-                                http2_session_data *session_data)
-{
+                                http2_session_data *session_data) {
   int rv;
   struct bufferevent *bev;
   SSL *ssl;
 
   ssl = create_ssl(ssl_ctx);
-  bev = bufferevent_openssl_socket_new(evbase, -1, ssl,
-                                       BUFFEREVENT_SSL_CONNECTING,
-                                       BEV_OPT_DEFER_CALLBACKS |
-                                       BEV_OPT_CLOSE_ON_FREE);
+  bev = bufferevent_openssl_socket_new(
+      evbase, -1, ssl, BUFFEREVENT_SSL_CONNECTING,
+      BEV_OPT_DEFER_CALLBACKS | BEV_OPT_CLOSE_ON_FREE);
   bufferevent_setcb(bev, readcb, writecb, eventcb, session_data);
   rv = bufferevent_socket_connect_hostname(bev, session_data->dnsbase,
                                            AF_UNSPEC, host, port);
 
-  if(rv != 0) {
+  if (rv != 0) {
     errx(1, "Could not connect to the remote host %s", host);
   }
   session_data->bev = bev;
@@ -519,8 +497,7 @@ static void initiate_connection(struct event_base *evbase,
 
 /* Get resource denoted by the |uri|. The debug and error messages are
    printed in stderr, while the response body is printed in stdout. */
-static void run(const char *uri)
-{
+static void run(const char *uri) {
   struct http_parser_url u;
   char *host;
   uint16_t port;
@@ -531,11 +508,11 @@ static void run(const char *uri)
 
   /* Parse the |uri| and stores its components in |u| */
   rv = http_parser_parse_url(uri, strlen(uri), 0, &u);
-  if(rv != 0) {
+  if (rv != 0) {
     errx(1, "Could not parse URI %s", uri);
   }
   host = strndup(&uri[u.field_data[UF_HOST].off], u.field_data[UF_HOST].len);
-  if(!(u.field_set & (1 << UF_PORT))) {
+  if (!(u.field_set & (1 << UF_PORT))) {
     port = 443;
   } else {
     port = u.port;
@@ -558,11 +535,10 @@ static void run(const char *uri)
   SSL_CTX_free(ssl_ctx);
 }
 
-int main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
   struct sigaction act;
 
-  if(argc < 2) {
+  if (argc < 2) {
     fprintf(stderr, "Usage: libevent-client HTTPS_URI\n");
     exit(EXIT_FAILURE);
   }
@@ -571,6 +547,8 @@ int main(int argc, char **argv)
   act.sa_handler = SIG_IGN;
   sigaction(SIGPIPE, &act, NULL);
 
+  OPENSSL_config(NULL);
+  OpenSSL_add_all_algorithms();
   SSL_load_error_strings();
   SSL_library_init();
 

examples/libevent-server.c

@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
@@ -22,6 +22,10 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* !HAVE_CONFIG_H */
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
@@ -36,6 +40,7 @@
 
 #include <openssl/ssl.h>
 #include <openssl/err.h>
+#include <openssl/conf.h>
 
 #include <event.h>
 #include <event2/event.h>
@@ -46,10 +51,13 @@
 
 #define OUTPUT_WOULDBLOCK_THRESHOLD (1 << 16)
 
-#define ARRLEN(x) (sizeof(x)/sizeof(x[0]))
+#define ARRLEN(x) (sizeof(x) / sizeof(x[0]))
 
-#define MAKE_NV(NAME, VALUE)                                            \
-  { (uint8_t*)NAME, (uint8_t*)VALUE, sizeof(NAME) - 1, sizeof(VALUE) - 1 }
+#define MAKE_NV(NAME, VALUE)                                                   \
+  {                                                                            \
+    (uint8_t *) NAME, (uint8_t *)VALUE, sizeof(NAME) - 1, sizeof(VALUE) - 1,   \
+        NGHTTP2_NV_FLAG_NONE                                                   \
+  }
 
 struct app_context;
 typedef struct app_context app_context;
@@ -67,7 +75,6 @@ typedef struct http2_session_data {
   app_context *app_ctx;
   nghttp2_session *session;
   char *client_addr;
-  size_t handshake_leftlen;
 } http2_session_data;
 
 struct app_context {
@@ -78,32 +85,40 @@ struct app_context {
 static unsigned char next_proto_list[256];
 static size_t next_proto_list_len;
 
-static int next_proto_cb(SSL *s, const unsigned char **data, unsigned int *len,
-                         void *arg)
-{
+static int next_proto_cb(SSL *s _U_, const unsigned char **data,
+                         unsigned int *len, void *arg _U_) {
   *data = next_proto_list;
-  *len = next_proto_list_len;
+  *len = (unsigned int)next_proto_list_len;
   return SSL_TLSEXT_ERR_OK;
 }
 
 /* Create SSL_CTX. */
-static SSL_CTX* create_ssl_ctx(const char *key_file, const char *cert_file)
-{
+static SSL_CTX *create_ssl_ctx(const char *key_file, const char *cert_file) {
   SSL_CTX *ssl_ctx;
+  EC_KEY *ecdh;
+
   ssl_ctx = SSL_CTX_new(SSLv23_server_method());
-  if(!ssl_ctx) {
+  if (!ssl_ctx) {
     errx(1, "Could not create SSL/TLS context: %s",
          ERR_error_string(ERR_get_error(), NULL));
   }
   SSL_CTX_set_options(ssl_ctx,
-                      SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_COMPRESSION |
-                      SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
+                      SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 |
+                          SSL_OP_NO_COMPRESSION |
+                          SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
 
-  if(SSL_CTX_use_PrivateKey_file(ssl_ctx, key_file,
-                                 SSL_FILETYPE_PEM) != 1) {
+  ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
+  if (!ecdh) {
+    errx(1, "EC_KEY_new_by_curv_name failed: %s",
+         ERR_error_string(ERR_get_error(), NULL));
+  }
+  SSL_CTX_set_tmp_ecdh(ssl_ctx, ecdh);
+  EC_KEY_free(ecdh);
+
+  if (SSL_CTX_use_PrivateKey_file(ssl_ctx, key_file, SSL_FILETYPE_PEM) != 1) {
     errx(1, "Could not read private key file %s", key_file);
   }
-  if(SSL_CTX_use_certificate_chain_file(ssl_ctx, cert_file) != 1) {
+  if (SSL_CTX_use_certificate_chain_file(ssl_ctx, cert_file) != 1) {
     errx(1, "Could not read certificate file %s", cert_file);
   }
 
@@ -117,11 +132,10 @@ static SSL_CTX* create_ssl_ctx(const char *key_file, const char *cert_file)
 }
 
 /* Create SSL object */
-static SSL* create_ssl(SSL_CTX *ssl_ctx)
-{
+static SSL *create_ssl(SSL_CTX *ssl_ctx) {
   SSL *ssl;
   ssl = SSL_new(ssl_ctx);
-  if(!ssl) {
+  if (!ssl) {
     errx(1, "Could not create SSL/TLS session object: %s",
          ERR_error_string(ERR_get_error(), NULL));
   }
@@ -129,28 +143,25 @@ static SSL* create_ssl(SSL_CTX *ssl_ctx)
 }
 
 static void add_stream(http2_session_data *session_data,
-                       http2_stream_data *stream_data)
-{
+                       http2_stream_data *stream_data) {
   stream_data->next = session_data->root.next;
   session_data->root.next = stream_data;
   stream_data->prev = &session_data->root;
-  if(stream_data->next) {
+  if (stream_data->next) {
     stream_data->next->prev = stream_data;
   }
 }
 
-static void remove_stream(http2_session_data *session_data,
-                          http2_stream_data *stream_data)
-{
+static void remove_stream(http2_session_data *session_data _U_,
+                          http2_stream_data *stream_data) {
   stream_data->prev->next = stream_data->next;
-  if(stream_data->next) {
+  if (stream_data->next) {
     stream_data->next->prev = stream_data->prev;
   }
 }
 
-static http2_stream_data* create_http2_stream_data
-(http2_session_data *session_data, int32_t stream_id)
-{
+static http2_stream_data *
+create_http2_stream_data(http2_session_data *session_data, int32_t stream_id) {
   http2_stream_data *stream_data;
   stream_data = malloc(sizeof(http2_stream_data));
   memset(stream_data, 0, sizeof(http2_stream_data));
@@ -161,20 +172,18 @@ static http2_stream_data* create_http2_stream_data
   return stream_data;
 }
 
-static void delete_http2_stream_data(http2_stream_data *stream_data)
-{
-  if(stream_data->fd != -1) {
+static void delete_http2_stream_data(http2_stream_data *stream_data) {
+  if (stream_data->fd != -1) {
     close(stream_data->fd);
   }
   free(stream_data->request_path);
   free(stream_data);
 }
 
-static http2_session_data* create_http2_session_data(app_context *app_ctx,
+static http2_session_data *create_http2_session_data(app_context *app_ctx,
                                                      int fd,
                                                      struct sockaddr *addr,
-                                                     int addrlen)
-{
+                                                     int addrlen) {
   int rv;
   http2_session_data *session_data;
   SSL *ssl;
@@ -186,13 +195,11 @@ static http2_session_data* create_http2_session_data(app_context *app_ctx,
   memset(session_data, 0, sizeof(http2_session_data));
   session_data->app_ctx = app_ctx;
   setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof(val));
-  session_data->bev = bufferevent_openssl_socket_new
-    (app_ctx->evbase, fd, ssl,
-     BUFFEREVENT_SSL_ACCEPTING,
-     BEV_OPT_CLOSE_ON_FREE | BEV_OPT_DEFER_CALLBACKS);
-  session_data->handshake_leftlen = NGHTTP2_CLIENT_CONNECTION_HEADER_LEN;
+  session_data->bev = bufferevent_openssl_socket_new(
+      app_ctx->evbase, fd, ssl, BUFFEREVENT_SSL_ACCEPTING,
+      BEV_OPT_CLOSE_ON_FREE | BEV_OPT_DEFER_CALLBACKS);
   rv = getnameinfo(addr, addrlen, host, sizeof(host), NULL, 0, NI_NUMERICHOST);
-  if(rv != 0) {
+  if (rv != 0) {
     session_data->client_addr = strdup("(unknown)");
   } else {
     session_data->client_addr = strdup(host);
@@ -201,17 +208,16 @@ static http2_session_data* create_http2_session_data(app_context *app_ctx,
   return session_data;
 }
 
-static void delete_http2_session_data(http2_session_data *session_data)
-{
+static void delete_http2_session_data(http2_session_data *session_data) {
   http2_stream_data *stream_data;
   SSL *ssl = bufferevent_openssl_get_ssl(session_data->bev);
   fprintf(stderr, "%s disconnected\n", session_data->client_addr);
-  if(ssl) {
+  if (ssl) {
     SSL_shutdown(ssl);
   }
   bufferevent_free(session_data->bev);
   nghttp2_session_del(session_data->session);
-  for(stream_data = session_data->root.next; stream_data;) {
+  for (stream_data = session_data->root.next; stream_data;) {
     http2_stream_data *next = stream_data->next;
     delete_http2_stream_data(stream_data);
     stream_data = next;
@@ -222,11 +228,10 @@ static void delete_http2_session_data(http2_session_data *session_data)
 
 /* Serialize the frame and send (or buffer) the data to
    bufferevent. */
-static int session_send(http2_session_data *session_data)
-{
+static int session_send(http2_session_data *session_data) {
   int rv;
   rv = nghttp2_session_send(session_data->session);
-  if(rv != 0) {
+  if (rv != 0) {
     warnx("Fatal error: %s", nghttp2_strerror(rv));
     return -1;
   }
@@ -237,33 +242,34 @@ static int session_send(http2_session_data *session_data)
    function. Invocation of nghttp2_session_mem_recv() may make
    additional pending frames, so call session_send() at the end of the
    function. */
-static int session_recv(http2_session_data *session_data)
-{
-  int rv;
+static int session_recv(http2_session_data *session_data) {
+  ssize_t readlen;
   struct evbuffer *input = bufferevent_get_input(session_data->bev);
   size_t datalen = evbuffer_get_length(input);
   unsigned char *data = evbuffer_pullup(input, -1);
-  rv = nghttp2_session_mem_recv(session_data->session, data, datalen);
-  if(rv < 0) {
-    warnx("Fatal error: %s", nghttp2_strerror(rv));
+
+  readlen = nghttp2_session_mem_recv(session_data->session, data, datalen);
+  if (readlen < 0) {
+    warnx("Fatal error: %s", nghttp2_strerror((int)readlen));
     return -1;
   }
-  evbuffer_drain(input, rv);
-  if(session_send(session_data) != 0) {
+  if (evbuffer_drain(input, readlen) != 0) {
+    warnx("Fatal error: evbuffer_drain failed");
+    return -1;
+  }
+  if (session_send(session_data) != 0) {
     return -1;
   }
   return 0;
 }
 
-static ssize_t send_callback(nghttp2_session *session,
-                             const uint8_t *data, size_t length,
-                             int flags, void *user_data)
-{
-  http2_session_data *session_data = (http2_session_data*)user_data;
+static ssize_t send_callback(nghttp2_session *session _U_, const uint8_t *data,
+                             size_t length, int flags _U_, void *user_data) {
+  http2_session_data *session_data = (http2_session_data *)user_data;
   struct bufferevent *bev = session_data->bev;
   /* Avoid excessive buffering in server side. */
-  if(evbuffer_get_length(bufferevent_get_output(session_data->bev)) >=
-     OUTPUT_WOULDBLOCK_THRESHOLD) {
+  if (evbuffer_get_length(bufferevent_get_output(session_data->bev)) >=
+      OUTPUT_WOULDBLOCK_THRESHOLD) {
     return NGHTTP2_ERR_WOULDBLOCK;
   }
   bufferevent_write(bev, data, length);
@@ -271,26 +277,24 @@ static ssize_t send_callback(nghttp2_session *session,
 }
 
 /* Returns nonzero if the string |s| ends with the substring |sub| */
-static int ends_with(const char *s, const char *sub)
-{
+static int ends_with(const char *s, const char *sub) {
   size_t slen = strlen(s);
   size_t sublen = strlen(sub);
-  if(slen < sublen) {
+  if (slen < sublen) {
     return 0;
   }
   return memcmp(s + slen - sublen, sub, sublen) == 0;
 }
 
 /* Returns int value of hex string character |c| */
-static uint8_t hex_to_uint(uint8_t c)
-{
-  if('0' <= c && c <= '9') {
+static uint8_t hex_to_uint(uint8_t c) {
+  if ('0' <= c && c <= '9') {
     return c - '0';
   }
-  if('A' <= c && c <= 'F') {
+  if ('A' <= c && c <= 'F') {
     return c - 'A' + 10;
   }
-  if('a' <= c && c <= 'f') {
+  if ('a' <= c && c <= 'f') {
     return c - 'a' + 10;
   }
   return 0;
@@ -300,16 +304,15 @@ static uint8_t hex_to_uint(uint8_t c)
    and returns the decoded byte string in allocated buffer. The return
    value is NULL terminated. The caller must free the returned
    string. */
-static char* percent_decode(const uint8_t *value, size_t valuelen)
-{
+static char *percent_decode(const uint8_t *value, size_t valuelen) {
   char *res;
 
   res = malloc(valuelen + 1);
-  if(valuelen > 3) {
+  if (valuelen > 3) {
     size_t i, j;
-    for(i = 0, j = 0; i < valuelen - 2;) {
-      if(value[i] != '%' ||
-         !isxdigit(value[i + 1]) || !isxdigit(value[i + 2])) {
+    for (i = 0, j = 0; i < valuelen - 2;) {
+      if (value[i] != '%' || !isxdigit(value[i + 1]) ||
+          !isxdigit(value[i + 2])) {
         res[j++] = value[i++];
         continue;
       }
@@ -325,33 +328,33 @@ static char* percent_decode(const uint8_t *value, size_t valuelen)
   return res;
 }
 
-static ssize_t file_read_callback
-(nghttp2_session *session, int32_t stream_id,
- uint8_t *buf, size_t length, int *eof,
- nghttp2_data_source *source, void *user_data)
-{
+static ssize_t file_read_callback(nghttp2_session *session _U_,
+                                  int32_t stream_id _U_, uint8_t *buf,
+                                  size_t length, uint32_t *data_flags,
+                                  nghttp2_data_source *source,
+                                  void *user_data _U_) {
   int fd = source->fd;
   ssize_t r;
-  while((r = read(fd, buf, length)) == -1 && errno == EINTR);
-  if(r == -1) {
+  while ((r = read(fd, buf, length)) == -1 && errno == EINTR)
+    ;
+  if (r == -1) {
     return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
   }
-  if(r == 0) {
-    *eof = 1;
+  if (r == 0) {
+    *data_flags |= NGHTTP2_DATA_FLAG_EOF;
   }
   return r;
 }
 
 static int send_response(nghttp2_session *session, int32_t stream_id,
-                         nghttp2_nv *nva, size_t nvlen, int fd)
-{
+                         nghttp2_nv *nva, size_t nvlen, int fd) {
   int rv;
   nghttp2_data_provider data_prd;
   data_prd.source.fd = fd;
   data_prd.read_callback = file_read_callback;
 
   rv = nghttp2_submit_response(session, stream_id, nva, nvlen, &data_prd);
-  if(rv != 0) {
+  if (rv != 0) {
     warnx("Fatal error: %s", nghttp2_strerror(rv));
     return -1;
   }
@@ -359,34 +362,40 @@ static int send_response(nghttp2_session *session, int32_t stream_id,
 }
 
 const char ERROR_HTML[] = "<html><head><title>404</title></head>"
-  "<body><h1>404 Not Found</h1></body></html>";
+                          "<body><h1>404 Not Found</h1></body></html>";
 
 static int error_reply(nghttp2_session *session,
-                       http2_stream_data *stream_data)
-{
+                       http2_stream_data *stream_data) {
   int rv;
+  ssize_t writelen;
   int pipefd[2];
-  nghttp2_nv hdrs[] = {
-    MAKE_NV(":status", "404")
-  };
+  nghttp2_nv hdrs[] = {MAKE_NV(":status", "404")};
 
   rv = pipe(pipefd);
-  if(rv != 0) {
+  if (rv != 0) {
     warn("Could not create pipe");
     rv = nghttp2_submit_rst_stream(session, NGHTTP2_FLAG_NONE,
                                    stream_data->stream_id,
                                    NGHTTP2_INTERNAL_ERROR);
-    if(rv != 0) {
+    if (rv != 0) {
       warnx("Fatal error: %s", nghttp2_strerror(rv));
       return -1;
     }
     return 0;
   }
-  write(pipefd[1], ERROR_HTML, sizeof(ERROR_HTML) - 1);
+
+  writelen = write(pipefd[1], ERROR_HTML, sizeof(ERROR_HTML) - 1);
   close(pipefd[1]);
+
+  if (writelen != sizeof(ERROR_HTML) - 1) {
+    close(pipefd[0]);
+    return -1;
+  }
+
   stream_data->fd = pipefd[0];
-  if(send_response(session, stream_data->stream_id, hdrs, ARRLEN(hdrs),
-                   pipefd[0]) != 0) {
+
+  if (send_response(session, stream_data->stream_id, hdrs, ARRLEN(hdrs),
+                    pipefd[0]) != 0) {
     close(pipefd[0]);
     return -1;
   }
@@ -396,26 +405,26 @@ static int error_reply(nghttp2_session *session,
 /* nghttp2_on_header_callback: Called when nghttp2 library emits
    single header name/value pair. */
 static int on_header_callback(nghttp2_session *session,
-                              const nghttp2_frame *frame,
-                              const uint8_t *name, size_t namelen,
-                              const uint8_t *value, size_t valuelen,
-                              void *user_data)
-{
+                              const nghttp2_frame *frame, const uint8_t *name,
+                              size_t namelen, const uint8_t *value,
+                              size_t valuelen, uint8_t flags _U_,
+                              void *user_data _U_) {
   http2_stream_data *stream_data;
   const char PATH[] = ":path";
-  switch(frame->hd.type) {
+  switch (frame->hd.type) {
   case NGHTTP2_HEADERS:
-    if(frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
+    if (frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
       break;
     }
-    stream_data = nghttp2_session_get_stream_user_data(session,
-                                                       frame->hd.stream_id);
-    if(stream_data->request_path) {
+    stream_data =
+        nghttp2_session_get_stream_user_data(session, frame->hd.stream_id);
+    if (!stream_data || stream_data->request_path) {
       break;
     }
-    if(namelen == sizeof(PATH) - 1 && memcmp(PATH, name, namelen) == 0) {
+    if (namelen == sizeof(PATH) - 1 && memcmp(PATH, name, namelen) == 0) {
       size_t j;
-      for(j = 0; j < valuelen && value[j] != '?'; ++j);
+      for (j = 0; j < valuelen && value[j] != '?'; ++j)
+        ;
       stream_data->request_path = percent_decode(value, j);
     }
     break;
@@ -425,13 +434,12 @@ static int on_header_callback(nghttp2_session *session,
 
 static int on_begin_headers_callback(nghttp2_session *session,
                                      const nghttp2_frame *frame,
-                                     void *user_data)
-{
-  http2_session_data *session_data = (http2_session_data*)user_data;
+                                     void *user_data) {
+  http2_session_data *session_data = (http2_session_data *)user_data;
   http2_stream_data *stream_data;
 
-  if(frame->hd.type != NGHTTP2_HEADERS ||
-     frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
+  if (frame->hd.type != NGHTTP2_HEADERS ||
+      frame->headers.cat != NGHTTP2_HCAT_REQUEST) {
     return 0;
   }
   stream_data = create_http2_stream_data(session_data, frame->hd.stream_id);
@@ -442,52 +450,47 @@ static int on_begin_headers_callback(nghttp2_session *session,
 
 /* Minimum check for directory traversal. Returns nonzero if it is
    safe. */
-static int check_path(const char *path)
-{
+static int check_path(const char *path) {
   /* We don't like '\' in url. */
-  return path[0] && path[0] == '/' &&
-    strchr(path, '\\') == NULL &&
-    strstr(path, "/../") == NULL &&
-    strstr(path, "/./") == NULL &&
-    !ends_with(path, "/..") && !ends_with(path, "/.");
+  return path[0] && path[0] == '/' && strchr(path, '\\') == NULL &&
+         strstr(path, "/../") == NULL && strstr(path, "/./") == NULL &&
+         !ends_with(path, "/..") && !ends_with(path, "/.");
 }
 
 static int on_request_recv(nghttp2_session *session,
                            http2_session_data *session_data,
-                           http2_stream_data *stream_data)
-{
+                           http2_stream_data *stream_data) {
   int fd;
-  nghttp2_nv hdrs[] = {
-    MAKE_NV(":status", "200")
-  };
+  nghttp2_nv hdrs[] = {MAKE_NV(":status", "200")};
   char *rel_path;
 
-  if(!stream_data->request_path) {
-    if(error_reply(session, stream_data) != 0) {
+  if (!stream_data->request_path) {
+    if (error_reply(session, stream_data) != 0) {
       return NGHTTP2_ERR_CALLBACK_FAILURE;
     }
     return 0;
   }
   fprintf(stderr, "%s GET %s\n", session_data->client_addr,
           stream_data->request_path);
-  if(!check_path(stream_data->request_path)) {
-    if(error_reply(session, stream_data) != 0) {
+  if (!check_path(stream_data->request_path)) {
+    if (error_reply(session, stream_data) != 0) {
       return NGHTTP2_ERR_CALLBACK_FAILURE;
     }
     return 0;
   }
-  for(rel_path = stream_data->request_path; *rel_path == '/'; ++rel_path);
+  for (rel_path = stream_data->request_path; *rel_path == '/'; ++rel_path)
+    ;
   fd = open(rel_path, O_RDONLY);
-  if(fd == -1) {
-    if(error_reply(session, stream_data) != 0) {
+  if (fd == -1) {
+    if (error_reply(session, stream_data) != 0) {
       return NGHTTP2_ERR_CALLBACK_FAILURE;
     }
     return 0;
   }
   stream_data->fd = fd;
 
-  if(send_response(session, stream_data->stream_id, hdrs,
-                   ARRLEN(hdrs), fd) != 0) {
+  if (send_response(session, stream_data->stream_id, hdrs, ARRLEN(hdrs), fd) !=
+      0) {
     close(fd);
     return NGHTTP2_ERR_CALLBACK_FAILURE;
   }
@@ -495,20 +498,19 @@ static int on_request_recv(nghttp2_session *session,
 }
 
 static int on_frame_recv_callback(nghttp2_session *session,
-                                  const nghttp2_frame *frame, void *user_data)
-{
-  http2_session_data *session_data = (http2_session_data*)user_data;
+                                  const nghttp2_frame *frame, void *user_data) {
+  http2_session_data *session_data = (http2_session_data *)user_data;
   http2_stream_data *stream_data;
-  switch(frame->hd.type) {
+  switch (frame->hd.type) {
   case NGHTTP2_DATA:
   case NGHTTP2_HEADERS:
     /* Check that the client request has finished */
-    if(frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
-      stream_data = nghttp2_session_get_stream_user_data(session,
-                                                         frame->hd.stream_id);
+    if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
+      stream_data =
+          nghttp2_session_get_stream_user_data(session, frame->hd.stream_id);
       /* For DATA and HEADERS frame, this callback may be called after
          on_stream_close_callback. Check that stream still alive. */
-      if(!stream_data) {
+      if (!stream_data) {
         return 0;
       }
       return on_request_recv(session, session_data, stream_data);
@@ -520,44 +522,63 @@ static int on_frame_recv_callback(nghttp2_session *session,
   return 0;
 }
 
-static int on_stream_close_callback(nghttp2_session *session,
-                                    int32_t stream_id,
-                                    nghttp2_error_code error_code,
-                                    void *user_data)
-{
-  http2_session_data *session_data = (http2_session_data*)user_data;
+static int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
+                                    uint32_t error_code _U_, void *user_data) {
+  http2_session_data *session_data = (http2_session_data *)user_data;
   http2_stream_data *stream_data;
 
   stream_data = nghttp2_session_get_stream_user_data(session, stream_id);
+  if (!stream_data) {
+    return 0;
+  }
   remove_stream(session_data, stream_data);
   delete_http2_stream_data(stream_data);
   return 0;
 }
 
-static void initialize_nghttp2_session(http2_session_data *session_data)
-{
-  nghttp2_session_callbacks callbacks = {0};
+static void initialize_nghttp2_session(http2_session_data *session_data) {
+  nghttp2_option *option;
+  nghttp2_session_callbacks *callbacks;
 
-  callbacks.send_callback = send_callback;
-  callbacks.on_frame_recv_callback = on_frame_recv_callback;
-  callbacks.on_stream_close_callback = on_stream_close_callback;
-  callbacks.on_header_callback = on_header_callback;
-  callbacks.on_begin_headers_callback = on_begin_headers_callback;
-  nghttp2_session_server_new(&session_data->session, &callbacks, session_data);
+  nghttp2_option_new(&option);
+
+  /* Tells nghttp2_session object that it handles client connection
+     preface */
+  nghttp2_option_set_recv_client_preface(option, 1);
+
+  nghttp2_session_callbacks_new(&callbacks);
+
+  nghttp2_session_callbacks_set_send_callback(callbacks, send_callback);
+
+  nghttp2_session_callbacks_set_on_frame_recv_callback(callbacks,
+                                                       on_frame_recv_callback);
+
+  nghttp2_session_callbacks_set_on_stream_close_callback(
+      callbacks, on_stream_close_callback);
+
+  nghttp2_session_callbacks_set_on_header_callback(callbacks,
+                                                   on_header_callback);
+
+  nghttp2_session_callbacks_set_on_begin_headers_callback(
+      callbacks, on_begin_headers_callback);
+
+  nghttp2_session_server_new2(&session_data->session, callbacks, session_data,
+                              option);
+
+  nghttp2_session_callbacks_del(callbacks);
+  nghttp2_option_del(option);
 }
 
-/* Send HTTP/2.0 client connection header, which includes 24 bytes
+/* Send HTTP/2 client connection header, which includes 24 bytes
    magic octets and SETTINGS frame */
-static int send_server_connection_header(http2_session_data *session_data)
-{
+static int send_server_connection_header(http2_session_data *session_data) {
   nghttp2_settings_entry iv[1] = {
-    { NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100 }
-  };
+      {NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100}};
   int rv;
 
-  rv = nghttp2_submit_settings(session_data->session, NGHTTP2_FLAG_NONE,
-                               iv, ARRLEN(iv));
-  if(rv != 0) {
+  rv = nghttp2_submit_settings(session_data->session, NGHTTP2_FLAG_NONE, iv,
+                               ARRLEN(iv));
+  if (rv != 0) {
     warnx("Fatal error: %s", nghttp2_strerror(rv));
     return -1;
   }
@@ -566,10 +587,9 @@ static int send_server_connection_header(http2_session_data *session_data)
 
 /* readcb for bufferevent after client connection header was
    checked. */
-static void readcb(struct bufferevent *bev, void *ptr)
-{
-  http2_session_data *session_data = (http2_session_data*)ptr;
-  if(session_recv(session_data) != 0) {
+static void readcb(struct bufferevent *bev _U_, void *ptr) {
+  http2_session_data *session_data = (http2_session_data *)ptr;
+  if (session_recv(session_data) != 0) {
     delete_http2_session_data(session_data);
     return;
   }
@@ -583,88 +603,60 @@ static void readcb(struct bufferevent *bev, void *ptr)
    process pending data in the output buffer. This is necessary
    because we have a threshold on the buffer size to avoid too much
    buffering. See send_callback(). */
-static void writecb(struct bufferevent *bev, void *ptr)
-{
-  http2_session_data *session_data = (http2_session_data*)ptr;
-  if(evbuffer_get_length(bufferevent_get_output(bev)) > 0) {
+static void writecb(struct bufferevent *bev, void *ptr) {
+  http2_session_data *session_data = (http2_session_data *)ptr;
+  if (evbuffer_get_length(bufferevent_get_output(bev)) > 0) {
     return;
   }
-  if(nghttp2_session_want_read(session_data->session) == 0 &&
-     nghttp2_session_want_write(session_data->session) == 0) {
+  if (nghttp2_session_want_read(session_data->session) == 0 &&
+      nghttp2_session_want_write(session_data->session) == 0) {
     delete_http2_session_data(session_data);
     return;
   }
-  if(session_send(session_data) != 0) {
+  if (session_send(session_data) != 0) {
     delete_http2_session_data(session_data);
     return;
   }
 }
 
 /* eventcb for bufferevent */
-static void eventcb(struct bufferevent *bev, short events, void *ptr)
-{
-  http2_session_data *session_data = (http2_session_data*)ptr;
-  if(events & BEV_EVENT_CONNECTED) {
+static void eventcb(struct bufferevent *bev _U_, short events, void *ptr) {
+  http2_session_data *session_data = (http2_session_data *)ptr;
+  if (events & BEV_EVENT_CONNECTED) {
     fprintf(stderr, "%s connected\n", session_data->client_addr);
+
+    initialize_nghttp2_session(session_data);
+
+    if (send_server_connection_header(session_data) != 0) {
+      delete_http2_session_data(session_data);
+      return;
+    }
+
     return;
   }
-  if(events & BEV_EVENT_EOF) {
+  if (events & BEV_EVENT_EOF) {
     fprintf(stderr, "%s EOF\n", session_data->client_addr);
-  } else if(events & BEV_EVENT_ERROR) {
+  } else if (events & BEV_EVENT_ERROR) {
     fprintf(stderr, "%s network error\n", session_data->client_addr);
-  } else if(events & BEV_EVENT_TIMEOUT) {
+  } else if (events & BEV_EVENT_TIMEOUT) {
     fprintf(stderr, "%s timeout\n", session_data->client_addr);
   }
   delete_http2_session_data(session_data);
 }
 
-/* readcb for bufferevent to check first 24 bytes client connection
-   header. */
-static void handshake_readcb(struct bufferevent *bev, void *ptr)
-{
-  http2_session_data *session_data = (http2_session_data*)ptr;
-  uint8_t data[24];
-  struct evbuffer *input = bufferevent_get_input(session_data->bev);
-  int readlen = evbuffer_remove(input, data, session_data->handshake_leftlen);
-  const char *conhead = NGHTTP2_CLIENT_CONNECTION_HEADER;
-
-  if(memcmp(conhead + NGHTTP2_CLIENT_CONNECTION_HEADER_LEN
-            - session_data->handshake_leftlen, data, readlen) != 0) {
-    delete_http2_session_data(session_data);
-    return;
-  }
-  session_data->handshake_leftlen -= readlen;
-  if(session_data->handshake_leftlen == 0) {
-    bufferevent_setcb(session_data->bev, readcb, writecb, eventcb, ptr);
-    /* Process pending data in buffer since they are not notified
-       further */
-    initialize_nghttp2_session(session_data);
-    if(send_server_connection_header(session_data) != 0) {
-      delete_http2_session_data(session_data);
-      return;
-    }
-    if(session_recv(session_data) != 0) {
-      delete_http2_session_data(session_data);
-      return;
-    }
-  }
-}
-
 /* callback for evconnlistener */
-static void acceptcb(struct evconnlistener *listener, int fd,
-                     struct sockaddr *addr, int addrlen, void *arg)
-{
-  app_context *app_ctx = (app_context*)arg;
+static void acceptcb(struct evconnlistener *listener _U_, int fd,
+                     struct sockaddr *addr, int addrlen, void *arg) {
+  app_context *app_ctx = (app_context *)arg;
   http2_session_data *session_data;
 
   session_data = create_http2_session_data(app_ctx, fd, addr, addrlen);
-  bufferevent_setcb(session_data->bev, handshake_readcb, NULL, eventcb,
-                    session_data);
+
+  bufferevent_setcb(session_data->bev, readcb, writecb, eventcb, session_data);
 }
 
 static void start_listen(struct event_base *evbase, const char *service,
-                         app_context *app_ctx)
-{
+                         app_context *app_ctx) {
   int rv;
   struct addrinfo hints;
   struct addrinfo *res, *rp;
@@ -675,19 +667,20 @@ static void start_listen(struct event_base *evbase, const char *service,
   hints.ai_flags = AI_PASSIVE;
 #ifdef AI_ADDRCONFIG
   hints.ai_flags |= AI_ADDRCONFIG;
-#endif // AI_ADDRCONFIG
+#endif /* AI_ADDRCONFIG */
 
   rv = getaddrinfo(NULL, service, &hints, &res);
-  if(rv != 0) {
+  if (rv != 0) {
     errx(1, NULL);
   }
-  for(rp = res; rp; rp = rp->ai_next) {
+  for (rp = res; rp; rp = rp->ai_next) {
     struct evconnlistener *listener;
-    listener = evconnlistener_new_bind(evbase, acceptcb, app_ctx,
-                                       LEV_OPT_CLOSE_ON_FREE |
-                                       LEV_OPT_REUSEABLE, 16,
-                                       rp->ai_addr, rp->ai_addrlen);
-    if(listener) {
+    listener = evconnlistener_new_bind(
+        evbase, acceptcb, app_ctx, LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE,
+        16, rp->ai_addr, rp->ai_addrlen);
+    if (listener) {
+      freeaddrinfo(res);
+
       return;
     }
   }
@@ -695,16 +688,14 @@ static void start_listen(struct event_base *evbase, const char *service,
 }
 
 static void initialize_app_context(app_context *app_ctx, SSL_CTX *ssl_ctx,
-                                   struct event_base *evbase)
-{
+                                   struct event_base *evbase) {
   memset(app_ctx, 0, sizeof(app_context));
   app_ctx->ssl_ctx = ssl_ctx;
   app_ctx->evbase = evbase;
 }
 
-static void run(const char *service,
-                const char *key_file, const char *cert_file)
-{
+static void run(const char *service, const char *key_file,
+                const char *cert_file) {
   SSL_CTX *ssl_ctx;
   app_context app_ctx;
   struct event_base *evbase;
@@ -720,11 +711,10 @@ static void run(const char *service,
   SSL_CTX_free(ssl_ctx);
 }
 
-int main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
   struct sigaction act;
 
-  if(argc < 4) {
+  if (argc < 4) {
     fprintf(stderr, "Usage: libevent-server PORT KEY_FILE CERT_FILE\n");
     exit(EXIT_FAILURE);
   }
@@ -733,6 +723,8 @@ int main(int argc, char **argv)
   act.sa_handler = SIG_IGN;
   sigaction(SIGPIPE, &act, NULL);
 
+  OPENSSL_config(NULL);
+  OpenSSL_add_all_algorithms();
   SSL_load_error_strings();
   SSL_library_init();
 

gendowncasetbl.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+import sys
+
+def name(i):
+    if i < 0x20:
+        return \
+            ['NUL ', 'SOH ', 'STX ', 'ETX ', 'EOT ', 'ENQ ', 'ACK ', 'BEL ',
+             'BS  ', 'HT  ', 'LF  ', 'VT  ', 'FF  ', 'CR  ', 'SO  ', 'SI  ',
+             'DLE ', 'DC1 ', 'DC2 ', 'DC3 ', 'DC4 ', 'NAK ', 'SYN ', 'ETB ',
+             'CAN ', 'EM  ', 'SUB ', 'ESC ', 'FS  ', 'GS  ', 'RS  ', 'US  '][i]
+    elif i == 0x7f:
+        return 'DEL '
+
+for i in range(256):
+    if chr(i) == ' ':
+        sys.stdout.write('{} /* SPC  */, '.format(i))
+    elif chr(i) == '\t':
+        sys.stdout.write('{} /* HT   */, '.format(i))
+    elif 'A' <= chr(i) and chr(i) <= 'Z':
+        sys.stdout.write('{} /* {}    */, '.format(i - ord('A') + ord('a'), chr(i)))
+    elif (0x21 <= i and i < 0x7f):
+        sys.stdout.write('{} /* {}    */, '.format(i, chr(i)))
+    elif 0x80 <= i:
+        sys.stdout.write('{} /* {} */, '.format(i, hex(i)))
+    elif 0 == i:
+        sys.stdout.write('{} /* NUL  */, '.format(i))
+    else:
+        sys.stdout.write('{} /* {} */, '.format(i, name(i)))
+    if (i + 1)%4 == 0:
+        sys.stdout.write('\n')

genheaderfunc.py

@@ -0,0 +1,97 @@
+#!/usr/bin/env python
+
+HEADERS = [
+    ':authority',
+    ':method',
+    ':path',
+    ':scheme',
+    ':status',
+    ':host', # for spdy
+    'expect',
+    'host',
+    'if-modified-since',
+    "te",
+    "cookie",
+    "http2-settings",
+    "server",
+    "via",
+    "x-forwarded-for",
+    "x-forwarded-proto",
+    "alt-svc",
+    "content-length",
+    "location",
+    # disallowed h1 headers
+    'connection',
+    'keep-alive',
+    'proxy-connection',
+    'transfer-encoding',
+    'upgrade'
+]
+
+def to_enum_hd(k):
+    res = 'HD_'
+    for c in k.upper():
+        if c == ':' or c == '-':
+            res += '_'
+            continue
+        res += c
+    return res
+
+def build_header(headers):
+    res = {}
+    for k in headers:
+        size = len(k)
+        if size not in res:
+            res[size] = {}
+        ent = res[size]
+        c = k[-1]
+        if c not in ent:
+            ent[c] = []
+        ent[c].append(k)
+
+    return res
+
+def gen_enum():
+    print '''\
+enum {'''
+    for k in sorted(HEADERS):
+        print '''\
+  {},'''.format(to_enum_hd(k))
+    print '''\
+  HD_MAXIDX,
+};'''
+
+def gen_index_header():
+    print '''\
+int lookup_token(const uint8_t *name, size_t namelen) {
+  switch (namelen) {'''
+    b = build_header(HEADERS)
+    for size in sorted(b.keys()):
+        ents = b[size]
+        print '''\
+  case {}:'''.format(size)
+        print '''\
+    switch (name[namelen - 1]) {'''
+        for c in sorted(ents.keys()):
+            headers = sorted(ents[c])
+            print '''\
+    case '{}':'''.format(c)
+            for k in headers:
+                print '''\
+      if (util::streq("{}", name, {})) {{
+        return {};
+      }}'''.format(k[:-1], size - 1, to_enum_hd(k))
+            print '''\
+      break;'''
+        print '''\
+    }
+    break;'''
+    print '''\
+  }
+  return -1;
+}'''
+
+if __name__ == '__main__':
+    gen_enum()
+    print ''
+    gen_index_header()

git-clang-format

@@ -0,0 +1,484 @@
+#!/usr/bin/env python
+#
+#===- git-clang-format - ClangFormat Git Integration ---------*- python -*--===#
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+#===------------------------------------------------------------------------===#
+
+r"""                                                                             
+clang-format git integration                                                     
+============================                                                     
+                                                                                 
+This file provides a clang-format integration for git. Put it somewhere in your  
+path and ensure that it is executable. Then, "git clang-format" will invoke      
+clang-format on the changes in current files or a specific commit.               
+                                                                                 
+For further details, run:                                                        
+git clang-format -h                                                              
+                                                                                 
+Requires Python 2.7                                                              
+"""               
+
+import argparse
+import collections
+import contextlib
+import errno
+import os
+import re
+import subprocess
+import sys
+
+usage = 'git clang-format [OPTIONS] [<commit>] [--] [<file>...]'
+
+desc = '''
+Run clang-format on all lines that differ between the working directory
+and <commit>, which defaults to HEAD.  Changes are only applied to the working
+directory.
+
+The following git-config settings set the default of the corresponding option:
+  clangFormat.binary
+  clangFormat.commit
+  clangFormat.extension
+  clangFormat.style
+'''
+
+# Name of the temporary index file in which save the output of clang-format.
+# This file is created within the .git directory.
+temp_index_basename = 'clang-format-index'
+
+
+Range = collections.namedtuple('Range', 'start, count')
+
+
+def main():
+  config = load_git_config()
+
+  # In order to keep '--' yet allow options after positionals, we need to
+  # check for '--' ourselves.  (Setting nargs='*' throws away the '--', while
+  # nargs=argparse.REMAINDER disallows options after positionals.)
+  argv = sys.argv[1:]
+  try:
+    idx = argv.index('--')
+  except ValueError:
+    dash_dash = []
+  else:
+    dash_dash = argv[idx:]
+    argv = argv[:idx]
+
+  default_extensions = ','.join([
+      # From clang/lib/Frontend/FrontendOptions.cpp, all lower case
+      'c', 'h',  # C
+      'm',  # ObjC
+      'mm',  # ObjC++
+      'cc', 'cp', 'cpp', 'c++', 'cxx', 'hpp',  # C++
+      # Other languages that clang-format supports
+      'proto', 'protodevel',  # Protocol Buffers
+      'js',  # JavaScript
+      ])
+
+  p = argparse.ArgumentParser(
+    usage=usage, formatter_class=argparse.RawDescriptionHelpFormatter,
+    description=desc)
+  p.add_argument('--binary',
+                 default=config.get('clangformat.binary', 'clang-format'),
+                 help='path to clang-format'),
+  p.add_argument('--commit',
+                 default=config.get('clangformat.commit', 'HEAD'),
+                 help='default commit to use if none is specified'),
+  p.add_argument('--diff', action='store_true',
+                 help='print a diff instead of applying the changes')
+  p.add_argument('--extensions',
+                 default=config.get('clangformat.extensions',
+                                    default_extensions),
+                 help=('comma-separated list of file extensions to format, '
+                       'excluding the period and case-insensitive')),
+  p.add_argument('-f', '--force', action='store_true',
+                 help='allow changes to unstaged files')
+  p.add_argument('-p', '--patch', action='store_true',
+                 help='select hunks interactively')
+  p.add_argument('-q', '--quiet', action='count', default=0,
+                 help='print less information')
+  p.add_argument('--style',
+                 default=config.get('clangformat.style', None),
+                 help='passed to clang-format'),
+  p.add_argument('-v', '--verbose', action='count', default=0,
+                 help='print extra information')
+  # We gather all the remaining positional arguments into 'args' since we need
+  # to use some heuristics to determine whether or not <commit> was present.
+  # However, to print pretty messages, we make use of metavar and help.
+  p.add_argument('args', nargs='*', metavar='<commit>',
+                 help='revision from which to compute the diff')
+  p.add_argument('ignored', nargs='*', metavar='<file>...',
+                 help='if specified, only consider differences in these files')
+  opts = p.parse_args(argv)
+
+  opts.verbose -= opts.quiet
+  del opts.quiet
+
+  commit, files = interpret_args(opts.args, dash_dash, opts.commit)
+  changed_lines = compute_diff_and_extract_lines(commit, files)
+  if opts.verbose >= 1:
+    ignored_files = set(changed_lines)
+  filter_by_extension(changed_lines, opts.extensions.lower().split(','))
+  if opts.verbose >= 1:
+    ignored_files.difference_update(changed_lines)
+    if ignored_files:
+      print 'Ignoring changes in the following files (wrong extension):'
+      for filename in ignored_files:
+        print '   ', filename
+    if changed_lines:
+      print 'Running clang-format on the following files:'
+      for filename in changed_lines:
+        print '   ', filename
+  if not changed_lines:
+    print 'no modified files to format'
+    return
+  # The computed diff outputs absolute paths, so we must cd before accessing
+  # those files.
+  cd_to_toplevel()
+  old_tree = create_tree_from_workdir(changed_lines)
+  new_tree = run_clang_format_and_save_to_tree(changed_lines,
+                                               binary=opts.binary,
+                                               style=opts.style)
+  if opts.verbose >= 1:
+    print 'old tree:', old_tree
+    print 'new tree:', new_tree
+  if old_tree == new_tree:
+    if opts.verbose >= 0:
+      print 'clang-format did not modify any files'
+  elif opts.diff:
+    print_diff(old_tree, new_tree)
+  else:
+    changed_files = apply_changes(old_tree, new_tree, force=opts.force,
+                                  patch_mode=opts.patch)
+    if (opts.verbose >= 0 and not opts.patch) or opts.verbose >= 1:
+      print 'changed files:'
+      for filename in changed_files:
+        print '   ', filename
+
+
+def load_git_config(non_string_options=None):
+  """Return the git configuration as a dictionary.
+
+  All options are assumed to be strings unless in `non_string_options`, in which
+  is a dictionary mapping option name (in lower case) to either "--bool" or
+  "--int"."""
+  if non_string_options is None:
+    non_string_options = {}
+  out = {}
+  for entry in run('git', 'config', '--list', '--null').split('\0'):
+    if entry:
+      name, value = entry.split('\n', 1)
+      if name in non_string_options:
+        value = run('git', 'config', non_string_options[name], name)
+      out[name] = value
+  return out
+
+
+def interpret_args(args, dash_dash, default_commit):
+  """Interpret `args` as "[commit] [--] [files...]" and return (commit, files).
+
+  It is assumed that "--" and everything that follows has been removed from
+  args and placed in `dash_dash`.
+
+  If "--" is present (i.e., `dash_dash` is non-empty), the argument to its
+  left (if present) is taken as commit.  Otherwise, the first argument is
+  checked if it is a commit or a file.  If commit is not given,
+  `default_commit` is used."""
+  if dash_dash:
+    if len(args) == 0:
+      commit = default_commit
+    elif len(args) > 1:
+      die('at most one commit allowed; %d given' % len(args))
+    else:
+      commit = args[0]
+    object_type = get_object_type(commit)
+    if object_type not in ('commit', 'tag'):
+      if object_type is None:
+        die("'%s' is not a commit" % commit)
+      else:
+        die("'%s' is a %s, but a commit was expected" % (commit, object_type))
+    files = dash_dash[1:]
+  elif args:
+    if disambiguate_revision(args[0]):
+      commit = args[0]
+      files = args[1:]
+    else:
+      commit = default_commit
+      files = args
+  else:
+    commit = default_commit
+    files = []
+  return commit, files
+
+
+def disambiguate_revision(value):
+  """Returns True if `value` is a revision, False if it is a file, or dies."""
+  # If `value` is ambiguous (neither a commit nor a file), the following
+  # command will die with an appropriate error message.
+  run('git', 'rev-parse', value, verbose=False)
+  object_type = get_object_type(value)
+  if object_type is None:
+    return False
+  if object_type in ('commit', 'tag'):
+    return True
+  die('`%s` is a %s, but a commit or filename was expected' %
+      (value, object_type))
+
+
+def get_object_type(value):
+  """Returns a string description of an object's type, or None if it is not
+  a valid git object."""
+  cmd = ['git', 'cat-file', '-t', value]
+  p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+  stdout, stderr = p.communicate()
+  if p.returncode != 0:
+    return None
+  return stdout.strip()
+
+
+def compute_diff_and_extract_lines(commit, files):
+  """Calls compute_diff() followed by extract_lines()."""
+  diff_process = compute_diff(commit, files)
+  changed_lines = extract_lines(diff_process.stdout)
+  diff_process.stdout.close()
+  diff_process.wait()
+  if diff_process.returncode != 0:
+    # Assume error was already printed to stderr.
+    sys.exit(2)
+  return changed_lines
+
+
+def compute_diff(commit, files):
+  """Return a subprocess object producing the diff from `commit`.
+
+  The return value's `stdin` file object will produce a patch with the
+  differences between the working directory and `commit`, filtered on `files`
+  (if non-empty).  Zero context lines are used in the patch."""
+  cmd = ['git', 'diff-index', '-p', '-U0', commit, '--']
+  cmd.extend(files)
+  p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+  p.stdin.close()
+  return p
+
+
+def extract_lines(patch_file):
+  """Extract the changed lines in `patch_file`.
+
+  The return value is a dictionary mapping filename to a list of (start_line,
+  line_count) pairs.
+
+  The input must have been produced with ``-U0``, meaning unidiff format with
+  zero lines of context.  The return value is a dict mapping filename to a
+  list of line `Range`s."""
+  matches = {}
+  for line in patch_file:
+    match = re.search(r'^\+\+\+\ [^/]+/(.*)', line)
+    if match:
+      filename = match.group(1).rstrip('\r\n')
+    match = re.search(r'^@@ -[0-9,]+ \+(\d+)(,(\d+))?', line)
+    if match:
+      start_line = int(match.group(1))
+      line_count = 1
+      if match.group(3):
+        line_count = int(match.group(3))
+      if line_count > 0:
+        matches.setdefault(filename, []).append(Range(start_line, line_count))
+  return matches
+
+
+def filter_by_extension(dictionary, allowed_extensions):
+  """Delete every key in `dictionary` that doesn't have an allowed extension.
+
+  `allowed_extensions` must be a collection of lowercase file extensions,
+  excluding the period."""
+  allowed_extensions = frozenset(allowed_extensions)
+  for filename in dictionary.keys():
+    base_ext = filename.rsplit('.', 1)
+    if len(base_ext) == 1 or base_ext[1].lower() not in allowed_extensions:
+      del dictionary[filename]
+
+
+def cd_to_toplevel():
+  """Change to the top level of the git repository."""
+  toplevel = run('git', 'rev-parse', '--show-toplevel')
+  os.chdir(toplevel)
+
+
+def create_tree_from_workdir(filenames):
+  """Create a new git tree with the given files from the working directory.
+
+  Returns the object ID (SHA-1) of the created tree."""
+  return create_tree(filenames, '--stdin')
+
+
+def run_clang_format_and_save_to_tree(changed_lines, binary='clang-format',
+                                      style=None):
+  """Run clang-format on each file and save the result to a git tree.
+
+  Returns the object ID (SHA-1) of the created tree."""
+  def index_info_generator():
+    for filename, line_ranges in changed_lines.iteritems():
+      mode = oct(os.stat(filename).st_mode)
+      blob_id = clang_format_to_blob(filename, line_ranges, binary=binary,
+                                     style=style)
+      yield '%s %s\t%s' % (mode, blob_id, filename)
+  return create_tree(index_info_generator(), '--index-info')
+
+
+def create_tree(input_lines, mode):
+  """Create a tree object from the given input.
+
+  If mode is '--stdin', it must be a list of filenames.  If mode is
+  '--index-info' is must be a list of values suitable for "git update-index
+  --index-info", such as "<mode> <SP> <sha1> <TAB> <filename>".  Any other mode
+  is invalid."""
+  assert mode in ('--stdin', '--index-info')
+  cmd = ['git', 'update-index', '--add', '-z', mode]
+  with temporary_index_file():
+    p = subprocess.Popen(cmd, stdin=subprocess.PIPE)
+    for line in input_lines:
+      p.stdin.write('%s\0' % line)
+    p.stdin.close()
+    if p.wait() != 0:
+      die('`%s` failed' % ' '.join(cmd))
+    tree_id = run('git', 'write-tree')
+    return tree_id
+
+
+def clang_format_to_blob(filename, line_ranges, binary='clang-format',
+                         style=None):
+  """Run clang-format on the given file and save the result to a git blob.
+
+  Returns the object ID (SHA-1) of the created blob."""
+  clang_format_cmd = [binary, filename]
+  if style:
+    clang_format_cmd.extend(['-style='+style])
+  clang_format_cmd.extend([
+      '-lines=%s:%s' % (start_line, start_line+line_count-1)
+      for start_line, line_count in line_ranges])
+  try:
+    clang_format = subprocess.Popen(clang_format_cmd, stdin=subprocess.PIPE,
+                                    stdout=subprocess.PIPE)
+  except OSError as e:
+    if e.errno == errno.ENOENT:
+      die('cannot find executable "%s"' % binary)
+    else:
+      raise
+  clang_format.stdin.close()
+  hash_object_cmd = ['git', 'hash-object', '-w', '--path='+filename, '--stdin']
+  hash_object = subprocess.Popen(hash_object_cmd, stdin=clang_format.stdout,
+                                 stdout=subprocess.PIPE)
+  clang_format.stdout.close()
+  stdout = hash_object.communicate()[0]
+  if hash_object.returncode != 0:
+    die('`%s` failed' % ' '.join(hash_object_cmd))
+  if clang_format.wait() != 0:
+    die('`%s` failed' % ' '.join(clang_format_cmd))
+  return stdout.rstrip('\r\n')
+
+
+@contextlib.contextmanager
+def temporary_index_file(tree=None):
+  """Context manager for setting GIT_INDEX_FILE to a temporary file and deleting
+  the file afterward."""
+  index_path = create_temporary_index(tree)
+  old_index_path = os.environ.get('GIT_INDEX_FILE')
+  os.environ['GIT_INDEX_FILE'] = index_path
+  try:
+    yield
+  finally:
+    if old_index_path is None:
+      del os.environ['GIT_INDEX_FILE']
+    else:
+      os.environ['GIT_INDEX_FILE'] = old_index_path
+    os.remove(index_path)
+
+
+def create_temporary_index(tree=None):
+  """Create a temporary index file and return the created file's path.
+
+  If `tree` is not None, use that as the tree to read in.  Otherwise, an
+  empty index is created."""
+  gitdir = run('git', 'rev-parse', '--git-dir')
+  path = os.path.join(gitdir, temp_index_basename)
+  if tree is None:
+    tree = '--empty'
+  run('git', 'read-tree', '--index-output='+path, tree)
+  return path
+
+
+def print_diff(old_tree, new_tree):
+  """Print the diff between the two trees to stdout."""
+  # We use the porcelain 'diff' and not plumbing 'diff-tree' because the output
+  # is expected to be viewed by the user, and only the former does nice things
+  # like color and pagination.
+  subprocess.check_call(['git', 'diff', old_tree, new_tree, '--'])
+
+
+def apply_changes(old_tree, new_tree, force=False, patch_mode=False):
+  """Apply the changes in `new_tree` to the working directory.
+
+  Bails if there are local changes in those files and not `force`.  If
+  `patch_mode`, runs `git checkout --patch` to select hunks interactively."""
+  changed_files = run('git', 'diff-tree', '-r', '-z', '--name-only', old_tree,
+                      new_tree).rstrip('\0').split('\0')
+  if not force:
+    unstaged_files = run('git', 'diff-files', '--name-status', *changed_files)
+    if unstaged_files:
+      print >>sys.stderr, ('The following files would be modified but '
+                           'have unstaged changes:')
+      print >>sys.stderr, unstaged_files
+      print >>sys.stderr, 'Please commit, stage, or stash them first.'
+      sys.exit(2)
+  if patch_mode:
+    # In patch mode, we could just as well create an index from the new tree
+    # and checkout from that, but then the user will be presented with a
+    # message saying "Discard ... from worktree".  Instead, we use the old
+    # tree as the index and checkout from new_tree, which gives the slightly
+    # better message, "Apply ... to index and worktree".  This is not quite
+    # right, since it won't be applied to the user's index, but oh well.
+    with temporary_index_file(old_tree):
+      subprocess.check_call(['git', 'checkout', '--patch', new_tree])
+    index_tree = old_tree
+  else:
+    with temporary_index_file(new_tree):
+      run('git', 'checkout-index', '-a', '-f')
+  return changed_files
+
+
+def run(*args, **kwargs):
+  stdin = kwargs.pop('stdin', '')
+  verbose = kwargs.pop('verbose', True)
+  strip = kwargs.pop('strip', True)
+  for name in kwargs:
+    raise TypeError("run() got an unexpected keyword argument '%s'" % name)
+  p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                       stdin=subprocess.PIPE)
+  stdout, stderr = p.communicate(input=stdin)
+  if p.returncode == 0:
+    if stderr:
+      if verbose:
+        print >>sys.stderr, '`%s` printed to stderr:' % ' '.join(args)
+      print >>sys.stderr, stderr.rstrip()
+    if strip:
+      stdout = stdout.rstrip('\r\n')
+    return stdout
+  if verbose:
+    print >>sys.stderr, '`%s` returned %s' % (' '.join(args), p.returncode)
+  if stderr:
+    print >>sys.stderr, stderr.rstrip()
+  sys.exit(2)
+
+
+def die(message):
+  print >>sys.stderr, 'error:', message
+  sys.exit(2)
+
+
+if __name__ == '__main__':
+  main()

help2rst.py

@@ -0,0 +1,178 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# script to produce rst file from program's help output.
+
+from __future__ import unicode_literals
+import sys
+import re
+import argparse
+
+arg_indent = ' ' * 21
+
+def help2man(infile):
+    # We assume that first line is usage line like this:
+    #
+    # Usage: nghttp [OPTIONS]... URI...
+    #
+    # The second line is description of the command.  Multiple lines
+    # are permitted.  The blank line signals the end of this section.
+    # After that, we parses positional and optional arguments.
+    #
+    # The positional argument is enclosed with < and >:
+    #
+    # <PRIVATE_KEY>
+    #
+    # We may describe default behavior without any options by encoding
+    # ( and ):
+    #
+    # (default mode)
+    #
+    # "Options:" is treated specially and produces "OPTIONS" section.
+    # We allow subsection under OPTIONS.  Lines not starting with (, <
+    # and Options: are treated as subsection name and produces section
+    # one level down:
+    #
+    # TLS/SSL:
+    #
+    # The above is an example of subsection.
+    #
+    # The description of arguments must be indented by len(arg_indent)
+    # characters.  The default value should be placed in separate line
+    # and should be start with "Default: " after indentation.
+
+    line = infile.readline().strip()
+    m = re.match(r'^Usage: (.*)', line)
+    if not m:
+        print 'usage line is invalid.  Expected following lines:'
+        print 'Usage: cmdname ...'
+        sys.exit(1)
+    synopsis = m.group(1).split(' ', 1)
+    if len(synopsis) == 2:
+        cmdname, args = synopsis
+    else:
+        cmdname, args = synopsis[0], ''
+
+    description = []
+    for line in infile:
+        line = line.strip()
+        if not line:
+            break
+        description.append(line)
+
+    print '''
+{cmdname}(1)
+{cmdnameunderline}
+
+SYNOPSIS
+--------
+
+**{cmdname}** {args}
+
+DESCRIPTION
+-----------
+
+{description}
+'''.format(cmdname=cmdname, args=args,
+           cmdnameunderline='=' * (len(cmdname) + 3),
+           synopsis=synopsis, description=format_text('\n'.join(description)))
+
+    in_arg = False
+
+    for line in infile:
+        line = line.rstrip()
+
+        if not line.strip() and in_arg:
+            print ''
+            continue
+        if line.startswith('   ') and in_arg:
+            if not line.startswith(arg_indent):
+                sys.stderr.write('warning: argument description is not indented correctly.  We need {} spaces as indentation.'.format(len(arg_indent)))
+            print '{}'.format(format_arg_text(line[len(arg_indent):]))
+            continue
+
+        if in_arg:
+            print ''
+            in_arg = False
+
+        if line == 'Options:':
+            print 'OPTIONS:'
+            print '--------'
+            print ''
+            continue
+
+        if line.startswith('  <'):
+            # positional argument
+            m = re.match(r'^(?:\s+)([a-zA-Z0-9-_<>]+)(.*)', line)
+            argname, rest = m.group(1), m.group(2)
+            print '.. describe:: {}'.format(argname)
+            print ''
+            print '{}'.format(format_arg_text(rest.strip()))
+            in_arg = True
+            continue
+
+        if line.startswith('  ('):
+            # positional argument
+            m = re.match(r'^(?:\s+)(\([a-zA-Z0-9-_<> ]+\))(.*)', line)
+            argname, rest = m.group(1), m.group(2)
+            print '.. describe:: {}'.format(argname)
+            print ''
+            print '{}'.format(format_arg_text(rest.strip()))
+            in_arg = True
+            continue
+
+        if line.startswith('  -'):
+            # optional argument
+            m = re.match(
+                r'^(?:\s+)(-\S+?(?:, -\S+?)*)($| .*)',
+                line)
+            argname, rest = m.group(1), m.group(2)
+            print '.. option:: {}'.format(argname)
+            print ''
+            rest = rest.strip()
+            if len(rest):
+                print '{}'.format(format_arg_text(rest))
+            in_arg = True
+            continue
+
+        if not line.startswith(' ') and line.endswith(':'):
+            # subsection
+            subsec = line.strip()
+            print '{}'.format(subsec)
+            print '{}'.format('~' * len(subsec))
+            print ''
+            continue
+
+        print line.strip()
+
+def format_text(text):
+    # escape *
+    if len(text) > len(arg_indent):
+        text = text[:len(arg_indent) + 1] + re.sub(r'\*', r'\*', text[len(arg_indent) + 1:])
+    else:
+        text = re.sub(r'\*', r'\*', text)
+    # markup option reference
+    text = re.sub(r'(^|\s)(-[a-zA-Z0-9-]+)', r'\1:option:`\2`', text)
+    # sphinx does not like markup like ':option:`-f`='.  We need
+    # backslash between ` and =.
+    text = re.sub(r'(:option:`.*?`)(\S)', r'\1\\\2', text)
+    # file path should be italic
+    text = re.sub(r'(^|\s|\'|")(/[^\s\'"]*)', r'\1*\2*', text)
+    return text
+
+def format_arg_text(text):
+    if text.strip().startswith('Default: '):
+        return '\n    ' + re.sub(r'^(\s*Default: )(.*)$', r'\1``\2``', text)
+    return '    {}'.format(format_text(text))
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(
+        description='Produces rst document from help output.')
+    parser.add_argument('-i', '--include', metavar='FILE',
+                        help='include content of <FILE> as verbatim.  It should be ReST formatted text.')
+    args = parser.parse_args()
+    help2man(sys.stdin)
+    if args.include:
+        print ''
+        with open(args.include) as f:
+            sys.stdout.write(f.read())

lib/Makefile.am

@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012, 2013 Tatsuhiro Tsujikawa
 
@@ -22,7 +22,9 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 SUBDIRS = includes
 
-AM_CFLAGS = -Wall
+EXTRA_DIST = Makefile.msvc
+
+AM_CFLAGS = $(WARNCFLAGS)
 AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes @DEFS@
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -32,21 +34,31 @@ DISTCLEANFILES = $(pkgconfig_DATA)
 lib_LTLIBRARIES = libnghttp2.la
 
 OBJECTS = nghttp2_pq.c nghttp2_map.c nghttp2_queue.c \
-	nghttp2_buffer.c nghttp2_frame.c \
+	nghttp2_frame.c \
+	nghttp2_buf.c \
 	nghttp2_stream.c nghttp2_outbound_item.c \
 	nghttp2_session.c nghttp2_submit.c \
 	nghttp2_helper.c \
-	nghttp2_npn.c nghttp2_gzip.c \
+	nghttp2_npn.c \
 	nghttp2_hd.c nghttp2_hd_huffman.c nghttp2_hd_huffman_data.c \
-	nghttp2_version.c
+	nghttp2_version.c \
+	nghttp2_priority_spec.c \
+	nghttp2_option.c \
+	nghttp2_callbacks.c \
+	nghttp2_mem.c
 
 HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
-	nghttp2_buffer.h nghttp2_frame.h \
+	nghttp2_frame.h \
+	nghttp2_buf.h \
 	nghttp2_session.h nghttp2_helper.h nghttp2_stream.h nghttp2_int.h \
-	nghttp2_npn.h nghttp2_gzip.h \
+	nghttp2_npn.h \
 	nghttp2_submit.h nghttp2_outbound_item.h \
 	nghttp2_net.h \
-	nghttp2_hd.h nghttp2_hd_huffman.h
+	nghttp2_hd.h nghttp2_hd_huffman.h \
+	nghttp2_priority_spec.h \
+	nghttp2_option.h \
+	nghttp2_callbacks.h \
+	nghttp2_mem.h
 
 libnghttp2_la_SOURCES = $(HFILES) $(OBJECTS)
 libnghttp2_la_LDFLAGS = -no-undefined \

lib/Makefile.msvc

@@ -0,0 +1,266 @@
+#
+# GNU Makefile for nghttp2 / MSVC.
+#
+# By G. Vanem <gvanem@yahoo.no> 2013
+# The MIT License apply.
+#
+
+#
+# Choose your weapons:
+#  Set 'ZLIB_ROOT' to the root of zlib.
+#  Set 'USE_CYTHON=1' to build and install the 'nghttp2.pyd' Python extension.
+#
+ZLIB_ROOT  = g:/MingW32/src/Compression/zlib-1.2.8
+USE_CYTHON = 1
+
+_VERSION   := $(shell grep AC_INIT ../configure.ac | cut -d'[' -f3 | sed -e 's/-DEV], //g')
+_VERSION   := $(subst ., ,$(_VERSION))
+VER_MAJOR   = $(word 1,$(_VERSION))
+VER_MINOR   = $(word 2,$(_VERSION))
+VER_MICRO   = $(word 3,$(_VERSION))
+VERSION     = $(VER_MAJOR).$(VER_MINOR).$(VER_MICRO)
+VERSION_NUM = ($(VER_MAJOR) << 16) + ($(VER_MINOR) << 8) + $(VER_MICRO)
+
+GENERATED   = 'Generated by $(realpath Makefile.MSVC)'
+
+#
+# Where to copy nghttp2.dll + lib + headers to.
+# Note: 'make install' is not in default targets. Do it explicitly.
+#
+VC_ROOT     = $(realpath $(VCINSTALLDIR))
+INSTALL_BIN = $(VC_ROOT)/bin
+INSTALL_LIB = $(VC_ROOT)/lib
+INSTALL_HDR = $(VC_ROOT)/include
+
+#
+# Build for DEBUG-model and RELEASE at the same time.
+#
+TARGETS = nghttp2.lib  nghttp2.dll  nghttp2_imp.lib \
+          nghttp2d.lib nghttp2d.dll nghttp2d_imp.lib
+
+EXT_LIBS = $(ZLIB_ROOT)/zlib.lib ws2_32.lib
+
+OBJ_DIR = MSVC_obj
+
+NGHTTP2_PDB_R = $(OBJ_DIR)/nghttp2.pdb
+NGHTTP2_PDB_D = $(OBJ_DIR)/nghttp2d.pdb
+
+CC       = cl
+CFLAGS   = -I./includes -I$(ZLIB_ROOT) -DHAVE_WINSOCK2_H -Dssize_t=long
+
+CFLAGS_R = -nologo -MD  -W3 -Zi -Fd./$(NGHTTP2_PDB_R)
+CFLAGS_D = -nologo -MDd -W3 -Zi -Fd./$(NGHTTP2_PDB_D) \
+           -Ot -D_DEBUG -GF -RTCs -RTCu # -RTCc -GS
+
+LDFLAGS = -nologo -machine:i386 -map -debug -incremental:no # -verbose
+
+NGHTTP2_SRC = nghttp2_buf.c             \
+              nghttp2_callbacks.c       \
+              nghttp2_frame.c           \
+              nghttp2_helper.c          \
+              nghttp2_hd.c              \
+              nghttp2_hd_huffman.c      \
+              nghttp2_hd_huffman_data.c \
+              nghttp2_map.c             \
+              nghttp2_npn.c             \
+              nghttp2_option.c          \
+              nghttp2_outbound_item.c   \
+              nghttp2_priority_spec.c   \
+              nghttp2_pq.c              \
+              nghttp2_queue.c           \
+              nghttp2_session.c         \
+              nghttp2_stream.c          \
+              nghttp2_submit.c          \
+              nghttp2_version.c
+
+NGHTTP2_OBJ_R = $(addprefix $(OBJ_DIR)/r_, $(notdir $(NGHTTP2_SRC:.c=.obj)))
+NGHTTP2_OBJ_D = $(addprefix $(OBJ_DIR)/d_, $(notdir $(NGHTTP2_SRC:.c=.obj)))
+
+all: intro $(OBJ_DIR) $(TARGETS)
+	@echo 'Welcome to NgHTTP2 (release + debug).'
+	@echo 'Do a "make -f Makefile.MSVC install" at own risk!'
+
+intro:
+	@echo 'Building NgHTTP (MSVC) ver. "$(VERSION)".'
+
+test_ver:
+	@echo '$$(VERSION):   "$(VERSION)".'
+	@echo '$$(_VERSION):  "$(_VERSION)".'
+	@echo '$$(VER_MAJOR): "$(VER_MAJOR)".'
+	@echo '$$(VER_MINOR): "$(VER_MINOR)".'
+	@echo '$$(VER_MICRO): "$(VER_MICRO)".'
+
+$(OBJ_DIR):
+	- mkdir $(OBJ_DIR)
+
+install: includes/nghttp2/nghttp2.h includes/nghttp2/nghttp2ver.h \
+         nghttp2.dll  nghttp2.lib  nghttp2_imp.lib \
+         nghttp2d.dll nghttp2d.lib nghttp2d_imp.lib \
+         copy_headers_and_libs install_nghttp2_pyd_$(USE_CYTHON)
+
+#
+# This MUST be done before using the 'install_nghttp2_pyd_1' rule.
+#
+copy_headers_and_libs:
+	- mkdir $(INSTALL_HDR)/nghttp2
+	cp --update $(addprefix includes/nghttp2/, nghttp2.h nghttp2ver.h)     $(INSTALL_HDR)/nghttp2
+	cp --update nghttp2.dll nghttp2d.dll $(NGHTTP2_PDB_R) $(NGHTTP2_PDB_D) $(INSTALL_BIN)
+	cp --update nghttp2.lib nghttp2d.lib nghttp2_imp.lib nghttp2d_imp.lib  $(INSTALL_LIB)
+	@echo
+
+nghttp2.lib: $(NGHTTP2_OBJ_R)
+	lib -nologo -out:$@ $^
+	@echo
+
+nghttp2d.lib: $(NGHTTP2_OBJ_D)
+	lib -nologo -out:$@ $^
+	@echo
+
+nghttp2.dll nghttp2_imp.lib: $(NGHTTP2_OBJ_R) $(OBJ_DIR)/r_nghttp2.res $(OBJ_DIR)/r_nghttp2.def
+	link $(LDFLAGS) -dll -out:nghttp2.dll -implib:nghttp2_imp.lib -def:$(OBJ_DIR)/r_nghttp2.def \
+	     $(NGHTTP2_OBJ_R) $(OBJ_DIR)/r_nghttp2.res $(EXT_LIBS)
+	@echo
+
+nghttp2d.dll nghttp2d_imp.lib: $(NGHTTP2_OBJ_D) $(OBJ_DIR)/d_nghttp2.res $(OBJ_DIR)/d_nghttp2.def
+	link $(LDFLAGS) -dll -out:nghttp2d.dll -implib:nghttp2d_imp.lib -def:$(OBJ_DIR)/d_nghttp2.def \
+	     $(NGHTTP2_OBJ_D) $(OBJ_DIR)/d_nghttp2.res $(EXT_LIBS)
+	@echo
+
+install_nghttp2_pyd_0: ;
+
+install_nghttp2_pyd_1: $(addprefix ../python/, setup.py.in nghttp2.pyx)
+	cd ../python ; \
+	echo '# $(GENERATED). DO NOT EDIT.' > setup.py ; \
+	sed -e 's/@top_srcdir@/../'   \
+	    -e 's/@top_builddir@/../' \
+	    -e 's/@PACKAGE_VERSION@/$(VERSION)/' setup.py.in >> setup.py ; \
+	cython -v nghttp2.pyx ; \
+	python setup.py install
+
+clean_nghttp2_pyd_0: ;
+
+clean_nghttp2_pyd_1:
+	cd ../python ; \
+	rm -f setup.py nghttp2.c ; \
+	rm -fR build/*
+
+$(OBJ_DIR)/r_%.obj: %.c
+	$(CC) $(CFLAGS_R) $(CFLAGS) -Fo$@ -c $<
+	@echo
+
+$(OBJ_DIR)/d_%.obj: %.c
+	$(CC) $(CFLAGS_D) $(CFLAGS) -Fo$@ -c $<
+	@echo
+
+$(OBJ_DIR)/r_nghttp2.res: nghttp2.rc
+	rc -nologo -D_RELEASE -Fo $@ $<
+	@echo
+
+$(OBJ_DIR)/d_nghttp2.res: nghttp2.rc
+	rc -nologo -D_DEBUG -Fo $@ $<
+	@echo
+
+includes/nghttp2/nghttp2ver.h: includes/nghttp2/nghttp2ver.h.in
+	sed < includes/nghttp2/nghttp2ver.h.in     \
+	     -e 's/@PACKAGE_VERSION@/$(VERSION)/g' \
+	     -e 's/@PACKAGE_VERSION_NUM@/($(VERSION_NUM))/g' > $@
+	touch --reference=includes/nghttp2/nghttp2ver.h.in $@
+
+
+define RES_FILE
+  #include <winver.h>
+
+  VS_VERSION_INFO VERSIONINFO
+    FILEVERSION    $(VER_MAJOR), $(VER_MINOR), $(VER_MICRO), 0
+    PRODUCTVERSION $(VER_MAJOR), $(VER_MINOR), $(VER_MICRO), 0
+    FILEFLAGSMASK  0x3fL
+    FILEOS         0x40004L
+    FILETYPE       0x2L
+    FILESUBTYPE    0x0L
+  #ifdef _DEBUG
+    #define        VER_STR  "$(VERSION).0 (MSVC debug)"
+    #define        DBG      "d"
+    FILEFLAGS      0x1L
+  #else
+    #define        VER_STR  "$(VERSION).0 (MSVC release)"
+    #define        DBG      ""
+    FILEFLAGS      0x0L
+  #endif
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+      BLOCK "040904b0"
+      BEGIN
+        VALUE "CompanyName",      "http://tatsuhiro-t.github.io/nghttp2/"
+        VALUE "FileDescription",  "nghttp2; HTTP/2 C library"
+        VALUE "FileVersion",      VER_STR
+        VALUE "InternalName",     "nghttp2" DBG
+        VALUE "LegalCopyright",   "The MIT License"
+        VALUE "LegalTrademarks",  ""
+        VALUE "OriginalFilename", "nghttp2" DBG ".dll"
+        VALUE "ProductName",      "NGHTTP2."
+        VALUE "ProductVersion",   VER_STR
+        VALUE "PrivateBuild",     "The privat build of <gvanem@yahoo.no>."
+        VALUE "SpecialBuild",     ""
+      END
+    END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x409, 1200
+  END
+  END
+endef
+
+export RES_FILE
+
+nghttp2.rc: Makefile.MSVC
+	@echo 'Generating $@...'
+	@echo ' /* $(GENERATED). DO NOT EDIT.' > $@
+	@echo '  */'                          >> $@
+	@echo "$$RES_FILE"                    >> $@
+
+$(OBJ_DIR)/r_nghttp2.def: Makefile.MSVC
+	@echo 'Generating $@...'
+	@echo '; $(GENERATED). DO NOT EDIT.' > $@
+	@echo ';'                           >> $@
+	@echo 'LIBRARY nghttp2.dll'         >> $@
+	@echo 'EXPORTS'                     >> $@
+	nm $(NGHTTP2_OBJ_R) | grep ' T .*_nghttp2' | sed 's/^.* _/  /' >> $@
+	@echo 'NGHTTP2_STATIC_TABLE_LENGTH DATA' >> $@
+
+$(OBJ_DIR)/d_nghttp2.def: Makefile.MSVC
+	@echo 'Generating $@...'
+	@echo '; $(GENERATED). DO NOT EDIT.' > $@
+	@echo ';'                           >> $@
+	@echo 'LIBRARY nghttp2d.dll'        >> $@
+	@echo 'EXPORTS'                     >> $@
+	nm $(NGHTTP2_OBJ_D) | grep ' T .*_nghttp2' | sed 's/^.* _/  /' >> $@
+	@echo 'NGHTTP2_STATIC_TABLE_LENGTH DATA' >> $@
+
+clean:
+	rm -f $(OBJ_DIR)/* nghttp2_imp.exp nghttp2_imp.exp \
+	      nghttp2.map nghttp2d.map nghttp2.rc includes/nghttp2/nghttp2ver.h
+	@echo
+
+vclean realclean: clean clean_nghttp2_pyd_$(USE_CYTHON)
+	rm -f $(TARGETS) nghttp2.pdb nghttp2d.pdb nghttp2_imp.exp nghttp2d_imp.exp .depend.MSVC
+	- rmdir $(OBJ_DIR)
+
+#
+# Use gcc to generated the dependencies. No MSVC specific args please!
+#
+REPLACE_R = 's/\(.*\)\.o: /\n$$(OBJ_DIR)\/r_\1.obj: /'
+REPLACE_D = 's/\(.*\)\.o: /\n$$(OBJ_DIR)\/d_\1.obj: /'
+
+depend: includes/nghttp2/nghttp2ver.h
+	@echo '# $(GENERATED). DO NOT EDIT.' > .depend.MSVC
+	gcc -MM $(CFLAGS) $(NGHTTP2_SRC)    >> .depend.tmp
+	@echo '#'                           >> .depend.MSVC
+	@echo '# Release lib objects:'      >> .depend.MSVC
+	sed -e $(REPLACE_R) .depend.tmp     >> .depend.MSVC
+	@echo '#'                           >> .depend.MSVC
+	@echo '# Debug lib objects:'        >> .depend.MSVC
+	sed -e $(REPLACE_D) .depend.tmp     >> .depend.MSVC
+	rm -f .depend.tmp
+
+-include .depend.MSVC

lib/includes/Makefile.am

@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
 

lib/includes/nghttp2/nghttp2ver.h.in

@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012, 2013 Tatsuhiro Tsujikawa
  *

lib/libnghttp2.pc.in

@@ -1,4 +1,4 @@
-# nghttp2 - HTTP/2.0 C Library
+# nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012, 2013 Tatsuhiro Tsujikawa
 
@@ -26,9 +26,8 @@ libdir=@libdir@
 includedir=@includedir@
 
 Name: libnghttp2
-Description: HTTP/2.0 C library
+Description: HTTP/2 C library
 URL: https://github.com/tatsuhiro-t/nghttp2
 Version: @VERSION@
 Libs: -L${libdir} -lnghttp2
-Libs.private: -lz
 Cflags: -I${includedir}

lib/nghttp2_buf.c

@@ -0,0 +1,484 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2014 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 "nghttp2_buf.h"
+
+#include <stdio.h>
+
+#include "nghttp2_helper.h"
+
+void nghttp2_buf_init(nghttp2_buf *buf) {
+  buf->begin = NULL;
+  buf->end = NULL;
+  buf->pos = NULL;
+  buf->last = NULL;
+  buf->mark = NULL;
+}
+
+int nghttp2_buf_init2(nghttp2_buf *buf, size_t initial, nghttp2_mem *mem) {
+  nghttp2_buf_init(buf);
+  return nghttp2_buf_reserve(buf, initial, mem);
+}
+
+void nghttp2_buf_free(nghttp2_buf *buf, nghttp2_mem *mem) {
+  if (buf == NULL) {
+    return;
+  }
+
+  nghttp2_mem_free(mem, buf->begin);
+  buf->begin = NULL;
+}
+
+int nghttp2_buf_reserve(nghttp2_buf *buf, size_t new_cap, nghttp2_mem *mem) {
+  uint8_t *ptr;
+  size_t cap;
+
+  cap = nghttp2_buf_cap(buf);
+
+  if (cap >= new_cap) {
+    return 0;
+  }
+
+  new_cap = nghttp2_max(new_cap, cap * 2);
+
+  ptr = nghttp2_mem_realloc(mem, buf->begin, new_cap);
+  if (ptr == NULL) {
+    return NGHTTP2_ERR_NOMEM;
+  }
+
+  buf->pos = ptr + (buf->pos - buf->begin);
+  buf->last = ptr + (buf->last - buf->begin);
+  buf->mark = ptr + (buf->mark - buf->begin);
+  buf->begin = ptr;
+  buf->end = ptr + new_cap;
+
+  return 0;
+}
+
+void nghttp2_buf_reset(nghttp2_buf *buf) {
+  buf->pos = buf->last = buf->mark = buf->begin;
+}
+
+void nghttp2_buf_wrap_init(nghttp2_buf *buf, uint8_t *begin, size_t len) {
+  buf->begin = buf->pos = buf->last = buf->mark = begin;
+  buf->end = begin + len;
+}
+
+static int buf_chain_new(nghttp2_buf_chain **chain, size_t chunk_length,
+                         nghttp2_mem *mem) {
+  int rv;
+
+  *chain = nghttp2_mem_malloc(mem, sizeof(nghttp2_buf_chain));
+  if (*chain == NULL) {
+    return NGHTTP2_ERR_NOMEM;
+  }
+
+  (*chain)->next = NULL;
+
+  rv = nghttp2_buf_init2(&(*chain)->buf, chunk_length, mem);
+  if (rv != 0) {
+    nghttp2_mem_free(mem, *chain);
+    return NGHTTP2_ERR_NOMEM;
+  }
+
+  return 0;
+}
+
+static void buf_chain_del(nghttp2_buf_chain *chain, nghttp2_mem *mem) {
+  nghttp2_buf_free(&chain->buf, mem);
+  nghttp2_mem_free(mem, chain);
+}
+
+int nghttp2_bufs_init(nghttp2_bufs *bufs, size_t chunk_length, size_t max_chunk,
+                      nghttp2_mem *mem) {
+  return nghttp2_bufs_init2(bufs, chunk_length, max_chunk, 0, mem);
+}
+
+int nghttp2_bufs_init2(nghttp2_bufs *bufs, size_t chunk_length,
+                       size_t max_chunk, size_t offset, nghttp2_mem *mem) {
+  return nghttp2_bufs_init3(bufs, chunk_length, max_chunk, max_chunk, offset,
+                            mem);
+}
+
+int nghttp2_bufs_init3(nghttp2_bufs *bufs, size_t chunk_length,
+                       size_t max_chunk, size_t chunk_keep, size_t offset,
+                       nghttp2_mem *mem) {
+  int rv;
+  nghttp2_buf_chain *chain;
+
+  if (chunk_keep == 0 || max_chunk < chunk_keep || chunk_length < offset) {
+    return NGHTTP2_ERR_INVALID_ARGUMENT;
+  }
+
+  rv = buf_chain_new(&chain, chunk_length, mem);
+  if (rv != 0) {
+    return rv;
+  }
+
+  bufs->mem = mem;
+  bufs->offset = offset;
+
+  bufs->head = chain;
+  bufs->cur = bufs->head;
+
+  nghttp2_buf_shift_right(&bufs->cur->buf, offset);
+
+  bufs->chunk_length = chunk_length;
+  bufs->chunk_used = 1;
+  bufs->max_chunk = max_chunk;
+  bufs->chunk_keep = chunk_keep;
+
+  return 0;
+}
+
+int nghttp2_bufs_realloc(nghttp2_bufs *bufs, size_t chunk_length) {
+  int rv;
+  nghttp2_buf_chain *chain;
+
+  if (chunk_length < bufs->offset) {
+    return NGHTTP2_ERR_INVALID_ARGUMENT;
+  }
+
+  rv = buf_chain_new(&chain, chunk_length, bufs->mem);
+  if (rv != 0) {
+    return rv;
+  }
+
+  nghttp2_bufs_free(bufs);
+
+  bufs->head = chain;
+  bufs->cur = bufs->head;
+
+  nghttp2_buf_shift_right(&bufs->cur->buf, bufs->offset);
+
+  bufs->chunk_length = chunk_length;
+  bufs->chunk_used = 1;
+
+  return 0;
+}
+
+void nghttp2_bufs_free(nghttp2_bufs *bufs) {
+  nghttp2_buf_chain *chain, *next_chain;
+
+  if (bufs == NULL) {
+    return;
+  }
+
+  for (chain = bufs->head; chain;) {
+    next_chain = chain->next;
+
+    buf_chain_del(chain, bufs->mem);
+
+    chain = next_chain;
+  }
+
+  bufs->head = NULL;
+}
+
+int nghttp2_bufs_wrap_init(nghttp2_bufs *bufs, uint8_t *begin, size_t len,
+                           nghttp2_mem *mem) {
+  nghttp2_buf_chain *chain;
+
+  chain = nghttp2_mem_malloc(mem, sizeof(nghttp2_buf_chain));
+  if (chain == NULL) {
+    return NGHTTP2_ERR_NOMEM;
+  }
+
+  chain->next = NULL;
+
+  nghttp2_buf_wrap_init(&chain->buf, begin, len);
+
+  bufs->mem = mem;
+  bufs->offset = 0;
+
+  bufs->head = chain;
+  bufs->cur = bufs->head;
+
+  bufs->chunk_length = len;
+  bufs->chunk_used = 1;
+  bufs->max_chunk = 1;
+  bufs->chunk_keep = 1;
+
+  return 0;
+}
+
+void nghttp2_bufs_wrap_free(nghttp2_bufs *bufs) {
+  if (bufs == NULL) {
+    return;
+  }
+
+  nghttp2_mem_free(bufs->mem, bufs->head);
+  bufs->head = NULL;
+}
+
+void nghttp2_bufs_seek_last_present(nghttp2_bufs *bufs) {
+  nghttp2_buf_chain *ci;
+
+  for (ci = bufs->cur; ci; ci = ci->next) {
+    if (nghttp2_buf_len(&ci->buf) == 0) {
+      return;
+    } else {
+      bufs->cur = ci;
+    }
+  }
+}
+
+ssize_t nghttp2_bufs_len(nghttp2_bufs *bufs) {
+  nghttp2_buf_chain *ci;
+  ssize_t len;
+
+  len = 0;
+  for (ci = bufs->head; ci; ci = ci->next) {
+    len += nghttp2_buf_len(&ci->buf);
+  }
+
+  return len;
+}
+
+static ssize_t bufs_avail(nghttp2_bufs *bufs) {
+  return (ssize_t)(nghttp2_buf_avail(&bufs->cur->buf) +
+                   (bufs->chunk_length - bufs->offset) *
+                       (bufs->max_chunk - bufs->chunk_used));
+}
+
+static int bufs_alloc_chain(nghttp2_bufs *bufs) {
+  int rv;
+  nghttp2_buf_chain *chain;
+
+  if (bufs->cur->next) {
+    bufs->cur = bufs->cur->next;
+
+    return 0;
+  }
+
+  if (bufs->max_chunk == bufs->chunk_used) {
+    return NGHTTP2_ERR_BUFFER_ERROR;
+  }
+
+  rv = buf_chain_new(&chain, bufs->chunk_length, bufs->mem);
+  if (rv != 0) {
+    return rv;
+  }
+
+  DEBUGF(fprintf(stderr,
+                 "new buffer %zu bytes allocated for bufs %p, used %zu\n",
+                 bufs->chunk_length, bufs, bufs->chunk_used));
+
+  ++bufs->chunk_used;
+
+  bufs->cur->next = chain;
+  bufs->cur = chain;
+
+  nghttp2_buf_shift_right(&bufs->cur->buf, bufs->offset);
+
+  return 0;
+}
+
+int nghttp2_bufs_add(nghttp2_bufs *bufs, const void *data, size_t len) {
+  int rv;
+  size_t nwrite;
+  nghttp2_buf *buf;
+  const uint8_t *p;
+
+  if (bufs_avail(bufs) < (ssize_t)len) {
+    return NGHTTP2_ERR_BUFFER_ERROR;
+  }
+
+  p = data;
+
+  while (len) {
+    buf = &bufs->cur->buf;
+
+    nwrite = nghttp2_min((size_t)nghttp2_buf_avail(buf), len);
+    if (nwrite == 0) {
+      rv = bufs_alloc_chain(bufs);
+      if (rv != 0) {
+        return rv;
+      }
+      continue;
+    }
+
+    buf->last = nghttp2_cpymem(buf->last, p, nwrite);
+    p += len;
+    len -= nwrite;
+  }
+
+  return 0;
+}
+
+static int bufs_ensure_addb(nghttp2_bufs *bufs) {
+  int rv;
+  nghttp2_buf *buf;
+
+  buf = &bufs->cur->buf;
+
+  if (nghttp2_buf_avail(buf) > 0) {
+    return 0;
+  }
+
+  rv = bufs_alloc_chain(bufs);
+  if (rv != 0) {
+    return rv;
+  }
+
+  return 0;
+}
+
+int nghttp2_bufs_addb(nghttp2_bufs *bufs, uint8_t b) {
+  int rv;
+
+  rv = bufs_ensure_addb(bufs);
+  if (rv != 0) {
+    return rv;
+  }
+
+  *bufs->cur->buf.last++ = b;
+
+  return 0;
+}
+
+int nghttp2_bufs_addb_hold(nghttp2_bufs *bufs, uint8_t b) {
+  int rv;
+
+  rv = bufs_ensure_addb(bufs);
+  if (rv != 0) {
+    return rv;
+  }
+
+  *bufs->cur->buf.last = b;
+
+  return 0;
+}
+
+int nghttp2_bufs_orb(nghttp2_bufs *bufs, uint8_t b) {
+  int rv;
+
+  rv = bufs_ensure_addb(bufs);
+  if (rv != 0) {
+    return rv;
+  }
+
+  *bufs->cur->buf.last++ |= b;
+
+  return 0;
+}
+
+int nghttp2_bufs_orb_hold(nghttp2_bufs *bufs, uint8_t b) {
+  int rv;
+
+  rv = bufs_ensure_addb(bufs);
+  if (rv != 0) {
+    return rv;
+  }
+
+  *bufs->cur->buf.last |= b;
+
+  return 0;
+}
+
+ssize_t nghttp2_bufs_remove(nghttp2_bufs *bufs, uint8_t **out) {
+  size_t len;
+  nghttp2_buf_chain *chain;
+  nghttp2_buf *buf;
+  uint8_t *res;
+  nghttp2_buf resbuf;
+
+  len = 0;
+
+  for (chain = bufs->head; chain; chain = chain->next) {
+    len += nghttp2_buf_len(&chain->buf);
+  }
+
+  if (!len) {
+    res = NULL;
+  } else {
+    res = nghttp2_mem_malloc(bufs->mem, len);
+
+    if (res == NULL) {
+      return NGHTTP2_ERR_NOMEM;
+    }
+  }
+
+  nghttp2_buf_wrap_init(&resbuf, res, len);
+
+  for (chain = bufs->head; chain; chain = chain->next) {
+    buf = &chain->buf;
+
+    if (resbuf.last) {
+      resbuf.last = nghttp2_cpymem(resbuf.last, buf->pos, nghttp2_buf_len(buf));
+    }
+
+    nghttp2_buf_reset(buf);
+    nghttp2_buf_shift_right(&chain->buf, bufs->offset);
+  }
+
+  bufs->cur = bufs->head;
+
+  *out = res;
+
+  return (ssize_t)len;
+}
+
+void nghttp2_bufs_reset(nghttp2_bufs *bufs) {
+  nghttp2_buf_chain *chain, *ci;
+  size_t k;
+
+  k = bufs->chunk_keep;
+
+  for (ci = bufs->head; ci; ci = ci->next) {
+    nghttp2_buf_reset(&ci->buf);
+    nghttp2_buf_shift_right(&ci->buf, bufs->offset);
+
+    if (--k == 0) {
+      break;
+    }
+  }
+
+  if (ci) {
+    chain = ci->next;
+    ci->next = NULL;
+
+    for (ci = chain; ci;) {
+      chain = ci->next;
+
+      buf_chain_del(ci, bufs->mem);
+
+      ci = chain;
+    }
+
+    bufs->chunk_used = bufs->chunk_keep;
+  }
+
+  bufs->cur = bufs->head;
+}
+
+int nghttp2_bufs_advance(nghttp2_bufs *bufs) { return bufs_alloc_chain(bufs); }
+
+int nghttp2_bufs_next_present(nghttp2_bufs *bufs) {
+  nghttp2_buf_chain *chain;
+
+  chain = bufs->cur->next;
+
+  return chain && nghttp2_buf_len(&chain->buf);
+}

lib/nghttp2_buf.h

@@ -0,0 +1,375 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2014 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.
+ */
+#ifndef NGHTTP2_BUF_H
+#define NGHTTP2_BUF_H
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+#include <nghttp2/nghttp2.h>
+
+#include "nghttp2_int.h"
+#include "nghttp2_mem.h"
+
+typedef struct {
+  /* This points to the beginning of the buffer. The effective range
+     of buffer is [begin, end). */
+  uint8_t *begin;
+  /* This points to the memory one byte beyond the end of the
+     buffer. */
+  uint8_t *end;
+  /* The position indicator for effective start of the buffer. pos <=
+     last must be hold. */
+  uint8_t *pos;
+  /* The position indicator for effective one beyond of the end of the
+     buffer. last <= end must be hold. */
+  uint8_t *last;
+  /* Mark arbitrary position in buffer [begin, end) */
+  uint8_t *mark;
+} nghttp2_buf;
+
+#define nghttp2_buf_len(BUF) ((ssize_t)((BUF)->last - (BUF)->pos))
+#define nghttp2_buf_avail(BUF) ((ssize_t)((BUF)->end - (BUF)->last))
+#define nghttp2_buf_mark_avail(BUF) ((ssize_t)((BUF)->mark - (BUF)->last))
+#define nghttp2_buf_cap(BUF) ((ssize_t)((BUF)->end - (BUF)->begin))
+
+#define nghttp2_buf_pos_offset(BUF) ((ssize_t)((BUF)->pos - (BUF)->begin))
+#define nghttp2_buf_last_offset(BUF) ((ssize_t)((BUF)->last - (BUF)->begin))
+
+#define nghttp2_buf_shift_right(BUF, AMT)                                      \
+  do {                                                                         \
+    (BUF)->pos += AMT;                                                         \
+    (BUF)->last += AMT;                                                        \
+  } while (0)
+
+#define nghttp2_buf_shift_left(BUF, AMT)                                       \
+  do {                                                                         \
+    (BUF)->pos -= AMT;                                                         \
+    (BUF)->last -= AMT;                                                        \
+  } while (0)
+
+/*
+ * Initializes the |buf|. No memory is allocated in this function. Use
+ * nghttp2_buf_reserve() or nghttp2_buf_reserve2() to allocate memory.
+ */
+void nghttp2_buf_init(nghttp2_buf *buf);
+
+/*
+ * Initializes the |buf| and allocates at least |initial| bytes of
+ * memory.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * NGHTTP2_ERR_NOMEM
+ *     Out of memory
+ */
+int nghttp2_buf_init2(nghttp2_buf *buf, size_t initial, nghttp2_mem *mem);
+
+/*
+ * Frees buffer in |buf|.
+ */
+void nghttp2_buf_free(nghttp2_buf *buf, nghttp2_mem *mem);
+
+/*
+ * Extends buffer so that nghttp2_buf_cap() returns at least
+ * |new_cap|. If extensions took place, buffer pointers in |buf| will
+ * change.
+ *
+ * This function returns 0 if it succeeds, or one of the followings
+ * negative error codes:
+ *
+ * NGHTTP2_ERR_NOMEM
+ *     Out of memory
+ */
+int nghttp2_buf_reserve(nghttp2_buf *buf, size_t new_cap, nghttp2_mem *mem);
+
+/*
+ * Resets pos, last, mark member of |buf| to buf->begin.
+ */
+void nghttp2_buf_reset(nghttp2_buf *buf);
+
+/*
+ * Initializes |buf| using supplied buffer |begin| of length
+ * |len|. Semantically, the application should not call *_reserve() or
+ * nghttp2_free() functions for |buf|.
+ */
+void nghttp2_buf_wrap_init(nghttp2_buf *buf, uint8_t *begin, size_t len);
+
+struct nghttp2_buf_chain;
+
+typedef struct nghttp2_buf_chain nghttp2_buf_chain;
+
+/* Chains 2 buffers */
+struct nghttp2_buf_chain {
+  /* Points to the subsequent buffer. NULL if there is no such
+     buffer. */
+  nghttp2_buf_chain *next;
+  nghttp2_buf buf;
+};
+
+typedef struct {
+  /* Points to the first buffer */
+  nghttp2_buf_chain *head;
+  /* Buffer pointer where write occurs. */
+  nghttp2_buf_chain *cur;
+  /* Memory allocator */
+  nghttp2_mem *mem;
+  /* The buffer capacity of each buf */
+  size_t chunk_length;
+  /* The maximum number of nghttp2_buf_chain */
+  size_t max_chunk;
+  /* The number of nghttp2_buf_chain allocated */
+  size_t chunk_used;
+  /* The number of nghttp2_buf_chain to keep on reset */
+  size_t chunk_keep;
+  /* pos offset from begin in each buffers. On initialization and
+     reset, buf->pos and buf->last are positioned at buf->begin +
+     offset. */
+  size_t offset;
+} nghttp2_bufs;
+
+/*
+ * This is the same as calling nghttp2_bufs_init2 with the given
+ * arguments and offset = 0.
+ */
+int nghttp2_bufs_init(nghttp2_bufs *bufs, size_t chunk_length, size_t max_chunk,
+                      nghttp2_mem *mem);
+
+/*
+ * This is the same as calling nghttp2_bufs_init3 with the given
+ * arguments and chunk_keep = max_chunk.
+ */
+int nghttp2_bufs_init2(nghttp2_bufs *bufs, size_t chunk_length,
+                       size_t max_chunk, size_t offset, nghttp2_mem *mem);
+
+/*
+ * Initializes |bufs|. Each buffer size is given in the
+ * |chunk_length|.  The maximum number of buffers is given in the
+ * |max_chunk|.  On reset, first |chunk_keep| buffers are kept and
+ * remaining buffers are deleted.  Each buffer will have bufs->pos and
+ * bufs->last shifted to left by |offset| bytes on creation and reset.
+ *
+ * This function allocates first buffer.  bufs->head and bufs->cur
+ * will point to the first buffer after this call.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * NGHTTP2_ERR_NOMEM
+ *     Out of memory.
+ * NGHTTP2_ERR_INVALID_ARGUMENT
+ *     chunk_keep is 0; or max_chunk < chunk_keep; or offset is too
+ *     long.
+ */
+int nghttp2_bufs_init3(nghttp2_bufs *bufs, size_t chunk_length,
+                       size_t max_chunk, size_t chunk_keep, size_t offset,
+                       nghttp2_mem *mem);
+
+/*
+ * Frees any related resources to the |bufs|.
+ */
+void nghttp2_bufs_free(nghttp2_bufs *bufs);
+
+/*
+ * Initializes |bufs| using supplied buffer |begin| of length |len|.
+ * The first buffer bufs->head uses buffer |begin|.  The buffer size
+ * is fixed and no allocate extra chunk buffer is allocated.  In other
+ * words, max_chunk = chunk_keep = 1.  To free the resource allocated
+ * for |bufs|, use nghttp2_bufs_wrap_free().
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * NGHTTP2_ERR_NOMEM
+ *     Out of memory.
+ */
+int nghttp2_bufs_wrap_init(nghttp2_bufs *bufs, uint8_t *begin, size_t len,
+                           nghttp2_mem *mem);
+
+/*
+ * Frees any related resource to the |bufs|.  This function does not
+ * free supplied buffer provided in nghttp2_bufs_wrap_init().
+ */
+void nghttp2_bufs_wrap_free(nghttp2_bufs *bufs);
+
+/*
+ * Reallocates internal buffer using |chunk_length|.  The max_chunk,
+ * chunk_keep and offset do not change.  After successful allocation
+ * of new buffer, previous buffers are deallocated without copying
+ * anything into new buffers.  chunk_used is reset to 1.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * NGHTTP2_ERR_NOMEM
+ *     Out of memory.
+ * NGHTTP2_ERR_INVALID_ARGUMENT
+ *     chunk_length < offset
+ */
+int nghttp2_bufs_realloc(nghttp2_bufs *bufs, size_t chunk_length);
+
+/*
+ * Appends the |data| of length |len| to the |bufs|. The write starts
+ * at bufs->cur->buf.last. A new buffers will be allocated to store
+ * all data.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * NGHTTP2_ERR_NOMEM
+ *     Out of memory.
+ * NGHTTP2_ERR_BUFFER_ERROR
+ *     Out of buffer space.
+ */
+int nghttp2_bufs_add(nghttp2_bufs *bufs, const void *data, size_t len);
+
+/*
+ * Appends a single byte |b| to the |bufs|. The write starts at
+ * bufs->cur->buf.last. A new buffers will be allocated to store all
+ * data.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * NGHTTP2_ERR_NOMEM
+ *     Out of memory.
+ * NGHTTP2_ERR_BUFFER_ERROR
+ *     Out of buffer space.
+ */
+int nghttp2_bufs_addb(nghttp2_bufs *bufs, uint8_t b);
+
+/*
+ * Behaves like nghttp2_bufs_addb(), but this does not update
+ * buf->last pointer.
+ */
+int nghttp2_bufs_addb_hold(nghttp2_bufs *bufs, uint8_t b);
+
+#define nghttp2_bufs_fast_addb(BUFS, B)                                        \
+  do {                                                                         \
+    *(BUFS)->cur->buf.last++ = B;                                              \
+  } while (0)
+
+#define nghttp2_bufs_fast_addb_hold(BUFS, B)                                   \
+  do {                                                                         \
+    *(BUFS)->cur->buf.last = B;                                                \
+  } while (0)
+
+/*
+ * Performs bitwise-OR of |b| at bufs->cur->buf.last. A new buffers
+ * will be allocated if necessary.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * NGHTTP2_ERR_NOMEM
+ *     Out of memory.
+ * NGHTTP2_ERR_BUFFER_ERROR
+ *     Out of buffer space.
+ */
+int nghttp2_bufs_orb(nghttp2_bufs *bufs, uint8_t b);
+
+/*
+ * Behaves like nghttp2_bufs_orb(), but does not update buf->last
+ * pointer.
+ */
+int nghttp2_bufs_orb_hold(nghttp2_bufs *bufs, uint8_t b);
+
+#define nghttp2_bufs_fast_orb(BUFS, B)                                         \
+  do {                                                                         \
+    *(BUFS)->cur->buf.last++ |= B;                                             \
+  } while (0)
+
+#define nghttp2_bufs_fast_orb_hold(BUFS, B)                                    \
+  do {                                                                         \
+    *(BUFS)->cur->buf.last |= B;                                               \
+  } while (0)
+
+/*
+ * Copies all data stored in |bufs| to the contagious buffer.  This
+ * function allocates the contagious memory to store all data in
+ * |bufs| and assigns it to |*out|.
+ *
+ * On successful return, nghttp2_bufs_len(bufs) returns 0, just like
+ * after calling nghttp2_bufs_reset().
+
+ * This function returns the length of copied data and assigns the
+ * pointer to copied data to |*out| if it succeeds, or one of the
+ * following negative error codes:
+ *
+ * NGHTTP2_ERR_NOMEM
+ *     Out of memory
+ */
+ssize_t nghttp2_bufs_remove(nghttp2_bufs *bufs, uint8_t **out);
+
+/*
+ * Resets |bufs| and makes the buffers empty.
+ */
+void nghttp2_bufs_reset(nghttp2_bufs *bufs);
+
+/*
+ * Moves bufs->cur to bufs->cur->next.  If resulting bufs->cur is
+ * NULL, this function allocates new buffers and bufs->cur points to
+ * it.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * NGHTTP2_ERR_NOMEM
+ *     Out of memory
+ * NGHTTP2_ERR_BUFFER_ERROR
+ *     Out of buffer space.
+ */
+int nghttp2_bufs_advance(nghttp2_bufs *bufs);
+
+/* Sets bufs->cur to bufs->head */
+#define nghttp2_bufs_rewind(BUFS)                                              \
+  do {                                                                         \
+    (BUFS)->cur = (BUFS)->head;                                                \
+  } while (0)
+
+/*
+ * Move bufs->cur, from the current position, using next member, to
+ * the last buf which has nghttp2_buf_len(buf) > 0 without seeing buf
+ * which satisfies nghttp2_buf_len(buf) == 0.  If
+ * nghttp2_buf_len(&bufs->cur->buf) == 0 or bufs->cur->next is NULL,
+ * bufs->cur is unchanged.
+ */
+void nghttp2_bufs_seek_last_present(nghttp2_bufs *bufs);
+
+/*
+ * Returns nonzero if bufs->cur->next is not emtpy.
+ */
+int nghttp2_bufs_next_present(nghttp2_bufs *bufs);
+
+#define nghttp2_bufs_cur_avail(BUFS) nghttp2_buf_avail(&(BUFS)->cur->buf)
+
+/*
+ * Returns the buffer length of |bufs|.
+ */
+ssize_t nghttp2_bufs_len(nghttp2_bufs *bufs);
+
+#endif /* NGHTTP2_BUF_H */

lib/nghttp2_buffer.c

@@ -1,94 +0,0 @@
-/*
- * nghttp2 - HTTP/2.0 C Library
- *
- * Copyright (c) 2014 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 "nghttp2_buffer.h"
-
-#include <assert.h>
-#include <string.h>
-
-#include "nghttp2_helper.h"
-
-void nghttp2_buffer_init(nghttp2_buffer *buffer, size_t max_capacity)
-{
-  buffer->buf = NULL;
-  buffer->len = 0;
-  buffer->capacity = 0;
-  buffer->max_capacity = max_capacity;
-}
-
-void nghttp2_buffer_free(nghttp2_buffer *buffer)
-{
-  free(buffer->buf);
-}
-
-int nghttp2_buffer_reserve(nghttp2_buffer *buffer, size_t len)
-{
-  if(len > buffer->max_capacity) {
-    return NGHTTP2_ERR_BUFFER_ERROR;
-  }
-  if(buffer->capacity < len) {
-    uint8_t *new_buf;
-    size_t new_cap = buffer->capacity == 0 ? 8 : buffer->capacity * 3 / 2;
-    new_cap = nghttp2_min(buffer->max_capacity, nghttp2_max(new_cap, len));
-    new_buf = realloc(buffer->buf, new_cap);
-    if(new_buf == NULL) {
-      return NGHTTP2_ERR_NOMEM;
-    }
-    buffer->buf = new_buf;
-    buffer->capacity = new_cap;
-  }
-  return 0;
-}
-
-int nghttp2_buffer_add(nghttp2_buffer *buffer,
-                       const uint8_t *data, size_t len)
-{
-  int rv;
-  rv = nghttp2_buffer_reserve(buffer, buffer->len + len);
-  if(rv != 0) {
-    return rv;
-  }
-  memcpy(buffer->buf + buffer->len, data, len);
-  buffer->len += len;
-  return 0;
-}
-
-int nghttp2_buffer_add_byte(nghttp2_buffer *buffer, uint8_t b)
-{
-  int rv;
-  rv = nghttp2_buffer_reserve(buffer, buffer->len + 1);
-  if(rv != 0) {
-    return rv;
-  }
-  buffer->buf[buffer->len] = b;
-  ++buffer->len;
-  return 0;
-}
-
-void nghttp2_buffer_release(nghttp2_buffer *buffer)
-{
-  buffer->buf = NULL;
-  buffer->len = 0;
-  buffer->capacity = 0;
-}

lib/nghttp2_buffer.h

@@ -1,103 +0,0 @@
-/*
- * nghttp2 - HTTP/2.0 C Library
- *
- * Copyright (c) 2014 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.
- */
-#ifndef NGHTTP2_BUFFER_H
-#define NGHTTP2_BUFFER_H
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif /* HAVE_CONFIG_H */
-
-#include <nghttp2/nghttp2.h>
-
-#include "nghttp2_int.h"
-
-/*
- * Byte array buffer
- */
-typedef struct {
-  uint8_t *buf;
-  /* Capacity of this buffer */
-  size_t capacity;
-  /* How many bytes are written to buf. len <= capacity must hold. */
-  size_t len;
-  /* Maximum capacity this buffer can grow up */
-  size_t max_capacity;
-} nghttp2_buffer;
-
-void nghttp2_buffer_init(nghttp2_buffer *buffer, size_t max_capacity);
-
-void nghttp2_buffer_free(nghttp2_buffer *buffer);
-
-/*
- * Expands capacity so that it can contain at least |len| bytes of
- * data. If buffer->capacity >= len, no action is taken. If len >
- * buffer->max_capacity, NGHTTP2_ERR_BUFFER_ERROR is returned.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_BUFFER_ERROR
- *   The |len| is strictly larger than buffer->max_capacity
- * NGHTTP2_ERR_NOMEM
- *   Out of memory
- */
-int nghttp2_buffer_reserve(nghttp2_buffer *buffer, size_t len);
-
-/*
- * Appends the |data| with |len| bytes to the buffer. The data is
- * copied. The |buffer| will be expanded as needed.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_BUFFER_ERROR
- *   The |len| is strictly larger than buffer->max_capacity
- * NGHTTP2_ERR_NOMEM
- *   Out of memory
- */
-int nghttp2_buffer_add(nghttp2_buffer *buffer,
-                       const uint8_t *data, size_t len);
-
-/*
- * Appends the a single byte|b| to the buffer. The data is copied. The
- * |buffer| will be expanded as needed.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_BUFFER_ERROR
- *   The |len| is strictly larger than buffer->max_capacity
- * NGHTTP2_ERR_NOMEM
- *   Out of memory
- */
-int nghttp2_buffer_add_byte(nghttp2_buffer *buffer, uint8_t b);
-
-/*
- * Releases the buffer without freeing it. The data members in buffer
- * is initialized.
- */
-void nghttp2_buffer_release(nghttp2_buffer *buffer);
-
-#endif /* NGHTTP2_BUFFER_H */

lib/nghttp2_callbacks.c

@@ -0,0 +1,123 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2014 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 "nghttp2_callbacks.h"
+
+#include <stdlib.h>
+
+int nghttp2_session_callbacks_new(nghttp2_session_callbacks **callbacks_ptr) {
+  *callbacks_ptr = calloc(1, sizeof(nghttp2_session_callbacks));
+
+  if (*callbacks_ptr == NULL) {
+    return NGHTTP2_ERR_NOMEM;
+  }
+
+  return 0;
+}
+
+void nghttp2_session_callbacks_del(nghttp2_session_callbacks *callbacks) {
+  free(callbacks);
+}
+
+void nghttp2_session_callbacks_set_send_callback(
+    nghttp2_session_callbacks *cbs, nghttp2_send_callback send_callback) {
+  cbs->send_callback = send_callback;
+}
+
+void nghttp2_session_callbacks_set_recv_callback(
+    nghttp2_session_callbacks *cbs, nghttp2_recv_callback recv_callback) {
+  cbs->recv_callback = recv_callback;
+}
+
+void nghttp2_session_callbacks_set_on_frame_recv_callback(
+    nghttp2_session_callbacks *cbs,
+    nghttp2_on_frame_recv_callback on_frame_recv_callback) {
+  cbs->on_frame_recv_callback = on_frame_recv_callback;
+}
+
+void nghttp2_session_callbacks_set_on_invalid_frame_recv_callback(
+    nghttp2_session_callbacks *cbs,
+    nghttp2_on_invalid_frame_recv_callback on_invalid_frame_recv_callback) {
+  cbs->on_invalid_frame_recv_callback = on_invalid_frame_recv_callback;
+}
+
+void nghttp2_session_callbacks_set_on_data_chunk_recv_callback(
+    nghttp2_session_callbacks *cbs,
+    nghttp2_on_data_chunk_recv_callback on_data_chunk_recv_callback) {
+  cbs->on_data_chunk_recv_callback = on_data_chunk_recv_callback;
+}
+
+void nghttp2_session_callbacks_set_before_frame_send_callback(
+    nghttp2_session_callbacks *cbs,
+    nghttp2_before_frame_send_callback before_frame_send_callback) {
+  cbs->before_frame_send_callback = before_frame_send_callback;
+}
+
+void nghttp2_session_callbacks_set_on_frame_send_callback(
+    nghttp2_session_callbacks *cbs,
+    nghttp2_on_frame_send_callback on_frame_send_callback) {
+  cbs->on_frame_send_callback = on_frame_send_callback;
+}
+
+void nghttp2_session_callbacks_set_on_frame_not_send_callback(
+    nghttp2_session_callbacks *cbs,
+    nghttp2_on_frame_not_send_callback on_frame_not_send_callback) {
+  cbs->on_frame_not_send_callback = on_frame_not_send_callback;
+}
+
+void nghttp2_session_callbacks_set_on_stream_close_callback(
+    nghttp2_session_callbacks *cbs,
+    nghttp2_on_stream_close_callback on_stream_close_callback) {
+  cbs->on_stream_close_callback = on_stream_close_callback;
+}
+
+void nghttp2_session_callbacks_set_on_begin_headers_callback(
+    nghttp2_session_callbacks *cbs,
+    nghttp2_on_begin_headers_callback on_begin_headers_callback) {
+  cbs->on_begin_headers_callback = on_begin_headers_callback;
+}
+
+void nghttp2_session_callbacks_set_on_header_callback(
+    nghttp2_session_callbacks *cbs,
+    nghttp2_on_header_callback on_header_callback) {
+  cbs->on_header_callback = on_header_callback;
+}
+
+void nghttp2_session_callbacks_set_select_padding_callback(
+    nghttp2_session_callbacks *cbs,
+    nghttp2_select_padding_callback select_padding_callback) {
+  cbs->select_padding_callback = select_padding_callback;
+}
+
+void nghttp2_session_callbacks_set_data_source_read_length_callback(
+    nghttp2_session_callbacks *cbs,
+    nghttp2_data_source_read_length_callback data_source_read_length_callback) {
+  cbs->read_length_callback = data_source_read_length_callback;
+}
+
+void nghttp2_session_callbacks_set_on_begin_frame_callback(
+    nghttp2_session_callbacks *cbs,
+    nghttp2_on_begin_frame_callback on_begin_frame_callback) {
+  cbs->on_begin_frame_callback = on_begin_frame_callback;
+}

lib/nghttp2_callbacks.h

@@ -0,0 +1,111 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2014 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.
+ */
+#ifndef NGHTTP2_CALLBACKS_H
+#define NGHTTP2_CALLBACKS_H
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+#include <nghttp2/nghttp2.h>
+
+/*
+ * Callback functions.
+ */
+struct nghttp2_session_callbacks {
+  /**
+   * Callback function invoked when the session wants to send data to
+   * the remote peer.  This callback is not necessary if the
+   * application uses solely `nghttp2_session_mem_send()` to serialize
+   * data to transmit.
+   */
+  nghttp2_send_callback send_callback;
+  /**
+   * Callback function invoked when the session wants to receive data
+   * from the remote peer.  This callback is not necessary if the
+   * application uses solely `nghttp2_session_mem_recv()` to process
+   * received data.
+   */
+  nghttp2_recv_callback recv_callback;
+  /**
+   * Callback function invoked by `nghttp2_session_recv()` when a
+   * frame is received.
+   */
+  nghttp2_on_frame_recv_callback on_frame_recv_callback;
+  /**
+   * Callback function invoked by `nghttp2_session_recv()` when an
+   * invalid non-DATA frame is received.
+   */
+  nghttp2_on_invalid_frame_recv_callback on_invalid_frame_recv_callback;
+  /**
+   * Callback function invoked when a chunk of data in DATA frame is
+   * received.
+   */
+  nghttp2_on_data_chunk_recv_callback on_data_chunk_recv_callback;
+  /**
+   * Callback function invoked before a non-DATA frame is sent.
+   */
+  nghttp2_before_frame_send_callback before_frame_send_callback;
+  /**
+   * Callback function invoked after a frame is sent.
+   */
+  nghttp2_on_frame_send_callback on_frame_send_callback;
+  /**
+   * The callback function invoked when a non-DATA frame is not sent
+   * because of an error.
+   */
+  nghttp2_on_frame_not_send_callback on_frame_not_send_callback;
+  /**
+   * Callback function invoked when the stream is closed.
+   */
+  nghttp2_on_stream_close_callback on_stream_close_callback;
+  /**
+   * Callback function invoked when the reception of header block in
+   * HEADERS or PUSH_PROMISE is started.
+   */
+  nghttp2_on_begin_headers_callback on_begin_headers_callback;
+  /**
+   * Callback function invoked when a header name/value pair is
+   * received.
+   */
+  nghttp2_on_header_callback on_header_callback;
+  /**
+   * Callback function invoked when the library asks application how
+   * many padding bytes are required for the transmission of the given
+   * frame.
+   */
+  nghttp2_select_padding_callback select_padding_callback;
+  /**
+   * The callback function used to determine the length allowed in
+   * `nghttp2_data_source_read_callback()`
+   */
+  nghttp2_data_source_read_length_callback read_length_callback;
+  /**
+   * Sets callback function invoked when a frame header is received.
+   */
+  nghttp2_on_begin_frame_callback on_begin_frame_callback;
+};
+
+#endif /* NGHTTP2_CALLBACKS_H */

lib/nghttp2_frame.h

@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
@@ -26,61 +26,93 @@
 #define NGHTTP2_FRAME_H
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif /* HAVE_CONFIG_H */
 
 #include <nghttp2/nghttp2.h>
 #include "nghttp2_hd.h"
-#include "nghttp2_buffer.h"
+#include "nghttp2_buf.h"
 
-#define NGHTTP2_FRAME_LENGTH_MASK ((1 << 14) - 1)
 #define NGHTTP2_STREAM_ID_MASK ((1u << 31) - 1)
+#define NGHTTP2_PRI_GROUP_ID_MASK ((1u << 31) - 1)
 #define NGHTTP2_PRIORITY_MASK ((1u << 31) - 1)
 #define NGHTTP2_WINDOW_SIZE_INCREMENT_MASK ((1u << 31) - 1)
 #define NGHTTP2_SETTINGS_ID_MASK ((1 << 24) - 1)
 
-/* The maximum payload length of a frame */
-#define NGHTTP2_MAX_FRAME_LENGTH ((1 << 14) - 1)
-
-/* The maximum length of DATA frame payload. */
-#define NGHTTP2_DATA_PAYLOAD_LENGTH 4096
-
 /* The number of bytes of frame header. */
-#define NGHTTP2_FRAME_HEAD_LENGTH 8
+#define NGHTTP2_FRAME_HDLEN 9
 
-/* Category of frames. */
-typedef enum {
-  /* non-DATA frame */
-  NGHTTP2_CAT_CTRL,
-  /* DATA frame */
-  NGHTTP2_CAT_DATA
-} nghttp2_frame_category;
+#define NGHTTP2_MAX_FRAME_SIZE_MAX ((1 << 24) - 1)
+#define NGHTTP2_MAX_FRAME_SIZE_MIN (1 << 14)
 
-/**
- * @struct
- *
- * The DATA frame used in the library privately. It has the following
- * members:
- */
-typedef struct {
-  nghttp2_frame_hd hd;
-  /**
-   * The data to be sent for this DATA frame.
-   */
-  nghttp2_data_provider data_prd;
-  /**
-   * The flag to indicate whether EOF was reached or not. Initially
-   * |eof| is 0. It becomes 1 after all data were read. This is used
-   * exclusively by nghttp2 library and not in the spec.
-   */
-  uint8_t eof;
-} nghttp2_private_data;
+#define NGHTTP2_MAX_PAYLOADLEN 16384
+/* The one frame buffer length for tranmission.  We may use several of
+   them to support CONTINUATION.  To account for Pad Length field, we
+   allocate extra 1 byte, which saves extra large memcopying. */
+#define NGHTTP2_FRAMEBUF_CHUNKLEN                                              \
+  (NGHTTP2_FRAME_HDLEN + 1 + NGHTTP2_MAX_PAYLOADLEN)
 
-int nghttp2_frame_is_data_frame(uint8_t *head);
+/* Number of inbound buffer */
+#define NGHTTP2_FRAMEBUF_MAX_NUM 5
+
+/* The default length of DATA frame payload. This should be small enough
+ * for the data payload and the header to fit into 1 TLS record */
+#define NGHTTP2_DATA_PAYLOADLEN                                                \
+  ((NGHTTP2_MAX_FRAME_SIZE_MIN) - (NGHTTP2_FRAME_HDLEN))
+
+/* Maximum headers payload length, calculated in compressed form.
+   This applies to transmission only. */
+#define NGHTTP2_MAX_HEADERSLEN 65536
+
+/* The number of bytes for each SETTINGS entry */
+#define NGHTTP2_FRAME_SETTINGS_ENTRY_LENGTH 6
+
+/* The maximum header table size in SETTINGS_HEADER_TABLE_SIZE */
+#define NGHTTP2_MAX_HEADER_TABLE_SIZE ((1u << 31) - 1)
+
+/* Length of priority related fields in HEADERS/PRIORITY frames */
+#define NGHTTP2_PRIORITY_SPECLEN 5
+
+/* Maximum length of padding in bytes. */
+#define NGHTTP2_MAX_PADLEN 256
+
+/* Union of extension frame payload */
+typedef union { nghttp2_ext_altsvc altsvc; } nghttp2_ext_frame_payload;
 
 void nghttp2_frame_pack_frame_hd(uint8_t *buf, const nghttp2_frame_hd *hd);
 
-void nghttp2_frame_unpack_frame_hd(nghttp2_frame_hd *hd, const uint8_t* buf);
+void nghttp2_frame_unpack_frame_hd(nghttp2_frame_hd *hd, const uint8_t *buf);
+
+/**
+ * Initializes frame header |hd| with given parameters.  Reserved bit
+ * is set to 0.
+ */
+void nghttp2_frame_hd_init(nghttp2_frame_hd *hd, size_t length, uint8_t type,
+                           uint8_t flags, int32_t stream_id);
+
+/**
+ * Returns the number of priority field depending on the |flags|.  If
+ * |flags| has neither NGHTTP2_FLAG_PRIORITY_GROUP nor
+ * NGHTTP2_FLAG_PRIORITY_DEPENDENCY set, return 0.
+ */
+size_t nghttp2_frame_priority_len(uint8_t flags);
+
+/**
+ * Packs the |pri_spec| in |buf|.  This function assumes |buf| has
+ * enough space for serialization.
+ */
+void nghttp2_frame_pack_priority_spec(uint8_t *buf,
+                                      const nghttp2_priority_spec *pri_spec);
+
+/**
+ * Unpacks the priority specification from payload |payload| of length
+ * |payloadlen| to |pri_spec|.  The |flags| is used to determine what
+ * kind of priority specification is in |payload|.  This function
+ * assumes the |payload| contains whole priority specification.
+ */
+void nghttp2_frame_unpack_priority_spec(nghttp2_priority_spec *pri_spec,
+                                        uint8_t flags, const uint8_t *payload,
+                                        size_t payloadlen);
 
 /*
  * Returns the offset from the HEADERS frame payload where the
@@ -90,42 +122,33 @@ void nghttp2_frame_unpack_frame_hd(nghttp2_frame_hd *hd, const uint8_t* buf);
 size_t nghttp2_frame_headers_payload_nv_offset(nghttp2_headers *frame);
 
 /*
- * Packs HEADERS frame |frame| in wire format and store it in
- * |*buf_ptr|.  The capacity of |*buf_ptr| is |*buflen_ptr| bytes.
- * This function expands |*buf_ptr| as necessary to store frame. When
- * expansion occurred, memory previously pointed by |*buf_ptr| may
- * change.  |*buf_ptr| and |*buflen_ptr| are updated accordingly.
+ * Packs HEADERS frame |frame| in wire format and store it in |bufs|.
+ * This function expands |bufs| as necessary to store frame.
+ *
+ * The caller must make sure that nghttp2_bufs_reset(bufs) is called
+ * before calling this function.
  *
  * frame->hd.length is assigned after length is determined during
- * packing process. If payload length is strictly larger than
- * NGHTTP2_MAX_FRAME_LENGTH, payload data is still serialized as is,
- * but frame->hd.length is set to NGHTTP2_MAX_FRAME_LENGTH and
- * NGHTTP2_FLAG_END_HEADERS flag is cleared from frame->hd.flags.
+ * packing process.  CONTINUATION frames are also serialized in this
+ * function. This function does not handle padding.
  *
- * This function returns the size of packed frame if it succeeds, or
- * returns one of the following negative error codes:
+ * This function returns 0 if it succeeds, or returns one of the
+ * following negative error codes:
  *
  * NGHTTP2_ERR_HEADER_COMP
  *     The deflate operation failed.
- * NGHTTP2_ERR_FRAME_TOO_LARGE
- *     The length of the frame is too large.
  * NGHTTP2_ERR_NOMEM
  *     Out of memory.
  */
-ssize_t nghttp2_frame_pack_headers(uint8_t **buf_ptr,
-                                   size_t *buflen_ptr,
-                                   nghttp2_headers *frame,
-                                   nghttp2_hd_deflater *deflater);
+int nghttp2_frame_pack_headers(nghttp2_bufs *bufs, nghttp2_headers *frame,
+                               nghttp2_hd_deflater *deflater);
 
 /*
- * Unpacks HEADERS frame byte sequence into |frame|. This function
- * only unapcks bytes that come before name/value header block.
+ * Unpacks HEADERS frame byte sequence into |frame|.  This function
+ * only unapcks bytes that come before name/value header block and
+ * after possible Pad Length field.
  *
- * This function returns 0 if it succeeds or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_PROTO
- *     TODO END_HEADERS flag is not set
+ * This function always succeeds and returns 0.
  */
 int nghttp2_frame_unpack_headers_payload(nghttp2_headers *frame,
                                          const uint8_t *payload,
@@ -133,18 +156,14 @@ int nghttp2_frame_unpack_headers_payload(nghttp2_headers *frame,
 
 /*
  * Packs PRIORITY frame |frame| in wire format and store it in
- * |*buf_ptr|. The capacity of |*buf_ptr| is |*buflen_ptr|
- * length. This function expands |*buf_ptr| as necessary to store
- * given |frame|.
+ * |bufs|.
  *
- * This function returns 0 if it succeeds or one of the following
- * negative error codes:
+ * The caller must make sure that nghttp2_bufs_reset(bufs) is called
+ * before calling this function.
  *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
+ * This function always succeeds and returns 0.
  */
-ssize_t nghttp2_frame_pack_priority(uint8_t **buf_ptr, size_t *buflen_ptr,
-                                    nghttp2_priority *frame);
+int nghttp2_frame_pack_priority(nghttp2_bufs *bufs, nghttp2_priority *frame);
 
 /*
  * Unpacks PRIORITY wire format into |frame|.
@@ -155,19 +174,15 @@ void nghttp2_frame_unpack_priority_payload(nghttp2_priority *frame,
 
 /*
  * Packs RST_STREAM frame |frame| in wire frame format and store it in
- * |*buf_ptr|. The capacity of |*buf_ptr| is |*buflen_ptr|
- * length. This function expands |*buf_ptr| as necessary to store
- * given |frame|. In spdy/2 spec, RST_STREAM wire format is always 16
- * bytes long.
+ * |bufs|.
  *
- * This function returns the size of packed frame if it succeeds, or
- * returns one of the following negative error codes:
+ * The caller must make sure that nghttp2_bufs_reset(bufs) is called
+ * before calling this function.
  *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
+ * This function always succeeds and returns 0.
  */
-ssize_t nghttp2_frame_pack_rst_stream(uint8_t **buf_ptr, size_t *buflen_ptr,
-                                      nghttp2_rst_stream *frame);
+int nghttp2_frame_pack_rst_stream(nghttp2_bufs *bufs,
+                                  nghttp2_rst_stream *frame);
 
 /*
  * Unpacks RST_STREAM frame byte sequence into |frame|.
@@ -178,18 +193,18 @@ void nghttp2_frame_unpack_rst_stream_payload(nghttp2_rst_stream *frame,
 
 /*
  * Packs SETTINGS frame |frame| in wire format and store it in
- * |*buf_ptr|. The capacity of |*buf_ptr| is |*buflen_ptr|
- * length. This function expands |*buf_ptr| as necessary to store
- * given |frame|.
+ * |bufs|.
  *
- * This function returns the size of packed frame if it succeeds, or
- * returns one of the following negative error codes:
+ * The caller must make sure that nghttp2_bufs_reset(bufs) is called
+ * before calling this function.
  *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
+ * This function returns 0 if it succeeds, or returns one of the
+ * following negative error codes:
+ *
+ * NGHTTP2_ERR_FRAME_SIZE_ERROR
+ *     The length of the frame is too large.
  */
-ssize_t nghttp2_frame_pack_settings(uint8_t **buf_ptr, size_t *buflen_ptr,
-                                    nghttp2_settings *frame);
+int nghttp2_frame_pack_settings(nghttp2_bufs *bufs, nghttp2_settings *frame);
 
 /*
  * Packs the |iv|, which includes |niv| entries, in the |buf|,
@@ -216,7 +231,7 @@ void nghttp2_frame_unpack_settings_entry(nghttp2_settings_entry *iv,
  */
 int nghttp2_frame_unpack_settings_payload(nghttp2_settings *frame,
                                           nghttp2_settings_entry *iv,
-                                          size_t niv);
+                                          size_t niv, nghttp2_mem *mem);
 
 /*
  * Unpacks SETTINGS payload into |*iv_ptr|. The number of entries are
@@ -233,39 +248,36 @@ int nghttp2_frame_unpack_settings_payload(nghttp2_settings *frame,
 int nghttp2_frame_unpack_settings_payload2(nghttp2_settings_entry **iv_ptr,
                                            size_t *niv_ptr,
                                            const uint8_t *payload,
-                                           size_t payloadlen);
+                                           size_t payloadlen, nghttp2_mem *mem);
 
 /*
  * Packs PUSH_PROMISE frame |frame| in wire format and store it in
- * |*buf_ptr|.  The capacity of |*buf_ptr| is |*buflen_ptr| bytes.
- * This function expands |*buf_ptr| as necessary to store frame. When
- * expansion occurred, memory previously pointed by |*buf_ptr| may
- * change.  |*buf_ptr| and |*buflen_ptr| are updated accordingly.
+ * |bufs|.  This function expands |bufs| as necessary to store
+ * frame.
+ *
+ * The caller must make sure that nghttp2_bufs_reset(bufs) is called
+ * before calling this function.
  *
  * frame->hd.length is assigned after length is determined during
- * packing process. If payload length is strictly larger than
- * NGHTTP2_MAX_FRAME_LENGTH, payload data is still serialized as is,
- * but frame->hd.length is set to NGHTTP2_MAX_FRAME_LENGTH and
- * NGHTTP2_FLAG_END_HEADERS flag is cleared from frame->hd.flags.
+ * packing process.  CONTINUATION frames are also serialized in this
+ * function. This function does not handle padding.
  *
- * This function returns the size of packed frame if it succeeds, or
- * returns one of the following negative error codes:
+ * This function returns 0 if it succeeds, or returns one of the
+ * following negative error codes:
  *
  * NGHTTP2_ERR_HEADER_COMP
  *     The deflate operation failed.
- * NGHTTP2_ERR_FRAME_TOO_LARGE
- *     The length of the frame is too large.
  * NGHTTP2_ERR_NOMEM
  *     Out of memory.
  */
-ssize_t nghttp2_frame_pack_push_promise(uint8_t **buf_ptr,
-                                        size_t *buflen_ptr,
-                                        nghttp2_push_promise *frame,
-                                        nghttp2_hd_deflater *deflater);
+int nghttp2_frame_pack_push_promise(nghttp2_bufs *bufs,
+                                    nghttp2_push_promise *frame,
+                                    nghttp2_hd_deflater *deflater);
 
 /*
- * Unpacks PUSH_PROMISE frame byte sequence into |frame|. This function
- * only unapcks bytes that come before name/value header block.
+ * Unpacks PUSH_PROMISE frame byte sequence into |frame|.  This
+ * function only unapcks bytes that come before name/value header
+ * block and after possible Pad Length field.
  *
  * This function returns 0 if it succeeds or one of the following
  * negative error codes:
@@ -279,18 +291,14 @@ int nghttp2_frame_unpack_push_promise_payload(nghttp2_push_promise *frame,
 
 /*
  * Packs PING frame |frame| in wire format and store it in
- * |*buf_ptr|. The capacity of |*buf_ptr| is |*buflen_ptr|
- * length. This function expands |*buf_ptr| as necessary to store
- * given |frame|.
+ * |bufs|.
  *
- * This function returns 0 if it succeeds or one of the following
- * negative error codes:
+ * The caller must make sure that nghttp2_bufs_reset(bufs) is called
+ * before calling this function.
  *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
+ * This function always succeeds and returns 0.
  */
-ssize_t nghttp2_frame_pack_ping(uint8_t **buf_ptr, size_t *buflen_ptr,
-                                nghttp2_ping *frame);
+int nghttp2_frame_pack_ping(nghttp2_bufs *bufs, nghttp2_ping *frame);
 
 /*
  * Unpacks PING wire format into |frame|.
@@ -300,41 +308,62 @@ void nghttp2_frame_unpack_ping_payload(nghttp2_ping *frame,
                                        size_t payloadlen);
 
 /*
- * Packs GOAWAY frame |frame | in wire format and store it in
- * |*buf_ptr|. The capacity of |*buf_ptr| is |*buflen_ptr|
- * length. This function expands |*buf_ptr| as necessary to store
- * given |frame|.
+ * Packs GOAWAY frame |frame| in wire format and store it in |bufs|.
+ * This function expands |bufs| as necessary to store frame.
+ *
+ * The caller must make sure that nghttp2_bufs_reset(bufs) is called
+ * before calling this function.
  *
  * This function returns 0 if it succeeds or one of the following
  * negative error codes:
  *
  * NGHTTP2_ERR_NOMEM
  *     Out of memory.
+ * NGHTTP2_ERR_FRAME_SIZE_ERROR
+ *     The length of the frame is too large.
  */
-ssize_t nghttp2_frame_pack_goaway(uint8_t **buf_ptr, size_t *buflen_ptr,
-                                  nghttp2_goaway *frame);
+int nghttp2_frame_pack_goaway(nghttp2_bufs *bufs, nghttp2_goaway *frame);
 
 /*
- * Unpacks GOAWAY wire format into |frame|.
+ * Unpacks GOAWAY wire format into |frame|.  The |payload| of length
+ * |payloadlen| contains first 8 bytes of payload.  The
+ * |var_gift_payload| of length |var_gift_payloadlen| contains
+ * remaining payload and its buffer is gifted to the function and then
+ * |frame|.  The |var_gift_payloadlen| must be freed by
+ * nghttp2_frame_goaway_free().
  */
 void nghttp2_frame_unpack_goaway_payload(nghttp2_goaway *frame,
                                          const uint8_t *payload,
-                                         size_t payloadlen);
+                                         size_t payloadlen,
+                                         uint8_t *var_gift_payload,
+                                         size_t var_gift_payloadlen);
 
 /*
- * Packs WINDOW_UPDATE frame |frame| in wire frame format and store it
- * in |*buf_ptr|. The capacity of |*buf_ptr| is |*buflen_ptr|
- * length. This function expands |*buf_ptr| as necessary to store
- * given |frame|.
+ * Unpacks GOAWAY wire format into |frame|.  This function only exists
+ * for unit test.  After allocating buffer for debug data, this
+ * function internally calls nghttp2_frame_unpack_goaway_payload().
  *
- * This function returns the size of packed frame if it succeeds, or
- * returns one of the following negative error codes:
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
  *
  * NGHTTP2_ERR_NOMEM
  *     Out of memory.
  */
-ssize_t nghttp2_frame_pack_window_update(uint8_t **buf_ptr, size_t *buflen_ptr,
-                                         nghttp2_window_update *frame);
+int nghttp2_frame_unpack_goaway_payload2(nghttp2_goaway *frame,
+                                         const uint8_t *payload,
+                                         size_t payloadlen, nghttp2_mem *mem);
+
+/*
+ * Packs WINDOW_UPDATE frame |frame| in wire frame format and store it
+ * in |bufs|.
+ *
+ * The caller must make sure that nghttp2_bufs_reset(bufs) is called
+ * before calling this function.
+ *
+ * This function always succeeds and returns 0.
+ */
+int nghttp2_frame_pack_window_update(nghttp2_bufs *bufs,
+                                     nghttp2_window_update *frame);
 
 /*
  * Unpacks WINDOW_UPDATE frame byte sequence into |frame|.
@@ -348,21 +377,20 @@ void nghttp2_frame_unpack_window_update_payload(nghttp2_window_update *frame,
  * ownership of |nva|, so caller must not free it. If |stream_id| is
  * not assigned yet, it must be -1.
  */
-void nghttp2_frame_headers_init(nghttp2_headers *frame,
-                                uint8_t flags, int32_t stream_id, int32_t pri,
+void nghttp2_frame_headers_init(nghttp2_headers *frame, uint8_t flags,
+                                int32_t stream_id, nghttp2_headers_category cat,
+                                const nghttp2_priority_spec *pri_spec,
                                 nghttp2_nv *nva, size_t nvlen);
 
-void nghttp2_frame_headers_free(nghttp2_headers *frame);
-
+void nghttp2_frame_headers_free(nghttp2_headers *frame, nghttp2_mem *mem);
 
 void nghttp2_frame_priority_init(nghttp2_priority *frame, int32_t stream_id,
-                                 int32_t pri);
+                                 const nghttp2_priority_spec *pri_spec);
 
 void nghttp2_frame_priority_free(nghttp2_priority *frame);
 
-void nghttp2_frame_rst_stream_init(nghttp2_rst_stream *frame,
-                                   int32_t stream_id,
-                                   nghttp2_error_code error_code);
+void nghttp2_frame_rst_stream_init(nghttp2_rst_stream *frame, int32_t stream_id,
+                                   uint32_t error_code);
 
 void nghttp2_frame_rst_stream_free(nghttp2_rst_stream *frame);
 
@@ -370,12 +398,13 @@ void nghttp2_frame_rst_stream_free(nghttp2_rst_stream *frame);
  * Initializes PUSH_PROMISE frame |frame| with given values.  |frame|
  * takes ownership of |nva|, so caller must not free it.
  */
-void nghttp2_frame_push_promise_init(nghttp2_push_promise *frame,
-                                     uint8_t flags, int32_t stream_id,
+void nghttp2_frame_push_promise_init(nghttp2_push_promise *frame, uint8_t flags,
+                                     int32_t stream_id,
                                      int32_t promised_stream_id,
                                      nghttp2_nv *nva, size_t nvlen);
 
-void nghttp2_frame_push_promise_free(nghttp2_push_promise *frame);
+void nghttp2_frame_push_promise_free(nghttp2_push_promise *frame,
+                                     nghttp2_mem *mem);
 
 /*
  * Initializes SETTINGS frame |frame| with given values. |frame| takes
@@ -385,7 +414,7 @@ void nghttp2_frame_push_promise_free(nghttp2_push_promise *frame);
 void nghttp2_frame_settings_init(nghttp2_settings *frame, uint8_t flags,
                                  nghttp2_settings_entry *iv, size_t niv);
 
-void nghttp2_frame_settings_free(nghttp2_settings *frame);
+void nghttp2_frame_settings_free(nghttp2_settings *frame, nghttp2_mem *mem);
 
 /*
  * Initializes PING frame |frame| with given values. If the
@@ -404,34 +433,36 @@ void nghttp2_frame_ping_free(nghttp2_ping *frame);
  * free it. If the |opaque_data_len| is 0, opaque_data could be NULL.
  */
 void nghttp2_frame_goaway_init(nghttp2_goaway *frame, int32_t last_stream_id,
-                               nghttp2_error_code error_code,
-                               uint8_t *opaque_data, size_t opaque_data_len);
+                               uint32_t error_code, uint8_t *opaque_data,
+                               size_t opaque_data_len);
 
-void nghttp2_frame_goaway_free(nghttp2_goaway *frame);
+void nghttp2_frame_goaway_free(nghttp2_goaway *frame, nghttp2_mem *mem);
 
 void nghttp2_frame_window_update_init(nghttp2_window_update *frame,
-                                      uint8_t flags,
-                                      int32_t stream_id,
+                                      uint8_t flags, int32_t stream_id,
                                       int32_t window_size_increment);
 
 void nghttp2_frame_window_update_free(nghttp2_window_update *frame);
 
-void nghttp2_frame_data_init(nghttp2_data *frame, nghttp2_private_data *pdata);
+/*
+ * Returns the number of padding bytes after payload.  The total
+ * padding length is given in the |padlen|.  The returned value does
+ * not include the Pad Length field.
+ */
+size_t nghttp2_frame_trail_padlen(nghttp2_frame *frame, size_t padlen);
 
-void nghttp2_frame_private_data_init(nghttp2_private_data *frame,
-                                     uint8_t flags,
-                                     int32_t stream_id,
-                                     const nghttp2_data_provider *data_prd);
+void nghttp2_frame_data_init(nghttp2_data *frame, uint8_t flags,
+                             int32_t stream_id);
 
-void nghttp2_frame_private_data_free(nghttp2_private_data *frame);
+void nghttp2_frame_data_free(nghttp2_data *frame);
 
 /*
  * Makes copy of |iv| and return the copy. The |niv| is the number of
  * entries in |iv|. This function returns the pointer to the copy if
  * it succeeds, or NULL.
  */
-nghttp2_settings_entry* nghttp2_frame_iv_copy(const nghttp2_settings_entry *iv,
-                                              size_t niv);
+nghttp2_settings_entry *nghttp2_frame_iv_copy(const nghttp2_settings_entry *iv,
+                                              size_t niv, nghttp2_mem *mem);
 
 /*
  * Sorts the |nva| in ascending order of name and value. If names are
@@ -446,17 +477,14 @@ void nghttp2_nv_array_sort(nghttp2_nv *nva, size_t nvlen);
  *
  * The |*nva_ptr| must be freed using nghttp2_nv_array_del().
  *
- * This function returns the number of name/value pairs in |*nva_ptr|,
- * or one of the following negative error codes:
+ * This function returns 0 if it succeeds or one of the following
+ * negative error codes:
  *
  * NGHTTP2_ERR_NOMEM
  *     Out of memory.
- * NGHTTP2_ERR_INVALID_ARGUMENT
- *     The length of name or value in |nva| is strictly larger than
- *     NGHTTP2_MAX_HD_VALUE_LENGTH.
  */
-ssize_t nghttp2_nv_array_copy(nghttp2_nv **nva_ptr,
-                              const nghttp2_nv *nva, size_t nvlen);
+int nghttp2_nv_array_copy(nghttp2_nv **nva_ptr, const nghttp2_nv *nva,
+                          size_t nvlen, nghttp2_mem *mem);
 
 /*
  * Returns nonzero if the name/value pair |a| equals to |b|. The name
@@ -468,16 +496,31 @@ int nghttp2_nv_equal(const nghttp2_nv *a, const nghttp2_nv *b);
 /*
  * Frees |nva|.
  */
-void nghttp2_nv_array_del(nghttp2_nv *nva);
+void nghttp2_nv_array_del(nghttp2_nv *nva, nghttp2_mem *mem);
 
 /*
  * Checks that the |iv|, which includes |niv| entries, does not have
- * invalid values. The |flow_control_opt| is current flow control
- * option value.
+ * invalid values.
  *
  * This function returns nonzero if it succeeds, or 0.
  */
-int nghttp2_iv_check(const nghttp2_settings_entry *iv, size_t niv,
-                     int32_t flow_control_opt);
+int nghttp2_iv_check(const nghttp2_settings_entry *iv, size_t niv);
+
+/*
+ * Sets Pad Length field and flags and adjusts frame header position
+ * of each buffers in |bufs|.  The number of padding is given in the
+ * |padlen| including Pad Length field.  The |hd| is the frame header
+ * for the serialized data.
+ *
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * NGHTTP2_ERR_NOMEM
+ *     Out of memory.
+ * NGHTTP2_ERR_FRAME_SIZE_ERROR
+ *     The length of the resulting frame is too large.
+ */
+int nghttp2_frame_add_pad(nghttp2_bufs *bufs, nghttp2_frame_hd *hd,
+                          size_t padlen);
 
 #endif /* NGHTTP2_FRAME_H */

lib/nghttp2_hd.h

@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
@@ -22,41 +22,34 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#ifndef NGHTTP2_HD_COMP_H
-#define NGHTTP2_HD_COMP_H
+#ifndef NGHTTP2_HD_H
+#define NGHTTP2_HD_H
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif /* HAVE_CONFIG_H */
 
 #include <nghttp2/nghttp2.h>
 
 #include "nghttp2_hd_huffman.h"
-#include "nghttp2_buffer.h"
+#include "nghttp2_buf.h"
+#include "nghttp2_mem.h"
 
-#define NGHTTP2_HD_DEFAULT_MAX_BUFFER_SIZE (1 << 12)
+#define NGHTTP2_HD_DEFAULT_MAX_BUFFER_SIZE NGHTTP2_DEFAULT_HEADER_TABLE_SIZE
 #define NGHTTP2_HD_ENTRY_OVERHEAD 32
 
-/* The maximum value length of name/value pair. This is not specified
-   by the spec. We just chose the arbitrary size */
-#define NGHTTP2_HD_MAX_NAME 256
-#define NGHTTP2_HD_MAX_VALUE 4096
-#define NGHTTP2_HD_MAX_BUFFER_LENGTH (1 << 15)
+/* The maximum length of one name/value pair.  This is the sum of the
+   length of name and value.  This is not specified by the spec. We
+   just chose the arbitrary size */
+#define NGHTTP2_HD_MAX_NV 65536
 
 /* Default size of maximum table buffer size for encoder. Even if
    remote decoder notifies larger buffer size for its decoding,
    encoder only uses the memory up to this value. */
 #define NGHTTP2_HD_DEFAULT_MAX_DEFLATE_BUFFER_SIZE (1 << 12)
 
-typedef enum {
-  NGHTTP2_HD_SIDE_REQUEST = 0,
-  NGHTTP2_HD_SIDE_RESPONSE = 1
-} nghttp2_hd_side;
-
-typedef enum {
-  NGHTTP2_HD_ROLE_DEFLATE,
-  NGHTTP2_HD_ROLE_INFLATE
-} nghttp2_hd_role;
+/* Exported for unit test */
+extern const size_t NGHTTP2_STATIC_TABLE_LENGTH;
 
 typedef enum {
   NGHTTP2_HD_FLAG_NONE = 0,
@@ -64,18 +57,12 @@ typedef enum {
   NGHTTP2_HD_FLAG_NAME_ALLOC = 1,
   /* Indicates value was dynamically allocated and must be freed */
   NGHTTP2_HD_FLAG_VALUE_ALLOC = 1 << 1,
-  /* Indicates that the entry is in the reference set */
-  NGHTTP2_HD_FLAG_REFSET = 1 << 2,
-  /* Indicates that the entry is emitted in the current header
-     processing. */
-  NGHTTP2_HD_FLAG_EMIT = 1 << 3,
-  NGHTTP2_HD_FLAG_IMPLICIT_EMIT = 1 << 4,
   /* Indicates that the name was gifted to the entry and no copying
      necessary. */
-  NGHTTP2_HD_FLAG_NAME_GIFT = 1 << 5,
+  NGHTTP2_HD_FLAG_NAME_GIFT = 1 << 2,
   /* Indicates that the value was gifted to the entry and no copying
      necessary. */
-  NGHTTP2_HD_FLAG_VALUE_GIFT = 1 << 6
+  NGHTTP2_HD_FLAG_VALUE_GIFT = 1 << 3
 } nghttp2_hd_flags;
 
 typedef struct {
@@ -108,6 +95,7 @@ typedef enum {
 
 typedef enum {
   NGHTTP2_HD_STATE_OPCODE,
+  NGHTTP2_HD_STATE_READ_TABLE_SIZE,
   NGHTTP2_HD_STATE_READ_INDEX,
   NGHTTP2_HD_STATE_NEWNAME_CHECK_NAMELEN,
   NGHTTP2_HD_STATE_NEWNAME_READ_NAMELEN,
@@ -116,93 +104,81 @@ typedef enum {
   NGHTTP2_HD_STATE_CHECK_VALUELEN,
   NGHTTP2_HD_STATE_READ_VALUELEN,
   NGHTTP2_HD_STATE_READ_VALUEHUFF,
-  NGHTTP2_HD_STATE_READ_VALUE,
+  NGHTTP2_HD_STATE_READ_VALUE
 } nghttp2_hd_inflate_state;
 
 typedef struct {
   /* dynamic header table */
   nghttp2_hd_ringbuf hd_table;
+  /* Memory allocator */
+  nghttp2_mem *mem;
   /* Abstract buffer size of hd_table as described in the spec. This
      is the sum of length of name/value in hd_table +
      NGHTTP2_HD_ENTRY_OVERHEAD bytes overhead per each entry. */
   size_t hd_table_bufsize;
-  /* The header table size for decoding. If the context is initialized
-     as encoder, this value is advertised by remote endpoint
-     decoder. */
+  /* The effective header table size. */
   size_t hd_table_bufsize_max;
-  /* The current effective header table size for encoding. This value
-     is always equal to |hd_table_bufsize| on decoder
-     context. |deflate_hd_table_bufsize| <= |hd_table_bufsize| must be
-     hold. */
-  size_t deflate_hd_table_bufsize;
-  /* The maximum effective header table for encoding. Although header
-     table size is bounded by |hd_table_bufsize_max|, the encoder can
-     use smaller buffer by not retaining the header name/values beyond
-     the |deflate_hd_table_bufsize_max| and not referencing those
-     entries. This value is always equal to |hd_table_bufsize_max| on
-     decoder context. */
-  size_t deflate_hd_table_bufsize_max;
-  /* The number of effective entry in |hd_table|. This value is always
-     equal to hd_table.len on decoder side. */
-  size_t deflate_hd_tablelen;
-  /* Role of this context; deflate or infalte */
-  nghttp2_hd_role role;
-  /* NGHTTP2_HD_SIDE_REQUEST for processing request, otherwise
-     response. */
-  nghttp2_hd_side side;
   /* If inflate/deflate error occurred, this value is set to 1 and
      further invocation of inflate/deflate will fail with
      NGHTTP2_ERR_HEADER_COMP. */
   uint8_t bad;
 } nghttp2_hd_context;
 
-typedef struct {
+struct nghttp2_hd_deflater {
   nghttp2_hd_context ctx;
-  /* Set to this nonzero to clear reference set on each deflation each
-     time. */
-  uint8_t no_refset;
-} nghttp2_hd_deflater;
+  /* The upper limit of the header table size the deflater accepts. */
+  size_t deflate_hd_table_bufsize_max;
+  /* Minimum header table size notified in the next context update */
+  size_t min_hd_table_bufsize_max;
+  /* If nonzero, send header table size using encoding context update
+     in the next deflate process */
+  uint8_t notify_table_size_change;
+};
 
-typedef struct {
+struct nghttp2_hd_inflater {
   nghttp2_hd_context ctx;
-  /* header name buffer */
-  nghttp2_buffer namebuf;
-  /* header value buffer */
-  nghttp2_buffer valuebuf;
+  /* header buffer */
+  nghttp2_bufs nvbufs;
   /* Stores current state of huffman decoding */
   nghttp2_hd_huff_decode_context huff_decode_ctx;
   /* Pointer to the nghttp2_hd_entry which is used current header
      emission. This is required because in some cases the
      ent_keep->ref == 0 and we have to keep track of it. */
   nghttp2_hd_entry *ent_keep;
-  /* Pointers to the name/value pair which are used current header
-     emission. They are usually used to keep track of malloc'ed memory
-     for huffman decoding. */
-  uint8_t *name_keep, *value_keep;
-  /* Pointers to the name/value pair which is referred as indexed
-     name. This entry must be in header table. */
-  nghttp2_hd_entry *ent_name;
+  /* Pointer to the name/value pair buffer which is used in the
+     current header emission. */
+  uint8_t *nv_keep;
   /* The number of bytes to read */
-  ssize_t left;
+  size_t left;
   /* The index in indexed repr or indexed name */
   size_t index;
-  /* The index of header table to toggle off the entry from reference
-     set at the end of decompression. */
-  size_t end_headers_index;
+  /* The length of new name encoded in literal.  For huffman encoded
+     string, this is the length after it is decoded. */
+  size_t newnamelen;
+  /* The maximum header table size the inflater supports. This is the
+     same value transmitted in SETTINGS_HEADER_TABLE_SIZE */
+  size_t settings_hd_table_bufsize_max;
+  /* The number of next shift to decode integer */
+  size_t shift;
   nghttp2_hd_opcode opcode;
   nghttp2_hd_inflate_state state;
   /* nonzero if string is huffman encoded */
   uint8_t huffman_encoded;
   /* nonzero if deflater requires that current entry is indexed */
   uint8_t index_required;
-} nghttp2_hd_inflater;
+  /* nonzero if deflater requires that current entry must not be
+     indexed */
+  uint8_t no_index;
+};
 
 /*
  * Initializes the |ent| members. If NGHTTP2_HD_FLAG_NAME_ALLOC bit
  * set in the |flags|, the content pointed by the |name| with length
  * |namelen| is copied. Likewise, if NGHTTP2_HD_FLAG_VALUE_ALLOC bit
  * set in the |flags|, the content pointed by the |value| with length
- * |valuelen| is copied.
+ * |valuelen| is copied.  The |name_hash| and |value_hash| are hash
+ * value for |name| and |value| respectively.  The hash function is
+ * defined in nghttp2_hd.c.
  *
  * This function returns 0 if it succeeds, or one of the following
  * negative error codes:
@@ -210,11 +186,12 @@ typedef struct {
  * NGHTTP2_ERR_NOMEM
  *     Out of memory.
  */
-int nghttp2_hd_entry_init(nghttp2_hd_entry *ent, uint8_t flags,
-                          uint8_t *name, uint16_t namelen,
-                          uint8_t *value, uint16_t valuelen);
+int nghttp2_hd_entry_init(nghttp2_hd_entry *ent, uint8_t flags, uint8_t *name,
+                          size_t namelen, uint8_t *value, size_t valuelen,
+                          uint32_t name_hash, uint32_t value_hash,
+                          nghttp2_mem *mem);
 
-void nghttp2_hd_entry_free(nghttp2_hd_entry *ent);
+void nghttp2_hd_entry_free(nghttp2_hd_entry *ent, nghttp2_mem *mem);
 
 /*
  * Initializes |deflater| for deflating name/values pairs.
@@ -230,8 +207,7 @@ void nghttp2_hd_entry_free(nghttp2_hd_entry *ent);
  * NGHTTP2_ERR_NOMEM
  *     Out of memory.
  */
-int nghttp2_hd_deflate_init(nghttp2_hd_deflater *deflater,
-                            nghttp2_hd_side side);
+int nghttp2_hd_deflate_init(nghttp2_hd_deflater *deflater, nghttp2_mem *mem);
 
 /*
  * Initializes |deflater| for deflating name/values pairs.
@@ -247,20 +223,8 @@ int nghttp2_hd_deflate_init(nghttp2_hd_deflater *deflater,
  *     Out of memory.
  */
 int nghttp2_hd_deflate_init2(nghttp2_hd_deflater *deflater,
-                             nghttp2_hd_side side,
-                             size_t deflate_hd_table_bufsize_max);
-
-/*
- * Initializes |inflater| for inflating name/values pairs.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-int nghttp2_hd_inflate_init(nghttp2_hd_inflater *inflater,
-                            nghttp2_hd_side side);
+                             size_t deflate_hd_table_bufsize_max,
+                             nghttp2_mem *mem);
 
 /*
  * Deallocates any resources allocated for |deflater|.
@@ -268,171 +232,100 @@ int nghttp2_hd_inflate_init(nghttp2_hd_inflater *inflater,
 void nghttp2_hd_deflate_free(nghttp2_hd_deflater *deflater);
 
 /*
- * Deallocates any resources allocated for |inflater|.
- */
-void nghttp2_hd_inflate_free(nghttp2_hd_inflater *inflater);
-
-/*
- * Sets the availability of reference set in the |deflater|. If
- * |no_refset| is nonzero, the deflater will first emit index=0 in the
- * each invocation of nghttp2_hd_deflate_hd() to clear up reference
- * set. By default, the deflater uses reference set.
- */
-void nghttp2_hd_deflate_set_no_refset(nghttp2_hd_deflater *deflater,
-                                      uint8_t no_refset);
-
-/*
- * Changes header table size in |context|. This may trigger eviction
- * in the dynamic table.
+ * Deflates the |nva|, which has the |nvlen| name/value pairs, into
+ * the |bufs|.
  *
- * This function can be used for deflater and inflater.
+ * This function expands |bufs| as necessary to store the result. If
+ * buffers is full and the process still requires more space, this
+ * funtion fails and returns NGHTTP2_ERR_HEADER_COMP.
+ *
+ * After this function returns, it is safe to delete the |nva|.
  *
  * This function returns 0 if it succeeds, or one of the following
  * negative error codes:
  *
  * NGHTTP2_ERR_NOMEM
  *     Out of memory.
- */
-int nghttp2_hd_change_table_size(nghttp2_hd_context *context,
-                                 size_t hd_table_bufsize_max);
-
-/*
- * Deflates the |nva|, which has the |nvlen| name/value pairs, into
- * the buffer pointed by the |*buf_ptr| with the length |*buflen_ptr|.
- * The output starts after |nv_offset| bytes from |*buf_ptr|.
- *
- * This function expands |*buf_ptr| as necessary to store the
- * result. When expansion occurred, memory previously pointed by
- * |*buf_ptr| may change.  |*buf_ptr| and |*buflen_ptr| are updated
- * accordingly.
- *
- * This function copies necessary data into |*buf_ptr|. After this
- * function returns, it is safe to delete the |nva|.
- *
- * TODO: The rest of the code call nghttp2_hd_end_headers() after this
- * call, but it is just a regacy of the first implementation. Now it
- * is not required to be called as of now.
- *
- * This function returns the number of bytes outputted if it succeeds,
- * or one of the following negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
  * NGHTTP2_ERR_HEADER_COMP
  *     Deflation process has failed.
+ * NGHTTP2_ERR_BUFFER_ERROR
+ *     Out of buffer space.
  */
-ssize_t nghttp2_hd_deflate_hd(nghttp2_hd_deflater *deflater,
-                              uint8_t **buf_ptr, size_t *buflen_ptr,
-                              size_t nv_offset,
-                              nghttp2_nv *nva, size_t nvlen);
-
-typedef enum {
-  NGHTTP2_HD_INFLATE_NONE = 0,
-  NGHTTP2_HD_INFLATE_FINAL = 1,
-  NGHTTP2_HD_INFLATE_EMIT = (1 << 1)
-} nghttp2_hd_inflate_flag;
+int nghttp2_hd_deflate_hd_bufs(nghttp2_hd_deflater *deflater,
+                               nghttp2_bufs *bufs, const nghttp2_nv *nva,
+                               size_t nvlen);
 
 /*
- * Inflates name/value block stored in |in| with length |inlen|. This
- * function performs decompression. For each successful emission of
- * header name/value pair, NGHTTP2_HD_INFLATE_EMIT is set in
- * |*inflate_flags| and name/value pair is assigned to the |nv_out|
- * and the function returns. The caller must not free the members of
- * |nv_out|.
+ * Initializes |inflater| for inflating name/values pairs.
  *
- * The |nv_out| may include pointers to the memory region in the
- * |in|. The caller must retain the |in| while the |nv_out| is used.
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
  *
- * The application should call this function repeatedly until the
- * |(*inflate_flags) & NGHTTP2_HD_INFLATE_FINAL| is nonzero and return
- * value is non-negative. This means the all input values are
- * processed successfully. Then the application must call
- * `nghttp2_hd_inflate_end_headers()` to prepare for the next header
- * block input.
- *
- * The caller can feed complete compressed header block. It also can
- * feed it in several chunks. The caller must set |in_final| to
- * nonzero if the given input is the last block of the compressed
- * header.
- *
- * This function returns the number of bytes processed if it succeeds,
- * or one of the following negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
+ * :enum:`NGHTTP2_ERR_NOMEM`
  *     Out of memory.
- * NGHTTP2_ERR_HEADER_COMP
- *     Inflation process has failed.
  */
-ssize_t nghttp2_hd_inflate_hd(nghttp2_hd_inflater *inflater,
-                              nghttp2_nv *nv_out, int *inflate_flags,
-                              uint8_t *in, size_t inlen, int in_final);
+int nghttp2_hd_inflate_init(nghttp2_hd_inflater *inflater, nghttp2_mem *mem);
 
 /*
- * Signals the end of decompression for one header block.
- *
- * This function returns 0 if it succeeds. Currently this function
- * always succeeds.
+ * Deallocates any resources allocated for |inflater|.
  */
-int nghttp2_hd_inflate_end_headers(nghttp2_hd_inflater *inflater);
+void nghttp2_hd_inflate_free(nghttp2_hd_inflater *inflater);
 
 /* For unittesting purpose */
-int nghttp2_hd_emit_indname_block(uint8_t **buf_ptr, size_t *buflen_ptr,
-                                  size_t *offset_ptr, size_t index,
-                                  const uint8_t *value, size_t valuelen,
-                                  int inc_indexing,
-                                  nghttp2_hd_side side);
+int nghttp2_hd_emit_indname_block(nghttp2_bufs *bufs, size_t index,
+                                  nghttp2_nv *nv, int inc_indexing);
 
 /* For unittesting purpose */
-int nghttp2_hd_emit_newname_block(uint8_t **buf_ptr, size_t *buflen_ptr,
-                                  size_t *offset_ptr, nghttp2_nv *nv,
-                                  int inc_indexing,
-                                  nghttp2_hd_side side);
+int nghttp2_hd_emit_newname_block(nghttp2_bufs *bufs, nghttp2_nv *nv,
+                                  int inc_indexing);
 
 /* For unittesting purpose */
-nghttp2_hd_entry* nghttp2_hd_table_get(nghttp2_hd_context *context,
+int nghttp2_hd_emit_table_size(nghttp2_bufs *bufs, size_t table_size);
+
+/* For unittesting purpose */
+nghttp2_hd_entry *nghttp2_hd_table_get(nghttp2_hd_context *context,
                                        size_t index);
 
+/* For unittesting purpose */
+ssize_t nghttp2_hd_decode_length(uint32_t *res, size_t *shift_ptr, int *final,
+                                 uint32_t initial, size_t shift, uint8_t *in,
+                                 uint8_t *last, size_t prefix);
+
 /* Huffman encoding/decoding functions */
 
 /*
- * Counts the required bytes to encode |src| with length |len|. If
- * |side| is NGHTTP2_HD_SIDE_REQUEST, the request huffman code table
- * is used. Otherwise, the response code table is used.
+ * Counts the required bytes to encode |src| with length |len|.
  *
  * This function returns the number of required bytes to encode given
  * data, including padding of prefix of terminal symbol code. This
  * function always succeeds.
  */
-size_t nghttp2_hd_huff_encode_count(const uint8_t *src, size_t len,
-                                    nghttp2_hd_side side);
+size_t nghttp2_hd_huff_encode_count(const uint8_t *src, size_t len);
 
 /*
- * Encodes the given data |src| with length |srclen| to the given
- * memory location pointed by |dest|, allocated at lest |destlen|
- * bytes. The caller is responsible to specify |destlen| at least the
- * length that nghttp2_hd_huff_encode_count() returns.  If |side| is
- * NGHTTP2_HD_SIDE_REQUEST, the request huffman code table is
- * used. Otherwise, the response code table is used.
+ * Encodes the given data |src| with length |srclen| to the |bufs|.
+ * This function expands extra buffers in |bufs| if necessary.
  *
- * This function returns the number of written bytes, including
- * padding of prefix of terminal symbol code. This return value is
- * exactly the same with the return value of
- * nghttp2_hd_huff_encode_count() if it is given with the same |src|,
- * |srclen|, and |side|. This function always succeeds.
+ * This function returns 0 if it succeeds, or one of the following
+ * negative error codes:
+ *
+ * NGHTTP2_ERR_NOMEM
+ *     Out of memory.
+ * NGHTTP2_ERR_BUFFER_ERROR
+ *     Out of buffer space.
  */
-ssize_t nghttp2_hd_huff_encode(uint8_t *dest, size_t destlen,
-                               const uint8_t *src, size_t srclen,
-                               nghttp2_hd_side side);
+int nghttp2_hd_huff_encode(nghttp2_bufs *bufs, const uint8_t *src,
+                           size_t srclen);
 
-void nghttp2_hd_huff_decode_context_init(nghttp2_hd_huff_decode_context *ctx,
-                                         nghttp2_hd_side side);
+void nghttp2_hd_huff_decode_context_init(nghttp2_hd_huff_decode_context *ctx);
 
 /*
  * Decodes the given data |src| with length |srclen|. The |ctx| must
  * be initialized by nghttp2_hd_huff_decode_context_init(). The result
  * will be added to |dest|. This function may expand |dest| as
  * needed. The caller is responsible to release the memory of |dest|
- * by calling nghttp2_buffer_free().
+ * by calling nghttp2_bufs_free() or export its content using
+ * nghttp2_bufs_remove().
  *
  * The caller must set the |final| to nonzero if the given input is
  * the final block.
@@ -450,7 +343,7 @@ void nghttp2_hd_huff_decode_context_init(nghttp2_hd_huff_decode_context *ctx,
  *     Decoding process has failed.
  */
 ssize_t nghttp2_hd_huff_decode(nghttp2_hd_huff_decode_context *ctx,
-                               nghttp2_buffer *dest,
-                               const uint8_t *src, size_t srclen, int final);
+                               nghttp2_bufs *bufs, const uint8_t *src,
+                               size_t srclen, int final);
 
-#endif /* NGHTTP2_HD_COMP_H */
+#endif /* NGHTTP2_HD_H */

lib/nghttp2_hd_huffman.c

@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
@@ -30,11 +30,8 @@
 
 #include "nghttp2_hd.h"
 
-extern const nghttp2_huff_sym req_huff_sym_table[];
-extern const nghttp2_huff_decode req_huff_decode_table[][16];
-
-extern const nghttp2_huff_sym res_huff_sym_table[];
-extern const nghttp2_huff_decode res_huff_decode_table[][16];
+extern const nghttp2_huff_sym huff_sym_table[];
+extern const nghttp2_huff_decode huff_decode_table[][16];
 
 /*
  * Encodes huffman code |sym| into |*dest_ptr|, whose least |rembits|
@@ -43,108 +40,164 @@ extern const nghttp2_huff_decode res_huff_decode_table[][16];
  * and points where next output should be placed. The number of
  * unfilled bits in the pointed location is returned.
  */
-static size_t huff_encode_sym(uint8_t **dest_ptr, size_t rembits,
-                              const nghttp2_huff_sym *sym)
-{
+static ssize_t huff_encode_sym(nghttp2_bufs *bufs, size_t *avail_ptr,
+                               size_t rembits, const nghttp2_huff_sym *sym) {
+  int rv;
   size_t nbits = sym->nbits;
-  for(;;) {
-    if(rembits > nbits) {
-      **dest_ptr |= sym->code << (rembits - nbits);
-      rembits -= nbits;
-      break;
-    }
-    **dest_ptr |= sym->code >> (nbits - rembits);
-    ++*dest_ptr;
-    nbits -= rembits;
-    rembits = 8;
-    if(nbits == 0) {
-      break;
-    }
-    **dest_ptr = 0;
+  uint32_t code = sym->code;
+
+  /* We assume that sym->nbits <= 32 */
+  if (rembits > nbits) {
+    nghttp2_bufs_fast_orb_hold(bufs, code << (rembits - nbits));
+    return (ssize_t)(rembits - nbits);
   }
-  return rembits;
+
+  if (rembits == nbits) {
+    nghttp2_bufs_fast_orb(bufs, code);
+    --*avail_ptr;
+    return 8;
+  }
+
+  nghttp2_bufs_fast_orb(bufs, code >> (nbits - rembits));
+  --*avail_ptr;
+
+  nbits -= rembits;
+  if (nbits & 0x7) {
+    /* align code to MSB byte boundary */
+    code <<= 8 - (nbits & 0x7);
+  }
+
+  /* we lose at most 3 bytes, but it is not critical in practice */
+  if (*avail_ptr < (nbits + 7) / 8) {
+    rv = nghttp2_bufs_advance(bufs);
+    if (rv != 0) {
+      return rv;
+    }
+    *avail_ptr = nghttp2_bufs_cur_avail(bufs);
+    /* we assume that we at least 3 buffer space available */
+    assert(*avail_ptr >= 3);
+  }
+
+  /* fast path, since most code is less than 8 */
+  if (nbits < 8) {
+    nghttp2_bufs_fast_addb_hold(bufs, code);
+    *avail_ptr = nghttp2_bufs_cur_avail(bufs);
+    return (ssize_t)(8 - nbits);
+  }
+
+  /* handle longer code path */
+  if (nbits > 24) {
+    nghttp2_bufs_fast_addb(bufs, code >> 24);
+    nbits -= 8;
+  }
+
+  if (nbits > 16) {
+    nghttp2_bufs_fast_addb(bufs, code >> 16);
+    nbits -= 8;
+  }
+
+  if (nbits > 8) {
+    nghttp2_bufs_fast_addb(bufs, code >> 8);
+    nbits -= 8;
+  }
+
+  if (nbits == 8) {
+    nghttp2_bufs_fast_addb(bufs, code);
+    *avail_ptr = nghttp2_bufs_cur_avail(bufs);
+    return 8;
+  }
+
+  nghttp2_bufs_fast_addb_hold(bufs, code);
+  *avail_ptr = nghttp2_bufs_cur_avail(bufs);
+  return (ssize_t)(8 - nbits);
 }
 
-size_t nghttp2_hd_huff_encode_count(const uint8_t *src, size_t len,
-                                    nghttp2_hd_side side)
-{
+size_t nghttp2_hd_huff_encode_count(const uint8_t *src, size_t len) {
   size_t i;
   size_t nbits = 0;
-  const nghttp2_huff_sym *huff_sym_table;
 
-  if(side == NGHTTP2_HD_SIDE_REQUEST) {
-    huff_sym_table = req_huff_sym_table;
-  } else {
-    huff_sym_table = res_huff_sym_table;
-  }
-  for(i = 0; i < len; ++i) {
+  for (i = 0; i < len; ++i) {
     nbits += huff_sym_table[src[i]].nbits;
   }
   /* pad the prefix of EOS (256) */
   return (nbits + 7) / 8;
 }
 
-ssize_t nghttp2_hd_huff_encode(uint8_t *dest, size_t destlen,
-                               const uint8_t *src, size_t srclen,
-                               nghttp2_hd_side side)
-{
-  int rembits = 8;
-  uint8_t *dest_first = dest;
+int nghttp2_hd_huff_encode(nghttp2_bufs *bufs, const uint8_t *src,
+                           size_t srclen) {
+  int rv;
+  ssize_t rembits = 8;
   size_t i;
-  const nghttp2_huff_sym *huff_sym_table;
+  size_t avail;
 
-  if(side == NGHTTP2_HD_SIDE_REQUEST) {
-    huff_sym_table = req_huff_sym_table;
-  } else {
-    huff_sym_table = res_huff_sym_table;
-  }
-  for(i = 0; i < srclen; ++i) {
+  avail = nghttp2_bufs_cur_avail(bufs);
+
+  for (i = 0; i < srclen; ++i) {
     const nghttp2_huff_sym *sym = &huff_sym_table[src[i]];
-    if(rembits == 8) {
-      *dest = 0;
+    if (rembits == 8) {
+      if (avail) {
+        nghttp2_bufs_fast_addb_hold(bufs, 0);
+      } else {
+        rv = nghttp2_bufs_addb_hold(bufs, 0);
+        if (rv != 0) {
+          return rv;
+        }
+        avail = nghttp2_bufs_cur_avail(bufs);
+      }
+    }
+    rembits = huff_encode_sym(bufs, &avail, rembits, sym);
+    if (rembits < 0) {
+      return (int)rembits;
     }
-    rembits = huff_encode_sym(&dest, rembits, sym);
   }
   /* 256 is special terminal symbol, pad with its prefix */
-  if(rembits < 8) {
+  if (rembits < 8) {
+    /* if rembits < 8, we should have at least 1 buffer space
+       available */
     const nghttp2_huff_sym *sym = &huff_sym_table[256];
-    *dest |= sym->code >> (sym->nbits - rembits);
-    ++dest;
+    assert(avail);
+    /* Caution we no longer adjust avail here */
+    nghttp2_bufs_fast_orb(bufs, sym->code >> (sym->nbits - rembits));
   }
-  return dest - dest_first;
+
+  return 0;
 }
 
-void nghttp2_hd_huff_decode_context_init(nghttp2_hd_huff_decode_context *ctx,
-                                         nghttp2_hd_side side)
-{
-  if(side == NGHTTP2_HD_SIDE_REQUEST) {
-    ctx->huff_decode_table = req_huff_decode_table;
-  } else {
-    ctx->huff_decode_table = res_huff_decode_table;
-  }
+void nghttp2_hd_huff_decode_context_init(nghttp2_hd_huff_decode_context *ctx) {
   ctx->state = 0;
   ctx->accept = 1;
 }
 
 ssize_t nghttp2_hd_huff_decode(nghttp2_hd_huff_decode_context *ctx,
-                               nghttp2_buffer *dest,
-                               const uint8_t *src, size_t srclen, int final)
-{
+                               nghttp2_bufs *bufs, const uint8_t *src,
+                               size_t srclen, int final) {
   size_t i, j;
   int rv;
+  size_t avail;
+
+  avail = nghttp2_bufs_cur_avail(bufs);
+
   /* We use the decoding algorithm described in
      http://graphics.ics.uci.edu/pub/Prefix.pdf */
-  for(i = 0; i < srclen; ++i) {
+  for (i = 0; i < srclen; ++i) {
     uint8_t in = src[i] >> 4;
-    for(j = 0; j < 2; ++j) {
-      const nghttp2_huff_decode *t = &ctx->huff_decode_table[ctx->state][in];
-      if(t->state == -1) {
+    for (j = 0; j < 2; ++j) {
+      const nghttp2_huff_decode *t;
+
+      t = &huff_decode_table[ctx->state][in];
+      if (t->flags & NGHTTP2_HUFF_FAIL) {
         return NGHTTP2_ERR_HEADER_COMP;
       }
-      if(t->flags & NGHTTP2_HUFF_SYM) {
-        rv = nghttp2_buffer_add_byte(dest, t->sym);
-        if(rv != 0) {
-          return rv;
+      if (t->flags & NGHTTP2_HUFF_SYM) {
+        if (avail) {
+          nghttp2_bufs_fast_addb(bufs, t->sym);
+          --avail;
+        } else {
+          rv = nghttp2_bufs_addb(bufs, t->sym);
+          if (rv != 0) {
+            return rv;
+          }
+          avail = nghttp2_bufs_cur_avail(bufs);
         }
       }
       ctx->state = t->state;
@@ -152,8 +205,8 @@ ssize_t nghttp2_hd_huff_decode(nghttp2_hd_huff_decode_context *ctx,
       in = src[i] & 0xf;
     }
   }
-  if(final && !ctx->accept) {
+  if (final && !ctx->accept) {
     return NGHTTP2_ERR_HEADER_COMP;
   }
-  return i;
+  return (ssize_t)i;
 }

lib/nghttp2_hd_huffman.h

@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2013 Tatsuhiro Tsujikawa
  *
@@ -26,7 +26,7 @@
 #define NGHTTP2_HD_HUFFMAN_H
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif /* HAVE_CONFIG_H */
 
 #include <nghttp2/nghttp2.h>
@@ -36,13 +36,17 @@ typedef enum {
      sequence. */
   NGHTTP2_HUFF_ACCEPTED = 1,
   /* This state emits symbol */
-  NGHTTP2_HUFF_SYM = (1 << 1)
+  NGHTTP2_HUFF_SYM = (1 << 1),
+  /* If state machine reaches this state, decoding fails. */
+  NGHTTP2_HUFF_FAIL = (1 << 2)
 } nghttp2_huff_decode_flag;
 
 typedef struct {
   /* huffman decoding state, which is actually the node ID of internal
-     huffman tree */
-  int16_t state;
+     huffman tree.  We have 257 leaf nodes, but they are identical to
+     root node other than emitting a symbol, so we have 256 internal
+     nodes [1..255], inclusive. */
+  uint8_t state;
   /* bitwise OR of zero or more of the nghttp2_huff_decode_flag */
   uint8_t flags;
   /* symbol if NGHTTP2_HUFF_SYM flag set */
@@ -52,7 +56,6 @@ typedef struct {
 typedef nghttp2_huff_decode huff_decode_table_type[16];
 
 typedef struct {
-  const huff_decode_table_type *huff_decode_table;
   /* Current huffman decoding state. We stripped leaf nodes, so the
      value range is [0..255], inclusive. */
   uint8_t state;

lib/nghttp2_helper.c

@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
@@ -29,138 +29,218 @@
 
 #include "nghttp2_net.h"
 
-void nghttp2_put_uint16be(uint8_t *buf, uint16_t n)
-{
+void nghttp2_put_uint16be(uint8_t *buf, uint16_t n) {
   uint16_t x = htons(n);
   memcpy(buf, &x, sizeof(uint16_t));
 }
 
-void nghttp2_put_uint32be(uint8_t *buf, uint32_t n)
-{
+void nghttp2_put_uint32be(uint8_t *buf, uint32_t n) {
   uint32_t x = htonl(n);
   memcpy(buf, &x, sizeof(uint32_t));
 }
 
-uint16_t nghttp2_get_uint16(const uint8_t *data)
-{
+uint16_t nghttp2_get_uint16(const uint8_t *data) {
   uint16_t n;
   memcpy(&n, data, sizeof(uint16_t));
   return ntohs(n);
 }
 
-uint32_t nghttp2_get_uint32(const uint8_t *data)
-{
+uint32_t nghttp2_get_uint32(const uint8_t *data) {
   uint32_t n;
   memcpy(&n, data, sizeof(uint32_t));
   return ntohl(n);
 }
 
-int nghttp2_reserve_buffer(uint8_t **buf_ptr, size_t *buflen_ptr,
-                           size_t min_length)
-{
-  if(min_length > *buflen_ptr) {
-    uint8_t *temp;
-    min_length = (min_length+4095)/4096*4096;
-    temp = realloc(*buf_ptr, min_length);
-    if(temp == NULL) {
-      return NGHTTP2_ERR_NOMEM;
-    } else {
-      *buf_ptr = temp;
-      *buflen_ptr = min_length;
-    }
-  }
-  return 0;
-}
+void *nghttp2_memdup(const void *src, size_t n, nghttp2_mem *mem) {
+  void *dest;
 
-void* nghttp2_memdup(const void* src, size_t n)
-{
-  void* dest = malloc(n);
-  if(dest == NULL) {
+  if (n == 0) {
+    return NULL;
+  }
+
+  dest = nghttp2_mem_malloc(mem, n);
+  if (dest == NULL) {
     return NULL;
   }
   memcpy(dest, src, n);
   return dest;
 }
 
-void nghttp2_downcase(uint8_t *s, size_t len)
-{
+/* Generated by gendowncasetbl.py */
+static const int DOWNCASE_TBL[] = {
+    0 /* NUL  */,   1 /* SOH  */,   2 /* STX  */,   3 /* ETX  */,
+    4 /* EOT  */,   5 /* ENQ  */,   6 /* ACK  */,   7 /* BEL  */,
+    8 /* BS   */,   9 /* HT   */,   10 /* LF   */,  11 /* VT   */,
+    12 /* FF   */,  13 /* CR   */,  14 /* SO   */,  15 /* SI   */,
+    16 /* DLE  */,  17 /* DC1  */,  18 /* DC2  */,  19 /* DC3  */,
+    20 /* DC4  */,  21 /* NAK  */,  22 /* SYN  */,  23 /* ETB  */,
+    24 /* CAN  */,  25 /* EM   */,  26 /* SUB  */,  27 /* ESC  */,
+    28 /* FS   */,  29 /* GS   */,  30 /* RS   */,  31 /* US   */,
+    32 /* SPC  */,  33 /* !    */,  34 /* "    */,  35 /* #    */,
+    36 /* $    */,  37 /* %    */,  38 /* &    */,  39 /* '    */,
+    40 /* (    */,  41 /* )    */,  42 /* *    */,  43 /* +    */,
+    44 /* ,    */,  45 /* -    */,  46 /* .    */,  47 /* /    */,
+    48 /* 0    */,  49 /* 1    */,  50 /* 2    */,  51 /* 3    */,
+    52 /* 4    */,  53 /* 5    */,  54 /* 6    */,  55 /* 7    */,
+    56 /* 8    */,  57 /* 9    */,  58 /* :    */,  59 /* ;    */,
+    60 /* <    */,  61 /* =    */,  62 /* >    */,  63 /* ?    */,
+    64 /* @    */,  97 /* A    */,  98 /* B    */,  99 /* C    */,
+    100 /* D    */, 101 /* E    */, 102 /* F    */, 103 /* G    */,
+    104 /* H    */, 105 /* I    */, 106 /* J    */, 107 /* K    */,
+    108 /* L    */, 109 /* M    */, 110 /* N    */, 111 /* O    */,
+    112 /* P    */, 113 /* Q    */, 114 /* R    */, 115 /* S    */,
+    116 /* T    */, 117 /* U    */, 118 /* V    */, 119 /* W    */,
+    120 /* X    */, 121 /* Y    */, 122 /* Z    */, 91 /* [    */,
+    92 /* \    */,  93 /* ]    */,  94 /* ^    */,  95 /* _    */,
+    96 /* `    */,  97 /* a    */,  98 /* b    */,  99 /* c    */,
+    100 /* d    */, 101 /* e    */, 102 /* f    */, 103 /* g    */,
+    104 /* h    */, 105 /* i    */, 106 /* j    */, 107 /* k    */,
+    108 /* l    */, 109 /* m    */, 110 /* n    */, 111 /* o    */,
+    112 /* p    */, 113 /* q    */, 114 /* r    */, 115 /* s    */,
+    116 /* t    */, 117 /* u    */, 118 /* v    */, 119 /* w    */,
+    120 /* x    */, 121 /* y    */, 122 /* z    */, 123 /* {    */,
+    124 /* |    */, 125 /* }    */, 126 /* ~    */, 127 /* DEL  */,
+    128 /* 0x80 */, 129 /* 0x81 */, 130 /* 0x82 */, 131 /* 0x83 */,
+    132 /* 0x84 */, 133 /* 0x85 */, 134 /* 0x86 */, 135 /* 0x87 */,
+    136 /* 0x88 */, 137 /* 0x89 */, 138 /* 0x8a */, 139 /* 0x8b */,
+    140 /* 0x8c */, 141 /* 0x8d */, 142 /* 0x8e */, 143 /* 0x8f */,
+    144 /* 0x90 */, 145 /* 0x91 */, 146 /* 0x92 */, 147 /* 0x93 */,
+    148 /* 0x94 */, 149 /* 0x95 */, 150 /* 0x96 */, 151 /* 0x97 */,
+    152 /* 0x98 */, 153 /* 0x99 */, 154 /* 0x9a */, 155 /* 0x9b */,
+    156 /* 0x9c */, 157 /* 0x9d */, 158 /* 0x9e */, 159 /* 0x9f */,
+    160 /* 0xa0 */, 161 /* 0xa1 */, 162 /* 0xa2 */, 163 /* 0xa3 */,
+    164 /* 0xa4 */, 165 /* 0xa5 */, 166 /* 0xa6 */, 167 /* 0xa7 */,
+    168 /* 0xa8 */, 169 /* 0xa9 */, 170 /* 0xaa */, 171 /* 0xab */,
+    172 /* 0xac */, 173 /* 0xad */, 174 /* 0xae */, 175 /* 0xaf */,
+    176 /* 0xb0 */, 177 /* 0xb1 */, 178 /* 0xb2 */, 179 /* 0xb3 */,
+    180 /* 0xb4 */, 181 /* 0xb5 */, 182 /* 0xb6 */, 183 /* 0xb7 */,
+    184 /* 0xb8 */, 185 /* 0xb9 */, 186 /* 0xba */, 187 /* 0xbb */,
+    188 /* 0xbc */, 189 /* 0xbd */, 190 /* 0xbe */, 191 /* 0xbf */,
+    192 /* 0xc0 */, 193 /* 0xc1 */, 194 /* 0xc2 */, 195 /* 0xc3 */,
+    196 /* 0xc4 */, 197 /* 0xc5 */, 198 /* 0xc6 */, 199 /* 0xc7 */,
+    200 /* 0xc8 */, 201 /* 0xc9 */, 202 /* 0xca */, 203 /* 0xcb */,
+    204 /* 0xcc */, 205 /* 0xcd */, 206 /* 0xce */, 207 /* 0xcf */,
+    208 /* 0xd0 */, 209 /* 0xd1 */, 210 /* 0xd2 */, 211 /* 0xd3 */,
+    212 /* 0xd4 */, 213 /* 0xd5 */, 214 /* 0xd6 */, 215 /* 0xd7 */,
+    216 /* 0xd8 */, 217 /* 0xd9 */, 218 /* 0xda */, 219 /* 0xdb */,
+    220 /* 0xdc */, 221 /* 0xdd */, 222 /* 0xde */, 223 /* 0xdf */,
+    224 /* 0xe0 */, 225 /* 0xe1 */, 226 /* 0xe2 */, 227 /* 0xe3 */,
+    228 /* 0xe4 */, 229 /* 0xe5 */, 230 /* 0xe6 */, 231 /* 0xe7 */,
+    232 /* 0xe8 */, 233 /* 0xe9 */, 234 /* 0xea */, 235 /* 0xeb */,
+    236 /* 0xec */, 237 /* 0xed */, 238 /* 0xee */, 239 /* 0xef */,
+    240 /* 0xf0 */, 241 /* 0xf1 */, 242 /* 0xf2 */, 243 /* 0xf3 */,
+    244 /* 0xf4 */, 245 /* 0xf5 */, 246 /* 0xf6 */, 247 /* 0xf7 */,
+    248 /* 0xf8 */, 249 /* 0xf9 */, 250 /* 0xfa */, 251 /* 0xfb */,
+    252 /* 0xfc */, 253 /* 0xfd */, 254 /* 0xfe */, 255 /* 0xff */,
+};
+
+void nghttp2_downcase(uint8_t *s, size_t len) {
   size_t i;
-  for(i = 0; i < len; ++i) {
-    if('A' <= s[i] && s[i] <= 'Z') {
-      s[i] += 'a'-'A';
-    }
+  for (i = 0; i < len; ++i) {
+    s[i] = DOWNCASE_TBL[s[i]];
   }
 }
 
+/*
+ *   local_window_size
+ *   ^  *
+ *   |  *    recv_window_size
+ *   |  *  * ^
+ *   |  *  * |
+ *  0+++++++++
+ *   |  *  *   \
+ *   |  *  *   | This rage is hidden in flow control.  But it must be
+ *   v  *  *   / kept in order to restore it when window size is enlarged.
+ *   recv_reduction
+ *   (+ for negative direction)
+ *
+ *   recv_window_size could be negative if we decrease
+ *   local_window_size more than recv_window_size:
+ *
+ *   local_window_size
+ *   ^  *
+ *   |  *
+ *   |  *
+ *   0++++++++
+ *   |  *    ^ recv_window_size (negative)
+ *   |  *    |
+ *   v  *  *
+ *   recv_reduction
+ */
 int nghttp2_adjust_local_window_size(int32_t *local_window_size_ptr,
                                      int32_t *recv_window_size_ptr,
                                      int32_t *recv_reduction_ptr,
-                                     int32_t *delta_ptr)
-{
-  if(*delta_ptr > 0) {
+                                     int32_t *delta_ptr) {
+  if (*delta_ptr > 0) {
+    int32_t recv_reduction_delta;
+    int32_t delta;
     int32_t new_recv_window_size =
-      nghttp2_max(0, *recv_window_size_ptr) - *delta_ptr;
-    if(new_recv_window_size < 0) {
-      /* The delta size is strictly more than received bytes. Increase
-         local_window_size by that difference. */
-      int32_t recv_reduction_diff;
-      if(*local_window_size_ptr >
-         NGHTTP2_MAX_WINDOW_SIZE + new_recv_window_size) {
-        return NGHTTP2_ERR_FLOW_CONTROL;
-      }
-      *local_window_size_ptr -= new_recv_window_size;
-      /* If there is recv_reduction due to earlier window_size
-         reduction, we have to adjust it too. */
-      recv_reduction_diff = nghttp2_min(*recv_reduction_ptr,
-                                        -new_recv_window_size);
-      *recv_reduction_ptr -= recv_reduction_diff;
-      if(*recv_window_size_ptr < 0) {
-        *recv_window_size_ptr += recv_reduction_diff;
-      } else {
-        /* If *recv_window_size_ptr > 0, then those bytes are
-           considered to be backed to the remote peer (by
-           WINDOW_UPDATE with the adjusted *delta_ptr), so it is
-           effectively 0 now. */
-        *recv_window_size_ptr = recv_reduction_diff;
-      }
-      /* recv_reduction_diff must be paied from *delta_ptr, since it
-         was added in window size reduction (see below). */
-      *delta_ptr -= recv_reduction_diff;
-    } else {
+        nghttp2_max(0, *recv_window_size_ptr) - *delta_ptr;
+
+    if (new_recv_window_size >= 0) {
       *recv_window_size_ptr = new_recv_window_size;
+      return 0;
     }
-    return 0;
-  } else {
-    if(*local_window_size_ptr + *delta_ptr < 0 ||
-       *recv_window_size_ptr < INT32_MIN - *delta_ptr ||
-       *recv_reduction_ptr > INT32_MAX + *delta_ptr) {
+
+    delta = -new_recv_window_size;
+
+    /* The delta size is strictly more than received bytes. Increase
+       local_window_size by that difference |delta|. */
+    if (*local_window_size_ptr > NGHTTP2_MAX_WINDOW_SIZE - delta) {
       return NGHTTP2_ERR_FLOW_CONTROL;
     }
-    /* Decreasing local window size. Note that we achieve this without
-       noticing to the remote peer. To do this, we cut
-       recv_window_size by -delta. This means that we don't send
-       WINDOW_UPDATE for -delta bytes. */
-    *local_window_size_ptr += *delta_ptr;
-    *recv_window_size_ptr += *delta_ptr;
-    *recv_reduction_ptr -= *delta_ptr;
-    *delta_ptr = 0;
+    *local_window_size_ptr += delta;
+    /* If there is recv_reduction due to earlier window_size
+       reduction, we have to adjust it too. */
+    recv_reduction_delta = nghttp2_min(*recv_reduction_ptr, delta);
+    *recv_reduction_ptr -= recv_reduction_delta;
+    if (*recv_window_size_ptr < 0) {
+      *recv_window_size_ptr += recv_reduction_delta;
+    } else {
+      /* If *recv_window_size_ptr > 0, then those bytes are going to
+         be returned to the remote peer (by WINDOW_UPDATE with the
+         adjusted *delta_ptr), so it is effectively 0 now.  We set to
+         *recv_reduction_delta, because caller does not take into
+         account it in *delta_ptr. */
+      *recv_window_size_ptr = recv_reduction_delta;
+    }
+    /* recv_reduction_delta must be paied from *delta_ptr, since it
+       was added in window size reduction (see below). */
+    *delta_ptr -= recv_reduction_delta;
+
+    return 0;
   }
+
+  if (*local_window_size_ptr + *delta_ptr < 0 ||
+      *recv_window_size_ptr < INT32_MIN - *delta_ptr ||
+      *recv_reduction_ptr > INT32_MAX + *delta_ptr) {
+    return NGHTTP2_ERR_FLOW_CONTROL;
+  }
+  /* Decreasing local window size. Note that we achieve this without
+     noticing to the remote peer. To do this, we cut
+     recv_window_size by -delta. This means that we don't send
+     WINDOW_UPDATE for -delta bytes. */
+  *local_window_size_ptr += *delta_ptr;
+  *recv_window_size_ptr += *delta_ptr;
+  *recv_reduction_ptr -= *delta_ptr;
+  *delta_ptr = 0;
+
   return 0;
 }
 
 int nghttp2_should_send_window_update(int32_t local_window_size,
-                                      int32_t recv_window_size)
-{
+                                      int32_t recv_window_size) {
   return recv_window_size >= local_window_size / 2;
 }
 
-const char* nghttp2_strerror(int error_code)
-{
-  switch(error_code) {
+const char *nghttp2_strerror(int error_code) {
+  switch (error_code) {
   case 0:
     return "Success";
   case NGHTTP2_ERR_INVALID_ARGUMENT:
     return "Invalid argument";
+  case NGHTTP2_ERR_BUFFER_ERROR:
+    return "Out of buffer space";
   case NGHTTP2_ERR_UNSUPPORTED_VERSION:
     return "Unsupported SPDY version";
   case NGHTTP2_ERR_WOULDBLOCK:
@@ -195,190 +275,179 @@ const char* nghttp2_strerror(int error_code)
     return "Invalid header block";
   case NGHTTP2_ERR_INVALID_STATE:
     return "Invalid state";
-  case NGHTTP2_ERR_GZIP:
-    return "Gzip error";
   case NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE:
     return "The user callback function failed due to the temporal error";
   case NGHTTP2_ERR_FRAME_SIZE_ERROR:
     return "The length of the frame is invalid";
   case NGHTTP2_ERR_HEADER_COMP:
     return "Header compression/decompression error";
+  case NGHTTP2_ERR_FLOW_CONTROL:
+    return "Flow control error";
+  case NGHTTP2_ERR_INSUFF_BUFSIZE:
+    return "Insufficient buffer size given to function";
+  case NGHTTP2_ERR_PAUSE:
+    return "Callback was paused by the application";
+  case NGHTTP2_ERR_TOO_MANY_INFLIGHT_SETTINGS:
+    return "Too many inflight SETTINGS";
+  case NGHTTP2_ERR_PUSH_DISABLED:
+    return "Server push is disabled by peer";
+  case NGHTTP2_ERR_DATA_EXIST:
+    return "DATA frame already exists";
   case NGHTTP2_ERR_NOMEM:
     return "Out of memory";
   case NGHTTP2_ERR_CALLBACK_FAILURE:
     return "The user callback function failed";
+  case NGHTTP2_ERR_BAD_PREFACE:
+    return "Received bad connection preface";
   default:
     return "Unknown error code";
   }
 }
 
-void nghttp2_free(void *ptr)
-{
-  free(ptr);
-}
-
+/* Generated by gennmchartbl.py */
 static int VALID_HD_NAME_CHARS[] = {
-  0 /* NUL  */, 0 /* SOH  */, 0 /* STX  */, 0 /* ETX  */,
-  0 /* EOT  */, 0 /* ENQ  */, 0 /* ACK  */, 0 /* BEL  */,
-  0 /* BS   */, 0 /* HT   */, 0 /* LF   */, 0 /* VT   */,
-  0 /* FF   */, 0 /* CR   */, 0 /* SO   */, 0 /* SI   */,
-  0 /* DLE  */, 0 /* DC1  */, 0 /* DC2  */, 0 /* DC3  */,
-  0 /* DC4  */, 0 /* NAK  */, 0 /* SYN  */, 0 /* ETB  */,
-  0 /* CAN  */, 0 /* EM   */, 0 /* SUB  */, 0 /* ESC  */,
-  0 /* FS   */, 0 /* GS   */, 0 /* RS   */, 0 /* US   */,
-  0 /* SPC  */, 1 /* !    */, 0 /* "    */, 1 /* #    */,
-  1 /* $    */, 1 /* %    */, 1 /* &    */, 1 /* '    */,
-  0 /* (    */, 0 /* )    */, 1 /* *    */, 1 /* +    */,
-  0 /* ,    */, 1 /* -    */, 1 /* .    */, 0 /* /    */,
-  1 /* 0    */, 1 /* 1    */, 1 /* 2    */, 1 /* 3    */,
-  1 /* 4    */, 1 /* 5    */, 1 /* 6    */, 1 /* 7    */,
-  1 /* 8    */, 1 /* 9    */, 0 /* :    */, 0 /* ;    */,
-  0 /* <    */, 0 /* =    */, 0 /* >    */, 0 /* ?    */,
-  0 /* @    */, 0 /* A    */, 0 /* B    */, 0 /* C    */,
-  0 /* D    */, 0 /* E    */, 0 /* F    */, 0 /* G    */,
-  0 /* H    */, 0 /* I    */, 0 /* J    */, 0 /* K    */,
-  0 /* L    */, 0 /* M    */, 0 /* N    */, 0 /* O    */,
-  0 /* P    */, 0 /* Q    */, 0 /* R    */, 0 /* S    */,
-  0 /* T    */, 0 /* U    */, 0 /* V    */, 0 /* W    */,
-  0 /* X    */, 0 /* Y    */, 0 /* Z    */, 0 /* [    */,
-  0 /* \    */, 0 /* ]    */, 1 /* ^    */, 1 /* _    */,
-  1 /* `    */, 1 /* a    */, 1 /* b    */, 1 /* c    */,
-  1 /* d    */, 1 /* e    */, 1 /* f    */, 1 /* g    */,
-  1 /* h    */, 1 /* i    */, 1 /* j    */, 1 /* k    */,
-  1 /* l    */, 1 /* m    */, 1 /* n    */, 1 /* o    */,
-  1 /* p    */, 1 /* q    */, 1 /* r    */, 1 /* s    */,
-  1 /* t    */, 1 /* u    */, 1 /* v    */, 1 /* w    */,
-  1 /* x    */, 1 /* y    */, 1 /* z    */, 0 /* {    */,
-  1 /* |    */, 0 /* }    */, 1 /* ~    */, 0 /* DEL  */,
-  0 /* 0x80 */, 0 /* 0x81 */, 0 /* 0x82 */, 0 /* 0x83 */,
-  0 /* 0x84 */, 0 /* 0x85 */, 0 /* 0x86 */, 0 /* 0x87 */,
-  0 /* 0x88 */, 0 /* 0x89 */, 0 /* 0x8a */, 0 /* 0x8b */,
-  0 /* 0x8c */, 0 /* 0x8d */, 0 /* 0x8e */, 0 /* 0x8f */,
-  0 /* 0x90 */, 0 /* 0x91 */, 0 /* 0x92 */, 0 /* 0x93 */,
-  0 /* 0x94 */, 0 /* 0x95 */, 0 /* 0x96 */, 0 /* 0x97 */,
-  0 /* 0x98 */, 0 /* 0x99 */, 0 /* 0x9a */, 0 /* 0x9b */,
-  0 /* 0x9c */, 0 /* 0x9d */, 0 /* 0x9e */, 0 /* 0x9f */,
-  0 /* 0xa0 */, 0 /* 0xa1 */, 0 /* 0xa2 */, 0 /* 0xa3 */,
-  0 /* 0xa4 */, 0 /* 0xa5 */, 0 /* 0xa6 */, 0 /* 0xa7 */,
-  0 /* 0xa8 */, 0 /* 0xa9 */, 0 /* 0xaa */, 0 /* 0xab */,
-  0 /* 0xac */, 0 /* 0xad */, 0 /* 0xae */, 0 /* 0xaf */,
-  0 /* 0xb0 */, 0 /* 0xb1 */, 0 /* 0xb2 */, 0 /* 0xb3 */,
-  0 /* 0xb4 */, 0 /* 0xb5 */, 0 /* 0xb6 */, 0 /* 0xb7 */,
-  0 /* 0xb8 */, 0 /* 0xb9 */, 0 /* 0xba */, 0 /* 0xbb */,
-  0 /* 0xbc */, 0 /* 0xbd */, 0 /* 0xbe */, 0 /* 0xbf */,
-  0 /* 0xc0 */, 0 /* 0xc1 */, 0 /* 0xc2 */, 0 /* 0xc3 */,
-  0 /* 0xc4 */, 0 /* 0xc5 */, 0 /* 0xc6 */, 0 /* 0xc7 */,
-  0 /* 0xc8 */, 0 /* 0xc9 */, 0 /* 0xca */, 0 /* 0xcb */,
-  0 /* 0xcc */, 0 /* 0xcd */, 0 /* 0xce */, 0 /* 0xcf */,
-  0 /* 0xd0 */, 0 /* 0xd1 */, 0 /* 0xd2 */, 0 /* 0xd3 */,
-  0 /* 0xd4 */, 0 /* 0xd5 */, 0 /* 0xd6 */, 0 /* 0xd7 */,
-  0 /* 0xd8 */, 0 /* 0xd9 */, 0 /* 0xda */, 0 /* 0xdb */,
-  0 /* 0xdc */, 0 /* 0xdd */, 0 /* 0xde */, 0 /* 0xdf */,
-  0 /* 0xe0 */, 0 /* 0xe1 */, 0 /* 0xe2 */, 0 /* 0xe3 */,
-  0 /* 0xe4 */, 0 /* 0xe5 */, 0 /* 0xe6 */, 0 /* 0xe7 */,
-  0 /* 0xe8 */, 0 /* 0xe9 */, 0 /* 0xea */, 0 /* 0xeb */,
-  0 /* 0xec */, 0 /* 0xed */, 0 /* 0xee */, 0 /* 0xef */,
-  0 /* 0xf0 */, 0 /* 0xf1 */, 0 /* 0xf2 */, 0 /* 0xf3 */,
-  0 /* 0xf4 */, 0 /* 0xf5 */, 0 /* 0xf6 */, 0 /* 0xf7 */,
-  0 /* 0xf8 */, 0 /* 0xf9 */, 0 /* 0xfa */, 0 /* 0xfb */,
-  0 /* 0xfc */, 0 /* 0xfd */, 0 /* 0xfe */, 0 /* 0xff */
+    0 /* NUL  */, 0 /* SOH  */, 0 /* STX  */, 0 /* ETX  */, 0 /* EOT  */,
+    0 /* ENQ  */, 0 /* ACK  */, 0 /* BEL  */, 0 /* BS   */, 0 /* HT   */,
+    0 /* LF   */, 0 /* VT   */, 0 /* FF   */, 0 /* CR   */, 0 /* SO   */,
+    0 /* SI   */, 0 /* DLE  */, 0 /* DC1  */, 0 /* DC2  */, 0 /* DC3  */,
+    0 /* DC4  */, 0 /* NAK  */, 0 /* SYN  */, 0 /* ETB  */, 0 /* CAN  */,
+    0 /* EM   */, 0 /* SUB  */, 0 /* ESC  */, 0 /* FS   */, 0 /* GS   */,
+    0 /* RS   */, 0 /* US   */, 0 /* SPC  */, 1 /* !    */, 0 /* "    */,
+    1 /* #    */, 1 /* $    */, 1 /* %    */, 1 /* &    */, 1 /* '    */,
+    0 /* (    */, 0 /* )    */, 1 /* *    */, 1 /* +    */, 0 /* ,    */,
+    1 /* -    */, 1 /* .    */, 0 /* /    */, 1 /* 0    */, 1 /* 1    */,
+    1 /* 2    */, 1 /* 3    */, 1 /* 4    */, 1 /* 5    */, 1 /* 6    */,
+    1 /* 7    */, 1 /* 8    */, 1 /* 9    */, 0 /* :    */, 0 /* ;    */,
+    0 /* <    */, 0 /* =    */, 0 /* >    */, 0 /* ?    */, 0 /* @    */,
+    0 /* A    */, 0 /* B    */, 0 /* C    */, 0 /* D    */, 0 /* E    */,
+    0 /* F    */, 0 /* G    */, 0 /* H    */, 0 /* I    */, 0 /* J    */,
+    0 /* K    */, 0 /* L    */, 0 /* M    */, 0 /* N    */, 0 /* O    */,
+    0 /* P    */, 0 /* Q    */, 0 /* R    */, 0 /* S    */, 0 /* T    */,
+    0 /* U    */, 0 /* V    */, 0 /* W    */, 0 /* X    */, 0 /* Y    */,
+    0 /* Z    */, 0 /* [    */, 0 /* \    */, 0 /* ]    */, 1 /* ^    */,
+    1 /* _    */, 1 /* `    */, 1 /* a    */, 1 /* b    */, 1 /* c    */,
+    1 /* d    */, 1 /* e    */, 1 /* f    */, 1 /* g    */, 1 /* h    */,
+    1 /* i    */, 1 /* j    */, 1 /* k    */, 1 /* l    */, 1 /* m    */,
+    1 /* n    */, 1 /* o    */, 1 /* p    */, 1 /* q    */, 1 /* r    */,
+    1 /* s    */, 1 /* t    */, 1 /* u    */, 1 /* v    */, 1 /* w    */,
+    1 /* x    */, 1 /* y    */, 1 /* z    */, 0 /* {    */, 1 /* |    */,
+    0 /* }    */, 1 /* ~    */, 0 /* DEL  */, 0 /* 0x80 */, 0 /* 0x81 */,
+    0 /* 0x82 */, 0 /* 0x83 */, 0 /* 0x84 */, 0 /* 0x85 */, 0 /* 0x86 */,
+    0 /* 0x87 */, 0 /* 0x88 */, 0 /* 0x89 */, 0 /* 0x8a */, 0 /* 0x8b */,
+    0 /* 0x8c */, 0 /* 0x8d */, 0 /* 0x8e */, 0 /* 0x8f */, 0 /* 0x90 */,
+    0 /* 0x91 */, 0 /* 0x92 */, 0 /* 0x93 */, 0 /* 0x94 */, 0 /* 0x95 */,
+    0 /* 0x96 */, 0 /* 0x97 */, 0 /* 0x98 */, 0 /* 0x99 */, 0 /* 0x9a */,
+    0 /* 0x9b */, 0 /* 0x9c */, 0 /* 0x9d */, 0 /* 0x9e */, 0 /* 0x9f */,
+    0 /* 0xa0 */, 0 /* 0xa1 */, 0 /* 0xa2 */, 0 /* 0xa3 */, 0 /* 0xa4 */,
+    0 /* 0xa5 */, 0 /* 0xa6 */, 0 /* 0xa7 */, 0 /* 0xa8 */, 0 /* 0xa9 */,
+    0 /* 0xaa */, 0 /* 0xab */, 0 /* 0xac */, 0 /* 0xad */, 0 /* 0xae */,
+    0 /* 0xaf */, 0 /* 0xb0 */, 0 /* 0xb1 */, 0 /* 0xb2 */, 0 /* 0xb3 */,
+    0 /* 0xb4 */, 0 /* 0xb5 */, 0 /* 0xb6 */, 0 /* 0xb7 */, 0 /* 0xb8 */,
+    0 /* 0xb9 */, 0 /* 0xba */, 0 /* 0xbb */, 0 /* 0xbc */, 0 /* 0xbd */,
+    0 /* 0xbe */, 0 /* 0xbf */, 0 /* 0xc0 */, 0 /* 0xc1 */, 0 /* 0xc2 */,
+    0 /* 0xc3 */, 0 /* 0xc4 */, 0 /* 0xc5 */, 0 /* 0xc6 */, 0 /* 0xc7 */,
+    0 /* 0xc8 */, 0 /* 0xc9 */, 0 /* 0xca */, 0 /* 0xcb */, 0 /* 0xcc */,
+    0 /* 0xcd */, 0 /* 0xce */, 0 /* 0xcf */, 0 /* 0xd0 */, 0 /* 0xd1 */,
+    0 /* 0xd2 */, 0 /* 0xd3 */, 0 /* 0xd4 */, 0 /* 0xd5 */, 0 /* 0xd6 */,
+    0 /* 0xd7 */, 0 /* 0xd8 */, 0 /* 0xd9 */, 0 /* 0xda */, 0 /* 0xdb */,
+    0 /* 0xdc */, 0 /* 0xdd */, 0 /* 0xde */, 0 /* 0xdf */, 0 /* 0xe0 */,
+    0 /* 0xe1 */, 0 /* 0xe2 */, 0 /* 0xe3 */, 0 /* 0xe4 */, 0 /* 0xe5 */,
+    0 /* 0xe6 */, 0 /* 0xe7 */, 0 /* 0xe8 */, 0 /* 0xe9 */, 0 /* 0xea */,
+    0 /* 0xeb */, 0 /* 0xec */, 0 /* 0xed */, 0 /* 0xee */, 0 /* 0xef */,
+    0 /* 0xf0 */, 0 /* 0xf1 */, 0 /* 0xf2 */, 0 /* 0xf3 */, 0 /* 0xf4 */,
+    0 /* 0xf5 */, 0 /* 0xf6 */, 0 /* 0xf7 */, 0 /* 0xf8 */, 0 /* 0xf9 */,
+    0 /* 0xfa */, 0 /* 0xfb */, 0 /* 0xfc */, 0 /* 0xfd */, 0 /* 0xfe */,
+    0 /* 0xff */
 };
 
-int nghttp2_check_header_name(const uint8_t *name, size_t len)
-{
+int nghttp2_check_header_name(const uint8_t *name, size_t len) {
   const uint8_t *last;
-  if(len == 0) {
+  if (len == 0) {
     return 0;
   }
-  if(*name == ':') {
-    if(len == 1) {
+  if (*name == ':') {
+    if (len == 1) {
       return 0;
     }
     ++name;
     --len;
   }
-  for(last = name + len; name != last; ++name) {
-    if(!VALID_HD_NAME_CHARS[*name]) {
+  for (last = name + len; name != last; ++name) {
+    if (!VALID_HD_NAME_CHARS[*name]) {
       return 0;
     }
   }
   return 1;
 }
 
+/* Generated by genvchartbl.py */
 static int VALID_HD_VALUE_CHARS[] = {
-  1 /* NUL  */, 0 /* SOH  */, 0 /* STX  */, 0 /* ETX  */,
-  0 /* EOT  */, 0 /* ENQ  */, 0 /* ACK  */, 0 /* BEL  */,
-  0 /* BS   */, 1 /* HT   */, 0 /* LF   */, 0 /* VT   */,
-  0 /* FF   */, 0 /* CR   */, 0 /* SO   */, 0 /* SI   */,
-  0 /* DLE  */, 0 /* DC1  */, 0 /* DC2  */, 0 /* DC3  */,
-  0 /* DC4  */, 0 /* NAK  */, 0 /* SYN  */, 0 /* ETB  */,
-  0 /* CAN  */, 0 /* EM   */, 0 /* SUB  */, 0 /* ESC  */,
-  0 /* FS   */, 0 /* GS   */, 0 /* RS   */, 0 /* US   */,
-  1 /* SPC  */, 1 /* !    */, 1 /* "    */, 1 /* #    */,
-  1 /* $    */, 1 /* %    */, 1 /* &    */, 1 /* '    */,
-  1 /* (    */, 1 /* )    */, 1 /* *    */, 1 /* +    */,
-  1 /* ,    */, 1 /* -    */, 1 /* .    */, 1 /* /    */,
-  1 /* 0    */, 1 /* 1    */, 1 /* 2    */, 1 /* 3    */,
-  1 /* 4    */, 1 /* 5    */, 1 /* 6    */, 1 /* 7    */,
-  1 /* 8    */, 1 /* 9    */, 1 /* :    */, 1 /* ;    */,
-  1 /* <    */, 1 /* =    */, 1 /* >    */, 1 /* ?    */,
-  1 /* @    */, 1 /* A    */, 1 /* B    */, 1 /* C    */,
-  1 /* D    */, 1 /* E    */, 1 /* F    */, 1 /* G    */,
-  1 /* H    */, 1 /* I    */, 1 /* J    */, 1 /* K    */,
-  1 /* L    */, 1 /* M    */, 1 /* N    */, 1 /* O    */,
-  1 /* P    */, 1 /* Q    */, 1 /* R    */, 1 /* S    */,
-  1 /* T    */, 1 /* U    */, 1 /* V    */, 1 /* W    */,
-  1 /* X    */, 1 /* Y    */, 1 /* Z    */, 1 /* [    */,
-  1 /* \    */, 1 /* ]    */, 1 /* ^    */, 1 /* _    */,
-  1 /* `    */, 1 /* a    */, 1 /* b    */, 1 /* c    */,
-  1 /* d    */, 1 /* e    */, 1 /* f    */, 1 /* g    */,
-  1 /* h    */, 1 /* i    */, 1 /* j    */, 1 /* k    */,
-  1 /* l    */, 1 /* m    */, 1 /* n    */, 1 /* o    */,
-  1 /* p    */, 1 /* q    */, 1 /* r    */, 1 /* s    */,
-  1 /* t    */, 1 /* u    */, 1 /* v    */, 1 /* w    */,
-  1 /* x    */, 1 /* y    */, 1 /* z    */, 1 /* {    */,
-  1 /* |    */, 1 /* }    */, 1 /* ~    */, 0 /* DEL  */,
-  1 /* 0x80 */, 1 /* 0x81 */, 1 /* 0x82 */, 1 /* 0x83 */,
-  1 /* 0x84 */, 1 /* 0x85 */, 1 /* 0x86 */, 1 /* 0x87 */,
-  1 /* 0x88 */, 1 /* 0x89 */, 1 /* 0x8a */, 1 /* 0x8b */,
-  1 /* 0x8c */, 1 /* 0x8d */, 1 /* 0x8e */, 1 /* 0x8f */,
-  1 /* 0x90 */, 1 /* 0x91 */, 1 /* 0x92 */, 1 /* 0x93 */,
-  1 /* 0x94 */, 1 /* 0x95 */, 1 /* 0x96 */, 1 /* 0x97 */,
-  1 /* 0x98 */, 1 /* 0x99 */, 1 /* 0x9a */, 1 /* 0x9b */,
-  1 /* 0x9c */, 1 /* 0x9d */, 1 /* 0x9e */, 1 /* 0x9f */,
-  1 /* 0xa0 */, 1 /* 0xa1 */, 1 /* 0xa2 */, 1 /* 0xa3 */,
-  1 /* 0xa4 */, 1 /* 0xa5 */, 1 /* 0xa6 */, 1 /* 0xa7 */,
-  1 /* 0xa8 */, 1 /* 0xa9 */, 1 /* 0xaa */, 1 /* 0xab */,
-  1 /* 0xac */, 1 /* 0xad */, 1 /* 0xae */, 1 /* 0xaf */,
-  1 /* 0xb0 */, 1 /* 0xb1 */, 1 /* 0xb2 */, 1 /* 0xb3 */,
-  1 /* 0xb4 */, 1 /* 0xb5 */, 1 /* 0xb6 */, 1 /* 0xb7 */,
-  1 /* 0xb8 */, 1 /* 0xb9 */, 1 /* 0xba */, 1 /* 0xbb */,
-  1 /* 0xbc */, 1 /* 0xbd */, 1 /* 0xbe */, 1 /* 0xbf */,
-  1 /* 0xc0 */, 1 /* 0xc1 */, 1 /* 0xc2 */, 1 /* 0xc3 */,
-  1 /* 0xc4 */, 1 /* 0xc5 */, 1 /* 0xc6 */, 1 /* 0xc7 */,
-  1 /* 0xc8 */, 1 /* 0xc9 */, 1 /* 0xca */, 1 /* 0xcb */,
-  1 /* 0xcc */, 1 /* 0xcd */, 1 /* 0xce */, 1 /* 0xcf */,
-  1 /* 0xd0 */, 1 /* 0xd1 */, 1 /* 0xd2 */, 1 /* 0xd3 */,
-  1 /* 0xd4 */, 1 /* 0xd5 */, 1 /* 0xd6 */, 1 /* 0xd7 */,
-  1 /* 0xd8 */, 1 /* 0xd9 */, 1 /* 0xda */, 1 /* 0xdb */,
-  1 /* 0xdc */, 1 /* 0xdd */, 1 /* 0xde */, 1 /* 0xdf */,
-  1 /* 0xe0 */, 1 /* 0xe1 */, 1 /* 0xe2 */, 1 /* 0xe3 */,
-  1 /* 0xe4 */, 1 /* 0xe5 */, 1 /* 0xe6 */, 1 /* 0xe7 */,
-  1 /* 0xe8 */, 1 /* 0xe9 */, 1 /* 0xea */, 1 /* 0xeb */,
-  1 /* 0xec */, 1 /* 0xed */, 1 /* 0xee */, 1 /* 0xef */,
-  1 /* 0xf0 */, 1 /* 0xf1 */, 1 /* 0xf2 */, 1 /* 0xf3 */,
-  1 /* 0xf4 */, 1 /* 0xf5 */, 1 /* 0xf6 */, 1 /* 0xf7 */,
-  1 /* 0xf8 */, 1 /* 0xf9 */, 1 /* 0xfa */, 1 /* 0xfb */,
-  1 /* 0xfc */, 1 /* 0xfd */, 1 /* 0xfe */, 1 /* 0xff */
+    0 /* NUL  */, 0 /* SOH  */, 0 /* STX  */, 0 /* ETX  */, 0 /* EOT  */,
+    0 /* ENQ  */, 0 /* ACK  */, 0 /* BEL  */, 0 /* BS   */, 1 /* HT   */,
+    0 /* LF   */, 0 /* VT   */, 0 /* FF   */, 0 /* CR   */, 0 /* SO   */,
+    0 /* SI   */, 0 /* DLE  */, 0 /* DC1  */, 0 /* DC2  */, 0 /* DC3  */,
+    0 /* DC4  */, 0 /* NAK  */, 0 /* SYN  */, 0 /* ETB  */, 0 /* CAN  */,
+    0 /* EM   */, 0 /* SUB  */, 0 /* ESC  */, 0 /* FS   */, 0 /* GS   */,
+    0 /* RS   */, 0 /* US   */, 1 /* SPC  */, 1 /* !    */, 1 /* "    */,
+    1 /* #    */, 1 /* $    */, 1 /* %    */, 1 /* &    */, 1 /* '    */,
+    1 /* (    */, 1 /* )    */, 1 /* *    */, 1 /* +    */, 1 /* ,    */,
+    1 /* -    */, 1 /* .    */, 1 /* /    */, 1 /* 0    */, 1 /* 1    */,
+    1 /* 2    */, 1 /* 3    */, 1 /* 4    */, 1 /* 5    */, 1 /* 6    */,
+    1 /* 7    */, 1 /* 8    */, 1 /* 9    */, 1 /* :    */, 1 /* ;    */,
+    1 /* <    */, 1 /* =    */, 1 /* >    */, 1 /* ?    */, 1 /* @    */,
+    1 /* A    */, 1 /* B    */, 1 /* C    */, 1 /* D    */, 1 /* E    */,
+    1 /* F    */, 1 /* G    */, 1 /* H    */, 1 /* I    */, 1 /* J    */,
+    1 /* K    */, 1 /* L    */, 1 /* M    */, 1 /* N    */, 1 /* O    */,
+    1 /* P    */, 1 /* Q    */, 1 /* R    */, 1 /* S    */, 1 /* T    */,
+    1 /* U    */, 1 /* V    */, 1 /* W    */, 1 /* X    */, 1 /* Y    */,
+    1 /* Z    */, 1 /* [    */, 1 /* \    */, 1 /* ]    */, 1 /* ^    */,
+    1 /* _    */, 1 /* `    */, 1 /* a    */, 1 /* b    */, 1 /* c    */,
+    1 /* d    */, 1 /* e    */, 1 /* f    */, 1 /* g    */, 1 /* h    */,
+    1 /* i    */, 1 /* j    */, 1 /* k    */, 1 /* l    */, 1 /* m    */,
+    1 /* n    */, 1 /* o    */, 1 /* p    */, 1 /* q    */, 1 /* r    */,
+    1 /* s    */, 1 /* t    */, 1 /* u    */, 1 /* v    */, 1 /* w    */,
+    1 /* x    */, 1 /* y    */, 1 /* z    */, 1 /* {    */, 1 /* |    */,
+    1 /* }    */, 1 /* ~    */, 0 /* DEL  */, 1 /* 0x80 */, 1 /* 0x81 */,
+    1 /* 0x82 */, 1 /* 0x83 */, 1 /* 0x84 */, 1 /* 0x85 */, 1 /* 0x86 */,
+    1 /* 0x87 */, 1 /* 0x88 */, 1 /* 0x89 */, 1 /* 0x8a */, 1 /* 0x8b */,
+    1 /* 0x8c */, 1 /* 0x8d */, 1 /* 0x8e */, 1 /* 0x8f */, 1 /* 0x90 */,
+    1 /* 0x91 */, 1 /* 0x92 */, 1 /* 0x93 */, 1 /* 0x94 */, 1 /* 0x95 */,
+    1 /* 0x96 */, 1 /* 0x97 */, 1 /* 0x98 */, 1 /* 0x99 */, 1 /* 0x9a */,
+    1 /* 0x9b */, 1 /* 0x9c */, 1 /* 0x9d */, 1 /* 0x9e */, 1 /* 0x9f */,
+    1 /* 0xa0 */, 1 /* 0xa1 */, 1 /* 0xa2 */, 1 /* 0xa3 */, 1 /* 0xa4 */,
+    1 /* 0xa5 */, 1 /* 0xa6 */, 1 /* 0xa7 */, 1 /* 0xa8 */, 1 /* 0xa9 */,
+    1 /* 0xaa */, 1 /* 0xab */, 1 /* 0xac */, 1 /* 0xad */, 1 /* 0xae */,
+    1 /* 0xaf */, 1 /* 0xb0 */, 1 /* 0xb1 */, 1 /* 0xb2 */, 1 /* 0xb3 */,
+    1 /* 0xb4 */, 1 /* 0xb5 */, 1 /* 0xb6 */, 1 /* 0xb7 */, 1 /* 0xb8 */,
+    1 /* 0xb9 */, 1 /* 0xba */, 1 /* 0xbb */, 1 /* 0xbc */, 1 /* 0xbd */,
+    1 /* 0xbe */, 1 /* 0xbf */, 1 /* 0xc0 */, 1 /* 0xc1 */, 1 /* 0xc2 */,
+    1 /* 0xc3 */, 1 /* 0xc4 */, 1 /* 0xc5 */, 1 /* 0xc6 */, 1 /* 0xc7 */,
+    1 /* 0xc8 */, 1 /* 0xc9 */, 1 /* 0xca */, 1 /* 0xcb */, 1 /* 0xcc */,
+    1 /* 0xcd */, 1 /* 0xce */, 1 /* 0xcf */, 1 /* 0xd0 */, 1 /* 0xd1 */,
+    1 /* 0xd2 */, 1 /* 0xd3 */, 1 /* 0xd4 */, 1 /* 0xd5 */, 1 /* 0xd6 */,
+    1 /* 0xd7 */, 1 /* 0xd8 */, 1 /* 0xd9 */, 1 /* 0xda */, 1 /* 0xdb */,
+    1 /* 0xdc */, 1 /* 0xdd */, 1 /* 0xde */, 1 /* 0xdf */, 1 /* 0xe0 */,
+    1 /* 0xe1 */, 1 /* 0xe2 */, 1 /* 0xe3 */, 1 /* 0xe4 */, 1 /* 0xe5 */,
+    1 /* 0xe6 */, 1 /* 0xe7 */, 1 /* 0xe8 */, 1 /* 0xe9 */, 1 /* 0xea */,
+    1 /* 0xeb */, 1 /* 0xec */, 1 /* 0xed */, 1 /* 0xee */, 1 /* 0xef */,
+    1 /* 0xf0 */, 1 /* 0xf1 */, 1 /* 0xf2 */, 1 /* 0xf3 */, 1 /* 0xf4 */,
+    1 /* 0xf5 */, 1 /* 0xf6 */, 1 /* 0xf7 */, 1 /* 0xf8 */, 1 /* 0xf9 */,
+    1 /* 0xfa */, 1 /* 0xfb */, 1 /* 0xfc */, 1 /* 0xfd */, 1 /* 0xfe */,
+    1 /* 0xff */
 };
 
-int nghttp2_check_header_value(const uint8_t *value, size_t len)
-{
+int nghttp2_check_header_value(const uint8_t *value, size_t len) {
   const uint8_t *last;
-  for(last = value + len; value != last; ++value) {
-    if(!VALID_HD_VALUE_CHARS[*value]) {
+  for (last = value + len; value != last; ++value) {
+    if (!VALID_HD_VALUE_CHARS[*value]) {
       return 0;
     }
   }
   return 1;
 }
+
+uint8_t *nghttp2_cpymem(uint8_t *dest, const void *src, size_t len) {
+  memcpy(dest, src, len);
+
+  return dest + len;
+}

lib/nghttp2_helper.h

@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
@@ -26,10 +26,11 @@
 #define NGHTTP2_HELPER_H
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif /* HAVE_CONFIG_H */
 
 #include <nghttp2/nghttp2.h>
+#include "nghttp2_mem.h"
 
 #define nghttp2_min(A, B) ((A) < (B) ? (A) : (B))
 #define nghttp2_max(A, B) ((A) > (B) ? (A) : (B))
@@ -59,26 +60,7 @@ uint16_t nghttp2_get_uint16(const uint8_t *data);
 uint32_t nghttp2_get_uint32(const uint8_t *data);
 
 /*
- * Ensures that buffer |*buf_ptr| with |*buflen_ptr| length has at
- * least |min_length| bytes. If |min_length| > |*buflen_ptr|,
- * allocates new buffer having at least |min_length| bytes and assigns
- * its pointer to |*buf_ptr| and allocated number of bytes to
- * |*buflen_ptr|. The memory pointed by |*buf_ptr| previously may
- * change. No memory copy is done between old and new buffer.
- * |*buf_ptr| and |*buflen_ptr| are only updated iff this function
- * succeeds.
- *
- * This function returns 0 if it succeeds, or one of the following
- * negative error codes:
- *
- * NGHTTP2_ERR_NOMEM
- *     Out of memory.
- */
-int nghttp2_reserve_buffer(uint8_t **buf_ptr, size_t *buflen_ptr,
-                           size_t min_length);
-
-/*
- * Allocates |n| bytes of memory and copy the meory region pointed by
+ * Allocates |n| bytes of memory and copy the memory region pointed by
  * |src| with the length |n| bytes into it. Returns the allocated memory.
  *
  * This function returns pointer to allocated memory, or one of the
@@ -87,7 +69,7 @@ int nghttp2_reserve_buffer(uint8_t **buf_ptr, size_t *buflen_ptr,
  * NGHTTP2_ERR_NOMEM
  *     Out of memory.
  */
-void* nghttp2_memdup(const void* src, size_t n);
+void *nghttp2_memdup(const void *src, size_t n, nghttp2_mem *mem);
 
 void nghttp2_downcase(uint8_t *s, size_t len);
 
@@ -119,11 +101,10 @@ int nghttp2_should_send_window_update(int32_t local_window_size,
                                       int32_t recv_window_size);
 
 /*
- * Deallocates memory space pointed by |ptr|. This function exists for
- * the application to free the memory space allocated by the library
- * functions. Currently this function is hidden from the public API,
- * but may be exposed as public API.
+ * Copies the buffer |src| of length |len| to the destination pointed
+ * by the |dest|, assuming that the |dest| is at lest |len| bytes long
+ * . Returns dest + len.
  */
-void nghttp2_free(void *ptr);
+uint8_t *nghttp2_cpymem(uint8_t *dest, const void *src, size_t len);
 
 #endif /* NGHTTP2_HELPER_H */

lib/nghttp2_int.h

@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
@@ -26,17 +26,17 @@
 #define NGHTTP2_INT_H
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif /* HAVE_CONFIG_H */
 
-#include <stdint.h>
-
 /* Macros, types and constants for internal use */
 
 #ifdef DEBUGBUILD
 #define DEBUGF(x) x
 #else
-#define DEBUGF(x) do { } while(0)
+#define DEBUGF(x)                                                              \
+  do {                                                                         \
+  } while (0)
 #endif
 
 typedef int (*nghttp2_compar)(const void *lhs, const void *rhs);
@@ -45,9 +45,8 @@ typedef int (*nghttp2_compar)(const void *lhs, const void *rhs);
    inclusive. */
 typedef enum {
   NGHTTP2_ERR_CREDENTIAL_PENDING = -101,
-  NGHTTP2_ERR_BUFFER_ERROR = -102,
   NGHTTP2_ERR_IGN_HEADER_BLOCK = -103,
-  NGHTTP2_ERR_IGN_PAYLOAD = -104,
+  NGHTTP2_ERR_IGN_PAYLOAD = -104
 } nghttp2_internal_error;
 
 #endif /* NGHTTP2_INT_H */

lib/nghttp2_map.c

@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
@@ -26,33 +26,33 @@
 
 #include <string.h>
 
-#define INITIAL_TABLE_LENGTH 16
+#define INITIAL_TABLE_LENGTH 256
 
-int nghttp2_map_init(nghttp2_map *map)
-{
+int nghttp2_map_init(nghttp2_map *map, nghttp2_mem *mem) {
+  map->mem = mem;
   map->tablelen = INITIAL_TABLE_LENGTH;
-  map->table = malloc(sizeof(nghttp2_map_entry*) * map->tablelen);
-  if(map->table == NULL) {
+  map->table =
+      nghttp2_mem_calloc(mem, map->tablelen, sizeof(nghttp2_map_entry *));
+  if (map->table == NULL) {
     return NGHTTP2_ERR_NOMEM;
   }
-  memset(map->table, 0, sizeof(nghttp2_map_entry*) * map->tablelen);
+
   map->size = 0;
+
   return 0;
 }
 
-void nghttp2_map_free(nghttp2_map *map)
-{
-  free(map->table);
+void nghttp2_map_free(nghttp2_map *map) {
+  nghttp2_mem_free(map->mem, map->table);
 }
 
 void nghttp2_map_each_free(nghttp2_map *map,
                            int (*func)(nghttp2_map_entry *entry, void *ptr),
-                           void *ptr)
-{
+                           void *ptr) {
   size_t i;
-  for(i = 0; i < map->tablelen; ++i) {
+  for (i = 0; i < map->tablelen; ++i) {
     nghttp2_map_entry *entry;
-    for(entry = map->table[i]; entry;) {
+    for (entry = map->table[i]; entry;) {
       nghttp2_map_entry *next = entry->next;
       func(entry, ptr);
       entry = next;
@@ -63,15 +63,14 @@ void nghttp2_map_each_free(nghttp2_map *map,
 
 int nghttp2_map_each(nghttp2_map *map,
                      int (*func)(nghttp2_map_entry *entry, void *ptr),
-                     void *ptr)
-{
+                     void *ptr) {
   int rv;
   size_t i;
-  for(i = 0; i < map->tablelen; ++i) {
+  for (i = 0; i < map->tablelen; ++i) {
     nghttp2_map_entry *entry;
-    for(entry = map->table[i]; entry; entry = entry->next) {
+    for (entry = map->table[i]; entry; entry = entry->next) {
       rv = func(entry, ptr);
-      if(rv != 0) {
+      if (rv != 0) {
         return rv;
       }
     }
@@ -79,31 +78,29 @@ int nghttp2_map_each(nghttp2_map *map,
   return 0;
 }
 
-void nghttp2_map_entry_init(nghttp2_map_entry *entry, key_type key)
-{
+void nghttp2_map_entry_init(nghttp2_map_entry *entry, key_type key) {
   entry->key = key;
   entry->next = NULL;
 }
 
-/* Same hash function in openjdk HashMap source code. */
+/* Same hash function in android HashMap source code. */
 /* The |mod| must be power of 2 */
-static int32_t hash(int32_t h, int32_t mod)
-{
+static int32_t hash(int32_t h, size_t mod) {
   h ^= (h >> 20) ^ (h >> 12);
-  return (h ^ (h >> 7) ^ (h >> 4)) & (mod - 1);
+  h ^= (h >> 7) ^ (h >> 4);
+  return h & (mod - 1);
 }
 
 static int insert(nghttp2_map_entry **table, size_t tablelen,
-                  nghttp2_map_entry *entry)
-{
+                  nghttp2_map_entry *entry) {
   int32_t h = hash(entry->key, tablelen);
-  if(table[h] == NULL) {
+  if (table[h] == NULL) {
     table[h] = entry;
   } else {
     nghttp2_map_entry *p;
     /* We won't allow duplicated key, so check it out. */
-    for(p = table[h]; p; p = p->next) {
-      if(p->key == entry->key) {
+    for (p = table[h]; p; p = p->next) {
+      if (p->key == entry->key) {
         return NGHTTP2_ERR_INVALID_ARGUMENT;
       }
     }
@@ -114,18 +111,19 @@ static int insert(nghttp2_map_entry **table, size_t tablelen,
 }
 
 /* new_tablelen must be power of 2 */
-static int resize(nghttp2_map *map, size_t new_tablelen)
-{
+static int resize(nghttp2_map *map, size_t new_tablelen) {
   size_t i;
   nghttp2_map_entry **new_table;
-  new_table = malloc(sizeof(nghttp2_map_entry*) * new_tablelen);
-  if(new_table == NULL) {
+
+  new_table =
+      nghttp2_mem_calloc(map->mem, new_tablelen, sizeof(nghttp2_map_entry *));
+  if (new_table == NULL) {
     return NGHTTP2_ERR_NOMEM;
   }
-  memset(new_table, 0, sizeof(nghttp2_map_entry*) * new_tablelen);
-  for(i = 0; i < map->tablelen; ++i) {
+
+  for (i = 0; i < map->tablelen; ++i) {
     nghttp2_map_entry *entry;
-    for(entry = map->table[i]; entry;) {
+    for (entry = map->table[i]; entry;) {
       nghttp2_map_entry *next = entry->next;
       entry->next = NULL;
       /* This function must succeed */
@@ -133,52 +131,50 @@ static int resize(nghttp2_map *map, size_t new_tablelen)
       entry = next;
     }
   }
-  free(map->table);
+  nghttp2_mem_free(map->mem, map->table);
   map->tablelen = new_tablelen;
   map->table = new_table;
+
   return 0;
 }
 
-int nghttp2_map_insert(nghttp2_map *map, nghttp2_map_entry *new_entry)
-{
+int nghttp2_map_insert(nghttp2_map *map, nghttp2_map_entry *new_entry) {
   int rv;
   /* Load factor is 0.75 */
-  if((map->size + 1) * 4 > map->tablelen * 3) {
+  if ((map->size + 1) * 4 > map->tablelen * 3) {
     rv = resize(map, map->tablelen * 2);
-    if(rv != 0) {
+    if (rv != 0) {
       return rv;
     }
   }
   rv = insert(map->table, map->tablelen, new_entry);
-  if(rv != 0) {
+  if (rv != 0) {
     return rv;
   }
   ++map->size;
   return 0;
 }
 
-nghttp2_map_entry* nghttp2_map_find(nghttp2_map *map, key_type key)
-{
+nghttp2_map_entry *nghttp2_map_find(nghttp2_map *map, key_type key) {
   int32_t h;
   nghttp2_map_entry *entry;
   h = hash(key, map->tablelen);
-  for(entry = map->table[h]; entry; entry = entry->next) {
-    if(entry->key == key) {
+  for (entry = map->table[h]; entry; entry = entry->next) {
+    if (entry->key == key) {
       return entry;
     }
   }
   return NULL;
 }
 
-int nghttp2_map_remove(nghttp2_map *map, key_type key)
-{
+int nghttp2_map_remove(nghttp2_map *map, key_type key) {
   int32_t h;
   nghttp2_map_entry *entry, *prev;
   h = hash(key, map->tablelen);
   prev = NULL;
-  for(entry = map->table[h]; entry; entry = entry->next) {
-    if(entry->key == key) {
-      if(prev == NULL) {
+  for (entry = map->table[h]; entry; entry = entry->next) {
+    if (entry->key == key) {
+      if (prev == NULL) {
         map->table[h] = entry->next;
       } else {
         prev->next = entry->next;
@@ -191,7 +187,4 @@ int nghttp2_map_remove(nghttp2_map *map, key_type key)
   return NGHTTP2_ERR_INVALID_ARGUMENT;
 }
 
-size_t nghttp2_map_size(nghttp2_map *map)
-{
-  return map->size;
-}
+size_t nghttp2_map_size(nghttp2_map *map) { return map->size; }

lib/nghttp2_map.h

@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
@@ -26,11 +26,12 @@
 #define NGHTTP2_MAP_H
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif /* HAVE_CONFIG_H */
 
 #include <nghttp2/nghttp2.h>
 #include "nghttp2_int.h"
+#include "nghttp2_mem.h"
 
 /* Implementation of unordered map */
 
@@ -43,6 +44,7 @@ typedef struct nghttp2_map_entry {
 
 typedef struct {
   nghttp2_map_entry **table;
+  nghttp2_mem *mem;
   size_t tablelen;
   size_t size;
 } nghttp2_map;
@@ -56,7 +58,7 @@ typedef struct {
  * NGHTTP2_ERR_NOMEM
  *   Out of memory
  */
-int nghttp2_map_init(nghttp2_map *map);
+int nghttp2_map_init(nghttp2_map *map, nghttp2_mem *mem);
 
 /*
  * Deallocates any resources allocated for |map|. The stored entries
@@ -98,7 +100,7 @@ int nghttp2_map_insert(nghttp2_map *map, nghttp2_map_entry *entry);
  * Returns the entry associated by the key |key|.  If there is no such
  * entry, this function returns NULL.
  */
-nghttp2_map_entry* nghttp2_map_find(nghttp2_map *map, key_type key);
+nghttp2_map_entry *nghttp2_map_find(nghttp2_map *map, key_type key);
 
 /*
  * Removes the entry associated by the key |key| from the |map|.  The

lib/nghttp2_mem.c

@@ -0,0 +1,61 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2014 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 "nghttp2_mem.h"
+
+static void *default_malloc(size_t size, void *mem_user_data _U_) {
+  return malloc(size);
+}
+
+static void default_free(void *ptr, void *mem_user_data _U_) { free(ptr); }
+
+static void *default_calloc(size_t nmemb, size_t size,
+                            void *mem_user_data _U_) {
+  return calloc(nmemb, size);
+}
+
+static void *default_realloc(void *ptr, size_t size, void *mem_user_data _U_) {
+  return realloc(ptr, size);
+}
+
+static nghttp2_mem mem_default = {NULL, default_malloc, default_free,
+                                  default_calloc, default_realloc};
+
+nghttp2_mem *nghttp2_mem_default(void) { return &mem_default; }
+
+void *nghttp2_mem_malloc(nghttp2_mem *mem, size_t size) {
+  return mem->malloc(size, mem->mem_user_data);
+}
+
+void nghttp2_mem_free(nghttp2_mem *mem, void *ptr) {
+  mem->free(ptr, mem->mem_user_data);
+}
+
+void *nghttp2_mem_calloc(nghttp2_mem *mem, size_t nmemb, size_t size) {
+  return mem->calloc(nmemb, size, mem->mem_user_data);
+}
+
+void *nghttp2_mem_realloc(nghttp2_mem *mem, void *ptr, size_t size) {
+  return mem->realloc(ptr, size, mem->mem_user_data);
+}

lib/nghttp2_mem.h

@@ -0,0 +1,44 @@
+/*
+ * nghttp2 - HTTP/2 C Library
+ *
+ * Copyright (c) 2014 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.
+ */
+#ifndef NGHTTP2_MEM_H
+#define NGHTTP2_MEM_H
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+#include <nghttp2/nghttp2.h>
+
+/* The default, system standard memory allocator */
+nghttp2_mem *nghttp2_mem_default(void);
+
+/* Convenient wrapper functions to call allocator function in
+   |mem|. */
+void *nghttp2_mem_malloc(nghttp2_mem *mem, size_t size);
+void nghttp2_mem_free(nghttp2_mem *mem, void *ptr);
+void *nghttp2_mem_calloc(nghttp2_mem *mem, size_t nmemb, size_t size);
+void *nghttp2_mem_realloc(nghttp2_mem *mem, void *ptr, size_t size);
+
+#endif /* NGHTTP2_MEM_H */

lib/nghttp2_net.h

@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
@@ -26,19 +26,19 @@
 #define NGHTTP2_NET_H
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif /* HAVE_CONFIG_H */
 
 #ifdef HAVE_ARPA_INET_H
-#  include <arpa/inet.h>
+#include <arpa/inet.h>
 #endif /* HAVE_ARPA_INET_H */
 
 #ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
+#include <netinet/in.h>
 #endif /* HAVE_NETINET_IN_H */
 
 #ifdef HAVE_WINSOCK2_H
-#  include <winsock2.h>
+#include <winsock2.h>
 #endif /* HAVE_WINSOCK2_H */
 
 #endif /* NGHTTP2_NET_H */

lib/nghttp2_npn.c

@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
@@ -27,26 +27,26 @@
 #include <string.h>
 
 int nghttp2_select_next_protocol(unsigned char **out, unsigned char *outlen,
-                                 const unsigned char *in, unsigned int inlen)
-{
+                                 const unsigned char *in, unsigned int inlen) {
   int http_selected = 0;
   unsigned int i = 0;
-  for(; i < inlen; i += in[i]+1) {
-    if(in[i] == NGHTTP2_PROTO_VERSION_ID_LEN &&
-       memcmp(&in[i+1], NGHTTP2_PROTO_VERSION_ID, in[i]) == 0) {
-      *out = (unsigned char*)&in[i+1];
+  for (; i < inlen; i += in [i] + 1) {
+    if (in[i] == NGHTTP2_PROTO_VERSION_ID_LEN && i + 1 + in[i] <= inlen &&
+        memcmp(&in[i + 1], NGHTTP2_PROTO_VERSION_ID, in[i]) == 0) {
+      *out = (unsigned char *)&in[i + 1];
       *outlen = in[i];
       return 1;
     }
-    if(in[i] == 8 && memcmp(&in[i+1], "http/1.1", in[i]) == 0) {
+    if (in[i] == 8 && i + 1 + in[i] <= inlen &&
+        memcmp(&in[i + 1], "http/1.1", in[i]) == 0) {
       http_selected = 1;
-      *out = (unsigned char*)&in[i+1];
+      *out = (unsigned char *)&in[i + 1];
       *outlen = in[i];
-      /* Go through to the next iteration, because "HTTP/2.0" may be
+      /* Go through to the next iteration, because "HTTP/2" may be
          there */
     }
   }
-  if(http_selected) {
+  if (http_selected) {
     return 0;
   } else {
     return -1;

lib/nghttp2_npn.h

@@ -1,5 +1,5 @@
 /*
- * nghttp2 - HTTP/2.0 C Library
+ * nghttp2 - HTTP/2 C Library
  *
  * Copyright (c) 2012 Tatsuhiro Tsujikawa
  *
@@ -26,7 +26,7 @@
 #define NGHTTP2_NPN_H
 
 #ifdef HAVE_CONFIG
-# include <config.h>
+#include <config.h>
 #endif /* HAVE_CONFIG */
 
 #include <nghttp2/nghttp2.h>