Update README.rst

This commit is contained in:
Tatsuhiro Tsujikawa 2014-06-14 22:49:18 +09:00
parent 1cbb5a3d8f
commit 5383db467e
1 changed files with 8 additions and 8 deletions

View File

@ -16,7 +16,7 @@ We didn't cover everything, but we have Python binding of this libary.
Development Status Development Status
------------------ ------------------
We started to implement h2-12 We started to implement h2-lc
(http://tools.ietf.org/html/draft-ietf-httpbis-http2-12) and the (http://tools.ietf.org/html/draft-ietf-httpbis-http2-12) and the
header compression header compression
(http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-07). (http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-07).
@ -179,10 +179,10 @@ output from ``nghttp`` client::
$ src/nghttp -nv https://nghttp2.org $ src/nghttp -nv https://nghttp2.org
[ 0.033][NPN] server offers: [ 0.033][NPN] server offers:
* h2-12 * h2-lc
* spdy/3.1 * spdy/3.1
* http/1.1 * http/1.1
The negotiated protocol: h2-12 The negotiated protocol: h2-lc
[ 0.068] send SETTINGS frame <length=15, flags=0x00, stream_id=0> [ 0.068] send SETTINGS frame <length=15, flags=0x00, stream_id=0>
(niv=3) (niv=3)
[SETTINGS_MAX_CONCURRENT_STREAMS(3):100] [SETTINGS_MAX_CONCURRENT_STREAMS(3):100]
@ -251,7 +251,7 @@ The HTTP Upgrade is performed like this::
GET / HTTP/1.1 GET / HTTP/1.1
Host: nghttp2.org Host: nghttp2.org
Connection: Upgrade, HTTP2-Settings Connection: Upgrade, HTTP2-Settings
Upgrade: h2c-12 Upgrade: h2c-lc
HTTP2-Settings: AwAAAGQEAAD__wUAAAAB HTTP2-Settings: AwAAAGQEAAD__wUAAAAB
Accept: */* Accept: */*
User-Agent: nghttp2/0.4.0-DEV User-Agent: nghttp2/0.4.0-DEV
@ -260,7 +260,7 @@ The HTTP Upgrade is performed like this::
[ 0.024] HTTP Upgrade response [ 0.024] HTTP Upgrade response
HTTP/1.1 101 Switching Protocols HTTP/1.1 101 Switching Protocols
Connection: Upgrade Connection: Upgrade
Upgrade: h2c-12 Upgrade: h2c-lc
[ 0.024] HTTP Upgrade success [ 0.024] HTTP Upgrade success
@ -274,7 +274,7 @@ The HTTP Upgrade is performed like this::
[SETTINGS_MAX_CONCURRENT_STREAMS(3):100] [SETTINGS_MAX_CONCURRENT_STREAMS(3):100]
[SETTINGS_INITIAL_WINDOW_SIZE(4):65535] [SETTINGS_INITIAL_WINDOW_SIZE(4):65535]
[ 0.024] recv ALTSVC frame <length=43, flags=0x00, stream_id=0> [ 0.024] recv ALTSVC frame <length=43, flags=0x00, stream_id=0>
(max-age=86400, port=443, protocol_id=h2-12, host=nghttp2.org, origin=http://nghttp2.org) (max-age=86400, port=443, protocol_id=h2-lc, host=nghttp2.org, origin=http://nghttp2.org)
[ 0.024] send SETTINGS frame <length=0, flags=0x01, stream_id=0> [ 0.024] send SETTINGS frame <length=0, flags=0x01, stream_id=0>
; ACK ; ACK
(niv=0) (niv=0)
@ -382,7 +382,7 @@ information. Here is sample output from ``nghttpd`` server::
nghttpx - proxy nghttpx - proxy
+++++++++++++++ +++++++++++++++
``nghttpx`` is a multi-threaded reverse proxy for ``h2-12``, SPDY and ``nghttpx`` is a multi-threaded reverse proxy for ``h2-lc``, SPDY and
HTTP/1.1 and powers nghttp2.org site. It has several operation modes: HTTP/1.1 and powers nghttp2.org site. It has several operation modes:
================== ============================ ============== ============= ================== ============================ ============== =============
@ -396,7 +396,7 @@ 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 The interesting mode at the moment is the default mode. It works like
a reverse proxy and listens for ``h2-12``, SPDY and HTTP/1.1 and can a reverse proxy and listens for ``h2-lc``, SPDY and HTTP/1.1 and can
be deployed SSL/TLS terminator for existing web server. be deployed SSL/TLS terminator for existing web server.
The default mode, ``--http2-proxy`` and ``--http2-bridge`` modes use The default mode, ``--http2-proxy`` and ``--http2-bridge`` modes use