Update bash_completion

When we know that stream is closed at time we read DATA frame header,
we use NGHTTP2_IB_IGN_DATA, and consume data for connection if
nghttp2_option_set_no_auto_window_update() is used.  However, if
stream is closed while we are in NGHTTP2_IB_READ_DATA, those bytes are
not consumed for connection, nor notified to application via callback,
so it eventually fills up connection window and connection will
freeze.  This commit fixes this issue by consuming these data for
connection when stream is closed or does not exist.

.travis.yml

@@ -1,31 +1,31 @@
 language: cpp
 compiler:
   - clang
-#Disable gcc build for the moment...
-#  - gcc
+  - gcc
+sudo: false
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - g++-4.9
+    - libstdc++-4.9-dev
+    - autoconf
+    - automake
+    - autotools-dev
+    - libtool
+    - pkg-config
+    - zlib1g-dev
+    - libcunit1-dev
+    - libssl-dev
+    - libxml2-dev
+    - libev-dev
+    - libevent-dev
+    - libjansson-dev
+    - libjemalloc-dev
 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
+  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
   - $CC --version
 before_script:
   - autoreconf -i

Dockerfile.android

@@ -10,7 +10,7 @@
 #
 # $ sudo docker run -v /path/to/dest:/out nghttp2-android cp /root/build/nghttp2/src/nghttpx /out
 
-FROM ubuntu:trusty
+FROM ubuntu:vivid
 
 MAINTAINER Tatsuhiro Tsujikawa
 
@@ -30,12 +30,12 @@ RUN apt-get install -y make binutils autoconf automake autotools-dev libtool \
     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 && \
-    chmod a+x android-ndk-r10c-linux-x86_64.bin && \
-    ./android-ndk-r10c-linux-x86_64.bin && \
-    rm android-ndk-r10c-linux-x86_64.bin
+RUN curl -L -O http://dl.google.com/android/ndk/android-ndk-r10d-linux-x86_64.bin && \
+    chmod a+x android-ndk-r10d-linux-x86_64.bin && \
+    ./android-ndk-r10d-linux-x86_64.bin && \
+    rm android-ndk-r10d-linux-x86_64.bin
 
-WORKDIR /root/build/android-ndk-r10c
+WORKDIR /root/build/android-ndk-r10d
 RUN /bin/bash build/tools/make-standalone-toolchain.sh \
     --install-dir=$ANDROID_HOME/toolchain \
     --toolchain=arm-linux-androideabi-4.9 --llvm-version=3.5 \
@@ -86,6 +86,25 @@ RUN patch -p1 < ../libev-4.19-android.patch && \
     LDFLAGS=-L$PREFIX/lib && \
     make install
 
+WORKDIR /root/build
+RUN curl -L -O http://zlib.net/zlib-1.2.8.tar.gz && \
+    tar xf zlib-1.2.8.tar.gz && \
+    rm zlib-1.2.8.tar.gz
+
+WORKDIR /root/build/zlib-1.2.8
+RUN HOST=arm-linux-androideabi \
+    CC=$HOST-gcc \
+    AR=$HOST-ar \
+    LD=$HOST-ld \
+    RANLIB=$HOST-ranlib \
+    STRIP=$HOST-strip \
+    ./configure \
+    --prefix=$PREFIX \
+    --libdir=$PREFIX/lib \
+    --includedir=$PREFIX/include \
+    --static && \
+    make install
+
 WORKDIR /root/build
 RUN git clone https://github.com/tatsuhiro-t/nghttp2
 WORKDIR /root/build/nghttp2
@@ -101,9 +120,9 @@ RUN autoreconf -i && \
     --disable-threads \
     LIBSPDYLAY_CFLAGS=-I$PREFIX/usr/local/include \
     LIBSPDYLAY_LIBS="-L$PREFIX/usr/local/lib -lspdylay" \
-    CPPFLAGS="-I$PREFIX/include" \
+    CPPFLAGS="-fPIE -I$PREFIX/include" \
     CXXFLAGS="-fno-strict-aliasing" \
     PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
-    LDFLAGS="-L$PREFIX/lib" && \
+    LDFLAGS="-fPIE -pie -L$PREFIX/lib" && \
     make && \
     arm-linux-androideabi-strip src/nghttpx src/nghttpd src/nghttp

Makefile.am

@@ -21,7 +21,7 @@
 # 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 integration-tests \
-	doc contrib
+	doc contrib script
 
 ACLOCAL_AMFLAGS = -I m4
 

README.rst

@@ -13,26 +13,18 @@ An HPACK encoder and decoder are available as a public API.
 
 An experimental high level C++ library is also available.
 
-We have Python bindings of this libary, but we do not have full
+We have Python bindings of this library, but we do not have full
 code coverage yet.
 
 Development Status
 ------------------
 
-We started to implement h2-14
-(http://tools.ietf.org/html/draft-ietf-httpbis-http2-14), and header
-compression
-(http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-09).
+We have implemented `RFC 7540 <https://tools.ietf.org/html/rfc7540>`_
+HTTP/2 and `RFC 7541 <https://tools.ietf.org/html/rfc7541>`_ HPACK -
+Header Compression for HTTP/2
 
-The nghttp2 code base was forked from the spdylay project.
-
-=========================== =======
-HTTP/2 Features             Support
-=========================== =======
-Core frames handling        Yes
-Dependency Tree             Yes
-Large header (CONTINUATION) Yes
-=========================== =======
+The nghttp2 code base was forked from the spdylay
+(https://github.com/tatsuhiro-t/spdylay) project.
 
 Public Test Server
 ------------------
@@ -46,9 +38,9 @@ implementation.
   and ``http/1.1`` via ALPN/NPN and requires TLSv1.2 for HTTP/2
   connection.
 
-* http://nghttp2.org/ (Upgrade / Direct)
+* http://nghttp2.org/ (HTTP Upgrade and HTTP/2 Direct)
 
-  ``h2c-14`` and ``http/1.1``.
+  ``h2c`` and ``http/1.1``.
 
 Requirements
 ------------
@@ -79,7 +71,7 @@ ALPN support requires OpenSSL >= 1.0.2 (released 22 January 2015).
 To enable the SPDY protocol in the application program ``nghttpx`` and
 ``h2load``, the following package is required:
 
-* spdylay >= 1.3.0
+* spdylay >= 1.3.2
 
 To enable ``-a`` option (getting linked assets from the downloaded
 resource) in ``nghttp``, the following package is required:
@@ -187,7 +179,7 @@ https://nghttp2.org/documentation/
 Unit tests
 ----------
 
-Unit tests are done by simply running `make check`.
+Unit tests are done by simply running ``make check``.
 
 Integration tests
 -----------------
@@ -198,7 +190,8 @@ its testing framework.  We depend on the following libraries:
 
 * https://github.com/bradfitz/http2
 * https://github.com/tatsuhiro-t/go-nghttp2
-* https://golang.org/x/net/spdy
+* https://github.com/tatsuhiro-t/spdy
+* golang.org/x/net/websocket
 
 To download the above packages, after settings ``GOPATH``, run the
 following command under ``integration-tests`` directory::
@@ -212,6 +205,109 @@ To run the tests, run the following command under
 
 Inside the tests, we use port 3009 to run the test subject server.
 
+.. note::
+
+   github.com/tatsuhiro-t/spdy is a copy used to be available at
+   golang.org/x/net/spdy, but it is now gone.
+
+Migration from v0.7.15 or earlier
+---------------------------------
+
+nghttp2 v1.0.0 introduced several backward incompatible changes.  In
+this section, we describe these changes and how to migrate to v1.0.0.
+
+ALPN protocol ID is now ``h2`` and ``h2c``
+++++++++++++++++++++++++++++++++++++++++++
+
+Previously we announced ``h2-14`` and ``h2c-14``.  v1.0.0 implements
+final protocol version, and we changed ALPN ID to ``h2`` and ``h2c``.
+The macros ``NGHTTP2_PROTO_VERSION_ID``,
+``NGHTTP2_PROTO_VERSION_ID_LEN``,
+``NGHTTP2_CLEARTEXT_PROTO_VERSION_ID``, and
+``NGHTTP2_CLEARTEXT_PROTO_VERSION_ID_LEN`` have been updated to
+reflect this change.
+
+Basically, existing applications do not have to do anything, just
+recompiling is enough for this change.
+
+Use word "client magic" where we use "client connection preface"
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+We use "client connection preface" to mean first 24 bytes of client
+connection preface.  This is technically not correct, since client
+connection preface is composed of 24 bytes client magic byte string
+followed by SETTINGS frame.  For clarification, we call "client magic"
+for this 24 bytes byte string and updated API.
+
+* ``NGHTTP2_CLIENT_CONNECTION_PREFACE`` was replaced with
+  ``NGHTTP2_CLIENT_MAGIC``.
+* ``NGHTTP2_CLIENT_CONNECTION_PREFACE_LEN`` was replaced with
+  ``NGHTTP2_CLIENT_MAGIC_LEN``.
+* ``NGHTTP2_BAD_PREFACE`` was renamed as ``NGHTTP2_BAD_CLIENT_MAGIC``
+
+The alreay deprecated ``NGHTTP2_CLIENT_CONNECTION_HEADER`` and
+``NGHTTP2_CLIENT_CONNECTION_HEADER_LEN`` were removed.
+
+If application uses these macros, just replace old ones with new ones.
+Since v1.0.0, client magic is sent by library (see next subsection),
+so client application may just remove these macro use.
+
+Client magic is sent by library
++++++++++++++++++++++++++++++++
+
+Previously nghttp2 library did not send client magic, which is first
+24 bytes byte string of client connection preface, and client
+applications have to send it by themselves.  Since v1.0.0, client
+magic is sent by library via first call of ``nghttp2_session_send()``
+or ``nghttp2_session_mem_send()``.
+
+The client applications which send client magic must remove the
+relevant code.
+
+Remove HTTP Alternative Services (Alt-Svc) related code
++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Alt-Svc specification is not finalized yet.  To make our API stable,
+we have decided to remove all Alt-Svc related API from nghttp2.
+
+* ``NGHTTP2_EXT_ALTSVC`` was removed.
+* ``nghttp2_ext_altsvc`` was removed.
+
+We have already removed the functionality of Alt-Svc in v0.7 series
+and they have been essentially noop.  The application using these
+macro and struct, remove those lines.
+
+Use nghttp2_error in nghttp2_on_invalid_frame_recv_callback
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Previously ``nghttp2_on_invalid_frame_recv_cb_called`` took the
+``error_code``, defined in ``nghttp2_error_code``, as parameter.  But
+they are not detailed enough to debug.  Therefore, we decided to use
+more detailed ``nghttp2_error`` values instead.
+
+The application using this callback should update the callback
+signature.  If it treats ``error_code`` as HTTP/2 error code, update
+the code so that it is treated as ``nghttp2_error``.
+
+Receive client magic by default
++++++++++++++++++++++++++++++++
+
+Previously nghttp2 did not process client magic (24 bytes byte
+string).  To make it deal with it, we had to use
+``nghttp2_option_set_recv_client_preface()``.  Since v1.0.0, nghttp2
+processes client magic by default and
+``nghttp2_option_set_recv_client_preface()`` was removed.
+
+Some application may want to disable this behaviour, so we added
+``nghttp2_option_set_no_recv_client_magic()`` to achieve this.
+
+The application using ``nghttp2_option_set_recv_client_preface()``
+with nonzero value, just remove it.
+
+The application using ``nghttp2_option_set_recv_client_preface()``
+with zero value or not using it must use
+``nghttp2_option_set_no_recv_client_magic()`` with nonzero value.
+
 Client, Server and Proxy programs
 ---------------------------------
 
@@ -227,140 +323,180 @@ It has verbose output mode for framing information.  Here is sample
 output from ``nghttp`` client::
 
     $ nghttp -nv https://nghttp2.org
-    [  0.033][NPN] server offers:
-              * h2-14
-              * spdy/3.1
-              * http/1.1
-    The negotiated protocol: h2-14
-    [  0.068] send SETTINGS frame <length=15, flags=0x00, stream_id=0>
-              (niv=3)
-              [SETTINGS_MAX_CONCURRENT_STREAMS(3):100]
-              [SETTINGS_INITIAL_WINDOW_SIZE(4):65535]
-              [SETTINGS_COMPRESS_DATA(5):1]
-    [  0.068] send HEADERS frame <length=46, flags=0x05, stream_id=1>
-              ; END_STREAM | END_HEADERS
-              (padlen=0)
+    [  0.190] Connected
+    The negotiated protocol: h2
+    [  0.212] recv SETTINGS frame <length=12, flags=0x00, stream_id=0>
+	      (niv=2)
+	      [SETTINGS_MAX_CONCURRENT_STREAMS(0x03):100]
+	      [SETTINGS_INITIAL_WINDOW_SIZE(0x04):65535]
+    [  0.212] send SETTINGS frame <length=12, flags=0x00, stream_id=0>
+	      (niv=2)
+	      [SETTINGS_MAX_CONCURRENT_STREAMS(0x03):100]
+	      [SETTINGS_INITIAL_WINDOW_SIZE(0x04):65535]
+    [  0.212] send SETTINGS frame <length=0, flags=0x01, stream_id=0>
+	      ; ACK
+	      (niv=0)
+    [  0.212] send PRIORITY frame <length=5, flags=0x00, stream_id=3>
+	      (dep_stream_id=0, weight=201, exclusive=0)
+    [  0.212] send PRIORITY frame <length=5, flags=0x00, stream_id=5>
+	      (dep_stream_id=0, weight=101, exclusive=0)
+    [  0.212] send PRIORITY frame <length=5, flags=0x00, stream_id=7>
+	      (dep_stream_id=0, weight=1, exclusive=0)
+    [  0.212] send PRIORITY frame <length=5, flags=0x00, stream_id=9>
+	      (dep_stream_id=7, weight=1, exclusive=0)
+    [  0.212] send PRIORITY frame <length=5, flags=0x00, stream_id=11>
+	      (dep_stream_id=3, weight=1, exclusive=0)
+    [  0.212] send HEADERS frame <length=39, flags=0x25, stream_id=13>
+	      ; END_STREAM | END_HEADERS | PRIORITY
+	      (padlen=0, dep_stream_id=11, weight=16, exclusive=0)
 	      ; Open new stream
-              :authority: nghttp2.org
 	      :method: GET
 	      :path: /
 	      :scheme: https
+	      :authority: nghttp2.org
 	      accept: */*
 	      accept-encoding: gzip, deflate
-              user-agent: nghttp2/0.4.0-DEV
-    [  0.068] recv SETTINGS frame <length=10, flags=0x00, stream_id=0>
-              (niv=2)
-              [SETTINGS_MAX_CONCURRENT_STREAMS(3):100]
-              [SETTINGS_INITIAL_WINDOW_SIZE(4):65535]
-    [  0.068] send SETTINGS frame <length=0, flags=0x01, stream_id=0>
+	      user-agent: nghttp2/1.0.1-DEV
+    [  0.221] recv SETTINGS frame <length=0, flags=0x01, stream_id=0>
 	      ; ACK
 	      (niv=0)
-    [  0.079] recv SETTINGS frame <length=0, flags=0x01, stream_id=0>
-              ; ACK
-              (niv=0)
-    [  0.080] (stream_id=1, noind=0) :status: 200
-    [  0.080] (stream_id=1, noind=0) accept-ranges: bytes
-    [  0.080] (stream_id=1, noind=0) age: 15
-    [  0.080] (stream_id=1, noind=0) content-length: 40243
-    [  0.080] (stream_id=1, noind=0) content-type: text/html
-    [  0.080] (stream_id=1, noind=0) date: Wed, 14 May 2014 15:14:30 GMT
-    [  0.080] (stream_id=1, noind=0) etag: "535d0eea-9d33"
-    [  0.080] (stream_id=1, noind=0) last-modified: Sun, 27 Apr 2014 14:06:34 GMT
-    [  0.080] (stream_id=1, noind=0) server: nginx/1.4.6 (Ubuntu)
-    [  0.080] (stream_id=1, noind=0) x-varnish: 2114900538 2114900537
-    [  0.080] (stream_id=1, noind=0) via: 1.1 varnish, 1.1 nghttpx
-    [  0.080] (stream_id=1, noind=0) strict-transport-security: max-age=31536000
-    [  0.080] recv HEADERS frame <length=162, flags=0x04, stream_id=1>
+    [  0.221] recv (stream_id=13) :method: GET
+    [  0.221] recv (stream_id=13) :scheme: https
+    [  0.221] recv (stream_id=13) :path: /stylesheets/screen.css
+    [  0.221] recv (stream_id=13) :authority: nghttp2.org
+    [  0.221] recv (stream_id=13) accept-encoding: gzip, deflate
+    [  0.222] recv (stream_id=13) user-agent: nghttp2/1.0.1-DEV
+    [  0.222] recv PUSH_PROMISE frame <length=50, flags=0x04, stream_id=13>
+	      ; END_HEADERS
+	      (padlen=0, promised_stream_id=2)
+    [  0.222] recv (stream_id=13) :status: 200
+    [  0.222] recv (stream_id=13) date: Thu, 21 May 2015 16:38:14 GMT
+    [  0.222] recv (stream_id=13) content-type: text/html
+    [  0.222] recv (stream_id=13) last-modified: Fri, 15 May 2015 15:38:06 GMT
+    [  0.222] recv (stream_id=13) etag: W/"555612de-19f6"
+    [  0.222] recv (stream_id=13) link: </stylesheets/screen.css>; rel=preload; as=stylesheet
+    [  0.222] recv (stream_id=13) content-encoding: gzip
+    [  0.222] recv (stream_id=13) server: nghttpx nghttp2/1.0.1-DEV
+    [  0.222] recv (stream_id=13) via: 1.1 nghttpx
+    [  0.222] recv (stream_id=13) strict-transport-security: max-age=31536000
+    [  0.222] recv HEADERS frame <length=166, flags=0x04, stream_id=13>
 	      ; END_HEADERS
 	      (padlen=0)
 	      ; First response header
-    [  0.080] recv DATA frame <length=3786, flags=0x00, stream_id=1>
-    [  0.080] recv DATA frame <length=4096, flags=0x00, stream_id=1>
-    [  0.081] recv DATA frame <length=4096, flags=0x00, stream_id=1>
-    [  0.093] recv DATA frame <length=4096, flags=0x00, stream_id=1>
-    [  0.093] recv DATA frame <length=4096, flags=0x00, stream_id=1>
-    [  0.094] recv DATA frame <length=4096, flags=0x00, stream_id=1>
-    [  0.094] recv DATA frame <length=4096, flags=0x00, stream_id=1>
-    [  0.094] recv DATA frame <length=4096, flags=0x00, stream_id=1>
-    [  0.096] recv DATA frame <length=4096, flags=0x00, stream_id=1>
-    [  0.096] send WINDOW_UPDATE frame <length=4, flags=0x00, stream_id=0>
-              (window_size_increment=36554)
-    [  0.096] send WINDOW_UPDATE frame <length=4, flags=0x00, stream_id=1>
-              (window_size_increment=36554)
-    [  0.108] recv DATA frame <length=3689, flags=0x00, stream_id=1>
-    [  0.108] recv DATA frame <length=0, flags=0x01, stream_id=1>
+    [  0.222] recv DATA frame <length=2601, flags=0x01, stream_id=13>
 	      ; END_STREAM
-    [  0.108] send GOAWAY frame <length=8, flags=0x00, stream_id=0>
-              (last_stream_id=0, error_code=NO_ERROR(0), opaque_data(0)=[])
+    [  0.222] recv (stream_id=2) :status: 200
+    [  0.222] recv (stream_id=2) date: Thu, 21 May 2015 16:38:14 GMT
+    [  0.222] recv (stream_id=2) content-type: text/css
+    [  0.222] recv (stream_id=2) last-modified: Fri, 15 May 2015 15:38:06 GMT
+    [  0.222] recv (stream_id=2) etag: W/"555612de-9845"
+    [  0.222] recv (stream_id=2) content-encoding: gzip
+    [  0.222] recv (stream_id=2) server: nghttpx nghttp2/1.0.1-DEV
+    [  0.222] recv (stream_id=2) via: 1.1 nghttpx
+    [  0.222] recv (stream_id=2) strict-transport-security: max-age=31536000
+    [  0.222] recv HEADERS frame <length=32, flags=0x04, stream_id=2>
+	      ; END_HEADERS
+	      (padlen=0)
+	      ; First push response header
+    [  0.228] recv DATA frame <length=8715, flags=0x01, stream_id=2>
+	      ; END_STREAM
+    [  0.228] send GOAWAY frame <length=8, flags=0x00, stream_id=0>
+	      (last_stream_id=2, error_code=NO_ERROR(0x00), opaque_data(0)=[])
 
-The HTTP Upgrade is performed like this::
+The HTTP Upgrade is performed like so::
 
     $ nghttp -nvu http://nghttp2.org
-    [  0.013] HTTP Upgrade request
+    [  0.011] Connected
+    [  0.011] HTTP Upgrade request
     GET / HTTP/1.1
     Host: nghttp2.org
     Connection: Upgrade, HTTP2-Settings
-    Upgrade: h2c-14
-    HTTP2-Settings: AwAAAGQEAAD__wUAAAAB
+    Upgrade: h2c
+    HTTP2-Settings: AAMAAABkAAQAAP__
     Accept: */*
-    User-Agent: nghttp2/0.4.0-DEV
+    User-Agent: nghttp2/1.0.1-DEV
 
 
-    [  0.024] HTTP Upgrade response
+    [  0.018] HTTP Upgrade response
     HTTP/1.1 101 Switching Protocols
     Connection: Upgrade
-    Upgrade: h2c-14
+    Upgrade: h2c
 
 
-    [  0.024] HTTP Upgrade success
-    [  0.024] send SETTINGS frame <length=15, flags=0x00, stream_id=0>
-              (niv=3)
-              [SETTINGS_MAX_CONCURRENT_STREAMS(3):100]
-              [SETTINGS_INITIAL_WINDOW_SIZE(4):65535]
-              [SETTINGS_COMPRESS_DATA(5):1]
-    [  0.024] recv SETTINGS frame <length=10, flags=0x00, stream_id=0>
+    [  0.018] HTTP Upgrade success
+    [  0.018] recv SETTINGS frame <length=12, flags=0x00, stream_id=0>
 	      (niv=2)
-              [SETTINGS_MAX_CONCURRENT_STREAMS(3):100]
-              [SETTINGS_INITIAL_WINDOW_SIZE(4):65535]
-    [  0.024] send SETTINGS frame <length=0, flags=0x01, stream_id=0>
+	      [SETTINGS_MAX_CONCURRENT_STREAMS(0x03):100]
+	      [SETTINGS_INITIAL_WINDOW_SIZE(0x04):65535]
+    [  0.018] send SETTINGS frame <length=12, flags=0x00, stream_id=0>
+	      (niv=2)
+	      [SETTINGS_MAX_CONCURRENT_STREAMS(0x03):100]
+	      [SETTINGS_INITIAL_WINDOW_SIZE(0x04):65535]
+    [  0.018] send SETTINGS frame <length=0, flags=0x01, stream_id=0>
 	      ; ACK
 	      (niv=0)
-    [  0.024] (stream_id=1, noind=0) :status: 200
-    [  0.024] (stream_id=1, noind=0) accept-ranges: bytes
-    [  0.024] (stream_id=1, noind=0) age: 10
-    [  0.024] (stream_id=1, noind=0) content-length: 40243
-    [  0.024] (stream_id=1, noind=0) content-type: text/html
-    [  0.024] (stream_id=1, noind=0) date: Wed, 14 May 2014 15:16:34 GMT
-    [  0.024] (stream_id=1, noind=0) etag: "535d0eea-9d33"
-    [  0.024] (stream_id=1, noind=0) last-modified: Sun, 27 Apr 2014 14:06:34 GMT
-    [  0.024] (stream_id=1, noind=0) server: nginx/1.4.6 (Ubuntu)
-    [  0.024] (stream_id=1, noind=0) x-varnish: 2114900541 2114900540
-    [  0.024] (stream_id=1, noind=0) via: 1.1 varnish, 1.1 nghttpx
-    [  0.024] recv HEADERS frame <length=148, flags=0x04, stream_id=1>
+    [  0.018] send PRIORITY frame <length=5, flags=0x00, stream_id=3>
+	      (dep_stream_id=0, weight=201, exclusive=0)
+    [  0.018] send PRIORITY frame <length=5, flags=0x00, stream_id=5>
+	      (dep_stream_id=0, weight=101, exclusive=0)
+    [  0.018] send PRIORITY frame <length=5, flags=0x00, stream_id=7>
+	      (dep_stream_id=0, weight=1, exclusive=0)
+    [  0.018] send PRIORITY frame <length=5, flags=0x00, stream_id=9>
+	      (dep_stream_id=7, weight=1, exclusive=0)
+    [  0.018] send PRIORITY frame <length=5, flags=0x00, stream_id=11>
+	      (dep_stream_id=3, weight=1, exclusive=0)
+    [  0.018] send PRIORITY frame <length=5, flags=0x00, stream_id=1>
+	      (dep_stream_id=11, weight=16, exclusive=0)
+    [  0.019] recv (stream_id=1) :method: GET
+    [  0.019] recv (stream_id=1) :scheme: http
+    [  0.019] recv (stream_id=1) :path: /stylesheets/screen.css
+    [  0.019] recv (stream_id=1) host: nghttp2.org
+    [  0.019] recv (stream_id=1) user-agent: nghttp2/1.0.1-DEV
+    [  0.019] recv PUSH_PROMISE frame <length=49, flags=0x04, stream_id=1>
+	      ; END_HEADERS
+	      (padlen=0, promised_stream_id=2)
+    [  0.019] recv (stream_id=1) :status: 200
+    [  0.019] recv (stream_id=1) date: Thu, 21 May 2015 16:39:16 GMT
+    [  0.019] recv (stream_id=1) content-type: text/html
+    [  0.019] recv (stream_id=1) content-length: 6646
+    [  0.019] recv (stream_id=1) last-modified: Fri, 15 May 2015 15:38:06 GMT
+    [  0.019] recv (stream_id=1) etag: "555612de-19f6"
+    [  0.019] recv (stream_id=1) link: </stylesheets/screen.css>; rel=preload; as=stylesheet
+    [  0.019] recv (stream_id=1) accept-ranges: bytes
+    [  0.019] recv (stream_id=1) server: nghttpx nghttp2/1.0.1-DEV
+    [  0.019] recv (stream_id=1) via: 1.1 nghttpx
+    [  0.019] recv HEADERS frame <length=157, flags=0x04, stream_id=1>
 	      ; END_HEADERS
 	      (padlen=0)
 	      ; First response header
-    [  0.024] recv DATA frame <length=3786, flags=0x00, stream_id=1>
-    [  0.025] recv DATA frame <length=4096, flags=0x00, stream_id=1>
-    [  0.031] recv DATA frame <length=4096, flags=0x00, stream_id=1>
-    [  0.031] recv DATA frame <length=4096, flags=0x00, stream_id=1>
-    [  0.032] recv DATA frame <length=4096, flags=0x00, stream_id=1>
-    [  0.032] recv DATA frame <length=4096, flags=0x00, stream_id=1>
-    [  0.033] recv DATA frame <length=4096, flags=0x00, stream_id=1>
-    [  0.033] recv DATA frame <length=4096, flags=0x00, stream_id=1>
-    [  0.033] send WINDOW_UPDATE frame <length=4, flags=0x00, stream_id=0>
-              (window_size_increment=33164)
-    [  0.033] send WINDOW_UPDATE frame <length=4, flags=0x00, stream_id=1>
-              (window_size_increment=33164)
-    [  0.038] recv DATA frame <length=4096, flags=0x00, stream_id=1>
-    [  0.038] recv DATA frame <length=3689, flags=0x00, stream_id=1>
-    [  0.038] recv DATA frame <length=0, flags=0x01, stream_id=1>
+    [  0.019] recv DATA frame <length=6646, flags=0x01, stream_id=1>
 	      ; END_STREAM
-    [  0.038] recv SETTINGS frame <length=0, flags=0x01, stream_id=0>
+    [  0.019] recv (stream_id=2) :status: 200
+    [  0.019] recv (stream_id=2) date: Thu, 21 May 2015 16:39:16 GMT
+    [  0.019] recv (stream_id=2) content-type: text/css
+    [  0.019] recv (stream_id=2) content-length: 38981
+    [  0.019] recv (stream_id=2) last-modified: Fri, 15 May 2015 15:38:06 GMT
+    [  0.019] recv (stream_id=2) etag: "555612de-9845"
+    [  0.019] recv (stream_id=2) accept-ranges: bytes
+    [  0.019] recv (stream_id=2) server: nghttpx nghttp2/1.0.1-DEV
+    [  0.019] recv (stream_id=2) via: 1.1 nghttpx
+    [  0.019] recv HEADERS frame <length=36, flags=0x04, stream_id=2>
+	      ; END_HEADERS
+	      (padlen=0)
+	      ; First push response header
+    [  0.026] recv DATA frame <length=16384, flags=0x00, stream_id=2>
+    [  0.027] recv DATA frame <length=7952, flags=0x00, stream_id=2>
+    [  0.027] send WINDOW_UPDATE frame <length=4, flags=0x00, stream_id=0>
+	      (window_size_increment=33343)
+    [  0.032] send WINDOW_UPDATE frame <length=4, flags=0x00, stream_id=2>
+	      (window_size_increment=33707)
+    [  0.032] recv DATA frame <length=14645, flags=0x01, stream_id=2>
+	      ; END_STREAM
+    [  0.032] recv SETTINGS frame <length=0, flags=0x01, stream_id=0>
 	      ; ACK
 	      (niv=0)
-    [  0.038] send GOAWAY frame <length=8, flags=0x00, stream_id=0>
-              (last_stream_id=0, error_code=NO_ERROR(0), opaque_data(0)=[])
+    [  0.032] send GOAWAY frame <length=8, flags=0x00, stream_id=0>
+	      (last_stream_id=2, error_code=NO_ERROR(0x00), opaque_data(0)=[])
 
 Using the ``-s`` option, ``nghttp`` prints out some timing information for
 requests, sorted by completion time::
@@ -369,24 +505,26 @@ requests, sorted by completion time::
     ***** Statistics *****
 
     Request timing:
-      complete: relative time from protocol handshake to stream close
-       request: relative   time  from   protocol   handshake  to   request
-                transmission.  If '*' is shown, this was pushed by server.
-       process: time for request and response
+      responseEnd: the  time  when  last  byte of  response  was  received
+                   relative to connectEnd
+     requestStart: the time  just before  first byte  of request  was sent
+                   relative  to connectEnd.   If  '*' is  shown, this  was
+                   pushed by server.
+          process: responseEnd - requestStart
              code: HTTP status code
              size: number  of  bytes  received as  response  body  without
                    inflation.
               URI: request URI
 
+    see http://www.w3.org/TR/resource-timing/#processing-model
+
     sorted by 'complete'
 
-    complete  request    process  code size request path
-     +11.07ms     +120us  10.95ms  200   9K /
-     +16.77ms *  +8.80ms   7.98ms  200   8K /stylesheets/screen.css
-     +27.00ms   +11.16ms  15.84ms  200   3K /javascripts/octopress.js
-     +27.40ms   +11.16ms  16.24ms  200   3K /javascripts/modernizr-2.0.js
-     +76.14ms   +11.17ms  64.97ms  200 171K /images/posts/with-pri-blog.png
-     +88.52ms   +11.17ms  77.36ms  200 174K /images/posts/without-pri-blog.png
+    id  responseEnd requestStart  process code size request path
+     13    +37.19ms       +280us  36.91ms  200   2K /
+      2    +72.65ms *   +36.38ms  36.26ms  200   8K /stylesheets/screen.css
+     17    +77.43ms     +38.67ms  38.75ms  200   3K /javascripts/octopress.js
+     15    +78.12ms     +38.66ms  39.46ms  200   3K /javascripts/modernizr-2.0.js
 
 Using the ``-r`` option, ``nghttp`` writes more detailed timing data to
 the given file in HAR format.
@@ -408,58 +546,65 @@ Just like ``nghttp``, it has a verbose output mode for framing
 information.  Here is sample output from ``nghttpd``::
 
     $ nghttpd --no-tls -v 8080
-    IPv4: listen on port 8080
-    IPv6: listen on port 8080
-    [id=1] [ 15.921] send SETTINGS frame <length=10, flags=0x00, stream_id=0>
+    IPv4: listen 0.0.0.0:8080
+    IPv6: listen :::8080
+    [id=1] [  1.521] send SETTINGS frame <length=6, flags=0x00, stream_id=0>
+              (niv=1)
+              [SETTINGS_MAX_CONCURRENT_STREAMS(0x03):100]
+    [id=1] [  1.521] recv SETTINGS frame <length=12, flags=0x00, stream_id=0>
               (niv=2)
-              [SETTINGS_MAX_CONCURRENT_STREAMS(3):100]
-              [SETTINGS_COMPRESS_DATA(5):1]
-    [id=1] [ 15.921] recv SETTINGS frame <length=15, flags=0x00, stream_id=0>
-              (niv=3)
-              [SETTINGS_MAX_CONCURRENT_STREAMS(3):100]
-              [SETTINGS_INITIAL_WINDOW_SIZE(4):65535]
-              [SETTINGS_COMPRESS_DATA(5):1]
-    [id=1] [ 15.921] (stream_id=1, noind=0) :authority: localhost:8080
-    [id=1] [ 15.921] (stream_id=1, noind=0) :method: GET
-    [id=1] [ 15.921] (stream_id=1, noind=0) :path: /
-    [id=1] [ 15.921] (stream_id=1, noind=0) :scheme: http
-    [id=1] [ 15.921] (stream_id=1, noind=0) accept: */*
-    [id=1] [ 15.921] (stream_id=1, noind=0) accept-encoding: gzip, deflate
-    [id=1] [ 15.921] (stream_id=1, noind=0) user-agent: nghttp2/0.4.0-DEV
-    [id=1] [ 15.921] recv HEADERS frame <length=48, flags=0x05, stream_id=1>
-              ; END_STREAM | END_HEADERS
-              (padlen=0)
+              [SETTINGS_MAX_CONCURRENT_STREAMS(0x03):100]
+              [SETTINGS_INITIAL_WINDOW_SIZE(0x04):65535]
+    [id=1] [  1.521] recv SETTINGS frame <length=0, flags=0x01, stream_id=0>
+              ; ACK
+              (niv=0)
+    [id=1] [  1.521] recv PRIORITY frame <length=5, flags=0x00, stream_id=3>
+              (dep_stream_id=0, weight=201, exclusive=0)
+    [id=1] [  1.521] recv PRIORITY frame <length=5, flags=0x00, stream_id=5>
+              (dep_stream_id=0, weight=101, exclusive=0)
+    [id=1] [  1.521] recv PRIORITY frame <length=5, flags=0x00, stream_id=7>
+              (dep_stream_id=0, weight=1, exclusive=0)
+    [id=1] [  1.521] recv PRIORITY frame <length=5, flags=0x00, stream_id=9>
+              (dep_stream_id=7, weight=1, exclusive=0)
+    [id=1] [  1.521] recv PRIORITY frame <length=5, flags=0x00, stream_id=11>
+              (dep_stream_id=3, weight=1, exclusive=0)
+    [id=1] [  1.521] recv (stream_id=13) :method: GET
+    [id=1] [  1.521] recv (stream_id=13) :path: /
+    [id=1] [  1.521] recv (stream_id=13) :scheme: http
+    [id=1] [  1.521] recv (stream_id=13) :authority: localhost:8080
+    [id=1] [  1.521] recv (stream_id=13) accept: */*
+    [id=1] [  1.521] recv (stream_id=13) accept-encoding: gzip, deflate
+    [id=1] [  1.521] recv (stream_id=13) user-agent: nghttp2/1.0.0-DEV
+    [id=1] [  1.521] recv HEADERS frame <length=41, flags=0x25, stream_id=13>
+              ; END_STREAM | END_HEADERS | PRIORITY
+              (padlen=0, dep_stream_id=11, weight=16, exclusive=0)
               ; Open new stream
-    [id=1] [ 15.921] recv SETTINGS frame <length=0, flags=0x01, stream_id=0>
+    [id=1] [  1.521] send SETTINGS frame <length=0, flags=0x01, stream_id=0>
               ; ACK
               (niv=0)
-    [id=1] [ 15.921] send SETTINGS frame <length=0, flags=0x01, stream_id=0>
-              ; ACK
-              (niv=0)
-    [id=1] [ 15.921] send HEADERS frame <length=82, flags=0x04, stream_id=1>
+    [id=1] [  1.521] send HEADERS frame <length=86, flags=0x04, stream_id=13>
               ; END_HEADERS
               (padlen=0)
               ; First response header
               :status: 200
+              server: nghttpd nghttp2/1.0.0-DEV
+              content-length: 10
               cache-control: max-age=3600
-              content-length: 612
-              date: Wed, 14 May 2014 15:19:03 GMT
-              last-modified: Sat, 08 Mar 2014 16:04:06 GMT
-              server: nghttpd nghttp2/0.4.0-DEV
-    [id=1] [ 15.922] send DATA frame <length=381, flags=0x20, stream_id=1>
-              ; COMPRESSED
-    [id=1] [ 15.922] send DATA frame <length=0, flags=0x01, stream_id=1>
+              date: Fri, 15 May 2015 14:49:04 GMT
+              last-modified: Tue, 30 Sep 2014 12:40:52 GMT
+    [id=1] [  1.522] send DATA frame <length=10, flags=0x01, stream_id=13>
               ; END_STREAM
-    [id=1] [ 15.922] stream_id=1 closed
-    [id=1] [ 15.922] recv GOAWAY frame <length=8, flags=0x00, stream_id=0>
-              (last_stream_id=0, error_code=NO_ERROR(0), opaque_data(0)=[])
-    [id=1] [ 15.922] closed
+    [id=1] [  1.522] stream_id=13 closed
+    [id=1] [  1.522] recv GOAWAY frame <length=8, flags=0x00, stream_id=0>
+              (last_stream_id=0, error_code=NO_ERROR(0x00), opaque_data(0)=[])
+    [id=1] [  1.522] closed
 
 nghttpx - proxy
 +++++++++++++++
 
-``nghttpx`` is a multi-threaded reverse proxy for ``h2-14``, SPDY and
-HTTP/1.1, and powers http://nghttp2.org and supports HTTP/2 server push.
+``nghttpx`` is a multi-threaded reverse proxy for HTTP/2, SPDY and
+HTTP/1.1, and powers http://nghttp2.org and supports HTTP/2 server
+push.
 
 ``nghttpx`` implements `important performance-oriented features
 <https://istlsfastyet.com/#server-performance>`_ in TLS, such as
@@ -480,8 +625,8 @@ default mode       HTTP/2, SPDY, HTTP/1.1 (TLS) HTTP/1.1       Reverse proxy
 ================== ============================ ============== =============
 
 The interesting mode at the moment is the default mode.  It works like
-a reverse proxy and listens for ``h2-14``, SPDY and HTTP/1.1 and can
-be deployed as a SSL/TLS terminator for existing web server.
+a reverse proxy and listens for HTTP/2, SPDY and HTTP/1.1 and can be
+deployed as a SSL/TLS terminator for existing web server.
 
 The default mode, ``--http2-proxy`` and ``--http2-bridge`` modes use
 SSL/TLS in the frontend connection by default.  To disable SSL/TLS,
@@ -490,7 +635,7 @@ disabled in the frontend and incoming HTTP/1.1 connections can be
 upgraded to HTTP/2 through HTTP Upgrade.
 
 The ``--http2-bridge``, ``--client`` and ``--client-proxy`` modes use
-SSL/TLS in the backend connection by deafult.  To disable SSL/TLS, use
+SSL/TLS in the backend connection by default.  To disable SSL/TLS, use
 the ``--backend-no-tls`` option.
 
 ``nghttpx`` supports a configuration file.  See the ``--conf`` option and
@@ -582,6 +727,7 @@ follows::
     spawning thread #0: 100 concurrent clients, 100000 total requests
     Protocol: TLSv1.2
     Cipher: ECDHE-RSA-AES128-GCM-SHA256
+    Server Temp Key: ECDH P-256 256 bits
     progress: 10% done
     progress: 20% done
     progress: 30% done
@@ -593,12 +739,14 @@ follows::
     progress: 90% done
     progress: 100% done
 
-    finished in 7.10s, 14092 req/s, 55.67MB/s
+    finished in 771.26ms, 129658 req/s, 4.71MB/s
     requests: 100000 total, 100000 started, 100000 done, 100000 succeeded, 0 failed, 0 errored
     status codes: 100000 2xx, 0 3xx, 0 4xx, 0 5xx
-    traffic: 414200800 bytes total, 2723100 bytes headers, 409600000 bytes data
+    traffic: 3812300 bytes total, 1009900 bytes headers, 1000000 bytes data
                          min         max         mean         sd        +/- sd
-    time for request:   283.86ms       1.46s    659.70ms    150.87ms    84.68%
+    time for request:    25.12ms    124.55ms     51.07ms     15.36ms    84.87%
+    time for connect:   208.94ms    254.67ms    241.38ms      7.95ms    63.00%
+    time to 1st byte:   209.11ms    254.80ms    241.51ms      7.94ms    63.00%
 
 The above example issued total 100,000 requests, using 100 concurrent
 clients (in other words, 100 HTTP/2 sessions), and a maximum of 100 streams
@@ -785,7 +933,7 @@ max_deflate_size
     The maximum header table size the encoder uses.  This can be smaller
     than ``max_size``.  In this case, the encoder only uses up to first
     ``max_deflate_size`` buffer.  Since the header table size is still
-    ``max_size``, the encoder has to keep track of entries ouside the
+    ``max_size``, the encoder has to keep track of entries outside the
     ``max_deflate_size`` but inside the ``max_size`` and make sure
     that they are no longer referenced.
 

android-config

@@ -42,6 +42,6 @@ PATH=$TOOLCHAIN/bin:$PATH
     --enable-werror \
     CC=clang \
     CXX=clang++ \
-    CPPFLAGS="-I$PREFIX/include" \
+    CPPFLAGS="-fPIE -I$PREFIX/include" \
     PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig" \
-    LDFLAGS="-L$PREFIX/lib"
+    LDFLAGS="-fPIE -pie -L$PREFIX/lib"

configure.ac

@@ -25,29 +25,16 @@ 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.7.10], [t-tujikawa@users.sourceforge.net])
+AC_INIT([nghttp2], [1.0.2], [t-tujikawa@users.sourceforge.net])
+AC_USE_SYSTEM_EXTENSIONS
+
 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, 13)
