diff options
| author | Michael Kaufmann <mail@michael-kaufmann.ch> | 2016-05-01 13:22:16 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-05-01 13:32:49 +0200 |
| commit | 6940f4b52a9244124740e1b8db3af07aa3d2763c (patch) | |
| tree | 39276319e134328c57877a2a50bb783c4f11f74c | |
| parent | ffd0e6193fceeccb2680088be023d2d1f7c5d49d (diff) | |
docs: fix bugs in CURLOPT_HTTP_VERSION.3 and CURLOPT_PIPEWAIT.3
Closes #786
| -rw-r--r-- | docs/libcurl/opts/CURLOPT_HTTP_VERSION.3 | 4 | ||||
| -rw-r--r-- | docs/libcurl/opts/CURLOPT_PIPEWAIT.3 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/libcurl/opts/CURLOPT_HTTP_VERSION.3 b/docs/libcurl/opts/CURLOPT_HTTP_VERSION.3 index f56d61a5c..96dd4b672 100644 --- a/docs/libcurl/opts/CURLOPT_HTTP_VERSION.3 +++ b/docs/libcurl/opts/CURLOPT_HTTP_VERSION.3 @@ -48,7 +48,7 @@ Enforce HTTP 1.1 requests. Attempt HTTP 2 requests. libcurl will fall back to HTTP 1.1 if HTTP 2 can't be negotiated with the server. (Added in 7.33.0) -The alias \fICURL_HTTP_VERSION_2\fI was added in 7.43.0 to better reflect the +The alias \fICURL_HTTP_VERSION_2\fP was added in 7.43.0 to better reflect the actual protocol name. .IP CURL_HTTP_VERSION_2TLS Attempt HTTP 2 over TLS (HTTPS) only. libcurl will fall back to HTTP 1.1 if @@ -58,7 +58,7 @@ libcurl will use 1.1. (Added in 7.47.0) Issue non-TLS HTTP requests using HTTP/2 without HTTP/1.1 Upgrade. It requires prior knowledge that the server supports HTTP/2 straight away. HTTPS requests will still do HTTP/2 the standard way with negotiated protocol version in the -TLS handshake. +TLS handshake. (Added in 7.49.0) .SH DEFAULT CURL_HTTP_VERSION_NONE .SH PROTOCOLS diff --git a/docs/libcurl/opts/CURLOPT_PIPEWAIT.3 b/docs/libcurl/opts/CURLOPT_PIPEWAIT.3 index 2dc1a5256..6d0f14e79 100644 --- a/docs/libcurl/opts/CURLOPT_PIPEWAIT.3 +++ b/docs/libcurl/opts/CURLOPT_PIPEWAIT.3 @@ -36,7 +36,7 @@ libcurl will check for existing connections to re-use and pipeline on. If no such connection exists it will immediately continue and create a fresh new connection to use. -By setting this option to 1 - and having \fICURLMOPT_PIPELINE(3)\fP enabled +By setting this option to 1 - and having \fICURLMOPT_PIPELINING(3)\fP enabled for the multi handle this transfer is associated with - libcurl will instead wait for the connection to reveal if it is possible to pipeline/multiplex on before it continues. This enables libcurl to much better keep the number of |