Commit 03986f1b authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

- Made the curl tool's -w option support the %{ssl_verify_result} variable

parent bc649593

docs/curl.1

+4 −0
Original line number Diff line number Diff line
@@ -1303,6 +1303,10 @@ will show the actual URL a redirect \fIwould\fP take you to. (Added in 7.18.2) 
.B ftp_entry_path

The initial path libcurl ended up in when logging on to the remote FTP

server. (Added in 7.15.4)

.TP

.B ssl_verify_result

The result of the SSL peer certificate verification that was requested. 0

means the verification was successful. (Added in 7.19.0)

.RE



If this option is used several times, the last one will be used.

src/writeout.c

+7 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ typedef enum { 
  VAR_REDIRECT_COUNT,

  VAR_FTP_ENTRY_PATH,

  VAR_REDIRECT_URL,

  VAR_SSL_VERIFY_RESULT,

  VAR_NUM_OF_VARS /* must be the last */

} replaceid;
@@ -95,6 +96,7 @@ static const struct variable replacements[]={ 
  {"num_redirects", VAR_REDIRECT_COUNT},

  {"ftp_entry_path", VAR_FTP_ENTRY_PATH},

  {"redirect_url", VAR_REDIRECT_URL},

  {"ssl_verify_result", VAR_SSL_VERIFY_RESULT},

  {NULL, VAR_NONE}

};
@@ -241,6 +243,11 @@ void ourWriteOut(CURL *curl, const char *writeinfo) 
                   && stringp)

                  fputs(stringp, stream);

                break;

              case VAR_SSL_VERIFY_RESULT:

                if(CURLE_OK ==

                   curl_easy_getinfo(curl, CURLINFO_SSL_VERIFYRESULT, &longinfo))

                  fprintf(stream, "%ld", longinfo);

                break;

              default:

                break;

              }