-AC_SUBST(LT_REVISION, 0)
-AC_SUBST(LT_AGE, 8)
-
-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"`
-patch=`echo $PACKAGE_VERSION |cut -d. -f3 | cut -d- -f1 | sed -e "s/[^0-9]//g"`
-
-PACKAGE_VERSION_NUM=`printf "0x%02x%02x%02x" "$major" "$minor" "$patch"`
-
-AC_SUBST(PACKAGE_VERSION_NUM)
 
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-AC_CONFIG_MACRO_DIR([m4])
-
 AM_INIT_AUTOMAKE([subdir-objects])
 # comment out for now since this requires automake 1.13 or higher and
 # travis has older one.
@@ -55,8 +42,23 @@ AM_INIT_AUTOMAKE([subdir-objects])
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 
+dnl See versioning rule:
+dnl  http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+AC_SUBST(LT_CURRENT, 14)
+AC_SUBST(LT_REVISION, 2)
+AC_SUBST(LT_AGE, 0)
+
+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"`
+patch=`echo $PACKAGE_VERSION |cut -d. -f3 | cut -d- -f1 | sed -e "s/[^0-9]//g"`
+
+PACKAGE_VERSION_NUM=`printf "0x%02x%02x%02x" "$major" "$minor" "$patch"`
+
+AC_SUBST(PACKAGE_VERSION_NUM)
+
 dnl Checks for command-line options
 AC_ARG_ENABLE([werror],
     [AS_HELP_STRING([--enable-werror],
@@ -129,14 +131,17 @@ AC_ARG_VAR([CYTHON], [the Cython executable])
 dnl Checks for programs
 AC_PROG_CC
 AC_PROG_CXX
+AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AM_PROG_CC_C_O
+AC_PROG_MKDIR_P
+
 PKG_PROG_PKG_CONFIG([0.20])
 
+AM_PATH_PYTHON([2.7],, [:])
+
 if [test "x$request_python_bindings" != "xno"]; then
-  AM_PATH_PYTHON([2.7],, [:])
   AX_PYTHON_DEVEL([>= '2.7'])
 fi
 
@@ -226,20 +231,6 @@ TESTLDADD=
 # Additional libraries required for programs under src directory.
 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])
-TESTLDADD="$LIBS $TESTLDADD"
-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`.])])
-APPLDFLAGS="$LIBS $APPLDFLAGS"
-LIBS=$LIBS_OLD
-
 case "$host" in
   *android*)
     android_build=yes
@@ -253,16 +244,10 @@ case "$host" in
 esac
 
 # zlib
-if test "x$android_build" = "xyes"; then
-  # Use zlib provided by NDK
-  APPLDFLAGS="-lz $APPLDFLAGS"
-  have_zlib=yes
-else
-  PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.3], [have_zlib=yes], [have_zlib=no])
+PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.3], [have_zlib=yes], [have_zlib=no])
 
-  if test "x${have_zlib}" = "xno"; then
+if test "x${have_zlib}" = "xno"; then
   AC_MSG_NOTICE($ZLIB_PKG_ERRORS)
-  fi
 fi
 
 # cunit
@@ -328,7 +313,7 @@ fi
 # 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}" == "xyes"; then
+if test "x${have_jansson}" = "xyes"; then
   AC_DEFINE([HAVE_JANSSON], [1],
             [Define to 1 if you have `libjansson` library.])
 else
@@ -358,9 +343,23 @@ if test "x${request_jemalloc}" != "xno"; then
   AC_SEARCH_LIBS([malloc_stats_print], [jemalloc], [have_jemalloc=yes], [],
                  [$PTHREAD_LDFLAGS])
   LIBS=$LIBS_OLD
+
+  if test "x${have_jemalloc}" = "xyes"; then
+    jemalloc_libs=${ac_cv_search_malloc_stats_print}
+  else
+    # On Darwin, malloc_stats_print is je_malloc_stats_print
+    AC_SEARCH_LIBS([je_malloc_stats_print], [jemalloc], [have_jemalloc=yes], [],
+                   [$PTHREAD_LDFLAGS])
+    LIBS=$LIBS_OLD
+
+    if test "x${have_jemalloc}" = "xyes"; then
+      jemalloc_libs=${ac_cv_search_je_malloc_stats_print}
+    fi
+  fi
+
   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}
+     test "x${jemalloc_libs}" != "xnone required"; then
+    JEMALLOC_LIBS=${jemalloc_libs}
     AC_SUBST([JEMALLOC_LIBS])
   fi
 fi
@@ -465,6 +464,16 @@ fi
 
 AM_CONDITIONAL([ENABLE_EXAMPLES], [ test "x${enable_examples}" = "xyes" ])
 
+# third-party only be built if either enable_examples or enable_app is
+# yes
+
+enable_third_party=no
+if test "x${enable_examples}" = "xyes" || test "x${enable_app}" = "xyes"; then
+  enable_third_party=yes
+fi
+
+AM_CONDITIONAL([ENABLE_THIRD_PARTY], [ test "x${enable_third_party}" = "xyes" ])
+
 # Python bindings
 enable_python_bindings=no
 if test "x${request_python_bindings}" != "xno" &&
@@ -498,12 +507,19 @@ AM_CONDITIONAL([ENABLE_FAILMALLOC], [ test "x${enable_failmalloc}" = "xyes" ])
 AC_HEADER_ASSERT
 AC_CHECK_HEADERS([ \
   arpa/inet.h \
+  fcntl.h \
+  inttypes.h \
+  limits.h \
+  netdb.h \
   netinet/in.h \
   pwd.h \
   stddef.h \
   stdint.h \
   stdlib.h \
   string.h \
+  sys/socket.h \
+  sys/time.h \
+  syslog.h \
   time.h \
   unistd.h \
 ])
@@ -515,8 +531,16 @@ AC_TYPE_UINT8_T
 AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
 AC_TYPE_UINT64_T
+AC_TYPE_INT8_T
+AC_TYPE_INT16_T
+AC_TYPE_INT32_T
+AC_TYPE_INT64_T
+AC_TYPE_OFF_T
+AC_TYPE_PID_T
+AC_TYPE_UID_T
 AC_CHECK_TYPES([ptrdiff_t])
 AC_C_BIGENDIAN
+AC_C_INLINE
 AC_SYS_LARGEFILE
 
 AC_CHECK_MEMBER([struct tm.tm_gmtoff], [have_struct_tm_tm_gmtoff=yes],
@@ -535,12 +559,34 @@ AC_CHECK_SIZEOF([int *])
 if test "x$cross_compiling" != "xyes"; then
   AC_FUNC_MALLOC
 fi
+
+AC_FUNC_CHOWN
+AC_FUNC_ERROR_AT_LINE
+AC_FUNC_FORK
+# Don't check realloc, since LeakSanitizer detects memory leak during check
+# AC_FUNC_REALLOC
+AC_FUNC_STRERROR_R
+AC_FUNC_STRNLEN
+
 AC_CHECK_FUNCS([ \
   _Exit \
   accept4 \
+  dup2 \
+  getcwd \
   getpwnam \
+  localtime_r \
+  memchr \
   memmove \
   memset \
+  socket \
+  sqrt \
+  strchr \
+  strdup \
+  strerror \
+  strndup \
+  strstr \
+  strtol \
+  strtoul \
   timegm \
 ])
 
@@ -650,6 +696,7 @@ AC_CONFIG_FILES([
   doc/asio_http2_client.h.rst
   doc/contribute.rst
   contrib/Makefile
+  script/Makefile
 ])
 AC_OUTPUT
 
@@ -688,6 +735,7 @@ AC_MSG_NOTICE([summary of build options:
       Spdylay:        ${have_spdylay}
       Jansson:        ${have_jansson}
       Jemalloc:       ${have_jemalloc}
+      Zlib:           ${have_zlib}
       Boost CPPFLAGS: ${BOOST_CPPFLAGS}
       Boost LDFLAGS:  ${BOOST_LDFLAGS}
       Boost::ASIO:    ${BOOST_ASIO_LIB}
@@ -700,4 +748,5 @@ AC_MSG_NOTICE([summary of build options:
       Examples:       ${enable_examples}
       Python bindings:${enable_python_bindings}
       Threading:      ${enable_threads}
+      Third-party:    ${enable_third_party}
 ])

contrib/.gitignore

@@ -1 +1,3 @@
 nghttpx-init
+nghttpx.service
+nghttpx-upstart.conf

contrib/Makefile.am

@@ -21,19 +21,24 @@
 # 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
+configfiles = nghttpx-init nghttpx.service nghttpx-upstart.conf
+
+EXTRA_DIST = $(configfiles:%=%.in) nghttpx-logrotate
 
 edit = sed -e 's|@bindir[@]|$(bindir)|g'
 
-nghttpx-init: Makefile
+nghttpx-init: %: $(srcdir)/%.in
 	rm -f $@ $@.tmp
-	$(edit) $(srcdir)/$@.in > $@.tmp
+	$(edit) $< > $@.tmp
 	chmod +x $@.tmp
 	mv $@.tmp $@
 
-nghttpx-init: $(srcdir)/nghttpx-init.in
+nghttpx.service nghttpx-upstart.conf: %: $(srcdir)/%.in
+	$(edit) $< > $@
 
-all-local: nghttpx-init
+$(configfiles): Makefile
+
+all-local: $(configfiles)
 
 clean-local:
-	-rm -f nghttpx-init nghttpx-init.tmp
+	-rm -f nghttpx-init.tmp $(configfiles)

contrib/nghttpx-logrotate

@@ -1,18 +1,11 @@
 /var/log/nghttpx/*.log {
   weekly
-        missingok
   rotate 52
+  missingok
   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`
+    killall -USR1 nghttpx 2> /dev/null || true
   endscript
 }

contrib/nghttpx-upstart.conf.in

@@ -0,0 +1,8 @@
+# vim: ft=upstart:
+
+description "HTTP/2 reverse proxy"
+
+start on runlevel [2]
+stop on runlevel [016]
+
+exec @bindir@/nghttpx

contrib/nghttpx.service.in

@@ -0,0 +1,10 @@
+[Unit]
+Description=HTTP/2 experimental proxy
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=@bindir@/nghttpx --errorlog-syslog
+
+[Install]
+WantedBy=multi-user.target

doc/Makefile.am

@@ -49,7 +49,7 @@ APIDOCS= \
 	nghttp2_option_set_no_auto_window_update.rst \
 	nghttp2_option_set_no_http_messaging.rst \
 	nghttp2_option_set_peer_max_concurrent_streams.rst \
-	nghttp2_option_set_recv_client_preface.rst \
+	nghttp2_option_set_no_recv_client_magic.rst \
 	nghttp2_pack_settings_payload.rst \
 	nghttp2_priority_spec_check_default.rst \
 	nghttp2_priority_spec_default_init.rst \
@@ -108,7 +108,6 @@ APIDOCS= \
 	nghttp2_session_want_read.rst \
 	nghttp2_session_want_write.rst \
 	nghttp2_strerror.rst \
-	nghttp2_submit_altsvc.rst \
 	nghttp2_submit_data.rst \
 	nghttp2_submit_goaway.rst \
 	nghttp2_submit_headers.rst \
@@ -201,11 +200,28 @@ help:
 	@echo "  linkcheck  to check all external links for integrity"
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
 
-apiref.rst: $(top_builddir)/lib/includes/nghttp2/nghttp2ver.h \
+apiref.rst macros.rst enums.rst types.rst: \
+	$(top_builddir)/lib/includes/nghttp2/nghttp2ver.h \
 	$(top_builddir)/lib/includes/nghttp2/nghttp2.h
 	$(PYTHON) $(top_srcdir)/doc/mkapiref.py \
 	$@ macros.rst enums.rst types.rst . $^
 
