diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2015-10-23 09:16:00 +0200 | 
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-10-23 09:16:00 +0200 | 
| commit | b7d894d808f0546fcfad725711ee648f0290f7fe (patch) | |
| tree | b7e4ac2d4ef38db5c14558b1243c55d3e247dcf5 | |
| parent | d31ed6ac719cd3c7c1dcac5f9000b19536087b7e (diff) | |
http2: add stream options to dist and curl_easy_setopt.3
| -rw-r--r-- | docs/libcurl/curl_easy_setopt.3 | 7 | ||||
| -rw-r--r-- | docs/libcurl/opts/Makefile.am | 9 | 
2 files changed, 13 insertions, 3 deletions
diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3 index 011e35061..961ea5549 100644 --- a/docs/libcurl/curl_easy_setopt.3 +++ b/docs/libcurl/curl_easy_setopt.3 @@ -297,6 +297,13 @@ Disable Transfer decoding. See \fICURLOPT_HTTP_TRANSFER_DECODING(3)\fP  100-continue timeout. See \fICURLOPT_EXPECT_100_TIMEOUT_MS(3)\fP  .IP CURLOPT_PIPEWAIT  Wait on connection to pipeline on it. See \fICURLOPT_PIPEWAIT(3)\fP +.IP CURLOPT_STREAM_DEPENDS +This HTTP/2 stream depends on another. See \fICURLOPT_STREAM_DEPENDS(3)\fP +.IP CURLOPT_STREAM_DEPENDS_E +This HTTP/2 stream depends on another exclusively. See +\fICURLOPT_STREAM_DEPENDS_E(3)\fP +.IP CURLOPT_STREAM_WEIGHT +Set this HTTP/2 stream's weight. See \fICURLOPT_STREAM_WEIGHT(3)\fP  .SH SMTP OPTIONS  .IP CURLOPT_MAIL_FROM  Address of the sender. See \fICURLOPT_MAIL_FROM(3)\fP diff --git a/docs/libcurl/opts/Makefile.am b/docs/libcurl/opts/Makefile.am index 548b513c8..bebefec80 100644 --- a/docs/libcurl/opts/Makefile.am +++ b/docs/libcurl/opts/Makefile.am @@ -106,7 +106,8 @@ man_MANS = CURLOPT_ACCEPT_ENCODING.3 CURLOPT_ACCEPTTIMEOUT_MS.3		\   CURLOPT_USE_SSL.3 CURLOPT_VERBOSE.3 CURLOPT_WILDCARDMATCH.3		\   CURLOPT_WRITEDATA.3 CURLOPT_WRITEFUNCTION.3 CURLOPT_XFERINFODATA.3	\   CURLOPT_XFERINFOFUNCTION.3 CURLOPT_XOAUTH2_BEARER.3			\ - CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3					\ + CURLOPT_STREAM_DEPENDS.3 CURLOPT_STREAM_DEPENDS_E.3			\ + CURLOPT_STREAM_WEIGHT.3 CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3		\   CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3 CURLMOPT_MAXCONNECTS.3		\   CURLMOPT_MAX_HOST_CONNECTIONS.3 CURLMOPT_MAX_PIPELINE_LENGTH.3		\   CURLMOPT_MAX_TOTAL_CONNECTIONS.3 CURLMOPT_PIPELINING.3			\ @@ -233,7 +234,8 @@ HTMLPAGES = CURLOPT_ACCEPT_ENCODING.html CURLOPT_ACCEPTTIMEOUT_MS.html	\   CURLOPT_VERBOSE.html CURLOPT_WILDCARDMATCH.html CURLOPT_WRITEDATA.html	\   CURLOPT_WRITEFUNCTION.html CURLOPT_XFERINFODATA.html			\   CURLOPT_XFERINFOFUNCTION.html CURLOPT_XOAUTH2_BEARER.html		\ - CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.html				\ + CURLOPT_STREAM_DEPENDS.html CURLOPT_STREAM_DEPENDS_E.html		\ + CURLOPT_STREAM_WEIGHT.html CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.html	\   CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.html CURLMOPT_MAXCONNECTS.html	\   CURLMOPT_MAX_HOST_CONNECTIONS.html CURLMOPT_MAX_PIPELINE_LENGTH.html	\   CURLMOPT_MAX_TOTAL_CONNECTIONS.html CURLMOPT_PIPELINING.html		\ @@ -362,7 +364,8 @@ PDFPAGES = CURLOPT_ACCEPT_ENCODING.pdf CURLOPT_ACCEPTTIMEOUT_MS.pdf	\   CURLOPT_VERBOSE.pdf CURLOPT_WILDCARDMATCH.pdf CURLOPT_WRITEDATA.pdf	\   CURLOPT_WRITEFUNCTION.pdf CURLOPT_XFERINFODATA.pdf			\   CURLOPT_XFERINFOFUNCTION.pdf CURLOPT_XOAUTH2_BEARER.pdf		\ - CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.pdf					\ + CURLOPT_STREAM_DEPENDS.pdf CURLOPT_STREAM_DEPENDS_E.pdf		\ + CURLOPT_STREAM_WEIGHT.pdf CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.pdf	\   CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.pdf CURLMOPT_MAXCONNECTS.pdf	\   CURLMOPT_MAX_HOST_CONNECTIONS.pdf CURLMOPT_MAX_PIPELINE_LENGTH.pdf	\   CURLMOPT_MAX_TOTAL_CONNECTIONS.pdf CURLMOPT_PIPELINING.pdf		\  | 
