Commit 071c5613 authored by Frank Gevaerts's avatar Frank Gevaerts Committed by Daniel Stenberg
Browse files

http: add CURLINFO_HTTP_VERSION and %{http_version} 

Adds access to the effectively used http version to both libcurl and
curl.

Closes #799
parent 4bffaad8

docs/curl.1

+3 −0
Original line number Diff line number Diff line
@@ -1944,6 +1944,9 @@ same info. 
The numerical code that was found in the last response (from a proxy) to a

curl CONNECT request. (Added in 7.12.4)

.TP

.B http_version

The http version that was effectively used. (Added in 7.50.0)

.TP

.B local_ip

The IP address of the local end of the most recently done connection - can be

either IPv4 or IPv6 (Added in 7.29.0)

docs/libcurl/curl_easy_getinfo.3

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ See \fICURLINFO_RESPONSE_CODE(3)\fP 
.IP CURLINFO_HTTP_CONNECTCODE

Last proxy CONNECT response code.

See \fICURLINFO_HTTP_CONNECTCODE(3)\fP

.IP CURLINFO_HTTP_VERSION

The http version used in the connection.

See \fICURLINFO_HTTP_VERSION(3)\fP

.IP CURLINFO_FILETIME

Remote time of the retrieved document.

See \fICURLINFO_FILETIME(3)\fP

docs/libcurl/opts/CURLINFO_HTTP_VERSION.3

0 → 100644
+56 −0
Original line number Diff line number Diff line 
.\" **************************************************************************

.\" *                                  _   _ ____  _

.\" *  Project                     ___| | | |  _ \| |

.\" *                             / __| | | | |_) | |

.\" *                            | (__| |_| |  _ <| |___

.\" *                             \___|\___/|_| \_\_____|

.\" *

.\" * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

.\" *

.\" * This software is licensed as described in the file COPYING, which

.\" * you should have received as part of this distribution. The terms

.\" * are also available at https://curl.haxx.se/docs/copyright.html.

.\" *

.\" * You may opt to use, copy, modify, merge, publish, distribute and/or sell

.\" * copies of the Software, and permit persons to whom the Software is

.\" * furnished to do so, under the terms of the COPYING file.

.\" *

.\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

.\" * KIND, either express or implied.

.\" *

.\" **************************************************************************

.\"

.TH CURLINFO_HTTP_VERSION 3 "11 May 2016" "libcurl 7.50.0" "curl_easy_getinfo options"

.SH NAME

CURLINFO_HTTP_VERSION \- get the http version used in the connection

.SH SYNOPSIS

#include <curl/curl.h>



CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_HTTP_VERSION, long *p);

.SH DESCRIPTION

Pass a pointer to a long to receive the version used in the last http connection.

The returned value will be CURL_HTTP_VERSION_1_0, CURL_HTTP_VERSION_1_1, or

CURL_HTTP_VERSION_2_0, or 0 if the version can't be determined.

.SH PROTOCOLS

HTTP

.SH EXAMPLE

.nf

CURL *curl = curl_easy_init();

if(curl) {

  CURLcode res;

  curl_easy_setopt(curl, CURLOPT_URL, "http://example.com");

  res = curl_easy_perform(curl);

  if(res == CURLE_OK) {

    long http_version;

    curl_easy_getinfo(curl, CURLINFO_HTTP_VERSION, &http_version);

  }

  curl_easy_cleanup(curl);

}

.fi

.SH AVAILABILITY

Added in 7.50.0

.SH RETURN VALUE

Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not.

.SH "SEE ALSO"

.BR CURLINFO_RESPONSE_CODE "(3), "

.BR curl_easy_getinfo "(3), " curl_easy_setopt "(3), "

docs/libcurl/symbols-in-versions

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ CURLINFO_HEADER_SIZE 7.4.1 
CURLINFO_HTTPAUTH_AVAIL         7.10.8

CURLINFO_HTTP_CODE              7.4.1         7.10.8

CURLINFO_HTTP_CONNECTCODE       7.10.7

CURLINFO_HTTP_VERSION           7.50.0

CURLINFO_LASTONE                7.4.1

CURLINFO_LASTSOCKET             7.15.2

CURLINFO_LOCAL_IP               7.21.0

include/curl/curl.h

+2 −1
Original line number Diff line number Diff line
@@ -2193,9 +2193,10 @@ typedef enum { 
  CURLINFO_TLS_SESSION      = CURLINFO_SLIST  + 43,

  CURLINFO_ACTIVESOCKET     = CURLINFO_SOCKET + 44,

  CURLINFO_TLS_SSL_PTR      = CURLINFO_SLIST  + 45,

  CURLINFO_HTTP_VERSION     = CURLINFO_LONG   + 46,

  /* Fill in new entries below here! */



  CURLINFO_LASTONE          = 45

  CURLINFO_LASTONE          = 46

} CURLINFO;



/* CURLINFO_RESPONSE_CODE is the new name for the option previously known as