+# Inspired by
+# http://www.gnu.org/savannah-checkouts/gnu/automake/manual/html_node/Multiple-Outputs.html
+apidoc.stamp: $(top_builddir)/lib/includes/nghttp2/nghttp2ver.h \
+	$(top_builddir)/lib/includes/nghttp2/nghttp2.h
+	@rm -f apidoc.tmp
+	@touch apidoc.tmp
+	$(PYTHON) $(top_srcdir)/doc/mkapiref.py \
+	$@ macros.rst enums.rst types.rst . $^
+	@mv -f apidoc.tmp $@
+$(APIDOC): apidoc.stamp
+## Recover from the removal of $@
+	@if test -f $@; then :; else \
+	  rm -f apidoc.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) apidoc.stamp; \
+	fi
+
 clean-local:
 	-rm $(APIDOCS)
 	-rm -rf $(BUILDDIR)/*

doc/_themes/sphinx_rtd_theme/__init__.py

@@ -5,7 +5,7 @@ From https://github.com/ryan-roemer/sphinx-bootstrap-theme.
 """
 import os
 
-VERSION = (0, 1, 7)
+VERSION = (0, 1, 8)
 
 __version__ = ".".join(str(v) for v in VERSION)
 __version_full__ = __version__

doc/_themes/sphinx_rtd_theme/breadcrumbs.html

@@ -6,6 +6,7 @@
       {% endfor %}
     <li>{{ title }}</li>
       <li class="wy-breadcrumbs-aside">
+        {% if pagename != "search" %}
           {% if display_github %}
             <a href="https://{{ github_host|default("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 %}
@@ -15,6 +16,7 @@
           {% elif show_source and has_source and sourcename %}
             <a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> View page source</a>
           {% endif %}
+        {% endif %}
       </li>
   </ul>
   <hr/>

doc/_themes/sphinx_rtd_theme/footer.html

@@ -2,10 +2,10 @@
   {% 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 }}" accesskey="n">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>
+        <a href="{{ prev.link|e }}" class="btn btn-neutral" title="{{ prev.title|striptags|e }}" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
       {% endif %}
     </div>
   {% endif %}

doc/_themes/sphinx_rtd_theme/layout.html

@@ -107,7 +107,7 @@
 
       <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
         {% block menu %}
-          {% set toctree = toctree(maxdepth=2, collapse=False, includehidden=True) %}
+          {% set toctree = toctree(maxdepth=4, collapse=False, includehidden=True) %}
           {% if toctree %}
               {{ toctree }}
           {% else %}

doc/_themes/sphinx_rtd_theme/static/js/theme.js

@@ -1,50 +1,113 @@
-$( document ).ready(function() {
+function toggleCurrent (elem) {
+    var parent_li = elem.closest('li');
+    parent_li.siblings('li.current').removeClass('current');
+    parent_li.siblings().find('li.current').removeClass('current');
+    parent_li.find('> ul li.current').removeClass('current');
+    parent_li.toggleClass('current');
+}
+
+$(document).ready(function() {
     // Shift nav in mobile when clicking the menu.
     $(document).on('click', "[data-toggle='wy-nav-top']", function() {
         $("[data-toggle='wy-nav-shift']").toggleClass("shift");
         $("[data-toggle='rst-versions']").toggleClass("shift");
     });
-    // Close menu when you click a link.
+    // Nav menu link click operations
     $(document).on('click', ".wy-menu-vertical .current ul li a", function() {
+        var target = $(this);
+        // Close menu when you click a link.
         $("[data-toggle='wy-nav-shift']").removeClass("shift");
         $("[data-toggle='rst-versions']").toggleClass("shift");
+        // Handle dynamic display of l3 and l4 nav lists
+        toggleCurrent(target);
+        if (typeof(window.SphinxRtdTheme) != 'undefined') {
+            window.SphinxRtdTheme.StickyNav.hashChange();
+        }
     });
     $(document).on('click', "[data-toggle='rst-current-version']", function() {
         $("[data-toggle='rst-versions']").toggleClass("shift-up");
     });
     // Make tables responsive
     $("table.docutils:not(.field-list)").wrap("<div class='wy-table-responsive'></div>");
+
+    // Add expand links to all parents of nested ul
+    $('.wy-menu-vertical ul').siblings('a').each(function () {
+        var link = $(this);
+            expand = $('<span class="toctree-expand"></span>');
+        expand.on('click', function (ev) {
+            toggleCurrent(link);
+            ev.stopPropagation();
+            return false;
+        });
+        link.prepend(expand);
+    });
 });
 
+// Sphinx theme state
 window.SphinxRtdTheme = (function (jquery) {
     var stickyNav = (function () {
         var navBar,
             win,
-            stickyNavCssClass = 'stickynav',
             winScroll = false,
+            linkScroll = false,
+            winPosition = 0,
             enable = function () {
-                navBar.addClass(stickyNavCssClass);
-                win.on('scroll', function() { // set flag on scroll event
+                init();
+                reset();
+                win.on('hashchange', reset);
+
+                // Set scrolling
+                win.on('scroll', function () {
+                    if (!linkScroll) {
                         winScroll = true;
+                    }
                 });
-                // use setInterval to only handle a subset of scroll events so we don't kill scroll performance
-                setInterval(function() {
+                setInterval(function () {
                     if (winScroll) {
                         winScroll = false;
-                        navBar.scrollTop(win.scrollTop());
+                        var newWinPosition = win.scrollTop(),
+                            navPosition = navBar.scrollTop(),
+                            newNavPosition = navPosition + (newWinPosition - winPosition);
+                        navBar.scrollTop(newNavPosition);
+                        winPosition = newWinPosition;
                     }
-                }, 100);
+                }, 25);
             },
             init = function () {
                 navBar = jquery('nav.wy-nav-side:first');
                 win = jquery(window);
+            },
+            reset = function () {
+                // Get anchor from URL and open up nested nav
+                var anchor = encodeURI(window.location.hash);
+                if (anchor) {
+                    try {
+                        var link = $('.wy-menu-vertical')
+                            .find('[href="' + anchor + '"]');
+                        $('.wy-menu-vertical li.toctree-l1 li.current')
+                            .removeClass('current');
+                        link.closest('li.toctree-l2').addClass('current');
+                        link.closest('li.toctree-l3').addClass('current');
+                        link.closest('li.toctree-l4').addClass('current');
+                    }
+                    catch (err) {
+                        console.log("Error expanding nav for anchor", err);
+                    }
+                }
+            },
+            hashChange = function () {
+                linkScroll = true;
+                win.one('hashchange', function () {
+                    linkScroll = false;
+                });
             };
         jquery(init);
         return {
-            enable : enable
+            enable: enable,
+            hashChange: hashChange
         };
     }());
     return {
-        StickyNav : stickyNav
+        StickyNav: stickyNav
     };
 }($));

doc/bash_completion/make_bash_completion.py

@@ -1,7 +1,10 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+from __future__ import print_function
 import subprocess
-from StringIO import StringIO
+import io
 import re
 import sys
 import os.path
@@ -14,10 +17,10 @@ class Option:
 def get_all_options(cmd):
     opt_pattern = re.compile(r'  (?:(-.), )?(--[^\s\[=]+)(\[)?')
     proc = subprocess.Popen([cmd, "--help"], stdout=subprocess.PIPE)
-    stdoutdata, stderrdata = proc.communicate()
+    stdoutdata, _ = proc.communicate()
     cur_option = None
     opts = {}
-    for line in StringIO(stdoutdata):
+    for line in io.StringIO(stdoutdata.decode('utf-8')):
         match = opt_pattern.match(line)
         if not match:
             continue
@@ -45,7 +48,7 @@ _{name}()
         -*)
             COMPREPLY=( $( compgen -W '\
 ''')
-    for opt in opts.itervalues():
+    for opt in opts.values():
         out.write(opt.long_opt)
         out.write(' ')
 
@@ -66,8 +69,8 @@ complete -F _{name} {name}
 
 if __name__ == '__main__':
     if len(sys.argv) < 2:
-        print "Generates bash_completion using `/path/to/cmd --help'"
-        print "Usage: make_bash_completion.py /path/to/cmd"
+        print("Generates bash_completion using `/path/to/cmd --help'")
+        print("Usage: make_bash_completion.py /path/to/cmd")
         exit(1)
     name = os.path.basename(sys.argv[1])
     opts = get_all_options(sys.argv[1])

doc/bash_completion/nghttp

@@ -8,7 +8,7 @@ _nghttp()
     _get_comp_words_by_ref cur prev
     case $cur in
         -*)
-            COMPREPLY=( $( compgen -W '--verbose --no-dep --get-assets --har --header-table-size --multiply --padding --hexdump --dep-idle --continuation --connection-window-bits --peer-max-concurrent-streams --timeout --data --no-content-length --version --color --cert --upgrade --remote-name --trailer --weight --help --key --null-out --window-bits --stat --header ' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '--no-push --verbose --no-dep --get-assets --har --header-table-size --multiply --padding --hexdump --continuation --connection-window-bits --peer-max-concurrent-streams --timeout --data --no-content-length --version --color --cert --upgrade --remote-name --trailer --weight --help --key --null-out --window-bits --stat --header ' -- "$cur" ) )
             ;;
         *)
             _filedir

doc/bash_completion/nghttpd

@@ -8,7 +8,7 @@ _nghttpd()
     _get_comp_words_by_ref cur prev
     case $cur in
         -*)
-            COMPREPLY=( $( compgen -W '--error-gzip --push --header-table-size --trailer --htdocs --address --padding --verbose --version --help --hexdump --daemon --verify-client --workers --no-tls --color --early-response --dh-param-file ' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '--error-gzip --push --header-table-size --trailer --htdocs --address --padding --verbose --version --help --hexdump --dh-param-file --daemon --verify-client --echo-upload --workers --no-tls --color --early-response --max-concurrent-streams ' -- "$cur" ) )
             ;;
         *)
             _filedir

doc/bash_completion/nghttpx

@@ -8,7 +8,7 @@ _nghttpx()
     _get_comp_words_by_ref cur prev
     case $cur in
         -*)
-            COMPREPLY=( $( compgen -W '--frontend-http2-connection-window-bits --worker-read-rate --frontend-no-tls --frontend-http2-dump-request-header --daemon --write-rate --altsvc --frontend-http2-dump-response-header --backend-http1-connections-per-frontend --tls-ticket-key-file --ciphers --verify-client-cacert --backend-keep-alive-timeout --strip-incoming-x-forwarded-for --errorlog-file --private-key-passwd-file --version --backlog --backend-http-proxy-uri --add-response-header --backend-write-timeout --backend-request-buffer --add-x-forwarded-for --write-burst --backend-http2-connection-window-bits --insecure --rlimit-nofile --backend-http2-window-bits --tls-proto-list --no-location-rewrite --padding --conf --accesslog-syslog --backend-http2-connections-per-worker --http2-max-concurrent-streams --client-proxy --worker-frontend-connections --ocsp-update-interval --cacert --frontend-read-timeout --worker-write-burst --npn-list --syslog-facility --backend-http1-connections-per-host --no-server-push --client --http2-bridge --fetch-ocsp-response-file --no-via --user --stream-write-timeout --no-ocsp --backend-response-buffer --http2-no-cookie-crumbling --backend-read-timeout --stream-read-timeout --workers --worker-read-burst --dh-param-file --errorlog-syslog --frontend --accesslog-file --http2-proxy --frontend-http2-read-timeout --accesslog-format --frontend-http2-window-bits --backend-no-tls --client-private-key-file --pid-file --client-cert-file --no-host-rewrite --log-level --worker-write-rate --help --backend-tls-sni-field --subcert --frontend-frame-debug --frontend-write-timeout --verify-client --read-rate --read-burst --backend-ipv4 --listener-disable-timeout --backend-ipv6 --backend ' -- "$cur" ) )
+            COMPREPLY=( $( compgen -W '--worker-read-rate --frontend-no-tls --frontend-http2-dump-response-header --backend-http1-connections-per-frontend --tls-ticket-key-file --verify-client-cacert --backend-request-buffer --backend-http2-connection-window-bits --conf --worker-write-burst --npn-list --fetch-ocsp-response-file --stream-read-timeout --accesslog-syslog --frontend-http2-read-timeout --listener-disable-timeout --frontend-http2-connection-window-bits --ciphers --strip-incoming-x-forwarded-for --daemon --backend-keep-alive-timeout --backend-http-proxy-uri --backend-http1-connections-per-host --rlimit-nofile --no-via --ocsp-update-interval --backend-write-timeout --client --http2-no-cookie-crumbling --worker-read-burst --client-proxy --http2-bridge --accesslog-format --errorlog-syslog --errorlog-file --http2-max-concurrent-streams --frontend-write-timeout --read-burst --backend-ipv4 --backend-ipv6 --backend --insecure --log-level --tls-proto-list --backend-http2-connections-per-worker --dh-param-file --worker-frontend-connections --header-field-buffer --no-server-push --no-location-rewrite --no-ocsp --backend-response-buffer --workers --frontend-http2-window-bits --no-host-rewrite --worker-write-rate --add-request-header --backend-tls-sni-field --subcert --help --frontend-frame-debug --pid-file --frontend-http2-dump-request-header --private-key-passwd-file --write-rate --altsvc --user --add-x-forwarded-for --syslog-facility --frontend-read-timeout --backlog --write-burst --backend-http2-window-bits --padding --stream-write-timeout --cacert --version --verify-client --backend-read-timeout --frontend --accesslog-file --http2-proxy --max-header-fields --backend-no-tls --client-private-key-file --client-cert-file --add-response-header --read-rate ' -- "$cur" ) )
             ;;
         *)
             _filedir

doc/h2load.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "H2LOAD" "1" "April 08, 2015" "0.7.10" "nghttp2"
+.TH "H2LOAD" "1" "June 12, 2015" "1.0.2" "nghttp2"
 .SH NAME
 h2load \- HTTP/2 benchmarking tool
 .
@@ -71,7 +71,7 @@ Default: \fB1\fP
 .INDENT 0.0
 .TP
 .B \-i, \-\-input\-file=<FILE>
-Path of a file with multiple URIs are seperated by EOLs.
+Path of a file with multiple URIs are separated 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
@@ -93,6 +93,8 @@ Default: \fBauto\fP
 .B \-w, \-\-window\-bits=<N>
 Sets the stream level initial window size to (2**<N>)\-1.
 For SPDY, 2**<N> is used instead.
+.sp
+Default: \fB30\fP
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -101,6 +103,8 @@ 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.
+.sp
+Default: \fB30\fP
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -112,9 +116,9 @@ Add/Override a header to the requests.
 .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
+Available protocols: spdy/2, spdy/3, spdy/3.1 and h2c
 .sp
-Default: \fBh2c\-14\fP
+Default: \fBh2c\fP
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -201,13 +205,63 @@ The maximum time taken for request and response.
 The mean time taken for request and response.
 .TP
 .B sd
-The standard deviation of the time for request and response.
+The standard deviation of the time taken for request and response.
 .TP
 .B +/\- sd
 The fraction of the number of requests within standard deviation
 range (mean +/\- sd) against total number of successful requests.
 .UNINDENT
+.TP
+.B time for connect
+.INDENT 7.0
+.TP
+.B min
+The minimum time taken to connect to a server.
+.TP
+.B max
+The maximum time taken to connect to a server.
+.TP
+.B mean
+The mean time taken to connect to a server.
+.TP
+.B sd
+The standard deviation of the time taken to connect to a server.
+.TP
+.B +/\- sd
+The  fraction  of  the   number  of  connections  within  standard
+deviation range (mean  +/\- sd) against total  number of successful
+connections.
 .UNINDENT
+.TP
+.B time for 1st byte (of (decrypted in case of TLS) application data)
+.INDENT 7.0
+.TP
+.B min
+The minimum time taken to get 1st byte from a server.
+.TP
+.B max
+The maximum time taken to get 1st byte from a server.
+.TP
+.B mean
+The mean time taken to get 1st byte from a server.
+.TP
+.B sd
+The standard deviation of the time taken to get 1st byte from a
+server.
+.TP
+.B +/\- sd
+The fraction of the number of connections within standard
+deviation range (mean +/\- sd) against total number of successful
+connections.
+.UNINDENT
+.UNINDENT
+.SH FLOW CONTROL
+.sp
+h2load sets large flow control window by default, and effectively
+disables flow control to avoid under utilization of server
+performance.  To set smaller flow control window, use \fI\%\-w\fP and
+\fI\%\-W\fP options.  For example, use \fB\-w16 \-W16\fP to set default
+window size described in HTTP/2 and SPDY protocol specification.
 .SH SEE ALSO
 .sp
 \fInghttp(1)\fP, \fInghttpd(1)\fP, \fInghttpx(1)\fP

doc/h2load.1.rst

@@ -1,4 +1,8 @@
 
+.. GENERATED by help2rst.py.  DO NOT EDIT DIRECTLY.
+
+.. program:: h2load
+
 h2load(1)
 =========
 
@@ -44,7 +48,7 @@ OPTIONS
 
 .. option:: -i, --input-file=<FILE>
 
-    Path of a file with multiple URIs are seperated by EOLs.
+    Path of a file with multiple URIs are separated 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
@@ -65,6 +69,8 @@ OPTIONS
     Sets the stream level initial window size to (2\*\*<N>)-1.
     For SPDY, 2**<N> is used instead.
 
+    Default: ``30``
+
 .. option:: -W, --connection-window-bits=<N>
 
     Sets  the  connection  level   initial  window  size  to
@@ -72,6 +78,8 @@ OPTIONS
     this option  is ignored.   Otherwise 2\*\*<N> is  used for
     SPDY.
 
+    Default: ``30``
+
 .. option:: -H, --header=<HEADER>
 
     Add/Override a header to the requests.
@@ -80,9 +88,9 @@ OPTIONS
 
     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
+    Available protocols: spdy/2, spdy/3, spdy/3.1 and h2c
 
-    Default: ``h2c-14``
+    Default: ``h2c``
 
 .. option:: -d, --data=<FILE>
 
@@ -147,11 +155,49 @@ time for request
   mean
     The mean time taken for request and response.
   sd
-    The standard deviation of the time for request and response.
+    The standard deviation of the time taken for request and response.
   +/- sd
     The fraction of the number of requests within standard deviation
     range (mean +/- sd) against total number of successful requests.
 
+time for connect
+  min
+    The minimum time taken to connect to a server.
+  max
+    The maximum time taken to connect to a server.
+  mean
+    The mean time taken to connect to a server.
+  sd
+    The standard deviation of the time taken to connect to a server.
+  +/- sd
+    The  fraction  of  the   number  of  connections  within  standard
+    deviation range (mean  +/- sd) against total  number of successful
+    connections.
+
+time for 1st byte (of (decrypted in case of TLS) application data)
+  min
+    The minimum time taken to get 1st byte from a server.
+  max
+    The maximum time taken to get 1st byte from a server.
+  mean
+    The mean time taken to get 1st byte from a server.
+  sd
+    The standard deviation of the time taken to get 1st byte from a
+    server.
+  +/- sd
+    The fraction of the number of connections within standard
+    deviation range (mean +/- sd) against total number of successful
+    connections.
+
+FLOW CONTROL
+------------
+
+h2load sets large flow control window by default, and effectively
+disables flow control to avoid under utilization of server
+performance.  To set smaller flow control window, use :option:`-w` and
+:option:`-W` options.  For example, use ``-w16 -W16`` to set default
+window size described in HTTP/2 and SPDY protocol specification.
+
 SEE ALSO
 --------
 

doc/h2load.h2r

@@ -44,11 +44,49 @@ time for request
   mean
     The mean time taken for request and response.
   sd
-    The standard deviation of the time for request and response.
+    The standard deviation of the time taken for request and response.
   +/- sd
     The fraction of the number of requests within standard deviation
     range (mean +/- sd) against total number of successful requests.
 
+time for connect
+  min
+    The minimum time taken to connect to a server.
+  max
+    The maximum time taken to connect to a server.
+  mean
+    The mean time taken to connect to a server.
+  sd
+    The standard deviation of the time taken to connect to a server.
+  +/- sd
+    The  fraction  of  the   number  of  connections  within  standard
+    deviation range (mean  +/- sd) against total  number of successful
+    connections.
+
+time for 1st byte (of (decrypted in case of TLS) application data)
+  min
+    The minimum time taken to get 1st byte from a server.
+  max
+    The maximum time taken to get 1st byte from a server.
+  mean
+    The mean time taken to get 1st byte from a server.
+  sd
+    The standard deviation of the time taken to get 1st byte from a
+    server.
+  +/- sd
+    The fraction of the number of connections within standard
+    deviation range (mean +/- sd) against total number of successful
+    connections.
+
+FLOW CONTROL
+------------
+
+h2load sets large flow control window by default, and effectively
+disables flow control to avoid under utilization of server
+performance.  To set smaller flow control window, use :option:`-w` and
+:option:`-W` options.  For example, use ``-w16 -W16`` to set default
+window size described in HTTP/2 and SPDY protocol specification.
+
 SEE ALSO
 --------
 

doc/mkapiref.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 # nghttp2 - HTTP/2 C Library
 
 # Copyright (c) 2012 Tatsuhiro Tsujikawa
@@ -23,6 +24,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 # Generates API reference from C source code.
+
+from __future__ import unicode_literals
 from __future__ import print_function # At least python 2.6 is required
 import re, sys, argparse, os.path
 
@@ -222,6 +225,7 @@ def process_function(domain, infile):
     func_proto = ''.join(func_proto)
     func_proto = re.sub(r';\n$', '', func_proto)
     func_proto = re.sub(r'\s+', ' ', func_proto)
+    func_proto = re.sub(r'NGHTTP2_EXTERN ', '', func_proto)
     return FunctionDoc(func_proto, content, domain)
 
 def read_content(infile):

doc/nghttp.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTP" "1" "April 08, 2015" "0.7.10" "nghttp2"
+.TH "NGHTTP" "1" "June 12, 2015" "1.0.2" "nghttp2"
 .SH NAME
 nghttp \- HTTP/2 experimental client
 .
@@ -64,8 +64,9 @@ yet.
 .UNINDENT
 .INDENT 0.0
 .TP
-.B \-t, \-\-timeout=<SEC>
-Timeout each request after <SEC> seconds.
+.B \-t, \-\-timeout=<DURATION>
+Timeout each request after <DURATION>.  Set 0 to disable
+timeout.
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -104,8 +105,8 @@ Add a header to the requests.  Example: \fI\%\-H\fP\(aq:method: PUT\(aq
 .B \-\-trailer=<HEADER>
 Add a trailer header to the requests.  <HEADER> must not
 include pseudo header field  (header field name starting
-with \(aq:\(aq).  To  send trailer, one must use  \fI\-d\fP option to
-send request body.  Example: \fI\-\-trailer\fP \(aqfoo: bar\(aq.
+with \(aq:\(aq).  To  send trailer, one must use  \fI\%\-d\fP option to
+send request body.  Example: \fI\%\-\-trailer\fP \(aqfoo: bar\(aq.
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -135,7 +136,7 @@ requested twice.  This option disables it too.
 .TP
 .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
+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
@@ -192,11 +193,6 @@ 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 \-\-hexdump
 Display the  incoming traffic in  hexadecimal (Canonical
 hex+ASCII display).  If SSL/TLS  is used, decrypted data
@@ -204,6 +200,11 @@ are used.
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-\-no\-push
+Disable server push.
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-\-version
 Display version information and exit.
 .UNINDENT
@@ -215,6 +216,68 @@ Display this help and exit.
 .sp
 The <SIZE> argument is an integer and an optional unit (e.g., 10K is
 10 * 1024).  Units are K, M and G (powers of 1024).
+.sp
+The <DURATION> argument is an integer and an optional unit (e.g., 1s
+is 1 second and 500ms is 500 milliseconds).  Units are h, m, s or ms
+(hours, minutes, seconds and milliseconds, respectively).  If a unit
+is omitted, a second is used as unit.
+.SH DEPENDENCY BASED PRIORITY
+.sp
+nghttp sends priority hints to server by default unless
+\fI\%\-\-no\-dep\fP is used.  nghttp mimics the way Firefox employs to
+manages dependency using idle streams.  We follows the behaviour of
+Firefox Nightly as of April, 2015, and nghttp\(aqs behaviour is very
+static and could be different from Firefox in detail.  But reproducing
+the same behaviour of Firefox is not our goal.  The goal is provide
+the easy way to test out the dependency priority in server
+implementation.
+.sp
+When connection is established, nghttp sends 5 PRIORITY frames to idle
+streams 3, 5, 7, 9 and 11 to create "anchor" nodes in dependency
+tree:
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.nf
+.ft C
+         +\-\-\-\-\-+
+         |id=0 |
+         +\-\-\-\-\-+
+        ^   ^   ^
+ w=201 /    |    \e w=1
+      /     |     \e
+     / w=101|      \e
+ +\-\-\-\-\-+ +\-\-\-\-\-+ +\-\-\-\-\-+
+ |id=3 | |id=5 | |id=7 |
+ +\-\-\-\-\-+ +\-\-\-\-\-+ +\-\-\-\-\-+
+    ^               ^
+w=1 |           w=1 |
+    |               |
+ +\-\-\-\-\-+         +\-\-\-\-\-+
+ |id=11|         |id=9 |
+ +\-\-\-\-\-+         +\-\-\-\-\-+
+.ft P
+.fi
+.UNINDENT
+.UNINDENT
+.sp
+In the above figure, \fBid\fP means stream ID, and \fBw\fP means weight.
+The stream 0 is non\-existence stream, and forms the root of the tree.
+The stream 7 and 9 are not used for now.
+.sp
+The URIs given in the command\-line depend on stream 11 with the weight
+given in \fI\%\-p\fP option, which defaults to 16.
+.sp
+If \fI\%\-a\fP option is used, nghttp parses the resource pointed by
+URI given in command\-line as html, and extracts resource links from
+it.  When requesting those resources, nghttp uses dependency according
+to its resource type.
+.sp
+For CSS, and Javascript files inside "head" element, they depend on
+stream 3 with the weight 2.  The Javascript files outside "head"
+element depend on stream 5 with the weight 2.  The mages depend on
+stream 11 with the weight 12.  The other resources (e.g., icon) depend
+on stream 11 with the weight 2.
 .SH SEE ALSO
 .sp
 \fInghttpd(1)\fP, \fInghttpx(1)\fP, \fIh2load(1)\fP

doc/nghttp.1.rst

@@ -1,4 +1,8 @@
 
+.. GENERATED by help2rst.py.  DO NOT EDIT DIRECTLY.
+
+.. program:: nghttp
+
 nghttp(1)
 =========
 
@@ -36,9 +40,10 @@ OPTIONS
     'index.html'  is used  as a  filename.  Not  implemented
     yet.
 
-.. option:: -t, --timeout=<SEC>
+.. option:: -t, --timeout=<DURATION>
 
-    Timeout each request after <SEC> seconds.
+    Timeout each request after <DURATION>.  Set 0 to disable
+    timeout.
 
 .. option:: -w, --window-bits=<N>
 
@@ -143,16 +148,16 @@ OPTIONS
 
     Don't send dependency based priority hint to server.
 
-.. option:: --dep-idle
-
-    Use idle streams as anchor nodes to express priority.
-
 .. option:: --hexdump
 
     Display the  incoming traffic in  hexadecimal (Canonical
     hex+ASCII display).  If SSL/TLS  is used, decrypted data
     are used.
 
+.. option:: --no-push
+
+    Disable server push.
+
 .. option:: --version
 
     Display version information and exit.
@@ -166,6 +171,62 @@ OPTIONS
 The <SIZE> argument is an integer and an optional unit (e.g., 10K is
 10 * 1024).  Units are K, M and G (powers of 1024).
 
+The <DURATION> argument is an integer and an optional unit (e.g., 1s
+is 1 second and 500ms is 500 milliseconds).  Units are h, m, s or ms
+(hours, minutes, seconds and milliseconds, respectively).  If a unit
+is omitted, a second is used as unit.
+
+DEPENDENCY BASED PRIORITY
+-------------------------
+
+nghttp sends priority hints to server by default unless
+:option:`--no-dep` is used.  nghttp mimics the way Firefox employs to
+manages dependency using idle streams.  We follows the behaviour of
+Firefox Nightly as of April, 2015, and nghttp's behaviour is very
+static and could be different from Firefox in detail.  But reproducing
+the same behaviour of Firefox is not our goal.  The goal is provide
+the easy way to test out the dependency priority in server
+implementation.
+
+When connection is established, nghttp sends 5 PRIORITY frames to idle
+streams 3, 5, 7, 9 and 11 to create "anchor" nodes in dependency
+tree::
+
+                      +-----+
+                      |id=0 |
+                      +-----+
+                     ^   ^   ^
+              w=201 /    |    \ w=1
+                   /     |     \
+                  / w=101|      \
+              +-----+ +-----+ +-----+
+              |id=3 | |id=5 | |id=7 |
+              +-----+ +-----+ +-----+
+                 ^               ^
+             w=1 |           w=1 |
+                 |               |
+              +-----+         +-----+
+              |id=11|         |id=9 |
+              +-----+         +-----+
+
+In the above figure, ``id`` means stream ID, and ``w`` means weight.
+The stream 0 is non-existence stream, and forms the root of the tree.
+The stream 7 and 9 are not used for now.
+
+The URIs given in the command-line depend on stream 11 with the weight
+given in :option:`-p` option, which defaults to 16.
+
+If :option:`-a` option is used, nghttp parses the resource pointed by
+URI given in command-line as html, and extracts resource links from
+it.  When requesting those resources, nghttp uses dependency according
+to its resource type.
+
+For CSS, and Javascript files inside "head" element, they depend on
+stream 3 with the weight 2.  The Javascript files outside "head"
+element depend on stream 5 with the weight 2.  The mages depend on
+stream 11 with the weight 12.  The other resources (e.g., icon) depend
+on stream 11 with the weight 2.
+
 SEE ALSO
 --------
 

doc/nghttp.h2r

@@ -1,3 +1,54 @@
+DEPENDENCY BASED PRIORITY
+-------------------------
+
+nghttp sends priority hints to server by default unless
+:option:`--no-dep` is used.  nghttp mimics the way Firefox employs to
+manages dependency using idle streams.  We follows the behaviour of
+Firefox Nightly as of April, 2015, and nghttp's behaviour is very
+static and could be different from Firefox in detail.  But reproducing
+the same behaviour of Firefox is not our goal.  The goal is provide
+the easy way to test out the dependency priority in server
+implementation.
+
+When connection is established, nghttp sends 5 PRIORITY frames to idle
+streams 3, 5, 7, 9 and 11 to create "anchor" nodes in dependency
+tree::
+
+                      +-----+
+                      |id=0 |
+                      +-----+
+                     ^   ^   ^
+              w=201 /    |    \ w=1
+                   /     |     \
+                  / w=101|      \
+              +-----+ +-----+ +-----+
+              |id=3 | |id=5 | |id=7 |
+              +-----+ +-----+ +-----+
+                 ^               ^
+             w=1 |           w=1 |
+                 |               |
+              +-----+         +-----+
+              |id=11|         |id=9 |
+              +-----+         +-----+
+
+In the above figure, ``id`` means stream ID, and ``w`` means weight.
+The stream 0 is non-existence stream, and forms the root of the tree.
+The stream 7 and 9 are not used for now.
+
+The URIs given in the command-line depend on stream 11 with the weight
+given in :option:`-p` option, which defaults to 16.
+
+If :option:`-a` option is used, nghttp parses the resource pointed by
+URI given in command-line as html, and extracts resource links from
+it.  When requesting those resources, nghttp uses dependency according
+to its resource type.
+
+For CSS, and Javascript files inside "head" element, they depend on
+stream 3 with the weight 2.  The Javascript files outside "head"
+element depend on stream 5 with the weight 2.  The mages depend on
+stream 11 with the weight 12.  The other resources (e.g., icon) depend
+on stream 11 with the weight 2.
+
 SEE ALSO
 --------
 

doc/nghttpd.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPD" "1" "April 08, 2015" "0.7.10" "nghttp2"
+.TH "NGHTTPD" "1" "June 12, 2015" "1.0.2" "nghttp2"
 .SH NAME
 nghttpd \- HTTP/2 experimental server
 .
@@ -63,7 +63,7 @@ address determined by getaddrinfo is used.
 .INDENT 0.0
 .TP
 .B \-D, \-\-daemon
-Run in a background.  If \fI\-D\fP is used, the current working
+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
@@ -109,7 +109,7 @@ 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
+Example: \fI\%\-p\fP/=/foo.png \fI\%\-p\fP/doc=/bar.css
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -119,6 +119,14 @@ Specify 0 to disable padding.
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-m, \-\-max\-concurrent\-streams=<N>
+Set the maximum number of  the concurrent streams in one
+HTTP/2 session.
+.sp
+Default: \fB100\fP
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-n, \-\-workers=<N>
 Set the number of worker threads.
 .sp
@@ -159,6 +167,11 @@ are used.
 .UNINDENT
 .INDENT 0.0
 .TP
+.B \-\-echo\-upload
+Send back uploaded content if method is POST or PUT.
+.UNINDENT
+.INDENT 0.0
+.TP
 .B \-\-version
 Display version information and exit.
 .UNINDENT

doc/nghttpd.1.rst

@@ -1,4 +1,8 @@
 
+.. GENERATED by help2rst.py.  DO NOT EDIT DIRECTLY.
+
+.. program:: nghttpd
+
 nghttpd(1)
 ==========
 
@@ -83,6 +87,13 @@ OPTIONS
     Add at  most <N>  bytes to a  frame payload  as padding.
     Specify 0 to disable padding.
 
+.. option:: -m, --max-concurrent-streams=<N>
+
+    Set the maximum number of  the concurrent streams in one
+    HTTP/2 session.
+
+    Default: ``100``
+
 .. option:: -n, --workers=<N>
 
     Set the number of worker threads.
@@ -117,6 +128,10 @@ OPTIONS
     hex+ASCII display).  If SSL/TLS  is used, decrypted data
     are used.
 
+.. option:: --echo-upload
+
+    Send back uploaded content if method is POST or PUT.
+
 .. option:: --version
 
     Display version information and exit.

doc/nghttpx.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "NGHTTPX" "1" "April 08, 2015" "0.7.10" "nghttp2"
+.TH "NGHTTPX" "1" "June 12, 2015" "1.0.2" "nghttp2"
 .SH NAME
 nghttpx \- HTTP/2 experimental proxy
 .
@@ -690,10 +690,19 @@ will not be altered regardless of this option.
 .B \-\-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:
-\fI\%\-\-altsvc\fP=h2,443
+They  are advertised  in  alt\-svc header  field only  in
+HTTP/1.1  frontend.  This  option can  be used  multiple
+times   to   specify  multiple   alternative   services.
+Example: \fI\%\-\-altsvc\fP=h2,443
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-add\-request\-header=<HEADER>
+Specify additional header field to add to request header
+set.  This  option just  appends header field  and won\(aqt
+replace anything  already set.  This option  can be used
+several  times   to  specify  multiple   header  fields.
+Example: \fI\%\-\-add\-request\-header\fP="foo: bar"
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -704,6 +713,23 @@ won\(aqt replace anything already  set.  This option can be
 used several  times to  specify multiple  header fields.
 Example: \fI\%\-\-add\-response\-header\fP="foo: bar"
 .UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-header\-field\-buffer=<SIZE>
+Set maximum  buffer size for incoming  HTTP header field
+list.   This is  the sum  of  header name  and value  in
+bytes.
+.sp
+Default: \fB64K\fP
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-max\-header\-fields=<N>
+Set maximum number of incoming HTTP header fields, which
+appear in one request or response header field list.
+.sp
+Default: \fB100\fP
+.UNINDENT
 .SS Debug
 .INDENT 0.0
 .TP
@@ -795,7 +821,7 @@ argument in the configuration file.  Specify \fByes\fP as an argument
 ignored.
 .sp
 To specify private key and certificate file which are given as
-positional arguments in commnad\-line, use \fBprivate\-key\-file\fP and
+positional arguments in command\-line, use \fBprivate\-key\-file\fP and
 \fBcertificate\-file\fP\&.
 .sp
 \fI\%\-\-conf\fP option cannot be used in the configuration file and

doc/nghttpx.1.rst

@@ -1,4 +1,8 @@
 
+.. GENERATED by help2rst.py.  DO NOT EDIT DIRECTLY.
+
+.. program:: nghttpx
+
 nghttpx(1)
 ==========
 
@@ -604,10 +608,18 @@ HTTP
 
     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
+    They  are advertised  in  alt-svc header  field only  in
+    HTTP/1.1  frontend.  This  option can  be used  multiple
+    times   to   specify  multiple   alternative   services.
+    Example: :option:`--altsvc`\=h2,443
+
+.. option:: --add-request-header=<HEADER>
+
+    Specify additional header field to add to request 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-request-header`\="foo: bar"
 
 .. option:: --add-response-header=<HEADER>
 
@@ -617,6 +629,21 @@ HTTP
     used several  times to  specify multiple  header fields.
     Example: :option:`--add-response-header`\="foo: bar"
 
+.. option:: --header-field-buffer=<SIZE>
+
+    Set maximum  buffer size for incoming  HTTP header field
+    list.   This is  the sum  of  header name  and value  in
+    bytes.
+
+    Default: ``64K``
+
+.. option:: --max-header-fields=<N>
+
+    Set maximum number of incoming HTTP header fields, which
+    appear in one request or response header field list.
+
+    Default: ``100``
+
 
 Debug
 ~~~~~
@@ -710,7 +737,7 @@ FILES
   ignored.
 
   To specify private key and certificate file which are given as
-  positional arguments in commnad-line, use ``private-key-file`` and
+  positional arguments in command-line, use ``private-key-file`` and
   ``certificate-file``.
 
   :option:`--conf` option cannot be used in the configuration file and

doc/nghttpx.h2r

@@ -19,7 +19,7 @@ FILES
   ignored.
 
   To specify private key and certificate file which are given as
-  positional arguments in commnad-line, use ``private-key-file`` and
+  positional arguments in command-line, use ``private-key-file`` and
   ``certificate-file``.
 
   :option:`--conf` option cannot be used in the configuration file and

doc/programmers-guide.rst

@@ -20,17 +20,15 @@ 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.
+`nghttp2_session_send()` and `nghttp2_session_mem_send()` send first
+24 bytes of client magic string (MAGIC)
+(:macro:`NGHTTP2_CLIENT_MAGIC`) on client configuration.  The
+applications are responsible to send SETTINGS frame as part of
+connection preface using `nghttp2_submit_settings()`.  Similarly,
+`nghttp2_session_recv()` and `nghttp2_session_mem_recv()` consume
+MAGIC on server configuration unless
+`nghttp2_option_set_no_recv_client_magic()` is used with nonzero
+option value.
 
 .. _http-messaging:
 

doc/sources/building-android-binary.rst

@@ -36,8 +36,9 @@ 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.
+Although zlib comes with Android NDK, it seems not to be a part of
+public API, so we have to built it for our own.  That also provides us
+proper .pc file as a bonus.
 
 If SPDY support is required for nghttpx and h2load, build and install
 spdylay as well.
@@ -95,10 +96,41 @@ patch, to configure libev, use the following script:
 
 And run ``make install`` to build and install.
 
+To configure zlib, use the following script:
+
+.. code-block:: sh
+
+    #!/bin/sh -e
+
+    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
+
+    HOST=arm-linux-androideabi
+
+    CC=$HOST-gcc \
+    AR=$HOST-ar \
+    LD=$HOST-ld \
+    RANLIB=$HOST-ranlib \
+    STRIP=$HOST-strip \
+    ./configure \
+        --prefix=$PREFIX \
+        --libdir=$PREFIX/lib \
+        --includedir=$PREFIX/include \
+        --static
+
+And run ``make install`` to build and install.
+
 To configure spdylay, use the following script:
 
 .. code-block:: sh
 
+    #!/bin/sh -e
+
     if [ -z "$ANDROID_HOME" ]; then
 	echo 'No $ANDROID_HOME specified.'
 	exit 1
@@ -119,11 +151,7 @@ To configure spdylay, use the following script:
 	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
+And run ``make install`` to build and install.
 
 After prerequisite libraries are prepared, run ``android-config`` and
 then ``android-make`` to compile nghttp2 source files.

doc/sources/h2load-howto.rst

@@ -50,8 +50,9 @@ 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:
+benchmarking results.  By default, h2load uses large enough flow
+control window, which effectively disables flow control.  To adjust
+receiver flow control window size, there are following options:
 
 ``-w``
    Sets  the stream  level  initial  window size  to
@@ -86,5 +87,5 @@ 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
+    Please note that h2load uses scheme, host and port in the first URI
     and ignores those parts in the rest of the URIs.

doc/sources/index.rst

@@ -49,5 +49,5 @@ https://github.com/tatsuhiro-t/nghttp2/releases
 Resources
 ---------
 
-* http://tools.ietf.org/html/draft-ietf-httpbis-http2-14
-* http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-09
+* HTTP/2 https://tools.ietf.org/html/rfc7540
+* HPACK https://tools.ietf.org/html/rfc7541

doc/sources/libnghttp2_asio.rst

@@ -80,7 +80,7 @@ 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.
+``nghttp2::asio_http2::server::response::end`` sends response body.
 In the above example, we send string "hello, world".
 
 The life time of req and res object ends after the callback set by
@@ -277,7 +277,7 @@ response header fields and response body to the console screen:
 ``boost::asio::io_service`` object and remote server address.  When
 connection is made, the callback function passed to
 ``nghttp2::asio_http2::client::on_connect`` is invoked with connected
-address as its paramter.  After this callback call, use
+address as its parameter.  After this callback call, use
 ``nghttp2::asio_http2::session::submit`` to send request to the
 server.  You can submit multiple requests at once without waiting for
 the completion of previous request.

doc/sources/nghttpx-howto.rst

@@ -21,7 +21,7 @@ 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.
+frontend 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
@@ -243,7 +243,7 @@ Read/write rate limit
 ---------------------
 
 nghttpx supports transfer rate limiting on frontend connections.  You
-can do rate limit per frontend connection for reading and writeing
+can do rate limit per frontend connection for reading and writing
 individually.
 
 To perform rate limit for reading, use ``--read-rate`` and

doc/sources/python-apiref.rst

@@ -267,7 +267,7 @@ HTTP/2 servers
       (byte string could be ``None``), :py:data:`DATA_EOF` must be
       returned as flag.  If there is no data available right now, but
       additional data are anticipated, return tuple (``None``,
-      :py:data:`DATA_DEFERRD`).  When data arrived, call
+      :py:data:`DATA_DEFERRED`).  When data arrived, call
       :py:meth:`resume()` and restart response body transmission.
 
       Only the body generator can pause response body generation;

doc/sources/tutorial-client.rst

@@ -65,11 +65,11 @@ its stream specific data in ``http2_stream_data`` structure and the
 defined as follows::
 
     typedef struct {
-      /* The NULL-terminated URI string to retreive. */
+      /* The NULL-terminated URI string to retrieve. */
       const char *uri;
       /* Parsed result of the |uri| */
       struct http_parser_url *u;
-      /* The authroity portion of the |uri|, not NULL-terminated */
+      /* The authority portion of the |uri|, not NULL-terminated */
       char *authority;
       /* The path portion of the |uri|, including query, not
          NULL-terminated */
@@ -184,9 +184,9 @@ its bufferevent, so it closes underlying connection as well. It also
 calls `nghttp2_session_del()` to delete nghttp2 session object.
 
 We begin HTTP/2 communication by sending client connection preface,
-which is 24 bytes magic byte sequence
-(:macro:`NGHTTP2_CLIENT_CONNECTION_PREFACE`) and SETTINGS frame.  The
-transmission of client connection header is done in
+which is 24 bytes magic byte string (:macro:`NGHTTP2_CLIENT_MAGIC`)
+followed by SETTINGS frame.  First 24 bytes magic string is
+automatically sent by nghttp2 library.  We send SETTINGS frame in
 ``send_client_connection_header()``::
 
     static void send_client_connection_header(http2_session_data *session_data) {
@@ -194,8 +194,7 @@ transmission of client connection header is done in
           {NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100}};
       int rv;
 
-      bufferevent_write(session_data->bev, NGHTTP2_CLIENT_CONNECTION_PREFACE,
-                        NGHTTP2_CLIENT_CONNECTION_PREFACE_LEN);
+      /* client 24 bytes magic string will be sent by nghttp2 library */
       rv = nghttp2_submit_settings(session_data->session, NGHTTP2_FLAG_NONE, iv,
                                    ARRLEN(iv));
       if (rv != 0) {
@@ -204,7 +203,7 @@ transmission of client connection header is done in
     }
 
 Here we specify SETTINGS_MAX_CONCURRENT_STREAMS to 100, which is
-really not needed for this tiny example progoram, but we are
+really not needed for this tiny example program, but we are
 demonstrating the use of 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
@@ -388,7 +387,7 @@ After all name/value pairs are emitted for a frame,
     }
 
 In this tutorial, we are just interested in the HTTP response
-HEADERS. We check te frame type and its category (it should be
+HEADERS. We check the frame type and its category (it should be
 :macro:`NGHTTP2_HCAT_RESPONSE` for HTTP response HEADERS). Also check
 its stream ID.
 
@@ -407,7 +406,7 @@ of data is received from the remote peer::
     }
 
 In our case, a chunk of data is response body. After checking stream
-ID, we just write the recieved data to the stdout. Note that the
+ID, we just write the received data to the stdout. Note that the
 output in the terminal may be corrupted if the response body contains
 some binary data.
 

doc/sources/tutorial-hpack.rst

@@ -51,7 +51,7 @@ 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
+Pass this function with the same parameters *deflater*, *nva* and
 *nvlen* which will be passed to `nghttp2_hd_deflate_hd()`.
 
 The subsequent call of `nghttp2_hd_deflate_hd()` will use current

doc/sources/tutorial-server.rst

@@ -194,15 +194,8 @@ We initialize a nghttp2 session object which is done in
 ``initialize_nghttp2_session()``::
 
     static void initialize_nghttp2_session(http2_session_data *session_data) {
-      nghttp2_option *option;
       nghttp2_session_callbacks *callbacks;
 
-      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);
@@ -219,20 +212,15 @@ We initialize a nghttp2 session object which is done in
       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_server_new(&session_data->session, callbacks, session_data);
 
       nghttp2_session_callbacks_del(callbacks);
-      nghttp2_option_del(option);
     }
 
 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.
+these callbacks later.
 
 After initialization of the nghttp2 session object, we are going to send
 a server connection header in ``send_server_connection_header()``::

examples/asio-sv2.cc

@@ -35,8 +35,12 @@
 //
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif // HAVE_UNISTD_H
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif // HAVE_FCNTL_H
 #include <iostream>
 #include <string>
 

examples/client.c

@@ -28,16 +28,26 @@
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif /* !HAVE_CONFIG_H */
+#endif /* HAVE_CONFIG_H */
 
-#include <stdint.h>
+#include <inttypes.h>
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif /* HAVE_UNISTD_H */
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif /* HAVE_FCNTL_H */
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif /* HAVE_SYS_SOCKET_H */
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif /* HAVE_NETDB_H */
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif /* HAVE_NETINET_IN_H */
 #include <netinet/tcp.h>
 #include <poll.h>
 #include <signal.h>
@@ -528,14 +538,6 @@ static void fetch_uri(const struct URI *uri) {
   connection.ssl = ssl;
   connection.want_io = IO_NONE;
 
-  /* Send connection header in blocking I/O mode */
-  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);
@@ -687,10 +689,10 @@ 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();
+  OpenSSL_add_all_algorithms();
+  OPENSSL_config(NULL);
 
   rv = parse_uri(&uri, argv[1]);
   if (rv != 0) {

examples/libevent-client.c

@@ -24,12 +24,18 @@
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif /* !HAVE_CONFIG_H */
+#endif /* HAVE_CONFIG_H */
 
 #include <sys/types.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif /* HAVE_UNISTD_H */
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif /* HAVE_SYS_SOCKET_H */
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif /* HAVE_NETINET_IN_H */
 #include <netinet/tcp.h>
 #include <err.h>
 #include <signal.h>
@@ -50,11 +56,11 @@
 #define ARRLEN(x) (sizeof(x) / sizeof(x[0]))
 
 typedef struct {
-  /* The NULL-terminated URI string to retreive. */
+  /* The NULL-terminated URI string to retrieve. */
   const char *uri;
   /* Parsed result of the |uri| */
   struct http_parser_url *u;
-  /* The authroity portion of the |uri|, not NULL-terminated */
+  /* The authority portion of the |uri|, not NULL-terminated */
   char *authority;
   /* The path portion of the |uri|, including query, not
      NULL-terminated */
@@ -94,7 +100,8 @@ static http2_stream_data *create_http2_stream_data(const char *uri,
                  ":%u", u->port);
   }
 
-  stream_data->pathlen = 0;
+  /* If we don't have path in URI, we use "/" as path. */
+  stream_data->pathlen = 1;
   if (u->field_set & (1 << UF_PATH)) {
     stream_data->pathlen = u->field_data[UF_PATH].len;
   }
@@ -102,19 +109,22 @@ static http2_stream_data *create_http2_stream_data(const char *uri,
     /* +1 for '?' character */
     stream_data->pathlen += u->field_data[UF_QUERY].len + 1;
   }
-  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);
+  } else {
+    stream_data->path[0] = '/';
   }
   if (u->field_set & (1 << UF_QUERY)) {
-      memcpy(stream_data->path + u->field_data[UF_PATH].len + 1,
+    stream_data->path[stream_data->pathlen - u->field_data[UF_QUERY].len - 1] =
+        '?';
+    memcpy(stream_data->path + stream_data->pathlen -
+               u->field_data[UF_QUERY].len,
            &uri[u->field_data[UF_QUERY].off], u->field_data[UF_QUERY].len);
   }
-  } else {
-    stream_data->path = NULL;
-  }
+
   return stream_data;
 }
 
@@ -258,8 +268,7 @@ static int on_data_chunk_recv_callback(nghttp2_session *session _U_,
    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,
-                                    uint32_t error_code,
-                                    void *user_data) {
+                                    uint32_t error_code, void *user_data) {
   http2_session_data *session_data = (http2_session_data *)user_data;
   int rv;
 
@@ -345,8 +354,7 @@ static void send_client_connection_header(http2_session_data *session_data) {
       {NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS, 100}};
   int rv;
 
-  bufferevent_write(session_data->bev, NGHTTP2_CLIENT_CONNECTION_PREFACE,
-                    NGHTTP2_CLIENT_CONNECTION_PREFACE_LEN);
+  /* client 24 bytes magic string will be sent by nghttp2 library */
   rv = nghttp2_submit_settings(session_data->session, NGHTTP2_FLAG_NONE, iv,
                                ARRLEN(iv));
   if (rv != 0) {
@@ -547,10 +555,10 @@ 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();
+  OpenSSL_add_all_algorithms();
+  OPENSSL_config(NULL);
 
   run(argv[1]);
   return 0;

examples/libevent-server.c

@@ -24,17 +24,27 @@
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif /* !HAVE_CONFIG_H */
+#endif /* HAVE_CONFIG_H */
 
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif /* HAVE_SYS_SOCKET_H */
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif /* HAVE_NETDB_H */
 #include <signal.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif /* HAVE_UNISTD_H */
 #include <sys/stat.h>
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif /* HAVE_FCNTL_H */
 #include <ctype.h>
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif /* HAVE_NETINET_IN_H */
 #include <netinet/tcp.h>
 #include <err.h>
 
@@ -537,15 +547,8 @@ static int on_stream_close_callback(nghttp2_session *session, int32_t stream_id,
 }
 
 static void initialize_nghttp2_session(http2_session_data *session_data) {
-  nghttp2_option *option;
   nghttp2_session_callbacks *callbacks;
 
-  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);
@@ -562,11 +565,9 @@ static void initialize_nghttp2_session(http2_session_data *session_data) {
   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_server_new(&session_data->session, callbacks, session_data);
 
   nghttp2_session_callbacks_del(callbacks);
-  nghttp2_option_del(option);
 }
 
 /* Send HTTP/2 client connection header, which includes 24 bytes
@@ -723,10 +724,10 @@ 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();
+  OpenSSL_add_all_algorithms();
+  OPENSSL_config(NULL);
 
   run(argv[1], argv[2], argv[3]);
   return 0;

examples/tiny-nghttpd.c

@@ -30,18 +30,30 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif /* !HAVE_CONFIG_H */
+#endif /* HAVE_CONFIG_H */
 
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif /* HAVE_SYS_SOCKET_H */
 #include <sys/stat.h>
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif /* HAVE_FCNTL_H */
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif /* HAVE_NETDB_H */
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif /* HAVE_NETINET_IN_H */
 #include <netinet/tcp.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif /* HAVE_UNISTD_H */
 #include <stdlib.h>
+#ifdef HAVE_TIME_H
 #include <time.h>
+#endif /* HAVE_TIME_H */
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
@@ -153,7 +165,6 @@ const char *docroot;
 size_t docrootlen;
 
 nghttp2_session_callbacks *shared_callbacks;
-nghttp2_option *shared_option;
 
 static int handle_accept(io_loop *loop, uint32_t events, void *ptr);
 static int handle_connection(io_loop *loop, uint32_t events, void *ptr);
@@ -190,7 +201,7 @@ typedef enum {
   NGHTTP2_TOKEN__METHOD,
   NGHTTP2_TOKEN__PATH,
   NGHTTP2_TOKEN__SCHEME,
-  NGHTTP2_TOKEN_HOST,
+  NGHTTP2_TOKEN_HOST
 } nghttp2_token;
 
 /* Inspired by h2o header lookup.  https://github.com/h2o/h2o */
@@ -388,8 +399,7 @@ static connection *connection_new(int fd) {
 
   conn = malloc(sizeof(connection));
 
-  rv = nghttp2_session_server_new2(&conn->session, shared_callbacks, conn,
-                                   shared_option);
+  rv = nghttp2_session_server_new(&conn->session, shared_callbacks, conn);
 
   if (rv != 0) {
     goto cleanup;
@@ -699,7 +709,8 @@ static ssize_t fd_read_callback(nghttp2_session *session _U_,
                                 nghttp2_data_source *source,
                                 void *user_data _U_) {
   stream *strm = source->ptr;
-  ssize_t nread = (int64_t)length < strm->fileleft ? length : strm->fileleft;
+  ssize_t nread =
+      (int64_t)length < strm->fileleft ? (int64_t)length : strm->fileleft;
 
   *data_flags |= NGHTTP2_DATA_FLAG_NO_COPY;
 
@@ -1309,14 +1320,6 @@ int main(int argc, char **argv) {
   nghttp2_session_callbacks_set_send_data_callback(shared_callbacks,
                                                    send_data_callback);
 
-  rv = nghttp2_option_new(&shared_option);
-  if (rv != 0) {
-    fprintf(stderr, "nghttp2_option_new: %s", nghttp2_strerror(rv));
-    exit(EXIT_FAILURE);
-  }
-
-  nghttp2_option_set_recv_client_preface(shared_option, 1);
-
   rv = io_loop_add(&loop, serv.fd, EPOLLIN, &serv);
 
   if (rv != 0) {
@@ -1333,7 +1336,6 @@ int main(int argc, char **argv) {
 
   io_loop_run(&loop, &serv);
 
-  nghttp2_option_del(shared_option);
   nghttp2_session_callbacks_del(shared_callbacks);
 
   return 0;

genheaderfunc.py

@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+from gentokenlookup import gentokenlookup
+
 HEADERS = [
     ':authority',
     ':method',
@@ -34,70 +36,5 @@ HEADERS = [
     '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[{}]) {{'''.format(size - 1)
-        for c in sorted(ents.keys()):
-            headers = sorted(ents[c])
-            print '''\
-    case '{}':'''.format(c)
-            for k in headers:
-                print '''\
-      if (util::streq_l("{}", 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()
+    gentokenlookup(HEADERS, 'HD')

genlibtokenlookup.py

@@ -1,19 +1,72 @@
 #!/usr/bin/env python
 
 HEADERS = [
-    ':authority',
-    ':method',
-    ':path',
-    ':scheme',
-    ':status',
-    "content-length",
-    "host",
-    "te",
-    'connection',
-    'keep-alive',
-    'proxy-connection',
-    'transfer-encoding',
-    'upgrade'
+    (':authority', 0),
+    (':method', 1),
+    (':method', 2),
+    (':path', 3),
+    (':path', 4),
+    (':scheme', 5),
+    (':scheme', 6),
+    (':status', 7),
+    (':status', 8),
+    (':status', 9),
+    (':status', 10),
+    (':status', 11),
+    (':status', 12),
+    (':status', 13),
+    ('accept-charset', 14),
+    ('accept-encoding', 15),
+    ('accept-language', 16),
+    ('accept-ranges', 17),
+    ('accept', 18),
+    ('access-control-allow-origin', 19),
+    ('age', 20),
+    ('allow', 21),
+    ('authorization', 22),
+    ('cache-control', 23),
+    ('content-disposition', 24),
+    ('content-encoding', 25),
+    ('content-language', 26),
+    ('content-length', 27),
+    ('content-location', 28),
+    ('content-range', 29),
+    ('content-type', 30),
+    ('cookie', 31),
+    ('date', 32),
+    ('etag', 33),
+    ('expect', 34),
+    ('expires', 35),
+    ('from', 36),
+    ('host', 37),
+    ('if-match', 38),
+    ('if-modified-since', 39),
+    ('if-none-match', 40),
+    ('if-range', 41),
+    ('if-unmodified-since', 42),
+    ('last-modified', 43),
+    ('link', 44),
+    ('location', 45),
+    ('max-forwards', 46),
+    ('proxy-authenticate', 47),
+    ('proxy-authorization', 48),
+    ('range', 49),
+    ('referer', 50),
+    ('refresh', 51),
+    ('retry-after', 52),
+    ('server', 53),
+    ('set-cookie', 54),
+    ('strict-transport-security', 55),
+    ('transfer-encoding', 56),
+    ('user-agent', 57),
+    ('vary', 58),
+    ('via', 59),
+    ('www-authenticate', 60),
+    ('te', None),
+    ('connection', None),
+    ('keep-alive',None),
+    ('proxy-connection', None),
+    ('upgrade', None),
 ]
 
 def to_enum_hd(k):
@@ -27,7 +80,7 @@ def to_enum_hd(k):
 
 def build_header(headers):
     res = {}
-    for k in headers:
+    for k, _ in headers:
         size = len(k)
         if size not in res:
             res[size] = {}
@@ -40,18 +93,20 @@ def build_header(headers):
     return res
 
 def gen_enum():
-    print '''\
-typedef enum {'''
-    for k in sorted(HEADERS):
-        print '''\
-  {},'''.format(to_enum_hd(k))
-    print '''\
-  NGHTTP2_TOKEN_MAXIDX,
-} nghttp2_token;'''
+    name = ''
+    print 'typedef enum {'
+    for k, token in HEADERS:
+        if token is None:
+            print '  {},'.format(to_enum_hd(k))
+        else:
+            if name != k:
+                name = k
+                print '  {} = {},'.format(to_enum_hd(k), token)
+    print '} nghttp2_token;'
 
 def gen_index_header():
     print '''\
-static int lookup_token(const uint8_t *name, size_t namelen) {
+static inline int lookup_token(const uint8_t *name, size_t namelen) {
   switch (namelen) {'''
     b = build_header(HEADERS)
     for size in sorted(b.keys()):
@@ -66,7 +121,7 @@ static int lookup_token(const uint8_t *name, size_t namelen) {
     case '{}':'''.format(c)
             for k in headers:
                 print '''\
-      if (streq("{}", name, {})) {{
+      if (lstreq("{}", name, {})) {{
         return {};
       }}'''.format(k[:-1], size - 1, to_enum_hd(k))
             print '''\

genmethodfunc.py

@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+from __future__ import unicode_literals
+from io import StringIO
+
+from gentokenlookup import gentokenlookup
+
+# copied from http-parser/http_parser.h, and stripped trailing spaces
+# and backslashes.
+SRC = '''
+  XX(0,  DELETE,      DELETE)
+  XX(1,  GET,         GET)
+  XX(2,  HEAD,        HEAD)
+  XX(3,  POST,        POST)
+  XX(4,  PUT,         PUT)
+  /* pathological */
+  XX(5,  CONNECT,     CONNECT)
+  XX(6,  OPTIONS,     OPTIONS)
+  XX(7,  TRACE,       TRACE)
+  /* webdav */
+  XX(8,  COPY,        COPY)
+  XX(9,  LOCK,        LOCK)
+  XX(10, MKCOL,       MKCOL)
+  XX(11, MOVE,        MOVE)
+  XX(12, PROPFIND,    PROPFIND)
+  XX(13, PROPPATCH,   PROPPATCH)
+  XX(14, SEARCH,      SEARCH)
+  XX(15, UNLOCK,      UNLOCK)
+  /* subversion */
+  XX(16, REPORT,      REPORT)
+  XX(17, MKACTIVITY,  MKACTIVITY)
+  XX(18, CHECKOUT,    CHECKOUT)
+  XX(19, MERGE,       MERGE)
+  /* upnp */
+  XX(20, MSEARCH,     M-SEARCH)
+  XX(21, NOTIFY,      NOTIFY)
+  XX(22, SUBSCRIBE,   SUBSCRIBE)
+  XX(23, UNSUBSCRIBE, UNSUBSCRIBE)
+  /* RFC-5789 */
+  XX(24, PATCH,       PATCH)
+  XX(25, PURGE,       PURGE)
+  /* CalDAV */
+  XX(26, MKCALENDAR,  MKCALENDAR)
+'''
+
+if __name__ == '__main__':
+    methods = []
+    for line in StringIO(SRC):
+        line = line.strip()
+        if not line.startswith('XX'):
+            continue
+        _, m, _ = line.split(',', 2)
+        methods.append(m.strip())
+    gentokenlookup(methods, 'HTTP')

gentokenlookup.py

@@ -0,0 +1,69 @@
+#!/usr/bin/env python
+
+def to_enum_hd(k, prefix):
+    res = prefix + '_'
+    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(tokens, prefix):
+    print '''\
+enum {'''
+    for k in sorted(tokens):
+        print '''\
+  {},'''.format(to_enum_hd(k, prefix))
+    print '''\
+  {}_MAXIDX,
+}};'''.format(prefix)
+
+def gen_index_header(tokens, prefix):
+    print '''\
+int lookup_token(const uint8_t *name, size_t namelen) {
+  switch (namelen) {'''
+    b = build_header(tokens)
+    for size in sorted(b.keys()):
+        ents = b[size]
+        print '''\
+  case {}:'''.format(size)
+        print '''\
+    switch (name[{}]) {{'''.format(size - 1)
+        for c in sorted(ents.keys()):
+            headers = sorted(ents[c])
+            print '''\
+    case '{}':'''.format(c)
+            for k in headers:
+                print '''\
+      if (util::streq_l("{}", name, {})) {{
+        return {};
+      }}'''.format(k[:-1], size - 1, to_enum_hd(k, prefix))
+            print '''\
+      break;'''
+        print '''\
+    }
+    break;'''
+    print '''\
+  }
+  return -1;
+}'''
+
+def gentokenlookup(tokens, prefix):
+    gen_enum(tokens, prefix)
+    print ''
+    gen_index_header(tokens, prefix)

help2rst.py

@@ -4,6 +4,7 @@
 # script to produce rst file from program's help output.
 
 from __future__ import unicode_literals
+from __future__ import print_function
 import sys
 import re
 import argparse
@@ -44,8 +45,8 @@ def help2man(infile):
     line = infile.readline().strip()
     m = re.match(r'^Usage: (.*)', line)
     if not m:
-        print 'usage line is invalid.  Expected following lines:'
-        print 'Usage: cmdname ...'
+        print('usage line is invalid.  Expected following lines:')
+        print('Usage: cmdname ...')
         sys.exit(1)
     synopsis = m.group(1).split(' ', 1)
     if len(synopsis) == 2:
@@ -60,7 +61,11 @@ def help2man(infile):
             break
         description.append(line)
 
-    print '''
+    print('''
+.. GENERATED by help2rst.py.  DO NOT EDIT DIRECTLY.
+
+.. program:: {cmdname}
+
 {cmdname}(1)
 {cmdnameunderline}
 
@@ -75,7 +80,7 @@ DESCRIPTION
 {description}
 '''.format(cmdname=cmdname, args=args,
            cmdnameunderline='=' * (len(cmdname) + 3),
-           synopsis=synopsis, description=format_text('\n'.join(description)))
+           synopsis=synopsis, description=format_text('\n'.join(description))))
 
     in_arg = False
     in_footer = False
@@ -84,16 +89,16 @@ DESCRIPTION
         line = line.rstrip()
 
         if not line.strip() and in_arg:
-            print ''
+            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.\n'.format(len(arg_indent)))
-            print '{}'.format(format_arg_text(line[len(arg_indent):]))
+            print('{}'.format(format_arg_text(line[len(arg_indent):])))
             continue
 
         if in_arg:
-            print ''
+            print()
             in_arg = False
 
         if line == '--':
@@ -101,22 +106,22 @@ DESCRIPTION
             continue
 
         if in_footer:
-            print line.strip()
+            print(line.strip())
             continue
 
         if line == 'Options:':
-            print 'OPTIONS'
-            print '-------'
-            print ''
+            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()))
+            print('.. describe:: {}'.format(argname))
+            print()
+            print('{}'.format(format_arg_text(rest.strip())))
             in_arg = True
             continue
 
@@ -124,9 +129,9 @@ DESCRIPTION
             # 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()))
+            print('.. describe:: {}'.format(argname))
+            print()
+            print('{}'.format(format_arg_text(rest.strip())))
             in_arg = True
             continue
 
@@ -136,23 +141,23 @@ DESCRIPTION
                 r'^(?:\s+)(-\S+?(?:, -\S+?)*)($| .*)',
                 line)
             argname, rest = m.group(1), m.group(2)
-            print '.. option:: {}'.format(argname)
-            print ''
+            print('.. option:: {}'.format(argname))
+            print()
             rest = rest.strip()
             if len(rest):
-                print '{}'.format(format_arg_text(rest))
+                print('{}'.format(format_arg_text(rest)))
             in_arg = True
             continue
 
         if not line.startswith(' ') and line.endswith(':'):
             # subsection
             subsec = line.strip()[:-1]
-            print '{}'.format(subsec)
-            print '{}'.format('~' * len(subsec))
-            print ''
+            print('{}'.format(subsec))
+            print('{}'.format('~' * len(subsec)))
+            print()
             continue
 
-        print line.strip()
+        print(line.strip())
 
 def format_text(text):
     # escape *
@@ -182,6 +187,6 @@ if __name__ == '__main__':
     args = parser.parse_args()
     help2man(sys.stdin)
     if args.include:
-        print ''
+        print()
         with open(args.include) as f:
             sys.stdout.write(f.read())

integration-tests/Makefile.am

@@ -37,7 +37,8 @@ EXTRA_DIST = \
 itprep:
 	go get -d -v github.com/bradfitz/http2
 	go get -d -v github.com/tatsuhiro-t/go-nghttp2
-	go get -d -v golang.org/x/net/spdy
+	go get -d -v github.com/tatsuhiro-t/spdy
+	go get -d -v golang.org/x/net/websocket
 
 it:
 	sh setenv go test -v

integration-tests/nghttpx_http1_test.go

@@ -2,8 +2,10 @@ package nghttp2
 
 import (
 	"bufio"
+	"bytes"
 	"fmt"
 	"github.com/bradfitz/http2/hpack"
+	"golang.org/x/net/websocket"
 	"io"
 	"net/http"
 	"syscall"
@@ -50,6 +52,27 @@ func TestH1H1PlainGETClose(t *testing.T) {
 	}
 }
 
+// TestH1H1InvalidMethod tests that server rejects invalid method with
+// 501 status code
+func TestH1H1InvalidMethod(t *testing.T) {
+	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
+		t.Errorf("server should not forward this request")
+	})
+	defer st.Close()
+
+	res, err := st.http1(requestParam{
+		name:   "TestH1H1InvalidMethod",
+		method: "get",
+	})
+	if err != nil {
+		t.Fatalf("Error st.http1() = %v", err)
+	}
+
+	if got, want := res.status, 501; got != want {
+		t.Errorf("status = %v; want %v", got, want)
+	}
+}
+
 // TestH1H1MultipleRequestCL tests that server rejects request which
 // contains multiple Content-Length header fields.
 func TestH1H1MultipleRequestCL(t *testing.T) {
@@ -246,6 +269,92 @@ func TestH1H1RequestTrailer(t *testing.T) {
 	}
 }
 
+// TestH1H1HeaderFieldBufferPath tests that request with request path
+// larger than configured buffer size is rejected.
+func TestH1H1HeaderFieldBufferPath(t *testing.T) {
+	// The value 100 is chosen so that sum of header fields bytes
+	// does not exceed it.  We use > 100 bytes URI to exceed this
+	// limit.
+	st := newServerTester([]string{"--header-field-buffer=100"}, t, func(w http.ResponseWriter, r *http.Request) {
+		t.Fatal("execution path should not be here")
+	})
+	defer st.Close()
+
+	res, err := st.http1(requestParam{
+		name: "TestH1H1HeaderFieldBufferPath",
+		path: "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
+	})
+	if err != nil {
+		t.Fatalf("Error st.http1() = %v", err)
+	}
+	if got, want := res.status, 431; got != want {
+		t.Errorf("status: %v; want %v", got, want)
+	}
+}
+
+// TestH1H1HeaderFieldBuffer tests that request with header fields
+// larger than configured buffer size is rejected.
+func TestH1H1HeaderFieldBuffer(t *testing.T) {
+	st := newServerTester([]string{"--header-field-buffer=10"}, t, func(w http.ResponseWriter, r *http.Request) {
+		t.Fatal("execution path should not be here")
+	})
+	defer st.Close()
+
+	res, err := st.http1(requestParam{
+		name: "TestH1H1HeaderFieldBuffer",
+	})
+	if err != nil {
+		t.Fatalf("Error st.http1() = %v", err)
+	}
+	if got, want := res.status, 431; got != want {
+		t.Errorf("status: %v; want %v", got, want)
+	}
+}
+
+// TestH1H1HeaderFields tests that request with header fields more
+// than configured number is rejected.
+func TestH1H1HeaderFields(t *testing.T) {
+	st := newServerTester([]string{"--max-header-fields=1"}, t, func(w http.ResponseWriter, r *http.Request) {
+		t.Fatal("execution path should not be here")
+	})
+	defer st.Close()
+
+	res, err := st.http1(requestParam{
+		name: "TestH1H1HeaderFields",
+		header: []hpack.HeaderField{
+			// Add extra header field to ensure that
+			// header field limit exceeds
+			pair("Connection", "close"),
+		},
+	})
+	if err != nil {
+		t.Fatalf("Error st.http1() = %v", err)
+	}
+	if got, want := res.status, 431; got != want {
+		t.Errorf("status: %v; want %v", got, want)
+	}
+}
+
+// TestH1H1Websocket tests that HTTP Upgrade to WebSocket works.
+func TestH1H1Websocket(t *testing.T) {
+	st := newServerTesterHandler(nil, t, websocket.Handler(func(ws *websocket.Conn) {
+		io.Copy(ws, ws)
+	}))
+	defer st.Close()
+
+	content := []byte("hello world")
+	res, err := st.websocket(requestParam{
+		name: "TestH1H1Websocket",
+		body: content,
+	})
+	if err != nil {
+		t.Fatalf("Error st.websocket() = %v", err)
+	}
+	if got, want := res.body, content; !bytes.Equal(got, want) {
+		t.Errorf("echo: %q; want %q", got, want)
+	}
+}
+
 // TestH1H2ConnectFailure tests that server handles the situation that
 // connection attempt to HTTP/2 backend failed.
 func TestH1H2ConnectFailure(t *testing.T) {

integration-tests/nghttpx_http2_test.go

@@ -404,6 +404,26 @@ func TestH2H1ConnectFailure(t *testing.T) {
 	}
 }
 
+// TestH2H1InvalidMethod tests that server rejects invalid method with
+// 501.
+func TestH2H1InvalidMethod(t *testing.T) {
+	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {
+		t.Errorf("server should not forward this request")
+	})
+	defer st.Close()
+
+	res, err := st.http2(requestParam{
+		name:   "TestH2H1InvalidMethod",
+		method: "get",
+	})
+	if err != nil {
+		t.Fatalf("Error st.http2() = %v", err)
+	}
+	if got, want := res.status, 501; got != want {
+		t.Errorf("status: %v; want %v", got, want)
+	}
+}
+
 // TestH2H1AssembleCookies tests that crumbled cookies in HTTP/2
 // request is assembled into 1 when forwarding to HTTP/1 backend link.
 func TestH2H1AssembleCookies(t *testing.T) {
@@ -558,6 +578,79 @@ func TestH2H1RequestTrailer(t *testing.T) {
 	}
 }
 
+// TestH2H1HeaderFieldBuffer tests that request with header fields
+// larger than configured buffer size is rejected.
+func TestH2H1HeaderFieldBuffer(t *testing.T) {
+	st := newServerTester([]string{"--header-field-buffer=10"}, t, func(w http.ResponseWriter, r *http.Request) {
+		t.Fatal("execution path should not be here")
+	})
+	defer st.Close()
+
+	res, err := st.http2(requestParam{
+		name: "TestH2H1HeaderFieldBuffer",
+	})
+	if err != nil {
+		t.Fatalf("Error st.http2() = %v", err)
+	}
+	if got, want := res.status, 431; got != want {
+		t.Errorf("status: %v; want %v", got, want)
+	}
+}
+
+// TestH2H1HeaderFields tests that request with header fields more
+// than configured number is rejected.
+func TestH2H1HeaderFields(t *testing.T) {
+	st := newServerTester([]string{"--max-header-fields=1"}, t, func(w http.ResponseWriter, r *http.Request) {
+		t.Fatal("execution path should not be here")
+	})
+	defer st.Close()
+
+	res, err := st.http2(requestParam{
+		name: "TestH2H1HeaderFields",
+		// we have at least 4 pseudo-header fields sent, and
+		// that ensures that buffer limit exceeds.
+	})
+	if err != nil {
+		t.Fatalf("Error st.http2() = %v", err)
+	}
+	if got, want := res.status, 431; got != want {
+		t.Errorf("status: %v; want %v", got, want)
+	}
+}
+
+// TestH2H1Upgrade tests HTTP Upgrade to HTTP/2
+func TestH2H1Upgrade(t *testing.T) {
+	st := newServerTester(nil, t, func(w http.ResponseWriter, r *http.Request) {})
+	defer st.Close()
+
+	res, err := st.http1(requestParam{
+		name: "TestH2H1Upgrade",
+		header: []hpack.HeaderField{
+			pair("Connection", "Upgrade, HTTP2-Settings"),
+			pair("Upgrade", "h2c"),
+			pair("HTTP2-Settings", "AAMAAABkAAQAAP__"),
+		},
+	})
+
+	if err != nil {
+		t.Fatalf("Error st.http1() = %v", err)
+	}
+
+	if got, want := res.status, 101; got != want {
+		t.Errorf("res.status: %v; want %v", got, want)
+	}
+
+	res, err = st.http2(requestParam{
+		httpUpgrade: true,
+	})
+	if err != nil {
+		t.Fatalf("Error st.http2() = %v", err)
+	}
+	if got, want := res.status, 200; got != want {
+		t.Errorf("res.status: %v; want %v", got, want)
+	}
+}
+
 // TestH2H1GracefulShutdown tests graceful shutdown.
 func TestH2H1GracefulShutdown(t *testing.T) {
 	st := newServerTester(nil, t, noopHandler)

integration-tests/nghttpx_spdy_test.go

@@ -2,7 +2,7 @@ package nghttp2
 
 import (
 	"github.com/bradfitz/http2/hpack"
-	"golang.org/x/net/spdy"
+	"github.com/tatsuhiro-t/spdy"
 	"net/http"
 	"testing"
 )
@@ -170,6 +170,66 @@ func TestS3H1NoVia(t *testing.T) {
 	}
 }
 
+// TestS3H1HeaderFieldBuffer tests that request with header fields
+// larger than configured buffer size is rejected.
+func TestS3H1HeaderFieldBuffer(t *testing.T) {
+	st := newServerTesterTLS([]string{"--npn-list=spdy/3.1", "--header-field-buffer=10"}, t, func(w http.ResponseWriter, r *http.Request) {
+		t.Fatal("execution path should not be here")
+	})
+	defer st.Close()
+
+	res, err := st.spdy(requestParam{
+		name: "TestS3H1HeaderFieldBuffer",
+	})
+	if err != nil {
+		t.Fatalf("Error st.spdy() = %v", err)
+	}
+	if got, want := res.spdyRstErrCode, spdy.InternalError; got != want {
+		t.Errorf("res.spdyRstErrCode: %v; want %v", got, want)
+	}
+}
+
+// TestS3H1HeaderFields tests that request with header fields more
+// than configured number is rejected.
+func TestS3H1HeaderFields(t *testing.T) {
+	st := newServerTesterTLS([]string{"--npn-list=spdy/3.1", "--max-header-fields=1"}, t, func(w http.ResponseWriter, r *http.Request) {
+		t.Fatal("execution path should not be here")
+	})
+	defer st.Close()
+
+	res, err := st.spdy(requestParam{
+		name: "TestS3H1HeaderFields",
+		// we have at least 5 pseudo-header fields sent, and
+		// that ensures that buffer limit exceeds.
+	})
+	if err != nil {
+		t.Fatalf("Error st.spdy() = %v", err)
+	}
+	if got, want := res.spdyRstErrCode, spdy.InternalError; got != want {
+		t.Errorf("res.spdyRstErrCode: %v; want %v", got, want)
+	}
+}
+
+// TestS3H1InvalidMethod tests that server rejects invalid method with
+// 501.
+func TestS3H1InvalidMethod(t *testing.T) {
+	st := newServerTesterTLS([]string{"--npn-list=spdy/3.1"}, t, func(w http.ResponseWriter, r *http.Request) {
+		t.Errorf("server should not forward this request")
+	})
+	defer st.Close()
+
+	res, err := st.spdy(requestParam{
+		name:   "TestS3H1InvalidMethod",
+		method: "get",
+	})
+	if err != nil {
+		t.Fatalf("Error st.spdy() = %v", err)
+	}
+	if got, want := res.status, 501; got != want {
+		t.Errorf("status: %v; want %v", got, want)
+	}
+}
+
 // TestS3H2ConnectFailure tests that server handles the situation that
 // connection attempt to HTTP/2 backend failed.
 func TestS3H2ConnectFailure(t *testing.T) {

integration-tests/server_tester.go

@@ -9,7 +9,8 @@ import (
 	"github.com/bradfitz/http2"
 	"github.com/bradfitz/http2/hpack"
 	"github.com/tatsuhiro-t/go-nghttp2"
-	"golang.org/x/net/spdy"
+	"github.com/tatsuhiro-t/spdy"
+	"golang.org/x/net/websocket"
 	"io"
 	"io/ioutil"
 	"net"
@@ -66,6 +67,10 @@ func newServerTester(args []string, t *testing.T, handler http.HandlerFunc) *ser
 	return newServerTesterInternal(args, t, handler, false, nil)
 }
 
+func newServerTesterHandler(args []string, t *testing.T, handler http.Handler) *serverTester {
+	return newServerTesterInternal(args, t, handler, false, nil)
+}
+
 // newServerTester creates test context for TLS frontend connection.
 func newServerTesterTLS(args []string, t *testing.T, handler http.HandlerFunc) *serverTester {
 	return newServerTesterInternal(args, t, handler, true, nil)
@@ -79,7 +84,7 @@ func newServerTesterTLSConfig(args []string, t *testing.T, handler http.HandlerF
 
 // newServerTesterInternal creates test context.  If frontendTLS is
 // true, set up TLS frontend connection.
-func newServerTesterInternal(args []string, t *testing.T, handler http.HandlerFunc, frontendTLS bool, clientConfig *tls.Config) *serverTester {
+func newServerTesterInternal(args []string, t *testing.T, handler http.Handler, frontendTLS bool, clientConfig *tls.Config) *serverTester {
 	ts := httptest.NewUnstartedServer(handler)
 
 	backendTLS := false
@@ -256,6 +261,7 @@ type requestParam struct {
 	header      []hpack.HeaderField // additional request header fields
 	body        []byte              // request body
 	trailer     []hpack.HeaderField // trailer part
+	httpUpgrade bool                // true if upgraded to HTTP/2 through HTTP Upgrade
 }
 
 // wrapper for request body to set trailer part
@@ -278,6 +284,41 @@ func (cbr *chunkedBodyReader) Read(p []byte) (n int, err error) {
 	return cbr.body.Read(p)
 }
 
+func (st *serverTester) websocket(rp requestParam) (*serverResponse, error) {
+	urlstring := st.url + "/echo"
+
+	config, err := websocket.NewConfig(urlstring, st.url)
+	if err != nil {
+		st.t.Fatalf("websocket.NewConfig(%q, %q) returned error: %v", urlstring, st.url, err)
+	}
+
+	config.Header.Add("Test-Case", rp.name)
+	for _, h := range rp.header {
+		config.Header.Add(h.Name, h.Value)
+	}
+
+	ws, err := websocket.NewClient(config, st.conn)
+	if err != nil {
+		st.t.Fatalf("Error creating websocket client: %v", err)
+	}
+
+	if _, err := ws.Write(rp.body); err != nil {
+		st.t.Fatalf("ws.Write() returned error: %v", err)
+	}
+
+	msg := make([]byte, 1024)
+	var n int
+	if n, err = ws.Read(msg); err != nil {
+		st.t.Fatalf("ws.Read() returned error: %v", err)
+	}
+
+	res := &serverResponse{
+		body: msg[:n],
+	}
+
+	return res, nil
+}
+
 func (st *serverTester) http1(rp requestParam) (*serverResponse, error) {
 	method := "GET"
 	if rp.method != "" {
@@ -296,7 +337,19 @@ func (st *serverTester) http1(rp requestParam) (*serverResponse, error) {
 			body = cbr
 		}
 	}
-	req, err := http.NewRequest(method, st.url, body)
+
+	reqURL := st.url
+
+	if rp.path != "" {
+		u, err := url.Parse(st.url)
+		if err != nil {
+			st.t.Fatalf("Error parsing URL from st.url %v: %v", st.url, err)
+		}
+		u.Path = rp.path
+		reqURL = u.String()
+	}
+
+	req, err := http.NewRequest(method, reqURL, body)
 	if err != nil {
 		return nil, err
 	}
@@ -478,6 +531,7 @@ func (st *serverTester) http2(rp requestParam) (*serverResponse, error) {
 	streams := make(map[uint32]*serverResponse)
 	streams[id] = res
 
+	if !rp.httpUpgrade {
 		method := "GET"
 		if rp.method != "" {
 			method = rp.method
@@ -540,7 +594,7 @@ func (st *serverTester) http2(rp requestParam) (*serverResponse, error) {
 				return nil, err
 			}
 		}
-
+	}
 loop:
 	for {
 		fr, err := st.readFrame()

lib/Makefile.am

@@ -25,7 +25,8 @@ SUBDIRS = includes
 EXTRA_DIST = Makefile.msvc
 
 AM_CFLAGS = $(WARNCFLAGS)
-AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes @DEFS@
+AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes -DBUILDING_NGHTTP2 \
+	@DEFS@
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnghttp2.pc

lib/includes/nghttp2/nghttp2.h

@@ -36,7 +36,14 @@ extern "C" {
 #endif
 
 #include <stdlib.h>
+#if defined(_MSC_VER) && (_MSC_VER < 1800)
+/* MSVC < 2013 does not have inttypes.h because it is not C99
+   compliant.  See compiler macros and version number in
+   https://sourceforge.net/p/predef/wiki/Compilers/ */
 #include <stdint.h>
+#else /* !defined(_MSC_VER) || (_MSC_VER >= 1800) */
+#include <inttypes.h>
+#endif /* !defined(_MSC_VER) || (_MSC_VER >= 1800) */
 #include <sys/types.h>
 
 #include <nghttp2/nghttp2ver.h>
@@ -44,7 +51,11 @@ extern "C" {
 #ifdef NGHTTP2_STATICLIB
 #define NGHTTP2_EXTERN
 #elif defined(WIN32)
+#ifdef BUILDING_NGHTTP2
 #define NGHTTP2_EXTERN __declspec(dllexport)
+#else /* !BUILDING_NGHTTP2 */
+#define NGHTTP2_EXTERN __declspec(dllimport)
+#endif /* !BUILDING_NGHTTP2 */
 #else  /* !defined(WIN32) */
 #define NGHTTP2_EXTERN
 #endif /* !defined(WIN32) */
@@ -55,13 +66,13 @@ extern "C" {
  * The protocol version identification string of this library
  * supports.  This identifier is used if HTTP/2 is used over TLS.
  */
-#define NGHTTP2_PROTO_VERSION_ID "h2-14"
+#define NGHTTP2_PROTO_VERSION_ID "h2"
 /**
  * @macro
  *
  * The length of :macro:`NGHTTP2_PROTO_VERSION_ID`.
  */
-#define NGHTTP2_PROTO_VERSION_ID_LEN 5
+#define NGHTTP2_PROTO_VERSION_ID_LEN 2
 
 /**
  * @macro
@@ -72,7 +83,7 @@ extern "C" {
  * extension <https://tools.ietf.org/html/rfc7301>`_.  This is useful
  * to process incoming ALPN tokens in wire format.
  */
-#define NGHTTP2_PROTO_ALPN "\x5h2-14"
+#define NGHTTP2_PROTO_ALPN "\x2h2"
 
 /**
  * @macro
@@ -88,14 +99,14 @@ extern "C" {
  * supports.  This identifier is used if HTTP/2 is used over cleartext
  * TCP.
  */
-#define NGHTTP2_CLEARTEXT_PROTO_VERSION_ID "h2c-14"
+#define NGHTTP2_CLEARTEXT_PROTO_VERSION_ID "h2c"
 
 /**
  * @macro
  *
  * The length of :macro:`NGHTTP2_CLEARTEXT_PROTO_VERSION_ID`.
  */
-#define NGHTTP2_CLEARTEXT_PROTO_VERSION_ID_LEN 6
+#define NGHTTP2_CLEARTEXT_PROTO_VERSION_ID_LEN 3
 
 struct nghttp2_session;
 /**
@@ -194,32 +205,17 @@ typedef struct {
 /**
  * @macro
  *
- * The client connection preface.
+ * The client magic string, which is the first 24 bytes byte string of
+ * client connection preface.
  */
-#define NGHTTP2_CLIENT_CONNECTION_PREFACE "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
+#define NGHTTP2_CLIENT_MAGIC "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
 
 /**
  * @macro
  *
- * The length of :macro:`NGHTTP2_CLIENT_CONNECTION_PREFACE`.
+ * The length of :macro:`NGHTTP2_CLIENT_MAGIC`.
  */
-#define NGHTTP2_CLIENT_CONNECTION_PREFACE_LEN 24
-
-/**
- * @macro
- *
- * The client connection header.  This macro is obsoleted by
- * NGHTTP2_CLIENT_CONNECTION_PREFACE.
- */
-#define NGHTTP2_CLIENT_CONNECTION_HEADER NGHTTP2_CLIENT_CONNECTION_PREFACE
-
-/**
- * @macro
- *
- * The length of :macro:`NGHTTP2_CLIENT_CONNECTION_HEADER`.
- */
-#define NGHTTP2_CLIENT_CONNECTION_HEADER_LEN                                   \
-  NGHTTP2_CLIENT_CONNECTION_PREFACE_LEN
+#define NGHTTP2_CLIENT_MAGIC_LEN 24
 
 /**
  * @enum
@@ -241,8 +237,9 @@ typedef enum {
    */
   NGHTTP2_ERR_UNSUPPORTED_VERSION = -503,
   /**
-   * Used as a return value from :type:`nghttp2_send_callback` and
-   * :type:`nghttp2_recv_callback` to indicate that the operation
+   * Used as a return value from :type:`nghttp2_send_callback`,
+   * :type:`nghttp2_recv_callback` and
+   * :type:`nghttp2_send_data_callback` to indicate that the operation
    * would block.
    */
   NGHTTP2_ERR_WOULDBLOCK = -504,
@@ -367,6 +364,18 @@ typedef enum {
    * closed.
    */
   NGHTTP2_ERR_HTTP_HEADER = -531,
+  /**
+   * Violation in HTTP messaging rule.
+   */
+  NGHTTP2_ERR_HTTP_MESSAGING = -532,
+  /**
+   * Stream was refused.
+   */
+  NGHTTP2_ERR_REFUSED_STREAM = -533,
+  /**
+   * Unexpected internal error, but recovered.
+   */
+  NGHTTP2_ERR_INTERNAL = -534,
   /**
    * The errors < :enum:`NGHTTP2_ERR_FATAL` mean that the library is
    * under unexpected condition and processing was terminated (e.g.,
@@ -385,10 +394,10 @@ typedef enum {
    */
   NGHTTP2_ERR_CALLBACK_FAILURE = -902,
   /**
-   * Invalid connection preface was received and further processing is
-   * not possible.
+   * Invalid client magic (see :macro:`NGHTTP2_CLIENT_MAGIC`) was
+   * received and further processing is not possible.
    */
-  NGHTTP2_ERR_BAD_PREFACE = -903
+  NGHTTP2_ERR_BAD_CLIENT_MAGIC = -903
 } nghttp2_error;
 
 /**
@@ -495,21 +504,6 @@ typedef enum {
   NGHTTP2_CONTINUATION = 0x09
 } nghttp2_frame_type;
 
-/**
- * @enum
- *
- * The extension frame types.
- *
- * TODO: The assigned frame types were carried from draft-12, and now
- * actually TBD.
- */
-typedef enum {
-  /**
-   * The ALTSVC extension frame.
-   */
-  NGHTTP2_EXT_ALTSVC = 0x0a
-} nghttp2_ext_frame_type;
-
 /**
  * @enum
  *
@@ -1078,52 +1072,12 @@ typedef struct {
    * The pointer to extension payload.  The exact pointer type is
    * determined by hd.type.
    *
-   * If hd.type == :enum:`NGHTTP2_EXT_ALTSVC`, it is a pointer to
-   * :type:`nghttp2_ext_altsvc`.
+   * Currently, no extension is supported.  This is a place holder for
+   * the future extensions.
    */
   void *payload;
 } nghttp2_extension;
 
-/**
- * @struct
- *
- * The ALTSVC extension frame payload.  It has following members:
- */
-typedef struct {
-  /**
-   * Protocol ID
-   */
-  uint8_t *protocol_id;
-  /**
-   * Host
-   */
-  uint8_t *host;
-  /**
-   * Origin
-   */
-  uint8_t *origin;
-  /**
-   * The length of |protocol_id|
-   */
-  size_t protocol_id_len;
-  /**
-   * The length of |host|
-   */
-  size_t host_len;
-  /**
-   * The length of |origin|
-   */
-  size_t origin_len;
-  /**
-   * Max-Age
-   */
-  uint32_t max_age;
-  /**
-   * Port
-   */
-  uint16_t port;
-} nghttp2_ext_altsvc;
-
 /**
  * @union
  *
@@ -1198,6 +1152,15 @@ typedef union {
  *
  * To set this callback to :type:`nghttp2_session_callbacks`, use
  * `nghttp2_session_callbacks_set_send_callback()`.
+ *
+ * .. note::
+ *
+ *   The |length| may be very small.  If that is the case, and
+ *   application disables Nagle algorithm (``TCP_NODELAY``), then just
+ *   writing |data| to the network stack leads to very small packet,
+ *   and it is very inefficient.  An application should be responsible
+ *   to buffer up small chunks of data as necessary to avoid this
+ *   situation.
  */
 typedef ssize_t (*nghttp2_send_callback)(nghttp2_session *session,
                                          const uint8_t *data, size_t length,
@@ -1275,10 +1238,10 @@ typedef ssize_t (*nghttp2_recv_callback)(nghttp2_session *session, uint8_t *buf,
 /**
  * @functypedef
  *
- * Callback function invoked by `nghttp2_session_recv()` when a frame
- * is received.  The |user_data| pointer is the third argument passed
- * in to the call to `nghttp2_session_client_new()` or
- * `nghttp2_session_server_new()`.
+ * Callback function invoked by `nghttp2_session_recv()` and
+ * `nghttp2_session_mem_recv()` when a frame is received.  The
+ * |user_data| pointer is the third argument passed in to the call to
+ * `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
  *
  * If frame is HEADERS or PUSH_PROMISE, the ``nva`` and ``nvlen``
  * member of their data structure are always ``NULL`` and 0
@@ -1313,14 +1276,14 @@ typedef int (*nghttp2_on_frame_recv_callback)(nghttp2_session *session,
 /**
  * @functypedef
  *
- * Callback function invoked by `nghttp2_session_recv()` when an
- * invalid non-DATA frame is received.  The |error_code| indicates the
- * error.  It is usually one of the :enum:`nghttp2_error_code` but
- * that is not guaranteed.  When this callback function is invoked,
- * the library automatically submits either RST_STREAM or GOAWAY
- * frame.  The |user_data| pointer is the third argument passed in to
- * the call to `nghttp2_session_client_new()` or
- * `nghttp2_session_server_new()`.
+ * Callback function invoked by `nghttp2_session_recv()` and
+ * `nghttp2_session_mem_recv()` when an invalid non-DATA frame is
+ * received.  The error is indicated by the |lib_error_code|, which is
+ * one of the values defined in :type:`nghttp2_error`.  When this
+ * callback function is invoked, the library automatically submits
+ * either RST_STREAM or GOAWAY frame.  The |user_data| pointer is the
+ * third argument passed in to the call to
+ * `nghttp2_session_client_new()` or `nghttp2_session_server_new()`.
  *
  * If frame is HEADERS or PUSH_PROMISE, the ``nva`` and ``nvlen``
  * member of their data structure are always ``NULL`` and 0
@@ -1328,14 +1291,14 @@ typedef int (*nghttp2_on_frame_recv_callback)(nghttp2_session *session,
  *
  * The implementation of this function must return 0 if it succeeds.
  * If nonzero is returned, it is treated as fatal error and
- * `nghttp2_session_recv()` and `nghttp2_session_send()` functions
+ * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
  * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
  *
  * To set this callback to :type:`nghttp2_session_callbacks`, use
  * `nghttp2_session_callbacks_set_on_invalid_frame_recv_callback()`.
  */
 typedef int (*nghttp2_on_invalid_frame_recv_callback)(
-    nghttp2_session *session, const nghttp2_frame *frame, uint32_t error_code,
+    nghttp2_session *session, const nghttp2_frame *frame, int lib_error_code,
     void *user_data);
 
 /**
@@ -1361,7 +1324,7 @@ typedef int (*nghttp2_on_invalid_frame_recv_callback)(
  * region included in the input bytes.
  *
  * The implementation of this function must return 0 if it succeeds.
- * If nonzero is returned, it is treated as fatal error and
+ * If nonzero is returned, it is treated as fatal error, and
  * `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` functions
  * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
  *
@@ -1384,7 +1347,7 @@ typedef int (*nghttp2_on_data_chunk_recv_callback)(nghttp2_session *session,
  *
  * The implementation of this function must return 0 if it succeeds.
  * If nonzero is returned, it is treated as fatal error and
- * `nghttp2_session_recv()` and `nghttp2_session_send()` functions
+ * `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
  * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
  *
  * To set this callback to :type:`nghttp2_session_callbacks`, use
@@ -1403,7 +1366,7 @@ typedef int (*nghttp2_before_frame_send_callback)(nghttp2_session *session,
  *
  * The implementation of this function must return 0 if it succeeds.
  * If nonzero is returned, it is treated as fatal error and
- * `nghttp2_session_recv()` and `nghttp2_session_send()` functions
+ * `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
  * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
  *
  * To set this callback to :type:`nghttp2_session_callbacks`, use
@@ -1425,7 +1388,7 @@ typedef int (*nghttp2_on_frame_send_callback)(nghttp2_session *session,
  *
  * The implementation of this function must return 0 if it succeeds.
  * If nonzero is returned, it is treated as fatal error and
- * `nghttp2_session_recv()` and `nghttp2_session_send()` functions
+ * `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
  * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
  *
  * `nghttp2_session_get_stream_user_data()` can be used to get
@@ -1455,8 +1418,9 @@ typedef int (*nghttp2_on_frame_not_send_callback)(nghttp2_session *session,
  *
  * The implementation of this function must return 0 if it succeeds.
  * If nonzero is returned, it is treated as fatal error and
- * `nghttp2_session_recv()` and `nghttp2_session_send()` functions
- * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
+ * `nghttp2_session_recv()`, `nghttp2_session_mem_recv()`,
+ * `nghttp2_session_send()`, and `nghttp2_session_mem_send()`
+ * functions immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
  *
  * To set this callback to :type:`nghttp2_session_callbacks`, use
  * `nghttp2_session_callbacks_set_on_stream_close_callback()`.
@@ -1498,13 +1462,26 @@ typedef int (*nghttp2_on_stream_close_callback)(nghttp2_session *session,
  * frame with ``frame->headers.cat == NGHTTP2_HCAT_HEADERS``
  * containing final response headers (non-1xx status code).  The
  * trailer headers also has ``frame->headers.cat ==
- * NGHTTP2_HCAT_HEADERS`` which does not containg any status code.
+ * NGHTTP2_HCAT_HEADERS`` which does not contain any status code.
  *
- * The implementation of this function must return 0 if it succeeds or
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  If nonzero value other than
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE` is returned, it is treated as
- * if :enum:`NGHTTP2_ERR_CALLBACK_FAILURE` is returned.  If
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE` is returned,
+ * Returning :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` will close
+ * the stream (promised stream if frame is PUSH_PROMISE) by issuing
+ * RST_STREAM with :enum:`NGHTTP2_INTERNAL_ERROR`.  In this case,
+ * :type:`nghttp2_on_header_callback` and
+ * :type:`nghttp2_on_frame_recv_callback` will not be invoked.  If a
+ * different error code is desirable, use
+ * `nghttp2_submit_rst_stream()` with a desired error code and then
+ * return :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  Again, use
+ * ``frame->push_promise.promised_stream_id`` as stream_id parameter
+ * in `nghttp2_submit_rst_stream()` if frame is PUSH_PROMISE.
+ *
+ * The implementation of this function must return 0 if it succeeds.
+ * It can return :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` to
+ * reset the stream (promised stream if frame is PUSH_PROMISE).  For
+ * critical errors, it must return
+ * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  If the other value is
+ * returned, it is treated as if :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`
+ * is returned.  If :enum:`NGHTTP2_ERR_CALLBACK_FAILURE` is returned,
  * `nghttp2_session_mem_recv()` function will immediately return
  * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
  *
@@ -1559,12 +1536,15 @@ typedef int (*nghttp2_on_begin_headers_callback)(nghttp2_session *session,
  * included in the input bytes.
  *
  * Returning :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE` will close
- * the stream by issuing RST_STREAM with
- * :enum:`NGHTTP2_INTERNAL_ERROR`.  In this case,
+ * the stream (promised stream if frame is PUSH_PROMISE) by issuing
+ * RST_STREAM with :enum:`NGHTTP2_INTERNAL_ERROR`.  In this case,
+ * :type:`nghttp2_on_header_callback` and
  * :type:`nghttp2_on_frame_recv_callback` will not be invoked.  If a
  * different error code is desirable, use
  * `nghttp2_submit_rst_stream()` with a desired error code and then
- * return :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.
+ * return :enum:`NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE`.  Again, use
+ * ``frame->push_promise.promised_stream_id`` as stream_id parameter
+ * in `nghttp2_submit_rst_stream()` if frame is PUSH_PROMISE.
  *
  * The implementation of this function must return 0 if it succeeds.
  * It may return :enum:`NGHTTP2_ERR_PAUSE` or
@@ -1596,8 +1576,8 @@ typedef int (*nghttp2_on_header_callback)(nghttp2_session *session,
  * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.  Returning
  * ``frame->hd.length`` means no padding is added.  Returning
  * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE` will make
- * `nghttp2_session_send()` function immediately return
- * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
+ * `nghttp2_session_send()` and `nghttp2_session_mem_send()` functions
+ * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
  *
  * To set this callback to :type:`nghttp2_session_callbacks`, use
  * `nghttp2_session_callbacks_set_select_padding_callback()`.
@@ -1726,8 +1706,8 @@ NGHTTP2_EXTERN void nghttp2_session_callbacks_set_recv_callback(
 /**
  * @function
  *
- * Sets callback function invoked by `nghttp2_session_recv()` when a
- * frame is received.
+ * Sets callback function invoked by `nghttp2_session_recv()` and
+ * `nghttp2_session_mem_recv()` when a frame is received.
  */
 NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_frame_recv_callback(
     nghttp2_session_callbacks *cbs,
@@ -1736,8 +1716,9 @@ NGHTTP2_EXTERN void nghttp2_session_callbacks_set_on_frame_recv_callback(
 /**
  * @function
  *
- * Sets callback function invoked by `nghttp2_session_recv()` when an
- * invalid non-DATA frame is received.
+ * Sets callback function invoked by `nghttp2_session_recv()` and
+ * `nghttp2_session_mem_recv()` when an invalid non-DATA frame is
+ * received.
  */
 NGHTTP2_EXTERN void
 nghttp2_session_callbacks_set_on_invalid_frame_recv_callback(
@@ -2017,31 +1998,33 @@ nghttp2_option_set_peer_max_concurrent_streams(nghttp2_option *option,
 /**
  * @function
  *
- * By default, nghttp2 library only handles HTTP/2 frames and does not
- * recognize first 24 bytes of client connection preface.  This design
- * choice is done due to the fact that server may want to detect the
- * application protocol based on first few bytes on clear text
- * communication.  But for simple servers which only speak HTTP/2, it
- * is easier for developers if nghttp2 library takes care of client
- * connection preface.
+ * By default, nghttp2 library, if configured as server, requires
+ * first 24 bytes of client magic byte string (MAGIC).  In most cases,
+ * this will simplify the implementation of server.  But sometimes
+ * server may want to detect the application protocol based on first
+ * few bytes on clear text communication.
  *
- * If this option is used with nonzero |val|, nghttp2 library checks
- * first 24 bytes client connection preface.  If it is not a valid
- * one, `nghttp2_session_recv()` and `nghttp2_session_mem_recv()` will
- * return error :enum:`NGHTTP2_ERR_BAD_PREFACE`, which is fatal error.
+ * If this option is used with nonzero |val|, nghttp2 library does not
+ * handle MAGIC.  It still checks following SETTINGS frame.  This
+ * means that applications should deal with MAGIC by themselves.
+ *
+ * If this option is not used or used with zero value, if MAGIC does
+ * not match :macro:`NGHTTP2_CLIENT_MAGIC`, `nghttp2_session_recv()`
+ * and `nghttp2_session_mem_recv()` will return error
+ * :enum:`NGHTTP2_ERR_BAD_CLIENT_MAGIC`, which is fatal error.
  */
 NGHTTP2_EXTERN void
-nghttp2_option_set_recv_client_preface(nghttp2_option *option, int val);
+nghttp2_option_set_no_recv_client_magic(nghttp2_option *option, int val);
 
 /**
  * @function
  *
  * By default, nghttp2 library enforces subset of HTTP Messaging rules
  * described in `HTTP/2 specification, section 8
- * <https://tools.ietf.org/html/draft-ietf-httpbis-http2-17#section-8>`_.
- * See :ref:`http-messaging` section for details.  For those
- * applications who use nghttp2 library as non-HTTP use, give nonzero
- * to |val| to disable this enforcement.
+ * <https://tools.ietf.org/html/rfc7540#section-8>`_.  See
+ * :ref:`http-messaging` section for details.  For those applications
+ * who use nghttp2 library as non-HTTP use, give nonzero to |val| to
+ * disable this enforcement.
  */
 NGHTTP2_EXTERN void nghttp2_option_set_no_http_messaging(nghttp2_option *option,
                                                          int val);
@@ -2286,6 +2269,15 @@ NGHTTP2_EXTERN int nghttp2_session_send(nghttp2_session *session);
  *
  * :enum:`NGHTTP2_ERR_NOMEM`
  *     Out of memory.
+ *
+ * .. note::
+ *
+ *   This function may produce very small byte string.  If that is the
+ *   case, and application disables Nagle algorithm (``TCP_NODELAY``),
+ *   then writing this small chunk leads to very small packet, and it
+ *   is very inefficient.  An application should be responsible to
+ *   buffer up small chunks of data as necessary to avoid this
+ *   situation.
  */
 NGHTTP2_EXTERN ssize_t nghttp2_session_mem_send(nghttp2_session *session,
                                                 const uint8_t **data_ptr);
@@ -2348,10 +2340,11 @@ NGHTTP2_EXTERN ssize_t nghttp2_session_mem_send(nghttp2_session *session,
  *     Out of memory.
  * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`
  *     The callback function failed.
- * :enum:`NGHTTP2_ERR_BAD_PREFACE`
- *     Invalid client preface was detected.  This error only returns
+ * :enum:`NGHTTP2_ERR_BAD_CLIENT_MAGIC`
+ *     Invalid client magic was detected.  This error only returns
  *     when |session| was configured as server and
- *     `nghttp2_option_set_recv_client_preface()` is used.
+ *     `nghttp2_option_set_no_recv_client_magic()` is not used with
+ *     nonzero value.
  */
 NGHTTP2_EXTERN int nghttp2_session_recv(nghttp2_session *session);
 
@@ -2383,10 +2376,11 @@ NGHTTP2_EXTERN int nghttp2_session_recv(nghttp2_session *session);
  *     Out of memory.
  * :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`
  *     The callback function failed.
- * :enum:`NGHTTP2_ERR_BAD_PREFACE`
- *     Invalid client preface was detected.  This error only returns
+ * :enum:`NGHTTP2_ERR_BAD_CLIENT_MAGIC`
+ *     Invalid client magic was detected.  This error only returns
  *     when |session| was configured as server and
- *     `nghttp2_option_set_recv_client_preface()` is used.
+ *     `nghttp2_option_set_no_recv_client_magic()` is not used with
+ *     nonzero value.
  */
 NGHTTP2_EXTERN ssize_t nghttp2_session_mem_recv(nghttp2_session *session,
                                                 const uint8_t *in,
@@ -2707,7 +2701,9 @@ NGHTTP2_EXTERN uint32_t
  *
  * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
  *     The |next_stream_id| is strictly less than the value
- *     `nghttp2_session_get_next_stream_id()` returns.
+ *     `nghttp2_session_get_next_stream_id()` returns; or
+ *     |next_stream_id| is invalid (e.g., even integer for client, or
+ *     odd integer for server).
  */
 NGHTTP2_EXTERN int nghttp2_session_set_next_stream_id(nghttp2_session *session,
                                                       int32_t next_stream_id);
@@ -2928,13 +2924,13 @@ nghttp2_priority_spec_check_default(const nghttp2_priority_spec *pri_spec);
  * If |data_prd| is not ``NULL``, it provides data which will be sent
  * in subsequent DATA frames.  In this case, a method that allows
  * request message bodies
- * (http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9) must
- * be specified with ``:method`` key in |nva| (e.g. ``POST``).  This
- * function does not take ownership of the |data_prd|.  The function
- * copies the members of the |data_prd|.  If |data_prd| is ``NULL``,
- * HEADERS have END_STREAM set.  The |stream_user_data| is data
- * associated to the stream opened by this request and can be an
- * arbitrary pointer, which can be retrieved later by
+ * (https://tools.ietf.org/html/rfc7231#section-4) must be specified
+ * with ``:method`` key in |nva| (e.g. ``POST``).  This function does
+ * not take ownership of the |data_prd|.  The function copies the
+ * members of the |data_prd|.  If |data_prd| is ``NULL``, HEADERS have
+ * END_STREAM set.  The |stream_user_data| is data associated to the
+ * stream opened by this request and can be an arbitrary pointer,
+ * which can be retrieved later by
  * `nghttp2_session_get_stream_user_data()`.
  *
  * This function returns assigned stream ID if it succeeds, or one of
@@ -3467,20 +3463,6 @@ NGHTTP2_EXTERN int nghttp2_submit_window_update(nghttp2_session *session,
                                                 int32_t stream_id,
                                                 int32_t window_size_increment);
 
-/**
- * @function
- *
- * This function previously submits ALTSVC frame with given
- * parameters, but is deprecated and will be removed in a future
- * release.  This function does nothing and just return 0.
- */
-NGHTTP2_EXTERN int
-nghttp2_submit_altsvc(nghttp2_session *session, uint8_t flags,
-                      int32_t stream_id, uint32_t max_age, uint16_t port,
-                      const uint8_t *protocol_id, size_t protocol_id_len,
-                      const uint8_t *host, size_t host_len,
-                      const uint8_t *origin, size_t origin_len);
-
 /**
  * @function
  *
@@ -3499,14 +3481,14 @@ NGHTTP2_EXTERN int nghttp2_nv_compare_name(const nghttp2_nv *lhs,
  * A helper function for dealing with NPN in client side or ALPN in
  * server side.  The |in| contains peer's protocol list in preferable
  * order.  The format of |in| is length-prefixed and not
- * null-terminated.  For example, ``HTTP-draft-04/2.0`` and
+ * null-terminated.  For example, ``h2`` and
  * ``http/1.1`` stored in |in| like this::
  *
- *     in[0] = 17
- *     in[1..17] = "HTTP-draft-04/2.0"
- *     in[18] = 8
- *     in[19..26] = "http/1.1"
- *     inlen = 27
+ *     in[0] = 2
+ *     in[1..2] = "h2"
+ *     in[3] = 8
+ *     in[4..11] = "http/1.1"
+ *     inlen = 12
  *
  * The selection algorithm is as follows:
  *
@@ -3520,12 +3502,10 @@ NGHTTP2_EXTERN int nghttp2_nv_compare_name(const nghttp2_nv *lhs,
  *    non-overlap case).  In this case, |out| and |outlen| are left
  *    untouched.
  *
- * Selecting ``HTTP-draft-04/2.0`` means that ``HTTP-draft-04/2.0`` is
- * written into |*out| and its length (which is 17) is assigned to
- * |*outlen|.
+ * Selecting ``h2`` means that ``h2`` is written into |*out| and its
+ * length (which is 2) is assigned to |*outlen|.
  *
- * For ALPN, refer to
- * https://tools.ietf.org/html/draft-ietf-tls-applayerprotoneg-05
+ * For ALPN, refer to https://tools.ietf.org/html/rfc7301
  *
  * See http://technotes.googlecode.com/git/nextprotoneg.html for more
  * details about NPN.
@@ -3541,7 +3521,10 @@ NGHTTP2_EXTERN int nghttp2_nv_compare_name(const nghttp2_nv *lhs,
  *     {
  *         int rv;
  *         rv = nghttp2_select_next_protocol(out, outlen, in, inlen);
- *         if(rv == 1) {
+ *         if (rv == -1) {
+ *             return SSL_TLSEXT_ERR_NOACK;
+ *         }
+ *         if (rv == 1) {
  *             ((MyType*)arg)->http2_selected = 1;
  *         }
  *         return SSL_TLSEXT_ERR_OK;
@@ -3572,7 +3555,7 @@ NGHTTP2_EXTERN nghttp2_info *nghttp2_version(int least_version);
  * Returns nonzero if the :type:`nghttp2_error` library error code
  * |lib_error| is fatal.
  */
-NGHTTP2_EXTERN int nghttp2_is_fatal(int lib_error);
+NGHTTP2_EXTERN int nghttp2_is_fatal(int lib_error_code);
 
 /**
  * @function

lib/nghttp2_buf.c

@@ -320,7 +320,7 @@ int nghttp2_bufs_add(nghttp2_bufs *bufs, const void *data, size_t len) {
     }
 
     buf->last = nghttp2_cpymem(buf->last, p, nwrite);
-    p += len;
+    p += nwrite;
     len -= nwrite;
   }
 
@@ -432,6 +432,24 @@ ssize_t nghttp2_bufs_remove(nghttp2_bufs *bufs, uint8_t **out) {
   return (ssize_t)len;
 }
 
+size_t nghttp2_bufs_remove_copy(nghttp2_bufs *bufs, uint8_t *out) {
+  size_t len;
+  nghttp2_buf_chain *chain;
+  nghttp2_buf *buf;
+  nghttp2_buf resbuf;
+
+  len = nghttp2_bufs_len(bufs);
+
+  nghttp2_buf_wrap_init(&resbuf, out, len);
+
+  for (chain = bufs->head; chain; chain = chain->next) {
+    buf = &chain->buf;
+    resbuf.last = nghttp2_cpymem(resbuf.last, buf->pos, nghttp2_buf_len(buf));
+  }
+
+  return len;
+}
+
 void nghttp2_bufs_reset(nghttp2_bufs *bufs) {
   nghttp2_buf_chain *chain, *ci;
   size_t k;

lib/nghttp2_buf.h

@@ -324,6 +324,17 @@ int nghttp2_bufs_orb_hold(nghttp2_bufs *bufs, uint8_t b);
  */
 ssize_t nghttp2_bufs_remove(nghttp2_bufs *bufs, uint8_t **out);
 
+/*
+ * Copies all data stored in |bufs| to |out|.  This function assumes
+ * that the buffer space pointed by |out| has at least
+ * nghttp2_bufs(bufs) bytes.
+ *
+ * The contents of |bufs| is left unchanged.
+ *
+ * This function returns the length of copied data.
+ */
+size_t nghttp2_bufs_remove_copy(nghttp2_bufs *bufs, uint8_t *out);
+
 /*
  * Resets |bufs| and makes the buffers empty.
  */

lib/nghttp2_frame.h

@@ -75,7 +75,7 @@
 #define NGHTTP2_MAX_PADLEN 256
 
 /* Union of extension frame payload */
-typedef union { nghttp2_ext_altsvc altsvc; } nghttp2_ext_frame_payload;
+typedef union { int dummy; } nghttp2_ext_frame_payload;
 
 void nghttp2_frame_pack_frame_hd(uint8_t *buf, const nghttp2_frame_hd *hd);
 

lib/nghttp2_hd.h

@@ -49,7 +49,68 @@
 #define NGHTTP2_HD_DEFAULT_MAX_DEFLATE_BUFFER_SIZE (1 << 12)
 
 /* Exported for unit test */
-extern const size_t NGHTTP2_STATIC_TABLE_LENGTH;
+#define NGHTTP2_STATIC_TABLE_LENGTH 61
+
+/* Generated by genlibtokenlookup.py */
+typedef enum {
+  NGHTTP2_TOKEN__AUTHORITY = 0,
+  NGHTTP2_TOKEN__METHOD = 1,
+  NGHTTP2_TOKEN__PATH = 3,
+  NGHTTP2_TOKEN__SCHEME = 5,
+  NGHTTP2_TOKEN__STATUS = 7,
+  NGHTTP2_TOKEN_ACCEPT_CHARSET = 14,
+  NGHTTP2_TOKEN_ACCEPT_ENCODING = 15,
+  NGHTTP2_TOKEN_ACCEPT_LANGUAGE = 16,
+  NGHTTP2_TOKEN_ACCEPT_RANGES = 17,
+  NGHTTP2_TOKEN_ACCEPT = 18,
+  NGHTTP2_TOKEN_ACCESS_CONTROL_ALLOW_ORIGIN = 19,
+  NGHTTP2_TOKEN_AGE = 20,
+  NGHTTP2_TOKEN_ALLOW = 21,
+  NGHTTP2_TOKEN_AUTHORIZATION = 22,
+  NGHTTP2_TOKEN_CACHE_CONTROL = 23,
+  NGHTTP2_TOKEN_CONTENT_DISPOSITION = 24,
+  NGHTTP2_TOKEN_CONTENT_ENCODING = 25,
+  NGHTTP2_TOKEN_CONTENT_LANGUAGE = 26,
+  NGHTTP2_TOKEN_CONTENT_LENGTH = 27,
+  NGHTTP2_TOKEN_CONTENT_LOCATION = 28,
+  NGHTTP2_TOKEN_CONTENT_RANGE = 29,
+  NGHTTP2_TOKEN_CONTENT_TYPE = 30,
+  NGHTTP2_TOKEN_COOKIE = 31,
+  NGHTTP2_TOKEN_DATE = 32,
+  NGHTTP2_TOKEN_ETAG = 33,
+  NGHTTP2_TOKEN_EXPECT = 34,
+  NGHTTP2_TOKEN_EXPIRES = 35,
+  NGHTTP2_TOKEN_FROM = 36,
+  NGHTTP2_TOKEN_HOST = 37,
+  NGHTTP2_TOKEN_IF_MATCH = 38,
+  NGHTTP2_TOKEN_IF_MODIFIED_SINCE = 39,
+  NGHTTP2_TOKEN_IF_NONE_MATCH = 40,
+  NGHTTP2_TOKEN_IF_RANGE = 41,
+  NGHTTP2_TOKEN_IF_UNMODIFIED_SINCE = 42,
+  NGHTTP2_TOKEN_LAST_MODIFIED = 43,
+  NGHTTP2_TOKEN_LINK = 44,
+  NGHTTP2_TOKEN_LOCATION = 45,
+  NGHTTP2_TOKEN_MAX_FORWARDS = 46,
+  NGHTTP2_TOKEN_PROXY_AUTHENTICATE = 47,
+  NGHTTP2_TOKEN_PROXY_AUTHORIZATION = 48,
+  NGHTTP2_TOKEN_RANGE = 49,
+  NGHTTP2_TOKEN_REFERER = 50,
+  NGHTTP2_TOKEN_REFRESH = 51,
+  NGHTTP2_TOKEN_RETRY_AFTER = 52,
+  NGHTTP2_TOKEN_SERVER = 53,
+  NGHTTP2_TOKEN_SET_COOKIE = 54,
+  NGHTTP2_TOKEN_STRICT_TRANSPORT_SECURITY = 55,
+  NGHTTP2_TOKEN_TRANSFER_ENCODING = 56,
+  NGHTTP2_TOKEN_USER_AGENT = 57,
+  NGHTTP2_TOKEN_VARY = 58,
+  NGHTTP2_TOKEN_VIA = 59,
+  NGHTTP2_TOKEN_WWW_AUTHENTICATE = 60,
+  NGHTTP2_TOKEN_TE,
+  NGHTTP2_TOKEN_CONNECTION,
+  NGHTTP2_TOKEN_KEEP_ALIVE,
+  NGHTTP2_TOKEN_PROXY_CONNECTION,
+  NGHTTP2_TOKEN_UPGRADE
+} nghttp2_token;
 
 typedef enum {
   NGHTTP2_HD_FLAG_NONE = 0,
@@ -67,18 +128,14 @@ typedef enum {
 
 typedef struct {
   nghttp2_nv nv;
-  uint32_t name_hash;
-  uint32_t value_hash;
+  /* nghttp2_token value for nv.name.  It could be -1 if we have no
+     token for that header field name. */
+  int token;
   /* Reference count */
   uint8_t ref;
   uint8_t flags;
 } nghttp2_hd_entry;
 
-typedef struct {
-  nghttp2_hd_entry ent;
-  size_t index;
-} nghttp2_hd_static_entry;
-
 typedef struct {
   nghttp2_hd_entry **buffer;
   size_t mask;
@@ -107,6 +164,12 @@ typedef enum {
   NGHTTP2_HD_STATE_READ_VALUE
 } nghttp2_hd_inflate_state;
 
+typedef enum {
+  NGHTTP2_HD_WITH_INDEXING,
+  NGHTTP2_HD_WITHOUT_INDEXING,
+  NGHTTP2_HD_NEVER_INDEXING
+} nghttp2_hd_indexing_mode;
+
 typedef struct {
   /* dynamic header table */
   nghttp2_hd_ringbuf hd_table;
@@ -176,9 +239,8 @@ struct nghttp2_hd_inflater {
  * 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.  The |name_hash| and |value_hash| are hash
- * value for |name| and |value| respectively.  The hash function is
- * defined in nghttp2_hd.c.
+ * |valuelen| is copied.  The |token| is enum number looked up by
+ * |name|.  It could be -1 if we don't have that enum value.
  *
  * This function returns 0 if it succeeds, or one of the following
  * negative error codes:
@@ -188,8 +250,7 @@ struct nghttp2_hd_inflater {
  */
 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);
+                          int token, nghttp2_mem *mem);
 
 void nghttp2_hd_entry_free(nghttp2_hd_entry *ent, nghttp2_mem *mem);
 
@@ -271,13 +332,25 @@ int nghttp2_hd_inflate_init(nghttp2_hd_inflater *inflater, nghttp2_mem *mem);
  */
 void nghttp2_hd_inflate_free(nghttp2_hd_inflater *inflater);
 
+/*
+ * Similar to nghttp2_hd_inflate_hd(), but this takes additional
+ * output parameter |token|.  On successful header emission, it
+ * contains nghttp2_token value for nv_out->name.  It could be -1 if
+ * we don't have enum value for the name.  Other than that return
+ * values and semantics are the same as nghttp2_hd_inflate_hd().
+ */
+ssize_t nghttp2_hd_inflate_hd2(nghttp2_hd_inflater *inflater,
+                               nghttp2_nv *nv_out, int *inflate_flags,
+                               int *token, uint8_t *in, size_t inlen,
+                               int in_final);
+
 /* For unittesting purpose */
 int nghttp2_hd_emit_indname_block(nghttp2_bufs *bufs, size_t index,
-                                  nghttp2_nv *nv, int inc_indexing);
+                                  nghttp2_nv *nv, int indexing_mode);
 
 /* For unittesting purpose */
 int nghttp2_hd_emit_newname_block(nghttp2_bufs *bufs, nghttp2_nv *nv,
-                                  int inc_indexing);
+                                  int indexing_mode);
 
 /* For unittesting purpose */
 int nghttp2_hd_emit_table_size(nghttp2_bufs *bufs, size_t table_size);

lib/nghttp2_hd_huffman.c

@@ -168,10 +168,27 @@ void nghttp2_hd_huff_decode_context_init(nghttp2_hd_huff_decode_context *ctx) {
   ctx->accept = 1;
 }
 
+/* Use macro to make the code simpler..., but error case is tricky.
+   We spent most of the CPU in decoding, so we are doing this
+   thing. */
+#define hd_huff_decode_sym_emit(bufs, sym, avail)                              \
+  do {                                                                         \
+    if ((avail)) {                                                             \
+      nghttp2_bufs_fast_addb((bufs), (sym));                                   \
+      --(avail);                                                               \
+    } else {                                                                   \
+      rv = nghttp2_bufs_addb((bufs), (sym));                                   \
+      if (rv != 0) {                                                           \
+        return rv;                                                             \
+      }                                                                        \
+      (avail) = nghttp2_bufs_cur_avail((bufs));                                \
+    }                                                                          \
+  } while (0)
+
 ssize_t nghttp2_hd_huff_decode(nghttp2_hd_huff_decode_context *ctx,
                                nghttp2_bufs *bufs, const uint8_t *src,
                                size_t srclen, int final) {
-  size_t i, j;
+  size_t i;
   int rv;
   size_t avail;
 
@@ -180,30 +197,28 @@ ssize_t nghttp2_hd_huff_decode(nghttp2_hd_huff_decode_context *ctx,
   /* We use the decoding algorithm described in
      http://graphics.ics.uci.edu/pub/Prefix.pdf */
   for (i = 0; i < srclen; ++i) {
-    uint8_t in = src[i] >> 4;
-    for (j = 0; j < 2; ++j) {
     const nghttp2_huff_decode *t;
 
-      t = &huff_decode_table[ctx->state][in];
+    t = &huff_decode_table[ctx->state][src[i] >> 4];
     if (t->flags & NGHTTP2_HUFF_FAIL) {
       return NGHTTP2_ERR_HEADER_COMP;
     }
     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;
+      /* this is macro, and may return from this function on error */
+      hd_huff_decode_sym_emit(bufs, t->sym, avail);
     }
-          avail = nghttp2_bufs_cur_avail(bufs);
+
+    t = &huff_decode_table[t->state][src[i] & 0xf];
+    if (t->flags & NGHTTP2_HUFF_FAIL) {
+      return NGHTTP2_ERR_HEADER_COMP;
     }
+    if (t->flags & NGHTTP2_HUFF_SYM) {
+      /* this is macro, and may return from this function on error */
+      hd_huff_decode_sym_emit(bufs, t->sym, avail);
     }
+
     ctx->state = t->state;
     ctx->accept = (t->flags & NGHTTP2_HUFF_ACCEPTED) != 0;
-      in = src[i] & 0xf;
-    }
   }
   if (final && !ctx->accept) {
     return NGHTTP2_ERR_HEADER_COMP;

lib/nghttp2_helper.c

@@ -297,12 +297,18 @@ const char *nghttp2_strerror(int error_code) {
     return "The current session is closing";
   case NGHTTP2_ERR_HTTP_HEADER:
     return "Invalid HTTP header field was received";
+  case NGHTTP2_ERR_HTTP_MESSAGING:
+    return "Violation in HTTP messaging rule";
+  case NGHTTP2_ERR_REFUSED_STREAM:
+    return "Stream was refused";
+  case NGHTTP2_ERR_INTERNAL:
+    return "Internal error";
   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";
+  case NGHTTP2_ERR_BAD_CLIENT_MAGIC:
+    return "Received bad clinet magic byte string";
   default:
     return "Unknown error code";
   }

lib/nghttp2_helper.h

@@ -29,12 +29,16 @@
 #include <config.h>
 #endif /* HAVE_CONFIG_H */
 
+#include <string.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))
 
+#define lstreq(A, B, N) ((sizeof((A)) - 1) == (N) && memcmp((A), (B), (N)) == 0)
+
 /*
  * Copies 2 byte unsigned integer |n| in host byte order to |buf| in
  * network byte order.

lib/nghttp2_http.c

@@ -28,11 +28,8 @@
 #include <assert.h>
 #include <stdio.h>
 
-static int memeq(const void *a, const void *b, size_t n) {
-  return memcmp(a, b, n) == 0;
-}
-
-#define streq(A, B, N) ((sizeof((A)) - 1) == (N) && memeq((A), (B), (N)))
+#include "nghttp2_hd.h"
+#include "nghttp2_helper.h"
 
 static char downcase(char c) {
   return 'A' <= c && c <= 'Z' ? (c - 'A' + 'a') : c;
@@ -50,129 +47,7 @@ static int memieq(const void *a, const void *b, size_t n) {
   return 1;
 }
 
-#define strieq(A, B, N) ((sizeof((A)) - 1) == (N) && memieq((A), (B), (N)))
-
-typedef enum {
-  NGHTTP2_TOKEN__AUTHORITY,
-  NGHTTP2_TOKEN__METHOD,
-  NGHTTP2_TOKEN__PATH,
-  NGHTTP2_TOKEN__SCHEME,
-  NGHTTP2_TOKEN__STATUS,
-  NGHTTP2_TOKEN_CONNECTION,
-  NGHTTP2_TOKEN_CONTENT_LENGTH,
-  NGHTTP2_TOKEN_HOST,
-  NGHTTP2_TOKEN_KEEP_ALIVE,
-  NGHTTP2_TOKEN_PROXY_CONNECTION,
-  NGHTTP2_TOKEN_TE,
-  NGHTTP2_TOKEN_TRANSFER_ENCODING,
-  NGHTTP2_TOKEN_UPGRADE,
-  NGHTTP2_TOKEN_MAXIDX,
-} nghttp2_token;
-
-/*
- * This function was generated by genlibtokenlookup.py.  Inspired by
- * h2o header lookup.  https://github.com/h2o/h2o
- */
-static int lookup_token(const uint8_t *name, size_t namelen) {
-  switch (namelen) {
-  case 2:
-    switch (name[1]) {
-    case 'e':
-      if (streq("t", name, 1)) {
-        return NGHTTP2_TOKEN_TE;
-      }
-      break;
-    }
-    break;
-  case 4:
-    switch (name[3]) {
-    case 't':
-      if (streq("hos", name, 3)) {
-        return NGHTTP2_TOKEN_HOST;
-      }
-      break;
-    }
-    break;
-  case 5:
-    switch (name[4]) {
-    case 'h':
-      if (streq(":pat", name, 4)) {
-        return NGHTTP2_TOKEN__PATH;
-      }
-      break;
-    }
-    break;
-  case 7:
-    switch (name[6]) {
-    case 'd':
-      if (streq(":metho", name, 6)) {
-        return NGHTTP2_TOKEN__METHOD;
-      }
-      break;
-    case 'e':
-      if (streq(":schem", name, 6)) {
-        return NGHTTP2_TOKEN__SCHEME;
-      }
-      if (streq("upgrad", name, 6)) {
-        return NGHTTP2_TOKEN_UPGRADE;
-      }
-      break;
-    case 's':
-      if (streq(":statu", name, 6)) {
-        return NGHTTP2_TOKEN__STATUS;
-      }
-      break;
-    }
-    break;
-  case 10:
-    switch (name[9]) {
-    case 'e':
-      if (streq("keep-aliv", name, 9)) {
-        return NGHTTP2_TOKEN_KEEP_ALIVE;
-      }
-      break;
-    case 'n':
-      if (streq("connectio", name, 9)) {
-        return NGHTTP2_TOKEN_CONNECTION;
-      }
-      break;
-    case 'y':
-      if (streq(":authorit", name, 9)) {
-        return NGHTTP2_TOKEN__AUTHORITY;
-      }
-      break;
-    }
-    break;
-  case 14:
-    switch (name[13]) {
-    case 'h':
-      if (streq("content-lengt", name, 13)) {
-        return NGHTTP2_TOKEN_CONTENT_LENGTH;
-      }
-      break;
-    }
-    break;
-  case 16:
-    switch (name[15]) {
-    case 'n':
-      if (streq("proxy-connectio", name, 15)) {
-        return NGHTTP2_TOKEN_PROXY_CONNECTION;
-      }
-      break;
-    }
-    break;
-  case 17:
-    switch (name[16]) {
-    case 'g':
-      if (streq("transfer-encodin", name, 16)) {
-        return NGHTTP2_TOKEN_TRANSFER_ENCODING;
-      }
-      break;
-    }
-    break;
-  }
-  return -1;
-}
+#define lstrieq(A, B, N) ((sizeof((A)) - 1) == (N) && memieq((A), (B), (N)))
 
 static int64_t parse_uint(const uint8_t *s, size_t len) {
   int64_t n = 0;
@@ -238,9 +113,7 @@ static int check_path(nghttp2_stream *stream) {
 }
 
 static int http_request_on_header(nghttp2_stream *stream, nghttp2_nv *nv,
-                                  int trailer) {
-  int token;
-
+                                  int token, int trailer) {
   if (nv->name[0] == ':') {
     if (trailer ||
         (stream->http_flags & NGHTTP2_HTTP_FLAG_PSEUDO_HEADER_DISALLOWED)) {
@@ -248,8 +121,6 @@ static int http_request_on_header(nghttp2_stream *stream, nghttp2_nv *nv,
     }
   }
 
-  token = lookup_token(nv->name, nv->namelen);
-
   switch (token) {
   case NGHTTP2_TOKEN__AUTHORITY:
     if (!check_pseudo_header(stream, nv, NGHTTP2_HTTP_FLAG__AUTHORITY)) {
@@ -262,14 +133,14 @@ static int http_request_on_header(nghttp2_stream *stream, nghttp2_nv *nv,
     }
     switch (nv->valuelen) {
     case 4:
-      if (streq("HEAD", nv->value, nv->valuelen)) {
+      if (lstreq("HEAD", nv->value, nv->valuelen)) {
         stream->http_flags |= NGHTTP2_HTTP_FLAG_METH_HEAD;
       }
       break;
     case 7:
       switch (nv->value[6]) {
       case 'T':
-        if (streq("CONNECT", nv->value, nv->valuelen)) {
+        if (lstreq("CONNECT", nv->value, nv->valuelen)) {
           if (stream->stream_id % 2 == 0) {
             /* we won't allow CONNECT for push */
             return NGHTTP2_ERR_HTTP_HEADER;
@@ -282,7 +153,7 @@ static int http_request_on_header(nghttp2_stream *stream, nghttp2_nv *nv,
         }
         break;
       case 'S':
-        if (streq("OPTIONS", nv->value, nv->valuelen)) {
+        if (lstreq("OPTIONS", nv->value, nv->valuelen)) {
           stream->http_flags |= NGHTTP2_HTTP_FLAG_METH_OPTIONS;
         }
         break;
@@ -338,7 +209,7 @@ static int http_request_on_header(nghttp2_stream *stream, nghttp2_nv *nv,
   case NGHTTP2_TOKEN_UPGRADE:
     return NGHTTP2_ERR_HTTP_HEADER;
   case NGHTTP2_TOKEN_TE:
-    if (!strieq("trailers", nv->value, nv->valuelen)) {
+    if (!lstrieq("trailers", nv->value, nv->valuelen)) {
       return NGHTTP2_ERR_HTTP_HEADER;
     }
     break;
@@ -356,9 +227,7 @@ static int http_request_on_header(nghttp2_stream *stream, nghttp2_nv *nv,
 }
 
 static int http_response_on_header(nghttp2_stream *stream, nghttp2_nv *nv,
-                                   int trailer) {
-  int token;
-
+                                   int token, int trailer) {
   if (nv->name[0] == ':') {
     if (trailer ||
         (stream->http_flags & NGHTTP2_HTTP_FLAG_PSEUDO_HEADER_DISALLOWED)) {
@@ -366,8 +235,6 @@ static int http_response_on_header(nghttp2_stream *stream, nghttp2_nv *nv,
     }
   }
 
-  token = lookup_token(nv->name, nv->namelen);
-
   switch (token) {
   case NGHTTP2_TOKEN__STATUS: {
     if (!check_pseudo_header(stream, nv, NGHTTP2_HTTP_FLAG__STATUS)) {
@@ -400,7 +267,7 @@ static int http_response_on_header(nghttp2_stream *stream, nghttp2_nv *nv,
   case NGHTTP2_TOKEN_UPGRADE:
     return NGHTTP2_ERR_HTTP_HEADER;
   case NGHTTP2_TOKEN_TE:
-    if (!strieq("trailers", nv->value, nv->valuelen)) {
+    if (!lstrieq("trailers", nv->value, nv->valuelen)) {
       return NGHTTP2_ERR_HTTP_HEADER;
     }
     break;
@@ -418,7 +285,8 @@ static int http_response_on_header(nghttp2_stream *stream, nghttp2_nv *nv,
 }
 
 int nghttp2_http_on_header(nghttp2_session *session, nghttp2_stream *stream,
-                           nghttp2_frame *frame, nghttp2_nv *nv, int trailer) {
+                           nghttp2_frame *frame, nghttp2_nv *nv, int token,
+                           int trailer) {
   /* We are strict for pseudo header field.  One bad character should
      lead to fail.  OTOH, we should be a bit forgiving for regular
      headers, since existing public internet has so much illegal
@@ -458,10 +326,10 @@ int nghttp2_http_on_header(nghttp2_session *session, nghttp2_stream *stream,
   }
 
   if (session->server || frame->hd.type == NGHTTP2_PUSH_PROMISE) {
-    return http_request_on_header(stream, nv, trailer);
+    return http_request_on_header(stream, nv, token, trailer);
   }
 
-  return http_response_on_header(stream, nv, trailer);
+  return http_response_on_header(stream, nv, token, trailer);
 }
 
 int nghttp2_http_on_request_headers(nghttp2_stream *stream,
@@ -574,14 +442,15 @@ void nghttp2_http_record_request_method(nghttp2_stream *stream,
   /* TODO we should do this strictly. */
   for (i = 0; i < nvlen; ++i) {
     const nghttp2_nv *nv = &nva[i];
-    if (lookup_token(nv->name, nv->namelen) != NGHTTP2_TOKEN__METHOD) {
+    if (!(nv->namelen == 7 && nv->name[6] == 'd' &&
+          memcmp(":metho", nv->name, nv->namelen - 1) == 0)) {
       continue;
     }
-    if (streq("CONNECT", nv->value, nv->valuelen)) {
+    if (lstreq("CONNECT", nv->value, nv->valuelen)) {
       stream->http_flags |= NGHTTP2_HTTP_FLAG_METH_CONNECT;
       return;
     }
-    if (streq("HEAD", nv->value, nv->valuelen)) {
+    if (lstreq("HEAD", nv->value, nv->valuelen)) {
       stream->http_flags |= NGHTTP2_HTTP_FLAG_METH_HEAD;
       return;
     }

lib/nghttp2_http.h

@@ -36,7 +36,8 @@
 /*
  * This function is called when HTTP header field |nv| in |frame| is
  * received for |stream|.  This function will validate |nv| against
- * the current state of stream.
+ * the current state of stream.  The |token| is nghttp2_token value
+ * for nv->name, or -1 if we don't have enum value for the name.
  *
  * This function returns 0 if it succeeds, or one of the following
  * negative error codes:
@@ -48,7 +49,8 @@
  *     if it was not received because of compatibility reasons.
  */
 int nghttp2_http_on_header(nghttp2_session *session, nghttp2_stream *stream,
-                           nghttp2_frame *frame, nghttp2_nv *nv, int trailer);
+                           nghttp2_frame *frame, nghttp2_nv *nv, int token,
+                           int trailer);
 
 /*
  * This function is called when request header is received.  This

lib/nghttp2_int.h

@@ -39,7 +39,8 @@
   } while (0)
 #endif
 
-typedef int (*nghttp2_compar)(const void *lhs, const void *rhs);
+/* "less" function, return nonzero if |lhs| is less than |rhs|. */
+typedef int (*nghttp2_less)(const void *lhs, const void *rhs);
 
 /* Internal error code. They must be in the range [-499, -100],
    inclusive. */
@@ -51,7 +52,7 @@ typedef enum {
    * Invalid HTTP header field was received but it can be treated as
    * if it was not received because of compatibility reasons.
    */
-  NGHTTP2_ERR_IGN_HTTP_HEADER = -105,
+  NGHTTP2_ERR_IGN_HTTP_HEADER = -105
 } nghttp2_internal_error;
 
 #endif /* NGHTTP2_INT_H */

lib/nghttp2_option.c

@@ -47,9 +47,9 @@ void nghttp2_option_set_peer_max_concurrent_streams(nghttp2_option *option,
   option->peer_max_concurrent_streams = val;
 }
 
-void nghttp2_option_set_recv_client_preface(nghttp2_option *option, int val) {
-  option->opt_set_mask |= NGHTTP2_OPT_RECV_CLIENT_PREFACE;
-  option->recv_client_preface = val;
+void nghttp2_option_set_no_recv_client_magic(nghttp2_option *option, int val) {
+  option->opt_set_mask |= NGHTTP2_OPT_NO_RECV_CLIENT_MAGIC;
+  option->no_recv_client_magic = val;
 }
 
 void nghttp2_option_set_no_http_messaging(nghttp2_option *option, int val) {

lib/nghttp2_option.h

@@ -57,8 +57,8 @@ typedef enum {
    * SETTINGS_MAX_CONCURRENT_STREAMS from the remote endpoint.
    */
   NGHTTP2_OPT_PEER_MAX_CONCURRENT_STREAMS = 1 << 1,
-  NGHTTP2_OPT_RECV_CLIENT_PREFACE = 1 << 2,
-  NGHTTP2_OPT_NO_HTTP_MESSAGING = 1 << 3,
+  NGHTTP2_OPT_NO_RECV_CLIENT_MAGIC = 1 << 2,
+  NGHTTP2_OPT_NO_HTTP_MESSAGING = 1 << 3
 } nghttp2_option_flag;
 
 /**
@@ -79,9 +79,9 @@ struct nghttp2_option {
    */
   uint8_t no_auto_window_update;
   /**
-   * NGHTTP2_OPT_RECV_CLIENT_PREFACE
+   * NGHTTP2_OPT_NO_RECV_CLIENT_MAGIC
    */
-  uint8_t recv_client_preface;
+  uint8_t no_recv_client_magic;
   /**
    * NGHTTP2_OPT_NO_HTTP_MESSAGING
    */

lib/nghttp2_outbound_item.c

@@ -25,6 +25,15 @@
 #include "nghttp2_outbound_item.h"
 
 #include <assert.h>
+#include <string.h>
+
+void nghttp2_outbound_item_init(nghttp2_outbound_item *item) {
+  item->cycle = 0;
+  item->qnext = NULL;
+  item->queued = 0;
+
+  memset(&item->aux_data, 0, sizeof(nghttp2_aux_data));
+}
 
 void nghttp2_outbound_item_free(nghttp2_outbound_item *item, nghttp2_mem *mem) {
   nghttp2_frame *frame;
@@ -65,3 +74,32 @@ void nghttp2_outbound_item_free(nghttp2_outbound_item *item, nghttp2_mem *mem) {
     break;
   }
 }
+
+void nghttp2_outbound_queue_init(nghttp2_outbound_queue *q) {
+  q->head = q->tail = NULL;
+  q->n = 0;
+}
+
+void nghttp2_outbound_queue_push(nghttp2_outbound_queue *q,
+                                 nghttp2_outbound_item *item) {
+  if (q->tail) {
+    q->tail = q->tail->qnext = item;
+  } else {
+    q->head = q->tail = item;
+  }
+  ++q->n;
+}
+
+void nghttp2_outbound_queue_pop(nghttp2_outbound_queue *q) {
+  nghttp2_outbound_item *item;
+  if (!q->head) {
+    return;
+  }
+  item = q->head;
+  q->head = q->head->qnext;
+  item->qnext = NULL;
+  if (!q->head) {
+    q->tail = NULL;
+  }
+  --q->n;
+}

lib/nghttp2_outbound_item.h

@@ -33,13 +33,6 @@
 #include "nghttp2_frame.h"
 #include "nghttp2_mem.h"
 
-/* A bit higher weight for non-DATA frames */
-#define NGHTTP2_OB_EX_WEIGHT 300
-/* Higher weight for SETTINGS */
-#define NGHTTP2_OB_SETTINGS_WEIGHT 301
-/* Highest weight for PING */
-#define NGHTTP2_OB_PING_WEIGHT 302
-
 /* struct used for HEADERS and PUSH_PROMISE frame */
 typedef struct {
   nghttp2_data_provider data_prd;
@@ -88,7 +81,7 @@ typedef enum {
   /* indicates that this GOAWAY is just a notification for graceful
      shutdown.  No nghttp2_session.goaway_flags should be updated on
      the reaction to this frame. */
-  NGHTTP2_GOAWAY_AUX_SHUTDOWN_NOTICE = 0x2,
+  NGHTTP2_GOAWAY_AUX_SHUTDOWN_NOTICE = 0x2
 } nghttp2_goaway_aux_flag;
 
 /* struct used for GOAWAY frame */
@@ -104,19 +97,31 @@ typedef union {
   nghttp2_goaway_aux_data goaway;
 } nghttp2_aux_data;
 
-typedef struct {
+struct nghttp2_outbound_item;
+typedef struct nghttp2_outbound_item nghttp2_outbound_item;
+
+struct nghttp2_outbound_item {
   nghttp2_frame frame;
   nghttp2_aux_data aux_data;
-  int64_t seq;
-  /* Reset count of weight. See comment for last_cycle in
-     nghttp2_session.h */
+  /* The priority used in priority comparion.  Smaller is served
+     ealier.  For PING, SETTINGS and non-DATA frames (excluding
+     response HEADERS frame) have dedicated cycle value defined above.
+     For DATA frame, cycle is computed by taking into account of
+     effective weight and frame payload length previously sent, so
+     that the amount of transmission is distributed across streams
+     proportional to effective weight (inside a tree). */
   uint64_t cycle;
-  /* The priority used in priority comparion.  Larger is served
-     ealier. */
-  int32_t weight;
+  nghttp2_outbound_item *qnext;
   /* nonzero if this object is queued. */
   uint8_t queued;
-} nghttp2_outbound_item;
+};
+
+/*
+ * Initializes |item|.  No memory allocation is done in this function.
+ * Don't call nghttp2_outbound_item_free() until frame member is
+ * initialized.
+ */
+void nghttp2_outbound_item_init(nghttp2_outbound_item *item);
 
 /*
  * Deallocates resource for |item|. If |item| is NULL, this function
@@ -124,4 +129,29 @@ typedef struct {
  */
 void nghttp2_outbound_item_free(nghttp2_outbound_item *item, nghttp2_mem *mem);
 
+/*
+ * queue for nghttp2_outbound_item.
+ */
+typedef struct {
+  nghttp2_outbound_item *head, *tail;
+  /* number of items in this queue. */
+  size_t n;
+} nghttp2_outbound_queue;
+
+void nghttp2_outbound_queue_init(nghttp2_outbound_queue *q);
+
+/* Pushes |item| into |q| */
+void nghttp2_outbound_queue_push(nghttp2_outbound_queue *q,
+                                 nghttp2_outbound_item *item);
+
+/* Pops |item| at the top from |q|.  If |q| is empty, nothing
+   happens. */
+void nghttp2_outbound_queue_pop(nghttp2_outbound_queue *q);
+
+/* Returns the top item. */
+#define nghttp2_outbound_queue_top(Q) ((Q)->head)
+
+/* Returns the size of the queue */
+#define nghttp2_outbound_queue_size(Q) ((Q)->n)
+
 #endif /* NGHTTP2_OUTBOUND_ITEM_H */

lib/nghttp2_pq.c

@@ -24,7 +24,7 @@
  */
 #include "nghttp2_pq.h"
 
-int nghttp2_pq_init(nghttp2_pq *pq, nghttp2_compar compar, nghttp2_mem *mem) {
+int nghttp2_pq_init(nghttp2_pq *pq, nghttp2_less less, nghttp2_mem *mem) {
   pq->mem = mem;
   pq->capacity = 128;
   pq->q = nghttp2_mem_malloc(mem, pq->capacity * sizeof(void *));
@@ -32,7 +32,7 @@ int nghttp2_pq_init(nghttp2_pq *pq, nghttp2_compar compar, nghttp2_mem *mem) {
     return NGHTTP2_ERR_NOMEM;
   }
   pq->length = 0;
-  pq->compar = compar;
+  pq->less = less;
   return 0;
 }
 
@@ -52,7 +52,7 @@ static void bubble_up(nghttp2_pq *pq, size_t index) {
     return;
   } else {
     size_t parent = (index - 1) / 2;
-    if (pq->compar(pq->q[parent], pq->q[index]) > 0) {
+    if (pq->less(pq->q[index], pq->q[parent])) {
       swap(pq, parent, index);
       bubble_up(pq, parent);
     }
@@ -93,7 +93,7 @@ static void bubble_down(nghttp2_pq *pq, size_t index) {
     if (j >= pq->length) {
       break;
     }
-    if (pq->compar(pq->q[minindex], pq->q[j]) > 0) {
+    if (pq->less(pq->q[j], pq->q[minindex])) {
       minindex = j;
     }
   }

lib/nghttp2_pq.h

@@ -45,8 +45,8 @@ typedef struct {
   /* The maximum number of items this pq can store. This is
      automatically extended when length is reached to this value. */
   size_t capacity;
-  /* The compare function between items */
-  nghttp2_compar compar;
+  /* The less function between items */
+  nghttp2_less less;
 } nghttp2_pq;
 
 /*
@@ -58,7 +58,7 @@ typedef struct {
  * NGHTTP2_ERR_NOMEM
  *     Out of memory.
  */
-int nghttp2_pq_init(nghttp2_pq *pq, nghttp2_compar cmp, nghttp2_mem *mem);
+int nghttp2_pq_init(nghttp2_pq *pq, nghttp2_less less, nghttp2_mem *mem);
 
 /*
  * Deallocates any resources allocated for |pq|.  The stored items are

lib/nghttp2_session.h

@@ -46,14 +46,15 @@
  */
 typedef enum {
   NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE = 1 << 0,
-  NGHTTP2_OPTMASK_RECV_CLIENT_PREFACE = 1 << 1,
-  NGHTTP2_OPTMASK_NO_HTTP_MESSAGING = 1 << 2,
+  NGHTTP2_OPTMASK_NO_RECV_CLIENT_MAGIC = 1 << 1,
+  NGHTTP2_OPTMASK_NO_HTTP_MESSAGING = 1 << 2
 } nghttp2_optmask;
 
 typedef enum {
   NGHTTP2_OB_POP_ITEM,
   NGHTTP2_OB_SEND_DATA,
-  NGHTTP2_OB_SEND_NO_COPY
+  NGHTTP2_OB_SEND_NO_COPY,
+  NGHTTP2_OB_SEND_CLIENT_MAGIC
 } nghttp2_outbound_state;
 
 typedef struct {
@@ -69,7 +70,7 @@ typedef struct {
 /* Internal state when receiving incoming frame */
 typedef enum {
   /* Receiving frame header */
-  NGHTTP2_IB_READ_CLIENT_PREFACE,
+  NGHTTP2_IB_READ_CLIENT_MAGIC,
   NGHTTP2_IB_READ_FIRST_SETTINGS,
   NGHTTP2_IB_READ_HEAD,
   NGHTTP2_IB_READ_NBYTE,
@@ -84,7 +85,7 @@ typedef enum {
   NGHTTP2_IB_READ_PAD_DATA,
   NGHTTP2_IB_READ_DATA,
   NGHTTP2_IB_IGN_DATA,
-  NGHTTP2_IB_IGN_ALL,
+  NGHTTP2_IB_IGN_ALL
 } nghttp2_inbound_state;
 
 #define NGHTTP2_INBOUND_NUM_IV 7
@@ -136,18 +137,21 @@ typedef enum {
   /* Flag means GOAWAY was sent */
   NGHTTP2_GOAWAY_SENT = 0x4,
   /* Flag means GOAWAY was received */
-  NGHTTP2_GOAWAY_RECV = 0x8,
+  NGHTTP2_GOAWAY_RECV = 0x8
 } nghttp2_goaway_flag;
 
 struct nghttp2_session {
   nghttp2_map /* <nghttp2_stream*> */ streams;
   nghttp2_stream_roots roots;
-  /* Queue for outbound frames other than stream-creating HEADERS and
-     DATA */
-  nghttp2_pq /* <nghttp2_outbound_item*> */ ob_pq;
-  /* Queue for outbound stream-creating HEADERS frame */
-  nghttp2_pq /* <nghttp2_outbound_item*> */ ob_ss_pq;
-  /* QUeue for DATA frame */
+  /* Queue for outbound urgent frames (PING and SETTINGS) */
+  nghttp2_outbound_queue ob_urgent;
+  /* Queue for non-DATA frames */
+  nghttp2_outbound_queue ob_reg;
+  /* Queue for outbound stream-creating HEADERS (request or push
+     response) frame, which are subject to
+     SETTINGS_MAX_CONCURRENT_STREAMS limit. */
+  nghttp2_outbound_queue ob_syn;
+  /* Queue for DATA frame */
   nghttp2_pq /* <nghttp2_outbound_item*> */ ob_da_pq;
   nghttp2_active_outbound_item aob;
   nghttp2_inbound_frame iframe;
@@ -156,22 +160,8 @@ struct nghttp2_session {
   nghttp2_session_callbacks callbacks;
   /* Memory allocator */
   nghttp2_mem mem;
-  /* Sequence number of outbound frame to maintain the order of
-     enqueue if priority is equal. */
-  int64_t next_seq;
-  /* Reset count of nghttp2_outbound_item's weight.  We decrements
-     weight each time DATA is sent to simulate resource sharing.  We
-     use priority queue and larger weight has the precedence.  If
-     weight is reached to lowest weight, it resets to its initial
-     weight.  If this happens, other items which have the lower weight
-     currently but same initial weight cannot send DATA until item
-     having large weight is decreased.  To avoid this, we use this
-     cycle variable.  Initally, this is set to 1.  If weight gets
-     lowest weight, and if item's cycle == last_cycle, we increments
-     last_cycle and assigns it to item's cycle.  Otherwise, just
-     assign last_cycle.  In priority queue comparator, we first
-     compare items' cycle value.  Lower cycle value has the
-     precedence. */
+  /* Base value when we schedule next DATA frame write.  This is
+     updated when one frame was written. */
   uint64_t last_cycle;
   void *user_data;
   /* Points to the latest closed stream.  NULL if there is no closed
@@ -291,14 +281,6 @@ typedef struct {
 int nghttp2_session_is_my_stream_id(nghttp2_session *session,
                                     int32_t stream_id);
 
-/*
- * Initializes |item|.  No memory allocation is done in this function.
- * Don't call nghttp2_outbound_item_free() until frame member is
- * initialized.
- */
-void nghttp2_session_outbound_item_init(nghttp2_session *session,
-                                        nghttp2_outbound_item *item);
-
 /*
  * Adds |item| to the outbound queue in |session|.  When this function
  * succeeds, it takes ownership of |item|. So caller must not free it
@@ -704,13 +686,8 @@ nghttp2_stream *nghttp2_session_get_stream_raw(nghttp2_session *session,
  */
 int nghttp2_session_pack_data(nghttp2_session *session, nghttp2_bufs *bufs,
                               size_t datamax, nghttp2_frame *frame,
-                              nghttp2_data_aux_data *aux_data);
-
-/*
- * Returns top of outbound frame queue. This function returns NULL if
- * queue is empty.
- */
-nghttp2_outbound_item *nghttp2_session_get_ob_pq_top(nghttp2_session *session);
+                              nghttp2_data_aux_data *aux_data,
+                              nghttp2_stream *stream);
 
 /*
  * Pops and returns next item to send. If there is no such item,

lib/nghttp2_stream.c

@@ -63,7 +63,6 @@ void nghttp2_stream_init(nghttp2_stream *stream, int32_t stream_id,
   stream->effective_weight = stream->weight;
   stream->sum_dep_weight = 0;
   stream->sum_norest_weight = 0;
-  stream->sum_top_weight = 0;
 
   stream->roots = roots;
   stream->root_prev = NULL;
@@ -102,21 +101,26 @@ static int stream_push_item(nghttp2_stream *stream, nghttp2_session *session) {
     return 0;
   }
 
-  if (item->weight > stream->effective_weight) {
-    item->weight = stream->effective_weight;
-  }
-
-  item->cycle = session->last_cycle;
-
   switch (item->frame.hd.type) {
   case NGHTTP2_DATA:
+    /* Penalize item by delaying scheduling according to effective
+       weight.  This will delay low priority stream, which is good.
+       OTOH, this may incur delay for high priority item.  Will
+       see. */
+    item->cycle =
+        session->last_cycle +
+        NGHTTP2_DATA_PAYLOADLEN * NGHTTP2_MAX_WEIGHT / stream->effective_weight;
+
     rv = nghttp2_pq_push(&session->ob_da_pq, item);
+    if (rv != 0) {
+      return rv;
+    }
     break;
   case NGHTTP2_HEADERS:
     if (stream->state == NGHTTP2_STREAM_RESERVED) {
-      rv = nghttp2_pq_push(&session->ob_ss_pq, item);
+      nghttp2_outbound_queue_push(&session->ob_syn, item);
     } else {
-      rv = nghttp2_pq_push(&session->ob_pq, item);
+      nghttp2_outbound_queue_push(&session->ob_reg, item);
     }
     break;
   default:
@@ -124,10 +128,6 @@ static int stream_push_item(nghttp2_stream *stream, nghttp2_session *session) {
     assert(0);
   }
 
-  if (rv != 0) {
-    return rv;
-  }
-
   item->queued = 1;
 
   return 0;
@@ -178,18 +178,6 @@ int32_t nghttp2_stream_dep_distributed_effective_weight(nghttp2_stream *stream,
   return nghttp2_max(1, weight);
 }
 
-static int32_t
-stream_dep_distributed_top_effective_weight(nghttp2_stream *stream,
-                                            int32_t weight) {
-  if (stream->sum_top_weight == 0) {
-    return stream->effective_weight;
-  }
-
-  weight = stream->effective_weight * weight / stream->sum_top_weight;
-
-  return nghttp2_max(1, weight);
-}
-
 static void stream_update_dep_set_rest(nghttp2_stream *stream);
 
 /* Updates effective_weight of descendant streams in subtree of
@@ -199,10 +187,9 @@ static void stream_update_dep_effective_weight(nghttp2_stream *stream) {
   nghttp2_stream *si;
 
   DEBUGF(fprintf(stderr, "stream: update_dep_effective_weight "
-                         "stream(%p)=%d, weight=%d, sum_norest_weight=%d, "
-                         "sum_top_weight=%d\n",
+                         "stream(%p)=%d, weight=%d, sum_norest_weight=%d\n",
                  stream, stream->stream_id, stream->weight,
-                 stream->sum_norest_weight, stream->sum_top_weight));
+                 stream->sum_norest_weight));
 
   /* stream->sum_norest_weight == 0 means there is no
      NGHTTP2_STREAM_DPRI_TOP under stream */
@@ -211,47 +198,13 @@ static void stream_update_dep_effective_weight(nghttp2_stream *stream) {
     return;
   }
 
-  /* If there is no direct descendant whose dpri is
-     NGHTTP2_STREAM_DPRI_TOP, indirect descendants have the chance to
-     send data, so recursively set weight for descendants. */
-  if (stream->sum_top_weight == 0) {
   for (si = stream->dep_next; si; si = si->sib_next) {
     if (si->dpri != NGHTTP2_STREAM_DPRI_REST) {
       si->effective_weight =
           nghttp2_stream_dep_distributed_effective_weight(stream, si->weight);
-      }
 
       stream_update_dep_effective_weight(si);
     }
-    return;
-  }
-
-  /* If there is at least one direct descendant whose dpri is
-     NGHTTP2_STREAM_DPRI_TOP, we won't give a chance to indirect
-     descendants, since closed or blocked stream's weight is
-     distributed among its siblings */
-  for (si = stream->dep_next; si; si = si->sib_next) {
-    if (si->dpri == NGHTTP2_STREAM_DPRI_TOP) {
-      si->effective_weight =
-          stream_dep_distributed_top_effective_weight(stream, si->weight);
-
-      DEBUGF(fprintf(stderr, "stream: stream=%d top eweight=%d\n",
-                     si->stream_id, si->effective_weight));
-
-      continue;
-    }
-
-    if (si->dpri == NGHTTP2_STREAM_DPRI_NO_ITEM) {
-      DEBUGF(fprintf(stderr, "stream: stream=%d no_item, ignored\n",
-                     si->stream_id));
-
-      /* Since we marked NGHTTP2_STREAM_DPRI_TOP under si, we make
-         them NGHTTP2_STREAM_DPRI_REST again. */
-      stream_update_dep_set_rest(si->dep_next);
-    } else {
-      DEBUGF(
-          fprintf(stderr, "stream: stream=%d rest, ignored\n", si->stream_id));
-    }
   }
 }
 
@@ -347,25 +300,19 @@ static int stream_update_dep_queue_top(nghttp2_stream *stream,
 }
 
 /*
- * Updates stream->sum_norest_weight and stream->sum_top_weight
- * recursively.  We have to gather effective sum of weight of
- * descendants.  If stream->dpri == NGHTTP2_STREAM_DPRI_NO_ITEM, we
- * have to go deeper and check that any of its descendants has dpri
- * value of NGHTTP2_STREAM_DPRI_TOP.  If so, we have to add weight of
- * its direct descendants to stream->sum_norest_weight.  To make this
- * work, this function returns 1 if any of its descendants has dpri
- * value of NGHTTP2_STREAM_DPRI_TOP, otherwise 0.
- *
- * Calculating stream->sum_top-weight is very simple compared to
- * stream->sum_norest_weight.  It just adds up the weight of direct
- * descendants whose dpri is NGHTTP2_STREAM_DPRI_TOP.
+ * Updates stream->sum_norest_weight recursively.  We have to gather
+ * effective sum of weight of descendants.  If stream->dpri ==
+ * NGHTTP2_STREAM_DPRI_NO_ITEM, we have to go deeper and check that
+ * any of its descendants has dpri value of NGHTTP2_STREAM_DPRI_TOP.
+ * If so, we have to add weight of its direct descendants to
+ * stream->sum_norest_weight.  To make this work, this function
+ * returns 1 if any of its descendants has dpri value of
+ * NGHTTP2_STREAM_DPRI_TOP, otherwise 0.
  */
 static int stream_update_dep_sum_norest_weight(nghttp2_stream *stream) {
   nghttp2_stream *si;
-  int rv;
 
   stream->sum_norest_weight = 0;
-  stream->sum_top_weight = 0;
 
   if (stream->dpri == NGHTTP2_STREAM_DPRI_TOP) {
     return 1;
@@ -375,21 +322,14 @@ static int stream_update_dep_sum_norest_weight(nghttp2_stream *stream) {
     return 0;
   }
 
-  rv = 0;
-
   for (si = stream->dep_next; si; si = si->sib_next) {
 
     if (stream_update_dep_sum_norest_weight(si)) {
-      rv = 1;
       stream->sum_norest_weight += si->weight;
     }
-
-    if (si->dpri == NGHTTP2_STREAM_DPRI_TOP) {
-      stream->sum_top_weight += si->weight;
-    }
   }
 
-  return rv;
+  return stream->sum_norest_weight > 0;
 }
 
 static int stream_update_dep_on_attach_item(nghttp2_stream *stream,

lib/nghttp2_stream.h

@@ -38,7 +38,7 @@
 /*
  * Maximum number of streams in one dependency tree.
  */
-#define NGHTTP2_MAX_DEP_TREE_LENGTH 100
+#define NGHTTP2_MAX_DEP_TREE_LENGTH 120
 
 /*
  * If local peer is stream initiator:
@@ -133,7 +133,7 @@ typedef enum {
   /* "http" or "https" scheme */
   NGHTTP2_HTTP_FLAG_SCHEME_HTTP = 1 << 12,
   /* set if final response is expected */
-  NGHTTP2_HTTP_FLAG_EXPECT_FINAL_RESPONSE = 1 << 13,
+  NGHTTP2_HTTP_FLAG_EXPECT_FINAL_RESPONSE = 1 << 13
 } nghttp2_http_flag;
 
 typedef enum {
@@ -217,9 +217,6 @@ struct nghttp2_stream {
      descendant with dpri == NGHTTP2_STREAM_DPRI_TOP.  We use this
      value to calculate effective weight. */
   int32_t sum_norest_weight;
-  /* sum of weight of direct descendants whose dpri value is
-     NGHTTP2_STREAM_DPRI_TOP */
-  int32_t sum_top_weight;
   nghttp2_stream_state state;
   /* status code from remote server */
   int16_t status_code;

lib/nghttp2_submit.c

@@ -62,7 +62,7 @@ static int32_t submit_headers_shared(nghttp2_session *session, uint8_t flags,
     goto fail;
   }
 
-  nghttp2_session_outbound_item_init(session, item);
+  nghttp2_outbound_item_init(item);
 
   if (data_prd != NULL && data_prd->read_callback != NULL) {
     item->aux_data.headers.data_prd = *data_prd;
@@ -212,7 +212,7 @@ int nghttp2_submit_priority(nghttp2_session *session, uint8_t flags _U_,
     return NGHTTP2_ERR_NOMEM;
   }
 
-  nghttp2_session_outbound_item_init(session, item);
+  nghttp2_outbound_item_init(item);
 
   frame = &item->frame;
 
@@ -299,7 +299,7 @@ int32_t nghttp2_submit_push_promise(nghttp2_session *session, uint8_t flags _U_,
     return NGHTTP2_ERR_NOMEM;
   }
 
-  nghttp2_session_outbound_item_init(session, item);
+  nghttp2_outbound_item_init(item);
 
   item->aux_data.headers.stream_user_data = promised_stream_user_data;
 
@@ -376,15 +376,6 @@ int nghttp2_submit_window_update(nghttp2_session *session, uint8_t flags,
   return 0;
 }
 
-int nghttp2_submit_altsvc(nghttp2_session *session _U_, uint8_t flags _U_,
-                          int32_t stream_id _U_, uint32_t max_age _U_,
-                          uint16_t port _U_, const uint8_t *protocol_id _U_,
-                          size_t protocol_id_len _U_, const uint8_t *host _U_,
-                          size_t host_len _U_, const uint8_t *origin _U_,
-                          size_t origin_len _U_) {
-  return 0;
-}
-
 static uint8_t set_request_flags(const nghttp2_priority_spec *pri_spec,
                                  const nghttp2_data_provider *data_prd) {
   uint8_t flags = NGHTTP2_FLAG_NONE;
@@ -453,7 +444,7 @@ int nghttp2_submit_data(nghttp2_session *session, uint8_t flags,
     return NGHTTP2_ERR_NOMEM;
   }
 
-  nghttp2_session_outbound_item_init(session, item);
+  nghttp2_outbound_item_init(item);
 
   frame = &item->frame;
   aux_data = &item->aux_data.data;

mkhufftbl.py

@@ -10,8 +10,271 @@
 from __future__ import unicode_literals
 import re
 import sys
+import StringIO
+
+# From [1]
+HUFFMAN_CODE_TABLE = """\
+    (  0)  |11111111|11000                             1ff8  [13]
+    (  1)  |11111111|11111111|1011000                7fffd8  [23]
+    (  2)  |11111111|11111111|11111110|0010         fffffe2  [28]
+    (  3)  |11111111|11111111|11111110|0011         fffffe3  [28]
+    (  4)  |11111111|11111111|11111110|0100         fffffe4  [28]
+    (  5)  |11111111|11111111|11111110|0101         fffffe5  [28]
+    (  6)  |11111111|11111111|11111110|0110         fffffe6  [28]
+    (  7)  |11111111|11111111|11111110|0111         fffffe7  [28]
+    (  8)  |11111111|11111111|11111110|1000         fffffe8  [28]
+    (  9)  |11111111|11111111|11101010               ffffea  [24]
+    ( 10)  |11111111|11111111|11111111|111100      3ffffffc  [30]
+    ( 11)  |11111111|11111111|11111110|1001         fffffe9  [28]
+    ( 12)  |11111111|11111111|11111110|1010         fffffea  [28]
+    ( 13)  |11111111|11111111|11111111|111101      3ffffffd  [30]
+    ( 14)  |11111111|11111111|11111110|1011         fffffeb  [28]
+    ( 15)  |11111111|11111111|11111110|1100         fffffec  [28]
+    ( 16)  |11111111|11111111|11111110|1101         fffffed  [28]
+    ( 17)  |11111111|11111111|11111110|1110         fffffee  [28]
+    ( 18)  |11111111|11111111|11111110|1111         fffffef  [28]
+    ( 19)  |11111111|11111111|11111111|0000         ffffff0  [28]
+    ( 20)  |11111111|11111111|11111111|0001         ffffff1  [28]
+    ( 21)  |11111111|11111111|11111111|0010         ffffff2  [28]
+    ( 22)  |11111111|11111111|11111111|111110      3ffffffe  [30]
+    ( 23)  |11111111|11111111|11111111|0011         ffffff3  [28]
+    ( 24)  |11111111|11111111|11111111|0100         ffffff4  [28]
+    ( 25)  |11111111|11111111|11111111|0101         ffffff5  [28]
+    ( 26)  |11111111|11111111|11111111|0110         ffffff6  [28]
+    ( 27)  |11111111|11111111|11111111|0111         ffffff7  [28]
+    ( 28)  |11111111|11111111|11111111|1000         ffffff8  [28]
+    ( 29)  |11111111|11111111|11111111|1001         ffffff9  [28]
+    ( 30)  |11111111|11111111|11111111|1010         ffffffa  [28]
+    ( 31)  |11111111|11111111|11111111|1011         ffffffb  [28]
+' ' ( 32)  |010100                                       14  [ 6]
+'!' ( 33)  |11111110|00                                 3f8  [10]
+'"' ( 34)  |11111110|01                                 3f9  [10]
+'#' ( 35)  |11111111|1010                               ffa  [12]
+'$' ( 36)  |11111111|11001                             1ff9  [13]
+'%' ( 37)  |010101                                       15  [ 6]
+'&' ( 38)  |11111000                                     f8  [ 8]
+''' ( 39)  |11111111|010                                7fa  [11]
+'(' ( 40)  |11111110|10                                 3fa  [10]
+')' ( 41)  |11111110|11                                 3fb  [10]
+'*' ( 42)  |11111001                                     f9  [ 8]
+'+' ( 43)  |11111111|011                                7fb  [11]
+',' ( 44)  |11111010                                     fa  [ 8]
+'-' ( 45)  |010110                                       16  [ 6]
+'.' ( 46)  |010111                                       17  [ 6]
+'/' ( 47)  |011000                                       18  [ 6]
+'0' ( 48)  |00000                                         0  [ 5]
+'1' ( 49)  |00001                                         1  [ 5]
+'2' ( 50)  |00010                                         2  [ 5]
+'3' ( 51)  |011001                                       19  [ 6]
+'4' ( 52)  |011010                                       1a  [ 6]
+'5' ( 53)  |011011                                       1b  [ 6]
+'6' ( 54)  |011100                                       1c  [ 6]
+'7' ( 55)  |011101                                       1d  [ 6]
+'8' ( 56)  |011110                                       1e  [ 6]
+'9' ( 57)  |011111                                       1f  [ 6]
+':' ( 58)  |1011100                                      5c  [ 7]
+';' ( 59)  |11111011                                     fb  [ 8]
+'<' ( 60)  |11111111|1111100                           7ffc  [15]
+'=' ( 61)  |100000                                       20  [ 6]
+'>' ( 62)  |11111111|1011                               ffb  [12]
+'?' ( 63)  |11111111|00                                 3fc  [10]
+'@' ( 64)  |11111111|11010                             1ffa  [13]
+'A' ( 65)  |100001                                       21  [ 6]
+'B' ( 66)  |1011101                                      5d  [ 7]
+'C' ( 67)  |1011110                                      5e  [ 7]
+'D' ( 68)  |1011111                                      5f  [ 7]
+'E' ( 69)  |1100000                                      60  [ 7]
+'F' ( 70)  |1100001                                      61  [ 7]
+'G' ( 71)  |1100010                                      62  [ 7]
+'H' ( 72)  |1100011                                      63  [ 7]
+'I' ( 73)  |1100100                                      64  [ 7]
+'J' ( 74)  |1100101                                      65  [ 7]
+'K' ( 75)  |1100110                                      66  [ 7]
+'L' ( 76)  |1100111                                      67  [ 7]
+'M' ( 77)  |1101000                                      68  [ 7]
+'N' ( 78)  |1101001                                      69  [ 7]
+'O' ( 79)  |1101010                                      6a  [ 7]
+'P' ( 80)  |1101011                                      6b  [ 7]
+'Q' ( 81)  |1101100                                      6c  [ 7]
+'R' ( 82)  |1101101                                      6d  [ 7]
+'S' ( 83)  |1101110                                      6e  [ 7]
+'T' ( 84)  |1101111                                      6f  [ 7]
+'U' ( 85)  |1110000                                      70  [ 7]
+'V' ( 86)  |1110001                                      71  [ 7]
+'W' ( 87)  |1110010                                      72  [ 7]
+'X' ( 88)  |11111100                                     fc  [ 8]
+'Y' ( 89)  |1110011                                      73  [ 7]
+'Z' ( 90)  |11111101                                     fd  [ 8]
+'[' ( 91)  |11111111|11011                             1ffb  [13]
+'\' ( 92)  |11111111|11111110|000                     7fff0  [19]
+']' ( 93)  |11111111|11100                             1ffc  [13]
+'^' ( 94)  |11111111|111100                            3ffc  [14]
+'_' ( 95)  |100010                                       22  [ 6]
+'`' ( 96)  |11111111|1111101                           7ffd  [15]
+'a' ( 97)  |00011                                         3  [ 5]
+'b' ( 98)  |100011                                       23  [ 6]
+'c' ( 99)  |00100                                         4  [ 5]
+'d' (100)  |100100                                       24  [ 6]
+'e' (101)  |00101                                         5  [ 5]
+'f' (102)  |100101                                       25  [ 6]
+'g' (103)  |100110                                       26  [ 6]
+'h' (104)  |100111                                       27  [ 6]
+'i' (105)  |00110                                         6  [ 5]
+'j' (106)  |1110100                                      74  [ 7]
+'k' (107)  |1110101                                      75  [ 7]
+'l' (108)  |101000                                       28  [ 6]
+'m' (109)  |101001                                       29  [ 6]
+'n' (110)  |101010                                       2a  [ 6]
+'o' (111)  |00111                                         7  [ 5]
+'p' (112)  |101011                                       2b  [ 6]
+'q' (113)  |1110110                                      76  [ 7]
+'r' (114)  |101100                                       2c  [ 6]
+'s' (115)  |01000                                         8  [ 5]
+'t' (116)  |01001                                         9  [ 5]
+'u' (117)  |101101                                       2d  [ 6]
+'v' (118)  |1110111                                      77  [ 7]
+'w' (119)  |1111000                                      78  [ 7]
+'x' (120)  |1111001                                      79  [ 7]
+'y' (121)  |1111010                                      7a  [ 7]
+'z' (122)  |1111011                                      7b  [ 7]
+'{' (123)  |11111111|1111110                           7ffe  [15]
+'|' (124)  |11111111|100                                7fc  [11]
+'}' (125)  |11111111|111101                            3ffd  [14]
+'~' (126)  |11111111|11101                             1ffd  [13]
+    (127)  |11111111|11111111|11111111|1100         ffffffc  [28]
+    (128)  |11111111|11111110|0110                    fffe6  [20]
+    (129)  |11111111|11111111|010010                 3fffd2  [22]
+    (130)  |11111111|11111110|0111                    fffe7  [20]
+    (131)  |11111111|11111110|1000                    fffe8  [20]
+    (132)  |11111111|11111111|010011                 3fffd3  [22]
+    (133)  |11111111|11111111|010100                 3fffd4  [22]
+    (134)  |11111111|11111111|010101                 3fffd5  [22]
+    (135)  |11111111|11111111|1011001                7fffd9  [23]
+    (136)  |11111111|11111111|010110                 3fffd6  [22]
+    (137)  |11111111|11111111|1011010                7fffda  [23]
+    (138)  |11111111|11111111|1011011                7fffdb  [23]
+    (139)  |11111111|11111111|1011100                7fffdc  [23]
+    (140)  |11111111|11111111|1011101                7fffdd  [23]
+    (141)  |11111111|11111111|1011110                7fffde  [23]
+    (142)  |11111111|11111111|11101011               ffffeb  [24]
+    (143)  |11111111|11111111|1011111                7fffdf  [23]
+    (144)  |11111111|11111111|11101100               ffffec  [24]
+    (145)  |11111111|11111111|11101101               ffffed  [24]
+    (146)  |11111111|11111111|010111                 3fffd7  [22]
+    (147)  |11111111|11111111|1100000                7fffe0  [23]
+    (148)  |11111111|11111111|11101110               ffffee  [24]
+    (149)  |11111111|11111111|1100001                7fffe1  [23]
+    (150)  |11111111|11111111|1100010                7fffe2  [23]
+    (151)  |11111111|11111111|1100011                7fffe3  [23]
+    (152)  |11111111|11111111|1100100                7fffe4  [23]
+    (153)  |11111111|11111110|11100                  1fffdc  [21]
+    (154)  |11111111|11111111|011000                 3fffd8  [22]
+    (155)  |11111111|11111111|1100101                7fffe5  [23]
+    (156)  |11111111|11111111|011001                 3fffd9  [22]
+    (157)  |11111111|11111111|1100110                7fffe6  [23]
+    (158)  |11111111|11111111|1100111                7fffe7  [23]
+    (159)  |11111111|11111111|11101111               ffffef  [24]
+    (160)  |11111111|11111111|011010                 3fffda  [22]
+    (161)  |11111111|11111110|11101                  1fffdd  [21]
+    (162)  |11111111|11111110|1001                    fffe9  [20]
+    (163)  |11111111|11111111|011011                 3fffdb  [22]
+    (164)  |11111111|11111111|011100                 3fffdc  [22]
+    (165)  |11111111|11111111|1101000                7fffe8  [23]
+    (166)  |11111111|11111111|1101001                7fffe9  [23]
+    (167)  |11111111|11111110|11110                  1fffde  [21]
+    (168)  |11111111|11111111|1101010                7fffea  [23]
+    (169)  |11111111|11111111|011101                 3fffdd  [22]
+    (170)  |11111111|11111111|011110                 3fffde  [22]
+    (171)  |11111111|11111111|11110000               fffff0  [24]
+    (172)  |11111111|11111110|11111                  1fffdf  [21]
+    (173)  |11111111|11111111|011111                 3fffdf  [22]
+    (174)  |11111111|11111111|1101011                7fffeb  [23]
+    (175)  |11111111|11111111|1101100                7fffec  [23]
+    (176)  |11111111|11111111|00000                  1fffe0  [21]
+    (177)  |11111111|11111111|00001                  1fffe1  [21]
+    (178)  |11111111|11111111|100000                 3fffe0  [22]
+    (179)  |11111111|11111111|00010                  1fffe2  [21]
+    (180)  |11111111|11111111|1101101                7fffed  [23]
+    (181)  |11111111|11111111|100001                 3fffe1  [22]
+    (182)  |11111111|11111111|1101110                7fffee  [23]
+    (183)  |11111111|11111111|1101111                7fffef  [23]
+    (184)  |11111111|11111110|1010                    fffea  [20]
+    (185)  |11111111|11111111|100010                 3fffe2  [22]
+    (186)  |11111111|11111111|100011                 3fffe3  [22]
+    (187)  |11111111|11111111|100100                 3fffe4  [22]
+    (188)  |11111111|11111111|1110000                7ffff0  [23]
+    (189)  |11111111|11111111|100101                 3fffe5  [22]
+    (190)  |11111111|11111111|100110                 3fffe6  [22]
+    (191)  |11111111|11111111|1110001                7ffff1  [23]
+    (192)  |11111111|11111111|11111000|00           3ffffe0  [26]
+    (193)  |11111111|11111111|11111000|01           3ffffe1  [26]
+    (194)  |11111111|11111110|1011                    fffeb  [20]
+    (195)  |11111111|11111110|001                     7fff1  [19]
+    (196)  |11111111|11111111|100111                 3fffe7  [22]
+    (197)  |11111111|11111111|1110010                7ffff2  [23]
+    (198)  |11111111|11111111|101000                 3fffe8  [22]
+    (199)  |11111111|11111111|11110110|0            1ffffec  [25]
+    (200)  |11111111|11111111|11111000|10           3ffffe2  [26]
+    (201)  |11111111|11111111|11111000|11           3ffffe3  [26]
+    (202)  |11111111|11111111|11111001|00           3ffffe4  [26]
+    (203)  |11111111|11111111|11111011|110          7ffffde  [27]
+    (204)  |11111111|11111111|11111011|111          7ffffdf  [27]
+    (205)  |11111111|11111111|11111001|01           3ffffe5  [26]
+    (206)  |11111111|11111111|11110001               fffff1  [24]
+    (207)  |11111111|11111111|11110110|1            1ffffed  [25]
+    (208)  |11111111|11111110|010                     7fff2  [19]
+    (209)  |11111111|11111111|00011                  1fffe3  [21]
+    (210)  |11111111|11111111|11111001|10           3ffffe6  [26]
+    (211)  |11111111|11111111|11111100|000          7ffffe0  [27]
+    (212)  |11111111|11111111|11111100|001          7ffffe1  [27]
+    (213)  |11111111|11111111|11111001|11           3ffffe7  [26]
+    (214)  |11111111|11111111|11111100|010          7ffffe2  [27]
+    (215)  |11111111|11111111|11110010               fffff2  [24]
+    (216)  |11111111|11111111|00100                  1fffe4  [21]
+    (217)  |11111111|11111111|00101                  1fffe5  [21]
+    (218)  |11111111|11111111|11111010|00           3ffffe8  [26]
+    (219)  |11111111|11111111|11111010|01           3ffffe9  [26]
+    (220)  |11111111|11111111|11111111|1101         ffffffd  [28]
+    (221)  |11111111|11111111|11111100|011          7ffffe3  [27]
+    (222)  |11111111|11111111|11111100|100          7ffffe4  [27]
+    (223)  |11111111|11111111|11111100|101          7ffffe5  [27]
+    (224)  |11111111|11111110|1100                    fffec  [20]
+    (225)  |11111111|11111111|11110011               fffff3  [24]
+    (226)  |11111111|11111110|1101                    fffed  [20]
+    (227)  |11111111|11111111|00110                  1fffe6  [21]
+    (228)  |11111111|11111111|101001                 3fffe9  [22]
+    (229)  |11111111|11111111|00111                  1fffe7  [21]
+    (230)  |11111111|11111111|01000                  1fffe8  [21]
+    (231)  |11111111|11111111|1110011                7ffff3  [23]
+    (232)  |11111111|11111111|101010                 3fffea  [22]
+    (233)  |11111111|11111111|101011                 3fffeb  [22]
+    (234)  |11111111|11111111|11110111|0            1ffffee  [25]
+    (235)  |11111111|11111111|11110111|1            1ffffef  [25]
+    (236)  |11111111|11111111|11110100               fffff4  [24]
+    (237)  |11111111|11111111|11110101               fffff5  [24]
+    (238)  |11111111|11111111|11111010|10           3ffffea  [26]
+    (239)  |11111111|11111111|1110100                7ffff4  [23]
+    (240)  |11111111|11111111|11111010|11           3ffffeb  [26]
+    (241)  |11111111|11111111|11111100|110          7ffffe6  [27]
+    (242)  |11111111|11111111|11111011|00           3ffffec  [26]
+    (243)  |11111111|11111111|11111011|01           3ffffed  [26]
+    (244)  |11111111|11111111|11111100|111          7ffffe7  [27]
+    (245)  |11111111|11111111|11111101|000          7ffffe8  [27]
+    (246)  |11111111|11111111|11111101|001          7ffffe9  [27]
+    (247)  |11111111|11111111|11111101|010          7ffffea  [27]
+    (248)  |11111111|11111111|11111101|011          7ffffeb  [27]
+    (249)  |11111111|11111111|11111111|1110         ffffffe  [28]
+    (250)  |11111111|11111111|11111101|100          7ffffec  [27]
+    (251)  |11111111|11111111|11111101|101          7ffffed  [27]
+    (252)  |11111111|11111111|11111101|110          7ffffee  [27]
+    (253)  |11111111|11111111|11111101|111          7ffffef  [27]
+    (254)  |11111111|11111111|11111110|000          7fffff0  [27]
+    (255)  |11111111|11111111|11111011|10           3ffffee  [26]
+EOS (256)  |11111111|11111111|11111111|111111      3fffffff  [30]
+"""
 
 class Node:
+
     def __init__(self, term = None):
         self.term = term
         self.left = None
@@ -20,21 +283,18 @@ class Node:
         self.id = None
         self.accept = False
 
-def to_bin(s):
-    res = []
-    for i in range(0, len(s), 8):
-        x = s[i:i+8]
-        x += '0'*(8 - len(x))
-        a = 0
-        for j in range(8):
-            a *= 2
-            a += ord(x[j]) - ord('0')
-        res.append(a) #chr(a))
-    return res
+class Context:
 
-nodes = []
+    def __init__(self):
+        self.next_id_ = 0
+        self.root = Node()
 
-def insert(node, sym, bits):
+    def next_id(self):
+        id = self.next_id_
+        self.next_id_ += 1
+        return id
+
+def _add(node, sym, bits):
     if len(bits) == 0:
         node.term = sym
         return
@@ -47,67 +307,71 @@ def insert(node, sym, bits):
             if node.right is None:
                 node.right = Node()
             child = node.right
-        insert(child, sym, bits[1:])
+        _add(child, sym, bits[1:])
 
-def traverse(node, bits, syms, start_node, root, depth):
-    if depth == 4:
-        if 256 in syms:
-            syms = []
+def huffman_tree_add(ctx, sym, bits):
+    _add(ctx.root, sym, bits)
+
+def _set_node_id(ctx, node, prefix):
+    if node.term is not None:
+        return
+    if len(prefix) <= 7 and [1] * len(prefix) == prefix:
+        node.accept = True
+    node.id = ctx.next_id()
+    _set_node_id(ctx, node.left, prefix + [0])
+    _set_node_id(ctx, node.right, prefix + [1])
+
+def huffman_tree_set_node_id(ctx):
+    _set_node_id(ctx, ctx.root, [])
+
+def _traverse(node, sym, start_node, root, left):
+    if left == 0:
+        if sym == 256:
+            sym = None
             node = None
-        start_node.trans.append((node, bits, syms))
+        start_node.trans.append((node, sym))
         return
 
     if node.term is not None:
         node = root
 
-    def go(node, bit):
-        nbits = list(bits)
-        nbits.append(bit)
-        nsyms = list(syms)
+    def go(node):
         if node.term is not None:
-            nsyms.append(node.term)
-        traverse(node, nbits, nsyms, start_node, root, depth + 1)
+            assert sym is None
+            nsym = node.term
+        else:
+            nsym = sym
 
-    go(node.left, 0)
-    go(node.right, 1)
+        _traverse(node, nsym, start_node, root, left - 1)
 
-idseed = 0
+    go(node.left)
+    go(node.right)
 
-def dfs_setid(node, prefix):
-    if node.term is not None:
-        return
-    if len(prefix) <= 7 and [1] * len(prefix) == prefix:
-        node.accept = True
-    global idseed
-    node.id = idseed
-    idseed += 1
-    dfs_setid(node.left, prefix + [0])
-    dfs_setid(node.right, prefix + [1])
-
-def dfs(node, root):
+def _build_transition_table(ctx, node):
     if node is None:
         return
-    traverse(node, [], [], node, root, 0)
-    dfs(node.left, root)
-    dfs(node.right, root)
+    _traverse(node, None, node, ctx.root, 4)
+    _build_transition_table(ctx, node.left)
+    _build_transition_table(ctx, node.right)
+
+def huffman_tree_build_transition_table(ctx):
+    _build_transition_table(ctx, ctx.root)
 
 NGHTTP2_HUFF_ACCEPTED = 1
 NGHTTP2_HUFF_SYM = 1 << 1
 NGHTTP2_HUFF_FAIL = 1 << 2
 
-def dfs_print(node):
+def _print_transition_table(node):
     if node.term is not None:
         return
     print '/* {} */'.format(node.id)
     print '{'
-    for nd, bits, syms in node.trans:
-        outlen = len(syms)
+    for nd, sym in node.trans:
         flags = 0
-        if outlen == 0:
+        if sym is None:
             out = 0
         else:
-            assert(outlen == 1)
-            out = syms[0]
+            out = sym
             flags |= NGHTTP2_HUFF_SYM
         if nd is None:
             id = 0
@@ -122,52 +386,50 @@ def dfs_print(node):
                 flags |= NGHTTP2_HUFF_ACCEPTED
         print '  {{{}, 0x{:02x}, {}}},'.format(id, flags, out)
     print '},'
-    dfs_print(node.left)
-    dfs_print(node.right)
+    _print_transition_table(node.left)
+    _print_transition_table(node.right)
 
-symbol_tbl = [(None, 0) for i in range(257)]
-tables = {}
+def huffman_tree_print_transition_table(ctx):
+    _print_transition_table(ctx.root)
 
-root = Node()
+if __name__ == '__main__':
+    ctx = Context()
+    symbol_tbl = [(None, 0) for i in range(257)]
 
-for line in sys.stdin:
-    m = re.match(r'.*\(\s*(\d+)\)\s+([|01]+)\s+(\S+)\s+\[\s*(\d+)\].*', line)
+    for line in StringIO.StringIO(HUFFMAN_CODE_TABLE):
+        m = re.match(
+            r'.*\(\s*(\d+)\)\s+([|01]+)\s+(\S+)\s+\[\s*(\d+)\].*', line)
         if m:
-        #print m.group(1), m.group(2), m.group(4)
-        if len(m.group(3)) > 8:
-            raise Error('Code is more than 4 bytes long')
             sym = int(m.group(1))
             bits = re.sub(r'\|', '', m.group(2))
+            code = m.group(3)
             nbits = int(m.group(4))
+            if len(code) > 8:
+                raise Error('Code is more than 4 bytes long')
             assert(len(bits) == nbits)
-        binpat = to_bin(bits)
-        assert(len(binpat) == (nbits+7)/8)
-        symbol_tbl[sym] = (binpat, nbits, m.group(3))
-        #print "Inserting", sym
-        insert(root, sym, bits)
+            symbol_tbl[sym] = (nbits, code)
+            huffman_tree_add(ctx, sym, bits)
 
-dfs_setid(root, [])
-dfs(root, root)
+    huffman_tree_set_node_id(ctx)
+    huffman_tree_build_transition_table(ctx)
 
-print '''\
+    print '''\
 typedef struct {
   uint32_t nbits;
   uint32_t code;
 } nghttp2_huff_sym;
 '''
 
-print '''\
+    print '''\
 const nghttp2_huff_sym huff_sym_table[] = {'''
-for i in range(257):
-    pat = list(symbol_tbl[i][0])
-    pat += [0]*(4 - len(pat))
+    for i in range(257):
         print '''\
   {{ {}, 0x{}u }}{}\
-'''.format(symbol_tbl[i][1], symbol_tbl[i][2], ',' if i < 256 else '')
-print '};'
-print ''
+'''.format(symbol_tbl[i][0], symbol_tbl[i][1], ',' if i < 256 else '')
+    print '};'
+    print ''
 
-print '''\
+    print '''\
 enum {{
   NGHTTP2_HUFF_ACCEPTED = {},
   NGHTTP2_HUFF_SYM = {},
@@ -175,7 +437,7 @@ enum {{
 }} nghttp2_huff_decode_flag;
 '''.format(NGHTTP2_HUFF_ACCEPTED, NGHTTP2_HUFF_SYM, NGHTTP2_HUFF_FAIL)
 
-print '''\
+    print '''\
 typedef struct {
   uint8_t state;
   uint8_t flags;
@@ -183,7 +445,7 @@ typedef struct {
 } nghttp2_huff_decode;
 '''
 
-print '''\
+    print '''\
 const nghttp2_huff_decode huff_decode_table[][16] = {'''
-dfs_print(root)
-print '};'
+    huffman_tree_print_transition_table(ctx)
+    print '};'

mkstatichdtbl.py

@@ -10,39 +10,17 @@
 from __future__ import unicode_literals
 import re, sys
 
-def hash(s):
-    h = 0
-    for c in s:
-        h = h * 31 + ord(c)
-    return h & ((1 << 32) - 1)
-
 entries = []
 for line in sys.stdin:
     m = re.match(r'(\d+)\s+(\S+)\s+(\S.*)?', line)
     val = m.group(3).strip() if m.group(3) else ''
-    entries.append((hash(m.group(2)), int(m.group(1)), m.group(2), val))
-
-entries.sort()
-
-print '/* Sorted by hash(name) and its table index */'
-print 'static nghttp2_hd_static_entry static_table[] = {'
-for ent in entries:
-    print 'MAKE_STATIC_ENT({}, "{}", "{}", {}u, {}u),'\
-        .format(ent[1] - 1, ent[2], ent[3], ent[0], hash(ent[3]))
-print '};'
-
-print ''
-
-print '/* Index to the position in static_table */'
-print 'const size_t static_table_index[] = {'
-for i in range(len(entries)):
-    for j, ent in enumerate(entries):
-        if ent[1] - 1 == i:
-            sys.stdout.write('{: <2d},'.format(j))
-            break
-    if (i + 1) % 16 == 0:
-        sys.stdout.write('\n')
-    else:
-        sys.stdout.write(' ')
+    entries.append((int(m.group(1)), m.group(2), val))
 
+print 'static nghttp2_hd_entry static_table[] = {'
+idx = 0
+for i, ent in enumerate(entries):
+    if entries[idx][1] != ent[1]:
+        idx = i
+    print 'MAKE_STATIC_ENT("{}", "{}", {}),'\
+        .format(ent[1], ent[2], entries[idx][0] - 1)
 print '};'

python/Makefile.am

@@ -36,7 +36,8 @@ install-exec-local:
 	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
 
 uninstall-local:
-	rm -rf $(DESTDIR)$(libdir)/python*/site-packages/*nghttp2*
+	rm -f $(DESTDIR)$(libdir)/python*/site-packages/nghttp2.so
+	rm -f $(DESTDIR)$(libdir)/python*/site-packages/python_nghttp2-*.egg-info
 
 clean-local:
 	$(PYTHON) setup.py clean --all

python/nghttp2.pyx

@@ -698,6 +698,7 @@ cdef class _HTTP2SessionCoreBase:
         handler.stream_id = stream_id
         handler.http2 = self
         handler.remote_address = self._get_remote_address()
+        handler.client_certificate = self._get_client_certificate()
         self.handlers.add(handler)
 
     def _rst_stream(self, stream_id,
@@ -713,6 +714,13 @@ cdef class _HTTP2SessionCoreBase:
     def _get_remote_address(self):
         return self.transport.get_extra_info('peername')
 
+    def _get_client_certificate(self):
+        sock = self.transport.get_extra_info('socket')
+        try:
+            return sock.getpeercert()
+        except AttributeError:
+            return None
+
     def _start_settings_timer(self):
         loop = asyncio.get_event_loop()
         self.settings_timer = loop.call_later(self.SETTINGS_TIMEOUT,
@@ -875,6 +883,11 @@ cdef class _HTTP2SessionCore(_HTTP2SessionCoreBase):
 
         return promised_handler
 
+    def connection_lost(self):
+        for handler in self.handlers:
+            handler.on_close(cnghttp2.NGHTTP2_INTERNAL_ERROR)
+        self.handlers = set()
+
 cdef class _HTTP2ClientSessionCore(_HTTP2SessionCoreBase):
     def __cinit__(self, *args, **kwargs):
         cdef cnghttp2.nghttp2_session_callbacks *callbacks
@@ -1030,6 +1043,9 @@ if asyncio:
           Contains a tuple of the form (host, port) referring to the client's
           address.
 
+        client_certificate
+          May contain the client certifcate in its non-binary form
+
         stream_id
           Stream ID of this stream
 
@@ -1058,6 +1074,8 @@ if asyncio:
             self.http2 = http2
             # address of the client
             self.remote_address = self.http2._get_remote_address()
+            # certificate of the client
+            self._client_certificate = self.http2._get_client_certificate()
             # :scheme header field in request
             self.scheme = None
             # :method header field in request
@@ -1075,6 +1093,10 @@ if asyncio:
         def client_address(self):
             return self.remote_address
 
+        @property
+        def client_certificate(self):
+            return self._client_certificate
+
         def on_headers(self):
 
             '''Called when request HEADERS is arrived.
@@ -1237,9 +1259,11 @@ if asyncio:
             logging.info('connection_made, address:%s, port:%s', address[0], address[1])
 
             self.transport = transport
-            self.connection_header = cnghttp2.NGHTTP2_CLIENT_CONNECTION_PREFACE
             sock = self.transport.get_extra_info('socket')
+            try:
                 sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
+            except OSError as e:
+                logging.info('failed to set tcp-nodelay: %s', str(e))
             ssl_ctx = self.transport.get_extra_info('sslcontext')
             if ssl_ctx:
                 protocol = sock.selected_npn_protocol()
@@ -1247,19 +1271,7 @@ if asyncio:
                 if protocol.encode('utf-8') != \
                    cnghttp2.NGHTTP2_PROTO_VERSION_ID:
                     self.transport.abort()
-
-        def connection_lost(self, exc):
-            logging.info('connection_lost')
-            if self.http2:
-                self.http2 = None
-
-        def data_received(self, data):
-            nread = min(len(data), len(self.connection_header))
-
-            if self.connection_header.startswith(data[:nread]):
-                data = data[nread:]
-                self.connection_header = self.connection_header[nread:]
-                if len(self.connection_header) == 0:
+                    return
             try:
                 self.http2 = _HTTP2SessionCore\
                              (self.transport,
@@ -1269,13 +1281,14 @@ if asyncio:
                 self.transport.abort()
                 return
 
-                    self.data_received = self.data_received2
-                    self.resume_writing = self.resume_writing2
-                    self.data_received(data)
-            else:
-                self.transport.abort()
 
-        def data_received2(self, data):
+        def connection_lost(self, exc):
+            logging.info('connection_lost')
+            if self.http2:
+                self.http2.connection_lost()
+                self.http2 = None
+
+        def data_received(self, data):
             try:
                 self.http2.data_received(data)
             except Exception as err:
@@ -1283,7 +1296,7 @@ if asyncio:
                 self.transport.close()
                 return
 
-        def resume_writing2(self):
+        def resume_writing(self):
             try:
                 self.http2.send_data()
             except Exception as err:
@@ -1350,7 +1363,8 @@ if asyncio:
 
         When whole response is received, on_response_done() is invoked.
 
-        When stream is closed, on_close(error_code) is called.
+        When stream is closed or underlying connection is lost,
+        on_close(error_code) is called.
 
         The application can send follow up requests using HTTP2Client.send_request() method.
 
@@ -1490,8 +1504,6 @@ if asyncio:
                    cnghttp2.NGHTTP2_PROTO_VERSION_ID:
                     self.transport.abort()
 
-            # Send preamble
-            self.transport.write(cnghttp2.NGHTTP2_CLIENT_CONNECTION_PREFACE)
             self.http2 = _HTTP2ClientSessionCore(self.transport)
 
 	    # Clear pending requests

script/Makefile.am

@@ -0,0 +1,25 @@
+# nghttp2 - HTTP/2 C Library
+
+# Copyright (c) 2015 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 = README.rst
+dist_pkgdata_SCRIPTS = fetch-ocsp-response

script/README.rst

@@ -0,0 +1,10 @@
+fetch-ocsp-response is a Python script which performs OCSP query and
+get response.  It uses openssl command under the hood.  nghttpx uses
+it to enable OCSP stapling feature.
+
+fetch-ocsp-response is a translation from original fetch-ocsp-response
+written in Perl and which has been developed as part of h2o project
+(https://github.com/h2o/h2o).
+
+fetch-ocsp-response is usually installed under $(pkgdatadir), which is
+$(prefix)/share/nghttp2.

script/fetch-ocsp-response

@@ -0,0 +1,241 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# nghttp2 - HTTP/2 C Library
+
+# Copyright (c) 2015 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.
+
+# This program was translated from the program originally developed by
+# h2o project (https://github.com/h2o/h2o), written in Perl.  It had
+# the following copyright notice:
+
+# Copyright (c) 2015 DeNA Co., Ltd.
+#
+# 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.
+
+from __future__ import unicode_literals
+import argparse
+import io
+import os
+import os.path
+import re
+import shutil
+import subprocess
+import sys
+import tempfile
+
+# make this program work for both Python 3 and Python 2.
+try:
+    from urllib.parse import urlparse
+    stdout_bwrite = sys.stdout.buffer.write
+except ImportError:
+    from urlparse import urlparse
+    stdout_bwrite = sys.stdout.write
+
+
+def die(msg):
+    sys.stderr.write(msg)
+    sys.stderr.write('\n')
+    sys.exit(255)
+
+
+def tempfail(msg):
+    sys.stderr.write(msg)
+    sys.stderr.write('\n')
+    sys.exit(os.EX_TEMPFAIL)
+
+
+def run_openssl(args, allow_tempfail=False):
+    buf = io.BytesIO()
+    try:
+        p = subprocess.Popen(args, stdout=subprocess.PIPE)
+    except Exception as e:
+        die('failed to invoke {}:{}'.format(args, e))
+    try:
+        while True:
+            data = p.stdout.read()
+            if len(data) == 0:
+                break
+            buf.write(data)
+        if p.wait() != 0:
+            raise Exception('nonzero return code {}'.format(p.returncode))
+        return buf.getvalue()
+    except Exception as e:
+        msg = 'OpenSSL exitted abnormally: {}:{}'.format(args, e)
+        tempfail(msg) if allow_tempfail else die(msg)
+
+
+def read_file(path):
+    with open(path, 'rb') as f:
+        return f.read()
+
+
+def write_file(path, data):
+    with open(path, 'wb') as f:
+        f.write(data)
+
+
+def detect_openssl_version(cmd):
+    return run_openssl([cmd, 'version']).decode('utf-8').strip()
+
+
+def extract_ocsp_uri(cmd, cert_fn):
+    # obtain ocsp uri
+    ocsp_uri = run_openssl(
+        [cmd, 'x509', '-in', cert_fn, '-noout',
+         '-ocsp_uri']).decode('utf-8').strip()
+
+    if not re.match(r'^https?://', ocsp_uri):
+        die('failed to extract ocsp URI from {}'.format(cert_fn))
+
+    return ocsp_uri
+
+
+def save_issuer_certificate(issuer_fn, cert_fn):
+    # save issuer certificate
+    chain = read_file(cert_fn).decode('utf-8')
+    m = re.match(
+        r'.*?-----END CERTIFICATE-----.*?(-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----)',
+        chain, re.DOTALL)
+    if not m:
+        die('--issuer option was not used, and failed to extract issuer certificate from the certificate')
+    write_file(issuer_fn, (m.group(1) + '\n').encode('utf-8'))
+
+
+def send_and_receive_ocsp(respder_fn, cmd, cert_fn, issuer_fn, ocsp_uri,
+                          ocsp_host, openssl_version):
+    # obtain response (without verification)
+    sys.stderr.write('sending OCSP request to {}\n'.format(ocsp_uri))
+    args = [
+        cmd, 'ocsp', '-issuer', issuer_fn, '-cert', cert_fn, '-url', ocsp_uri
+    ]
+    if openssl_version.lower().startswith('openssl 1.'):
+        args.extend(['-header', 'Host', ocsp_host])
+    args.extend(['-noverify', '-respout', respder_fn])
+    resp = run_openssl(args, allow_tempfail=True)
+
+    return resp.decode('utf-8')
+
+
+def verify_response(cmd, tempdir, issuer_fn, respder_fn):
+    # verify the response
+    sys.stderr.write('verifying the response signature\n')
+
+    verify_fn = os.path.join(tempdir, 'verify.out')
+
+    # try from exotic options
+    allextra = [
+        # for comodo
+        ['-VAfile', issuer_fn],
+        # these options are only available in OpenSSL >= 1.0.2
+        ['-partial_chain', '-trusted_first', '-CAfile', issuer_fn],
+        # for OpenSSL <= 1.0.1
+        ['-CAfile', issuer_fn],
+    ]
+
+    for extra in allextra:
+        with open(verify_fn, 'wb') as f:
+            args = [cmd, 'ocsp', '-respin', respder_fn]
+            args.extend(extra)
+            p = subprocess.Popen(args, stdout=f, stderr=f)
+            if p.wait() == 0:
+                sys.stderr.write('verify OK (used: {})\n'.format(extra))
+                return True
+
+    sys.stderr.write(read_file(verify_fn).decode('utf-8'))
+    return False
+
+
+def fetch_ocsp_response(cmd, cert_fn, tempdir, issuer_fn=None):
+    openssl_version = detect_openssl_version(cmd)
+
+    sys.stderr.write(
+        'fetch-ocsp-response (using {})\n'.format(openssl_version))
+
+    ocsp_uri = extract_ocsp_uri(cmd, cert_fn)
+    ocsp_host = urlparse(ocsp_uri).hostname
+
+    if not issuer_fn:
+        issuer_fn = os.path.join(tempdir, 'issuer.crt')
+        save_issuer_certificate(issuer_fn, cert_fn)
+
+    respder_fn = os.path.join(tempdir, 'resp.der')
+    resp = send_and_receive_ocsp(
+        respder_fn, cmd, cert_fn, issuer_fn, ocsp_uri, ocsp_host,
+        openssl_version)
+
+    sys.stderr.write('{}\n'.format(resp))
+
+    if not verify_response(cmd, tempdir, issuer_fn, respder_fn):
+        tempfail('failed to verify the response')
+
+    # success
+    res = read_file(respder_fn)
+    stdout_bwrite(res)
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(
+        description=
+        '''The command issues an OCSP request for given server certificate, verifies the response and prints the resulting DER.''',
+        epilog=
+        '''The command exits 0 if successful, or 75 (EX_TEMPFAIL) on temporary error.  Other exit codes may be returned in case of hard errors.''')
+    parser.add_argument(
+        '--issuer',
+        metavar='FILE',
+        help=
+        'issuer certificate (if omitted, is extracted from the certificate chain)')
+    parser.add_argument('--openssl',
+                        metavar='CMD',
+                        help='openssl command to use (default: "openssl")',
+                        default='openssl')
+    parser.add_argument('certificate',
+                        help='path to certificate file to validate')
+    args = parser.parse_args()
+
+    tempdir = None
+    try:
+        # Python3.2 has tempfile.TemporaryDirectory, which has nice
+        # feature to delete its tree by cleanup() function.  We have
+        # to support Python2.7, so we have to do this manually.
+        tempdir = tempfile.mkdtemp()
+        fetch_ocsp_response(args.openssl, args.certificate, tempdir,
+                            args.issuer)
+    finally:
+        if tempdir:
+            shutil.rmtree(tempdir)

src/HtmlParser.cc

@@ -30,7 +30,8 @@
 
 namespace nghttp2 {
 
-ParserData::ParserData(const std::string &base_uri) : base_uri(base_uri) {}
+ParserData::ParserData(const std::string &base_uri)
+    : base_uri(base_uri), inside_head(0) {}
 
 HtmlParser::HtmlParser(const std::string &base_uri)
     : base_uri_(base_uri), parser_ctx_(nullptr), parser_data_(base_uri) {}
@@ -52,13 +53,13 @@ const char *get_attr(const xmlChar **attrs, const char *name) {
 } // namespace
 
 namespace {
-void add_link(ParserData *parser_data, const char *uri, RequestPriority pri) {
+void add_link(ParserData *parser_data, const char *uri, ResourceType res_type) {
   auto u = xmlBuildURI(
       reinterpret_cast<const xmlChar *>(uri),
       reinterpret_cast<const xmlChar *>(parser_data->base_uri.c_str()));
   if (u) {
     parser_data->links.push_back(
-        std::make_pair(reinterpret_cast<char *>(u), pri));
+        std::make_pair(reinterpret_cast<char *>(u), res_type));
     free(u);
   }
 }
@@ -68,6 +69,9 @@ namespace {
 void start_element_func(void *user_data, const xmlChar *name,
                         const xmlChar **attrs) {
   auto parser_data = static_cast<ParserData *>(user_data);
+  if (util::strieq(reinterpret_cast<const char *>(name), "head")) {
+    ++parser_data->inside_head;
+  }
   if (util::strieq(reinterpret_cast<const char *>(name), "link")) {
     auto rel_attr = get_attr(attrs, "rel");
     auto href_attr = get_attr(attrs, "href");
@@ -75,22 +79,35 @@ void start_element_func(void *user_data, const xmlChar *name,
       return;
     }
     if (util::strieq(rel_attr, "shortcut icon")) {
-      add_link(parser_data, href_attr, REQ_PRI_LOWEST);
+      add_link(parser_data, href_attr, REQ_OTHERS);
     } else if (util::strieq(rel_attr, "stylesheet")) {
-      add_link(parser_data, href_attr, REQ_PRI_MEDIUM);
+      add_link(parser_data, href_attr, REQ_CSS);
     }
   } else if (util::strieq(reinterpret_cast<const char *>(name), "img")) {
     auto src_attr = get_attr(attrs, "src");
     if (!src_attr) {
       return;
     }
-    add_link(parser_data, src_attr, REQ_PRI_LOWEST);
+    add_link(parser_data, src_attr, REQ_IMG);
   } else if (util::strieq(reinterpret_cast<const char *>(name), "script")) {
     auto src_attr = get_attr(attrs, "src");
     if (!src_attr) {
       return;
     }
-    add_link(parser_data, src_attr, REQ_PRI_LOW);
+    if (parser_data->inside_head) {
+      add_link(parser_data, src_attr, REQ_JS);
+    } else {
+      add_link(parser_data, src_attr, REQ_UNBLOCK_JS);
+    }
+  }
+}
+} // namespace
+
+namespace {
+void end_element_func(void *user_data, const xmlChar *name) {
+  auto parser_data = static_cast<ParserData *>(user_data);
+  if (util::strieq(reinterpret_cast<const char *>(name), "head")) {
+    --parser_data->inside_head;
   }
 }
 } // namespace
@@ -112,7 +129,7 @@ xmlSAXHandler saxHandler = {
     nullptr,             // startDocumentSAXFunc
     nullptr,             // endDocumentSAXFunc
     &start_element_func, // startElementSAXFunc
-    nullptr,             // endElementSAXFunc
+    &end_element_func,   // endElementSAXFunc
     nullptr,             // referenceSAXFunc
     nullptr,             // charactersSAXFunc
     nullptr,             // ignorableWhitespaceSAXFunc
@@ -160,7 +177,7 @@ int HtmlParser::parse_chunk_internal(const char *chunk, size_t size, int fin) {
   }
 }
 
-const std::vector<std::pair<std::string, RequestPriority>> &
+const std::vector<std::pair<std::string, ResourceType>> &
 HtmlParser::get_links() const {
   return parser_data_.links;
 }

src/HtmlParser.h

@@ -38,16 +38,19 @@
 
 namespace nghttp2 {
 
-enum RequestPriority {
-  REQ_PRI_HIGH = 0,
-  REQ_PRI_MEDIUM = 1,
-  REQ_PRI_LOW = 2,
-  REQ_PRI_LOWEST = 3
+enum ResourceType {
+  REQ_CSS = 1,
+  REQ_JS,
+  REQ_UNBLOCK_JS,
+  REQ_IMG,
+  REQ_OTHERS,
 };
 
 struct ParserData {
   std::string base_uri;
-  std::vector<std::pair<std::string, RequestPriority>> links;
+  std::vector<std::pair<std::string, ResourceType>> links;
+  // > 0 if we are inside "head" element.
+  int inside_head;
   ParserData(const std::string &base_uri);
 };
 
@@ -58,7 +61,7 @@ public:
   HtmlParser(const std::string &base_uri);
   ~HtmlParser();
   int parse_chunk(const char *chunk, size_t size, int fin);
-  const std::vector<std::pair<std::string, RequestPriority>> &get_links() const;
+  const std::vector<std::pair<std::string, ResourceType>> &get_links() const;
   void clear_links();
 
 private:
@@ -75,14 +78,13 @@ class HtmlParser {
 public:
   HtmlParser(const std::string &base_uri) {}
   int parse_chunk(const char *chunk, size_t size, int fin) { return 0; }
-  const std::vector<std::pair<std::string, RequestPriority>> &
-  get_links() const {
+  const std::vector<std::pair<std::string, ResourceType>> &get_links() const {
     return links_;
   }
   void clear_links() {}
 
 private:
-  std::vector<std::pair<std::string, RequestPriority>> links_;
+  std::vector<std::pair<std::string, ResourceType>> links_;
 };
 
 #endif // !HAVE_LIBXML2

src/HttpServer.cc

@@ -25,13 +25,25 @@
 #include "HttpServer.h"
 
 #include <sys/stat.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif // HAVE_SYS_SOCKET_H
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif // HAVE_NETDB_H
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif // HAVE_UNISTD_H
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif // HAVE_FCNTL_H
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif // HAVE_NETINET_IN_H
 #include <netinet/tcp.h>
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif // HAVE_ARPA_INET_H
 
 #include <cassert>
 #include <set>
@@ -57,13 +69,9 @@
 namespace nghttp2 {
 
 namespace {
-const std::string STATUS_200 = "200";
-const std::string STATUS_301 = "301";
-const std::string STATUS_304 = "304";
-const std::string STATUS_400 = "400";
-const std::string STATUS_404 = "404";
-const std::string DEFAULT_HTML = "index.html";
-const std::string NGHTTPD_SERVER = "nghttpd nghttp2/" NGHTTP2_VERSION;
+// TODO could be constexpr
+constexpr char DEFAULT_HTML[] = "index.html";
+constexpr char NGHTTPD_SERVER[] = "nghttpd nghttp2/" NGHTTP2_VERSION;
 } // namespace
 
 namespace {
@@ -92,16 +100,13 @@ template <typename Array> void append_nv(Stream *stream, const Array &nva) {
 } // namespace
 
 Config::Config()
-    : stream_read_timeout(60.), stream_write_timeout(60.),
-      session_option(nullptr), data_ptr(nullptr), padding(0), num_worker(1),
+    : stream_read_timeout(60.), stream_write_timeout(60.), data_ptr(nullptr),
+      padding(0), num_worker(1), max_concurrent_streams(100),
       header_table_size(-1), port(0), verbose(false), daemon(false),
       verify_client(false), no_tls(false), error_gzip(false),
-      early_response(false), hexdump(false) {
-  nghttp2_option_new(&session_option);
-  nghttp2_option_set_recv_client_preface(session_option, 1);
-}
+      early_response(false), hexdump(false), echo_upload(false) {}
 
-Config::~Config() { nghttp2_option_del(session_option); }
+Config::~Config() {}
 
 namespace {
 void stream_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
@@ -171,9 +176,10 @@ void fill_callback(nghttp2_session_callbacks *callbacks, const Config *config);
 
 class Sessions {
 public:
-  Sessions(struct ev_loop *loop, const Config *config, SSL_CTX *ssl_ctx)
-      : loop_(loop), config_(config), ssl_ctx_(ssl_ctx), callbacks_(nullptr),
-        next_session_id_(1), tstamp_cached_(ev_now(loop)),
+  Sessions(HttpServer *sv, struct ev_loop *loop, const Config *config,
+           SSL_CTX *ssl_ctx)
+      : sv_(sv), loop_(loop), config_(config), ssl_ctx_(ssl_ctx),
+        callbacks_(nullptr), next_session_id_(1), tstamp_cached_(ev_now(loop)),
         cached_date_(util::http_date(tstamp_cached_)) {
     nghttp2_session_callbacks_new(&callbacks_);
 
@@ -244,9 +250,37 @@ public:
     }
     return cached_date_;
   }
+  FileEntry *get_cached_fd(const std::string &path) {
+    auto i = fd_cache_.find(path);
+    if (i == std::end(fd_cache_)) {
+      return nullptr;
+    }
+    auto &ent = (*i).second;
+    ++ent.usecount;
+    return &ent;
+  }
+  FileEntry *cache_fd(const std::string &path, const FileEntry &ent) {
+    auto rv = fd_cache_.emplace(path, ent);
+    return &(*rv.first).second;
+  }
+  void release_fd(const std::string &path) {
+    auto i = fd_cache_.find(path);
+    if (i == std::end(fd_cache_)) {
+      return;
+    }
+    auto &ent = (*i).second;
+    if (--ent.usecount == 0) {
+      close(ent.fd);
+      fd_cache_.erase(i);
+    }
+  }
+  const HttpServer *get_server() const { return sv_; }
 
 private:
   std::set<Http2Handler *> handlers_;
+  // cache for file descriptors to read file.
+  std::map<std::string, FileEntry> fd_cache_;
+  HttpServer *sv_;
   struct ev_loop *loop_;
   const Config *config_;
   SSL_CTX *ssl_ctx_;
@@ -257,7 +291,8 @@ private:
 };
 
 Stream::Stream(Http2Handler *handler, int32_t stream_id)
-    : handler(handler), body_left(0), stream_id(stream_id), file(-1) {
+    : handler(handler), file_ent(nullptr), body_length(0), body_offset(0),
+      stream_id(stream_id), echo_upload(false) {
   auto config = handler->get_config();
   ev_timer_init(&rtimer, stream_timeout_cb, 0., config->stream_read_timeout);
   ev_timer_init(&wtimer, stream_timeout_cb, 0., config->stream_write_timeout);
@@ -270,8 +305,9 @@ Stream::Stream(Http2Handler *handler, int32_t stream_id)
 }
 
 Stream::~Stream() {
-  if (file != -1) {
-    close(file);
+  if (file_ent != nullptr) {
+    auto sessions = handler->get_sessions();
+    sessions->release_fd(file_ent->path);
   }
 
   auto loop = handler->get_loop();
@@ -291,9 +327,13 @@ void on_session_closed(Http2Handler *hd, int64_t session_id) {
 
 namespace {
 void settings_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
+  int rv;
   auto hd = static_cast<Http2Handler *>(w->data);
   hd->terminate_session(NGHTTP2_SETTINGS_TIMEOUT);
-  hd->on_write();
+  rv = hd->on_write();
+  if (rv == -1) {
+    delete_handler(hd);
+  }
 }
 } // namespace
 
@@ -435,7 +475,7 @@ int Http2Handler::read_clear() {
 
     rv = nghttp2_session_mem_recv(session_, buf.data(), nread);
     if (rv < 0) {
-      if (rv != NGHTTP2_ERR_BAD_PREFACE) {
+      if (rv != NGHTTP2_ERR_BAD_CLIENT_MAGIC) {
         std::cerr << "nghttp2_session_mem_recv() returned error: "
                   << nghttp2_strerror(rv) << std::endl;
       }
@@ -562,7 +602,7 @@ int Http2Handler::read_tls() {
 
     rv = nghttp2_session_mem_recv(session_, buf.data(), nread);
     if (rv < 0) {
-      if (rv != NGHTTP2_ERR_BAD_PREFACE) {
+      if (rv != NGHTTP2_ERR_BAD_CLIENT_MAGIC) {
         std::cerr << "nghttp2_session_mem_recv() returned error: "
                   << nghttp2_strerror(rv) << std::endl;
       }
@@ -634,20 +674,22 @@ int Http2Handler::on_write() { return write_(*this); }
 int Http2Handler::connection_made() {
   int r;
 
-  r = nghttp2_session_server_new2(&session_, sessions_->get_callbacks(), this,
-                                  sessions_->get_config()->session_option);
+  r = nghttp2_session_server_new(&session_, sessions_->get_callbacks(), this);
+
   if (r != 0) {
     return r;
   }
+
+  auto config = sessions_->get_config();
   std::array<nghttp2_settings_entry, 4> entry;
   size_t niv = 1;
 
   entry[0].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
-  entry[0].value = 100;
+  entry[0].value = config->max_concurrent_streams;
 
-  if (sessions_->get_config()->header_table_size >= 0) {
+  if (config->header_table_size >= 0) {
     entry[niv].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
-    entry[niv].value = sessions_->get_config()->header_table_size;
+    entry[niv].value = config->header_table_size;
     ++niv;
   }
   r = nghttp2_submit_settings(session_, NGHTTP2_FLAG_NONE, entry.data(), niv);
@@ -698,7 +740,7 @@ int Http2Handler::submit_file_response(const std::string &status,
   std::string content_length = util::utos(file_length);
   std::string last_modified_str;
   auto nva = make_array(http2::make_nv_ls(":status", status),
-                        http2::make_nv_ls("server", NGHTTPD_SERVER),
+                        http2::make_nv_ll("server", NGHTTPD_SERVER),
                         http2::make_nv_ls("content-length", content_length),
                         http2::make_nv_ll("cache-control", "max-age=3600"),
                         http2::make_nv_ls("date", sessions_->get_cached_date()),
@@ -728,7 +770,7 @@ int Http2Handler::submit_response(const std::string &status, int32_t stream_id,
   auto nva = std::vector<nghttp2_nv>();
   nva.reserve(3 + headers.size());
   nva.push_back(http2::make_nv_ls(":status", status));
-  nva.push_back(http2::make_nv_ls("server", NGHTTPD_SERVER));
+  nva.push_back(http2::make_nv_ll("server", NGHTTPD_SERVER));
   nva.push_back(http2::make_nv_ls("date", sessions_->get_cached_date()));
   for (auto &nv : headers) {
     nva.push_back(http2::make_nv(nv.name, nv.value, nv.no_index));
@@ -741,7 +783,7 @@ int Http2Handler::submit_response(const std::string &status, int32_t stream_id,
 int Http2Handler::submit_response(const std::string &status, int32_t stream_id,
                                   nghttp2_data_provider *data_prd) {
   auto nva = make_array(http2::make_nv_ls(":status", status),
-                        http2::make_nv_ls("server", NGHTTPD_SERVER));
+                        http2::make_nv_ll("server", NGHTTPD_SERVER));
   return nghttp2_submit_response(session_, stream_id, nva.data(), nva.size(),
                                  data_prd);
 }
@@ -835,12 +877,12 @@ ssize_t file_read_callback(nghttp2_session *session, int32_t stream_id,
   auto hd = static_cast<Http2Handler *>(user_data);
   auto stream = hd->get_stream(stream_id);
 
-  size_t nread = std::min(stream->body_left, static_cast<int64_t>(length));
+  auto nread = std::min(stream->body_length - stream->body_offset,
+                        static_cast<int64_t>(length));
 
   *data_flags |= NGHTTP2_DATA_FLAG_NO_COPY;
 
-  stream->body_left -= nread;
-  if (nread == 0 || stream->body_left <= 0) {
+  if (nread == 0 || stream->body_length == stream->body_offset + nread) {
     *data_flags |= NGHTTP2_DATA_FLAG_EOF;
 
     auto config = hd->get_config();
@@ -872,59 +914,70 @@ ssize_t file_read_callback(nghttp2_session *session, int32_t stream_id,
 }
 
 namespace {
-void prepare_status_response(Stream *stream, Http2Handler *hd,
-                             const std::string &status) {
-  int pipefd[2];
-  if (status == STATUS_304 || pipe(pipefd) == -1) {
-    hd->submit_response(status, stream->stream_id, 0);
-    return;
-  }
-  std::string body;
-  body.reserve(256);
-  body = "<html><head><title>";
-  body += status;
-  body += "</title></head><body><h1>";
-  body += status;
-  body += "</h1><hr><address>";
-  body += NGHTTPD_SERVER;
-  body += " at port ";
-  body += util::utos(hd->get_config()->port);
-  body += "</address>";
-  body += "</body></html>";
+void prepare_status_response(Stream *stream, Http2Handler *hd, int status) {
+  auto sessions = hd->get_sessions();
+  auto status_page = sessions->get_server()->get_status_page(status);
+  auto file_ent = &status_page->file_ent;
+
+  // we don't set stream->file_ent since we don't want to expire it.
+  stream->body_length = file_ent->length;
+  nghttp2_data_provider data_prd;
+  data_prd.source.fd = file_ent->fd;
+  data_prd.read_callback = file_read_callback;
 
   Headers headers;
-  if (hd->get_config()->error_gzip) {
-    gzFile write_fd = gzdopen(pipefd[1], "w");
-    gzwrite(write_fd, body.c_str(), body.size());
-    gzclose(write_fd);
-    headers.emplace_back("content-encoding", "gzip");
-  } else {
-    ssize_t rv;
-
-    while ((rv = write(pipefd[1], body.c_str(), body.size())) == -1 &&
-           errno == EINTR)
-      ;
-
-    if (rv != static_cast<ssize_t>(body.size())) {
-      std::cerr << "Could not write all response body: " << rv << std::endl;
-    }
-  }
-  close(pipefd[1]);
-
-  stream->file = pipefd[0];
-  stream->body_left = body.size();
-  nghttp2_data_provider data_prd;
-  data_prd.source.fd = pipefd[0];
-  data_prd.read_callback = file_read_callback;
   headers.emplace_back("content-type", "text/html; charset=UTF-8");
-  hd->submit_response(status, stream->stream_id, headers, &data_prd);
+  hd->submit_response(status_page->status, stream->stream_id, headers,
+                      &data_prd);
+}
+} // namespace
+
+namespace {
+void prepare_echo_response(Stream *stream, Http2Handler *hd) {
+  auto length = lseek(stream->file_ent->fd, 0, SEEK_END);
+  if (length == -1) {
+    hd->submit_rst_stream(stream, NGHTTP2_INTERNAL_ERROR);
+    return;
+  }
+  stream->body_length = length;
+  if (lseek(stream->file_ent->fd, 0, SEEK_SET) == -1) {
+    hd->submit_rst_stream(stream, NGHTTP2_INTERNAL_ERROR);
+    return;
+  }
+  nghttp2_data_provider data_prd;
+  data_prd.source.fd = stream->file_ent->fd;
+  data_prd.read_callback = file_read_callback;
+
+  Headers headers;
+  headers.emplace_back("nghttpd-response", "echo");
+  headers.emplace_back("content-length", util::utos(length));
+
+  hd->submit_response("200", stream->stream_id, headers, &data_prd);
+}
+} // namespace
+
+namespace {
+bool prepare_upload_temp_store(Stream *stream, Http2Handler *hd) {
+  auto sessions = hd->get_sessions();
+
+  char tempfn[] = "/tmp/nghttpd.temp.XXXXXX";
+  auto fd = mkstemp(tempfn);
+  if (fd == -1) {
+    return false;
+  }
+  unlink(tempfn);
+  // Ordinary request never start with "echo:".  The length is 0 for
+  // now.  We will update it when we get whole request body.
+  stream->file_ent = sessions->cache_fd(std::string("echo:") + tempfn,
+                                        FileEntry(tempfn, 0, 0, fd));
+  stream->echo_upload = true;
+  return true;
 }
 } // namespace
 
 namespace {
 void prepare_redirect_response(Stream *stream, Http2Handler *hd,
-                               const std::string &path,
-                               const std::string &status) {
+                               const std::string &path, int status) {
   auto scheme =
       http2::get_header(stream->hdidx, http2::HD__SCHEME, stream->headers);
   auto authority =
@@ -941,7 +994,10 @@ void prepare_redirect_response(Stream *stream, Http2Handler *hd,
 
   auto headers = Headers{{"location", redirect_url}};
 
-  hd->submit_response(status, stream->stream_id, headers, nullptr);
+  auto sessions = hd->get_sessions();
+  auto status_page = sessions->get_server()->get_status_page(status);
+
+  hd->submit_response(status_page->status, stream->stream_id, headers, nullptr);
 }
 } // namespace
 
@@ -973,9 +1029,15 @@ void prepare_response(Stream *stream, Http2Handler *hd,
     url = reqpath;
   }
 
-  url = util::percentDecode(url.begin(), url.end());
+  auto sessions = hd->get_sessions();
+
+  url = util::percentDecode(std::begin(url), std::end(url));
   if (!util::check_path(url)) {
-    prepare_status_response(stream, hd, STATUS_404);
+    if (stream->file_ent) {
+      sessions->release_fd(stream->file_ent->path);
+      stream->file_ent = nullptr;
+    }
+    prepare_status_response(stream, hd, 404);
     return;
   }
   auto push_itr = hd->get_config()->push.find(url);
@@ -988,13 +1050,24 @@ void prepare_response(Stream *stream, Http2Handler *hd,
       }
     }
   }
+
   std::string path = hd->get_config()->htdocs + url;
   if (path[path.size() - 1] == '/') {
     path += DEFAULT_HTML;
   }
+
+  if (stream->echo_upload) {
+    assert(stream->file_ent);
+    prepare_echo_response(stream, hd);
+    return;
+  }
+
+  auto file_ent = sessions->get_cached_fd(path);
+
+  if (file_ent == nullptr) {
     int file = open(path.c_str(), O_RDONLY | O_BINARY);
     if (file == -1) {
-    prepare_status_response(stream, hd, STATUS_404);
+      prepare_status_response(stream, hd, 404);
 
       return;
     }
@@ -1003,7 +1076,7 @@ void prepare_response(Stream *stream, Http2Handler *hd,
 
     if (fstat(file, &buf) == -1) {
       close(file);
-    prepare_status_response(stream, hd, STATUS_404);
+      prepare_status_response(stream, hd, 404);
 
       return;
     }
@@ -1017,26 +1090,36 @@ void prepare_response(Stream *stream, Http2Handler *hd,
         reqpath.insert(query_pos, "/");
       }
 
-    prepare_redirect_response(stream, hd, reqpath, STATUS_301);
+      prepare_redirect_response(stream, hd, reqpath, 301);
 
       return;
     }
 
-  stream->file = file;
-  stream->body_left = buf.st_size;
+    if (last_mod_found && static_cast<time_t>(buf.st_mtime) <= last_mod) {
+      close(file);
+      prepare_status_response(stream, hd, 304);
+
+      return;
+    }
+
+    file_ent = sessions->cache_fd(
+        path, FileEntry(path, buf.st_size, buf.st_mtime, file));
+  } else if (last_mod_found && file_ent->mtime <= last_mod) {
+    sessions->release_fd(file_ent->path);
+    prepare_status_response(stream, hd, 304);
+
+    return;
+  }
+
+  stream->file_ent = file_ent;
+  stream->body_length = file_ent->length;
 
   nghttp2_data_provider data_prd;
 
-  data_prd.source.fd = file;
+  data_prd.source.fd = file_ent->fd;
   data_prd.read_callback = file_read_callback;
 
-  if (last_mod_found && buf.st_mtime <= last_mod) {
-    prepare_status_response(stream, hd, STATUS_304);
-
-    return;
-  }
-
-  hd->submit_file_response(STATUS_200, stream, buf.st_mtime, buf.st_size,
+  hd->submit_file_response("200", stream, file_ent->mtime, file_ent->length,
                            &data_prd);
 }
 } // namespace
@@ -1108,7 +1191,7 @@ int hd_on_frame_recv_callback(nghttp2_session *session,
 
     if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
       remove_stream_read_timeout(stream);
-      if (!hd->get_config()->early_response) {
+      if (stream->echo_upload || !hd->get_config()->early_response) {
         prepare_response(stream, hd);
       }
     } else {
@@ -1132,14 +1215,22 @@ int hd_on_frame_recv_callback(nghttp2_session *session,
         hd->submit_non_final_response("100", frame->hd.stream_id);
       }
 
-      if (hd->get_config()->early_response) {
+      auto &method = http2::get_header(stream->hdidx, http2::HD__METHOD,
+                                       stream->headers)->value;
+      if (hd->get_config()->echo_upload &&
+          (method == "POST" || method == "PUT")) {
+        if (!prepare_upload_temp_store(stream, hd)) {
+          hd->submit_rst_stream(stream, NGHTTP2_INTERNAL_ERROR);
+          return 0;
+        }
+      } else if (hd->get_config()->early_response) {
         prepare_response(stream, hd);
       }
     }
 
     if (frame->hd.flags & NGHTTP2_FLAG_END_STREAM) {
       remove_stream_read_timeout(stream);
-      if (!hd->get_config()->early_response) {
+      if (stream->echo_upload || !hd->get_config()->early_response) {
         prepare_response(stream, hd);
       }
     } else {
@@ -1220,6 +1311,7 @@ int send_data_callback(nghttp2_session *session, nghttp2_frame *frame,
   auto hd = static_cast<Http2Handler *>(user_data);
   auto wb = hd->get_wb();
   auto padlen = frame->data.padlen;
+  auto stream = hd->get_stream(frame->hd.stream_id);
 
   if (wb->wleft() < 9 + length + padlen) {
     return NGHTTP2_ERR_WOULDBLOCK;
@@ -1237,17 +1329,18 @@ int send_data_callback(nghttp2_session *session, nghttp2_frame *frame,
 
   while (length) {
     ssize_t nread;
-    while ((nread = read(fd, p, length)) == -1 && errno == EINTR)
+    while ((nread = pread(fd, p, length, stream->body_offset)) == -1 &&
+           errno == EINTR)
       ;
 
     if (nread == -1) {
-      auto stream = hd->get_stream(frame->hd.stream_id);
       remove_stream_read_timeout(stream);
       remove_stream_write_timeout(stream);
 
       return NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE;
     }
 
+    stream->body_offset += nread;
     length -= nread;
     p += nread;
   }
@@ -1283,6 +1376,21 @@ int on_data_chunk_recv_callback(nghttp2_session *session, uint8_t flags,
     return 0;
   }
 
+  if (stream->echo_upload) {
+    assert(stream->file_ent);
+    while (len) {
+      ssize_t n;
+      while ((n = write(stream->file_ent->fd, data, len)) == -1 &&
+             errno == EINTR)
+        ;
+      if (n == -1) {
+        hd->submit_rst_stream(stream, NGHTTP2_INTERNAL_ERROR);
+        return 0;
+      }
+      len -= n;
+      data += n;
+    }
+  }
   // TODO Handle POST
 
   add_stream_read_timeout(stream);
@@ -1380,7 +1488,7 @@ void run_worker(Worker *worker) {
 
 class AcceptHandler {
 public:
-  AcceptHandler(Sessions *sessions, const Config *config)
+  AcceptHandler(HttpServer *sv, Sessions *sessions, const Config *config)
       : sessions_(sessions), config_(config), next_worker_(0) {
     if (config_->num_worker == 1) {
       return;
@@ -1392,7 +1500,7 @@ public:
       auto worker = make_unique<Worker>();
       auto loop = ev_loop_new(0);
       worker->sessions =
-          make_unique<Sessions>(loop, config_, sessions_->get_ssl_ctx());
+          make_unique<Sessions>(sv, loop, config_, sessions_->get_ssl_ctx());
       ev_async_init(&worker->w, worker_acceptcb);
       worker->w.data = worker.get();
       ev_async_start(loop, &worker->w);
@@ -1476,7 +1584,61 @@ void acceptcb(struct ev_loop *loop, ev_io *w, int revents) {
 }
 } // namespace
 
-HttpServer::HttpServer(const Config *config) : config_(config) {}
+namespace {
+FileEntry make_status_body(int status, uint16_t port) {
+  std::string body;
+  body = "<html><head><title>";
+  body += http2::get_status_string(status);
+  body += "</title></head><body><h1>";
+  body += http2::get_status_string(status);
+  body += "</h1><hr><address>";
+  body += NGHTTPD_SERVER;
+  body += " at port ";
+  body += util::utos(port);
+  body += "</address>";
+  body += "</body></html>";
+
+  char tempfn[] = "/tmp/nghttpd.temp.XXXXXX";
+  int fd = mkstemp(tempfn);
+  if (fd == -1) {
+    auto error = errno;
+    std::cerr << "Could not open status response body file: errno=" << error;
+    assert(0);
+  }
+  unlink(tempfn);
+  ssize_t nwrite;
+  while ((nwrite = write(fd, body.c_str(), body.size())) == -1 &&
+         errno == EINTR)
+    ;
+  if (nwrite == -1) {
+    auto error = errno;
+    std::cerr << "Could not write status response body into file: errno="
+              << error;
+    assert(0);
+  }
+
+  return FileEntry(util::utos(status), nwrite, 0, fd);
+}
+} // namespace
+
+// index into HttpServer::status_pages_
+enum {
+  IDX_200,
+  IDX_301,
+  IDX_304,
+  IDX_400,
+  IDX_404,
+};
+
+HttpServer::HttpServer(const Config *config) : config_(config) {
+  status_pages_ = std::vector<StatusPage>{
+      {"200", make_status_body(200, config_->port)},
+      {"301", make_status_body(301, config_->port)},
+      {"304", make_status_body(304, config_->port)},
+      {"400", make_status_body(400, config_->port)},
+      {"404", make_status_body(404, config_->port)},
+  };
+}
 
 namespace {
 int next_proto_cb(SSL *s, const unsigned char **data, unsigned int *len,
@@ -1497,14 +1659,14 @@ int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) {
 } // namespace
 
 namespace {
-int start_listen(struct ev_loop *loop, Sessions *sessions,
+int start_listen(HttpServer *sv, struct ev_loop *loop, Sessions *sessions,
                  const Config *config) {
   addrinfo hints;
   int r;
   bool ok = false;
   const char *addr = nullptr;
 
-  auto acceptor = std::make_shared<AcceptHandler>(sessions, config);
+  auto acceptor = std::make_shared<AcceptHandler>(sv, sessions, config);
   auto service = util::utos(config->port);
 
   memset(&hints, 0, sizeof(addrinfo));
@@ -1699,8 +1861,8 @@ int HttpServer::run() {
 
   auto loop = EV_DEFAULT;
 
-  Sessions sessions(loop, config_, ssl_ctx);
-  if (start_listen(loop, &sessions, config_) != 0) {
+  Sessions sessions(this, loop, config_, ssl_ctx);
+  if (start_listen(this, loop, &sessions, config_) != 0) {
     std::cerr << "Could not listen" << std::endl;
     return -1;
   }
@@ -1711,4 +1873,22 @@ int HttpServer::run() {
 
 const Config *HttpServer::get_config() const { return config_; }
 
+const StatusPage *HttpServer::get_status_page(int status) const {
+  switch (status) {
+  case 200:
+    return &status_pages_[IDX_200];
+  case 301:
+    return &status_pages_[IDX_301];
+  case 304:
+    return &status_pages_[IDX_304];
+  case 400:
+    return &status_pages_[IDX_400];
+  case 404:
+    return &status_pages_[IDX_404];
+  default:
+    assert(0);
+  }
+  return nullptr;
+}
+
 } // namespace nghttp2

src/HttpServer.h

@@ -27,9 +27,9 @@
 
 #include "nghttp2_config.h"
 
-#include <stdint.h>
 #include <sys/types.h>
 
+#include <cinttypes>
 #include <cstdlib>
 
 #include <string>
@@ -59,10 +59,10 @@ struct Config {
   std::string address;
   ev_tstamp stream_read_timeout;
   ev_tstamp stream_write_timeout;
-  nghttp2_option *session_option;
   void *data_ptr;
   size_t padding;
   size_t num_worker;
+  size_t max_concurrent_streams;
   ssize_t header_table_size;
   uint16_t port;
   bool verbose;
@@ -72,21 +72,36 @@ struct Config {
   bool error_gzip;
   bool early_response;
   bool hexdump;
+  bool echo_upload;
   Config();
   ~Config();
 };
 
 class Http2Handler;
 
+struct FileEntry {
+  FileEntry(std::string path, int64_t length, int64_t mtime, int fd)
+      : path(std::move(path)), length(length), mtime(mtime), dlprev(nullptr),
+        dlnext(nullptr), fd(fd), usecount(1) {}
+  std::string path;
+  int64_t length;
+  int64_t mtime;
+  FileEntry *dlprev, *dlnext;
+  int fd;
+  int usecount;
+};
+
 struct Stream {
   Headers headers;
   Http2Handler *handler;
+  FileEntry *file_ent;
   ev_timer rtimer;
   ev_timer wtimer;
-  int64_t body_left;
+  int64_t body_length;
+  int64_t body_offset;
   int32_t stream_id;
-  int file;
   http2::HeaderIndex hdidx;
+  bool echo_upload;
   Stream(Http2Handler *handler, int32_t stream_id);
   ~Stream();
 };
@@ -160,14 +175,21 @@ private:
   int fd_;
 };
 
+struct StatusPage {
+  std::string status;
+  FileEntry file_ent;
+};
+
 class HttpServer {
 public:
   HttpServer(const Config *config);
   int listen();
   int run();
   const Config *get_config() const;
+  const StatusPage *get_status_page(int status) const;
 
 private:
+  std::vector<StatusPage> status_pages_;
   const Config *config_;
 };
 

src/app_helper.cc

@@ -23,11 +23,21 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif // HAVE_SYS_SOCKET_H
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif // HAVE_NETDB_H
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif // HAVE_UNISTD_H
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif // HAVE_FCNTL_H
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif // HAVE_NETINET_IN_H
 #include <netinet/tcp.h>
 #include <poll.h>
 
@@ -130,8 +140,6 @@ const char *strframetype(uint8_t type) {
     return "GOAWAY";
   case NGHTTP2_WINDOW_UPDATE:
     return "WINDOW_UPDATE";
-  case NGHTTP2_EXT_ALTSVC:
-    return "ALTSVC";
   default:
     return "UNKNOWN";
   }
@@ -362,34 +370,6 @@ void print_frame(print_type ptype, const nghttp2_frame *frame) {
     fprintf(outfile, "(window_size_increment=%d)\n",
             frame->window_update.window_size_increment);
     break;
-  case NGHTTP2_EXT_ALTSVC: {
-    print_frame_attr_indent();
-
-    auto altsvc = static_cast<const nghttp2_ext_altsvc *>(frame->ext.payload);
-
-    fprintf(outfile, "(max-age=%u, port=%u, protocol_id=", altsvc->max_age,
-            altsvc->port);
-
-    if (altsvc->protocol_id_len) {
-      fwrite(altsvc->protocol_id, altsvc->protocol_id_len, 1, outfile);
-    }
-
-    fprintf(outfile, ", host=");
-
-    if (altsvc->host_len) {
-      fwrite(altsvc->host, altsvc->host_len, 1, outfile);
-    }
-
-    fprintf(outfile, ", origin=");
-
-    if (altsvc->origin_len) {
-      fwrite(altsvc->origin, altsvc->origin_len, 1, outfile);
-    }
-
-    fprintf(outfile, ")\n");
-
-    break;
-  }
   default:
     break;
   }
@@ -429,10 +409,11 @@ int verbose_on_frame_recv_callback(nghttp2_session *session,
 
 int verbose_on_invalid_frame_recv_callback(nghttp2_session *session,
                                            const nghttp2_frame *frame,
-                                           uint32_t error_code,
+                                           int lib_error_code,
                                            void *user_data) {
   print_timer();
-  fprintf(outfile, " [INVALID; status=%s] recv ", strstatus(error_code));
+  fprintf(outfile, " [INVALID; error=%s] recv ",
+          nghttp2_strerror(lib_error_code));
   print_frame(PRINT_RECV, frame);
   fflush(outfile);
   return 0;

src/app_helper.h

@@ -27,9 +27,11 @@
 
 #include "nghttp2_config.h"
 
-#include <stdint.h>
+#include <cinttypes>
 #include <cstdlib>
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif // HAVE_SYS_TIME_H
 #include <poll.h>
 
 #include <map>
@@ -49,8 +51,7 @@ int verbose_on_frame_recv_callback(nghttp2_session *session,
 
 int verbose_on_invalid_frame_recv_callback(nghttp2_session *session,
                                            const nghttp2_frame *frame,
-                                           uint32_t error_code,
-                                           void *user_data);
+                                           int lib_error_code, void *user_data);
 
 int verbose_on_frame_send_callback(nghttp2_session *session,
                                    const nghttp2_frame *frame, void *user_data);

src/asio_client_session_impl.cc

@@ -75,10 +75,6 @@ void session_impl::connected(tcp::resolver::iterator endpoint_it) {
 
   socket().set_option(boost::asio::ip::tcp::no_delay(true));
 
-  std::copy_n(NGHTTP2_CLIENT_CONNECTION_PREFACE,
-              NGHTTP2_CLIENT_CONNECTION_PREFACE_LEN, std::begin(wb_));
-  wblen_ = NGHTTP2_CLIENT_CONNECTION_PREFACE_LEN;
-
   do_write();
   do_read();
 
@@ -89,10 +85,7 @@ void session_impl::connected(tcp::resolver::iterator endpoint_it) {
 }
 
 void session_impl::not_connected(const boost::system::error_code &ec) {
-  auto &error_cb = on_error();
-  if (error_cb) {
-    error_cb(ec);
-  }
+  call_error_cb(ec);
 }
 
 void session_impl::on_connect(connect_cb cb) { connect_cb_ = std::move(cb); }
@@ -103,6 +96,14 @@ const connect_cb &session_impl::on_connect() const { return connect_cb_; }
 
 const error_cb &session_impl::on_error() const { return error_cb_; }
 
+void session_impl::call_error_cb(const boost::system::error_code &ec) {
+  auto &error_cb = on_error();
+  if (!error_cb) {
+    return;
+  }
+  error_cb(ec);
+}
+
 namespace {
 int on_begin_headers_callback(nghttp2_session *session,
                               const nghttp2_frame *frame, void *user_data) {
@@ -308,10 +309,7 @@ bool session_impl::setup_session() {
 
   auto rv = nghttp2_session_client_new(&session_, callbacks, this);
   if (rv != 0) {
-    auto &error_cb = on_error();
-    if (error_cb) {
-      error_cb(make_error_code(static_cast<nghttp2_error>(rv)));
-    }
+    call_error_cb(make_error_code(static_cast<nghttp2_error>(rv)));
     return false;
   }
 
@@ -528,6 +526,7 @@ void session_impl::do_read() {
                      std::size_t bytes_transferred) {
     if (ec) {
       if (ec.value() == boost::asio::error::operation_aborted) {
+        call_error_cb(ec);
         shutdown_socket();
       }
       return;
@@ -540,6 +539,8 @@ void session_impl::do_read() {
           nghttp2_session_mem_recv(session_, rb_.data(), bytes_transferred);
 
       if (rv != static_cast<ssize_t>(bytes_transferred)) {
+        call_error_cb(make_error_code(
+            static_cast<nghttp2_error>(rv < 0 ? rv : NGHTTP2_ERR_PROTO)));
         shutdown_socket();
         return;
       }
@@ -577,6 +578,7 @@ void session_impl::do_write() {
       const uint8_t *data;
       auto n = nghttp2_session_mem_send(session_, &data);
       if (n < 0) {
+        call_error_cb(make_error_code(static_cast<nghttp2_error>(n)));
         shutdown_socket();
         return;
       }
@@ -606,6 +608,8 @@ void session_impl::do_write() {
 
   write_socket([this](const boost::system::error_code &ec, std::size_t n) {
     if (ec) {
+      call_error_cb(ec);
+      shutdown_socket();
       return;
     }
 

src/asio_client_session_impl.h

@@ -97,6 +97,7 @@ protected:
 private:
   bool should_stop() const;
   bool setup_session();
+  void call_error_cb(const boost::system::error_code &ec);
 
   boost::asio::io_service &io_service_;
   tcp::resolver resolver_;

src/asio_io_service_pool.cc

@@ -35,8 +35,6 @@
 //
 #include "asio_io_service_pool.h"
 
-#include <future>
-
 namespace nghttp2 {
 
 namespace asio_http2 {
@@ -56,19 +54,23 @@ io_service_pool::io_service_pool(std::size_t pool_size) : next_io_service_(0) {
   }
 }
 
-void io_service_pool::run() {
+void io_service_pool::run(bool asynchronous) {
   // Create a pool of threads to run all of the io_services.
-  auto futs = std::vector<std::future<std::size_t>>();
-
   for (std::size_t i = 0; i < io_services_.size(); ++i) {
-    futs.push_back(std::async(std::launch::async,
+    futures_.push_back(std::async(std::launch::async,
                                   (size_t (boost::asio::io_service::*)(void)) &
                                       boost::asio::io_service::run,
                                   io_services_[i]));
   }
 
+  if (!asynchronous) {
+    join();
+  }
+}
+
+void io_service_pool::join() {
   // Wait for all threads in the pool to exit.
-  for (auto &fut : futs) {
+  for (auto &fut : futures_) {
     fut.get();
   }
 }