moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 03:55:03 -05:00
Code Issues Releases Wiki Activity
ff43fb6dec
curl/src/tool_writeout.c

379 lines
14 KiB
C
Raw Normal View History

updated source code boilerplate/header
2002-09-03 07:52:59 -04:00
/***************************************************************************
removed trailing whitespace
2004-07-26 05:09:26 -04:00
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
* \___|\___/|_| \_\_____|
*
writeout: support to generate JSON output This commit adds support to generate JSON via the writeout feature: -w "%{json}" It leverages the existing infrastructure as much as possible. Thus, generating the JSON on STDERR is possible by: -w "%{stderr}%{json}" This implements a variant of https://github.com/curl/curl/wiki/JSON#--write-out-json. Closes #4870
2020-02-01 12:55:24 -05:00
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
*
updated source code boilerplate/header
2002-09-03 07:52:59 -04:00
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
URLs: change all http:// URLs to https://
2016-02-02 18:19:02 -05:00
* are also available at https://curl.haxx.se/docs/copyright.html.
removed trailing whitespace
2004-07-26 05:09:26 -04:00
*
dual-license fix
2001-01-03 04:29:33 -05:00
* 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
updated source code boilerplate/header
2002-09-03 07:52:59 -04:00
* furnished to do so, under the terms of the COPYING file.
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
*
dual-license fix
2001-01-03 04:29:33 -05:00
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
*
updated source code boilerplate/header
2002-09-03 07:52:59 -04:00
***************************************************************************/
curl tool: use configuration files from lib directory Configuration files such as curl_config.h and all config-*.h no longer exist nor are generated/copied into 'src' directory, now these only exist in 'lib' directory from where curl tool sources uses them. Additionally old src/setup.h has been refactored into src/tool_setup.h which now pulls lib/setup.h The possibility of a makefile needing an include path adjustment exists.
2012-04-06 17:35:15 -04:00
#include "tool_setup.h"
tool: use ENABLE_CURLX_PRINTF instead of _MPRINTF_REPLACE
2015-03-03 17:08:02 -05:00
#define ENABLE_CURLX_PRINTF
/* use our own printf() functions */
#include "curlx.h"
curl tool: add filename_effective token for --write-out By modifying the parameter list for ourWriteOut() and passing the OutStruct that collects data in tool_operate, we get access to the remote name that we're writing to. Shell scripters should find this useful when used in conjuntion with the --remote-header-name option.
2012-03-04 18:07:03 -05:00
#include "tool_cfgable.h"
curl tool: reviewed code moved to tool_*.[ch] files
2011-10-06 11:39:00 -04:00
#include "tool_writeout.h"
writeout: support to generate JSON output This commit adds support to generate JSON via the writeout feature: -w "%{json}" It leverages the existing infrastructure as much as possible. Thus, generating the JSON on STDERR is possible by: -w "%{stderr}%{json}" This implements a variant of https://github.com/curl/curl/wiki/JSON#--write-out-json. Closes #4870
2020-02-01 12:55:24 -05:00
#include "tool_writeout_json.h"
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
Revert changes relative to lib/*.[ch] recent renaming This reverts renaming and usage of lib/*.h header files done 28-12-2012, reverting 2 commits: f871de0... build: make use of 76 lib/*.h renamed files ffd8e12... build: rename 76 lib/*.h files This also reverts removal of redundant include guard (redundant thanks to changes in above commits) done 2-12-2013, reverting 1 commit: c087374... curl_setup.h: remove redundant include guard This also reverts renaming and usage of lib/*.c source files done 3-12-2013, reverting 3 commits: 13606bb... build: make use of 93 lib/*.c renamed files 5b6e792... build: rename 93 lib/*.c files 7d83dff... build: commit 13606bbfde follow-up 1 Start of related discussion thread: http://curl.haxx.se/mail/lib-2013-01/0012.html Asking for confirmation on pushing this revertion commit: http://curl.haxx.se/mail/lib-2013-01/0048.html Confirmation summary: http://curl.haxx.se/mail/lib-2013-01/0079.html NOTICE: The list of 2 files that have been modified by other intermixed commits, while renamed, and also by at least one of the 6 commits this one reverts follows below. These 2 files will exhibit a hole in history unless git's '--follow' option is used when viewing logs. lib/curl_imap.h lib/curl_smtp.h
2013-01-03 20:50:28 -05:00
#include "memdebug.h" /* keep this as LAST include */
curl tool: re-enable MemoryTracking capability on 'src' subdirectory files. Use same preprocessor logic for curl tool MemoryTracking activation in source files located in 'src' subdirectory as the one used for libcurl sources.
2011-09-14 05:27:12 -04:00
writeout: support to generate JSON output This commit adds support to generate JSON via the writeout feature: -w "%{json}" It leverages the existing infrastructure as much as possible. Thus, generating the JSON on STDERR is possible by: -w "%{stderr}%{json}" This implements a variant of https://github.com/curl/curl/wiki/JSON#--write-out-json. Closes #4870
2020-02-01 12:55:24 -05:00
static const struct writeoutvar variables[] = {
{"url_effective", VAR_EFFECTIVE_URL, 0,
CURLINFO_EFFECTIVE_URL, JSON_STRING},
{"http_code", VAR_HTTP_CODE, 0,
CURLINFO_RESPONSE_CODE, JSON_LONG},
{"response_code", VAR_HTTP_CODE, 0,
CURLINFO_RESPONSE_CODE, JSON_LONG},
{"http_connect", VAR_HTTP_CODE_PROXY, 0,
CURLINFO_HTTP_CONNECTCODE, JSON_LONG},
{"time_total", VAR_TOTAL_TIME, 0,
CURLINFO_TOTAL_TIME_T, JSON_TIME},
{"time_namelookup", VAR_NAMELOOKUP_TIME, 0,
CURLINFO_NAMELOOKUP_TIME_T, JSON_TIME},
{"time_connect", VAR_CONNECT_TIME, 0,
CURLINFO_CONNECT_TIME_T, JSON_TIME},
{"time_appconnect", VAR_APPCONNECT_TIME, 0,
CURLINFO_APPCONNECT_TIME_T, JSON_TIME},
{"time_pretransfer", VAR_PRETRANSFER_TIME, 0,
CURLINFO_PRETRANSFER_TIME_T, JSON_TIME},
{"time_starttransfer", VAR_STARTTRANSFER_TIME, 0,
CURLINFO_STARTTRANSFER_TIME_T, JSON_TIME},
{"size_header", VAR_HEADER_SIZE, 0,
CURLINFO_HEADER_SIZE, JSON_LONG},
{"size_request", VAR_REQUEST_SIZE, 0,
CURLINFO_REQUEST_SIZE, JSON_LONG},
{"size_download", VAR_SIZE_DOWNLOAD, 0,
writeout_json: Fix data type issues Load long values correctly (e.g. for http_code). Use curl_off_t (not long) for: - size_download (CURLINFO_SIZE_DOWNLOAD_T) - size_upload (CURLINFO_SIZE_UPLOAD_T) The unit for these values is bytes/second, not microseconds: - speed_download (CURLINFO_SPEED_DOWNLOAD_T) - speed_upload (CURLINFO_SPEED_UPLOAD_T) Fixes #5131 Closes #5152
2020-03-26 18:15:37 -04:00
CURLINFO_SIZE_DOWNLOAD_T, JSON_OFFSET},
writeout: support to generate JSON output This commit adds support to generate JSON via the writeout feature: -w "%{json}" It leverages the existing infrastructure as much as possible. Thus, generating the JSON on STDERR is possible by: -w "%{stderr}%{json}" This implements a variant of https://github.com/curl/curl/wiki/JSON#--write-out-json. Closes #4870
2020-02-01 12:55:24 -05:00
{"size_upload", VAR_SIZE_UPLOAD, 0,
writeout_json: Fix data type issues Load long values correctly (e.g. for http_code). Use curl_off_t (not long) for: - size_download (CURLINFO_SIZE_DOWNLOAD_T) - size_upload (CURLINFO_SIZE_UPLOAD_T) The unit for these values is bytes/second, not microseconds: - speed_download (CURLINFO_SPEED_DOWNLOAD_T) - speed_upload (CURLINFO_SPEED_UPLOAD_T) Fixes #5131 Closes #5152
2020-03-26 18:15:37 -04:00
CURLINFO_SIZE_UPLOAD_T, JSON_OFFSET},
writeout: support to generate JSON output This commit adds support to generate JSON via the writeout feature: -w "%{json}" It leverages the existing infrastructure as much as possible. Thus, generating the JSON on STDERR is possible by: -w "%{stderr}%{json}" This implements a variant of https://github.com/curl/curl/wiki/JSON#--write-out-json. Closes #4870
2020-02-01 12:55:24 -05:00
{"speed_download", VAR_SPEED_DOWNLOAD, 0,
writeout_json: Fix data type issues Load long values correctly (e.g. for http_code). Use curl_off_t (not long) for: - size_download (CURLINFO_SIZE_DOWNLOAD_T) - size_upload (CURLINFO_SIZE_UPLOAD_T) The unit for these values is bytes/second, not microseconds: - speed_download (CURLINFO_SPEED_DOWNLOAD_T) - speed_upload (CURLINFO_SPEED_UPLOAD_T) Fixes #5131 Closes #5152
2020-03-26 18:15:37 -04:00
CURLINFO_SPEED_DOWNLOAD_T, JSON_OFFSET},
writeout: support to generate JSON output This commit adds support to generate JSON via the writeout feature: -w "%{json}" It leverages the existing infrastructure as much as possible. Thus, generating the JSON on STDERR is possible by: -w "%{stderr}%{json}" This implements a variant of https://github.com/curl/curl/wiki/JSON#--write-out-json. Closes #4870
2020-02-01 12:55:24 -05:00
{"speed_upload", VAR_SPEED_UPLOAD, 0,
writeout_json: Fix data type issues Load long values correctly (e.g. for http_code). Use curl_off_t (not long) for: - size_download (CURLINFO_SIZE_DOWNLOAD_T) - size_upload (CURLINFO_SIZE_UPLOAD_T) The unit for these values is bytes/second, not microseconds: - speed_download (CURLINFO_SPEED_DOWNLOAD_T) - speed_upload (CURLINFO_SPEED_UPLOAD_T) Fixes #5131 Closes #5152
2020-03-26 18:15:37 -04:00
CURLINFO_SPEED_UPLOAD_T, JSON_OFFSET},
writeout: support to generate JSON output This commit adds support to generate JSON via the writeout feature: -w "%{json}" It leverages the existing infrastructure as much as possible. Thus, generating the JSON on STDERR is possible by: -w "%{stderr}%{json}" This implements a variant of https://github.com/curl/curl/wiki/JSON#--write-out-json. Closes #4870
2020-02-01 12:55:24 -05:00
{"content_type", VAR_CONTENT_TYPE, 0,
CURLINFO_CONTENT_TYPE, JSON_STRING},
{"num_connects", VAR_NUM_CONNECTS, 0,
CURLINFO_NUM_CONNECTS, JSON_LONG},
{"time_redirect", VAR_REDIRECT_TIME, 0,
CURLINFO_REDIRECT_TIME_T, JSON_TIME},
{"num_redirects", VAR_REDIRECT_COUNT, 0,
CURLINFO_REDIRECT_COUNT, JSON_LONG},
{"ftp_entry_path", VAR_FTP_ENTRY_PATH, 0,
CURLINFO_FTP_ENTRY_PATH, JSON_STRING},
{"redirect_url", VAR_REDIRECT_URL, 0,
CURLINFO_REDIRECT_URL, JSON_STRING},
{"ssl_verify_result", VAR_SSL_VERIFY_RESULT, 0,
CURLINFO_SSL_VERIFYRESULT, JSON_LONG},
{"proxy_ssl_verify_result", VAR_PROXY_SSL_VERIFY_RESULT, 0,
CURLINFO_PROXY_SSL_VERIFYRESULT, JSON_LONG},
{"filename_effective", VAR_EFFECTIVE_FILENAME, 0,
0, JSON_FILENAME},
{"remote_ip", VAR_PRIMARY_IP, 0,
CURLINFO_PRIMARY_IP, JSON_STRING},
{"remote_port", VAR_PRIMARY_PORT, 0,
CURLINFO_PRIMARY_PORT, JSON_LONG},
{"local_ip", VAR_LOCAL_IP, 0,
CURLINFO_LOCAL_IP, JSON_STRING},
{"local_port", VAR_LOCAL_PORT, 0,
CURLINFO_LOCAL_PORT, JSON_LONG},
{"http_version", VAR_HTTP_VERSION, 0,
CURLINFO_HTTP_VERSION, JSON_VERSION},
{"scheme", VAR_SCHEME, 0,
CURLINFO_SCHEME, JSON_STRING},
{"stdout", VAR_STDOUT, 1,
0, JSON_NONE},
{"stderr", VAR_STDERR, 1,
0, JSON_NONE},
{"json", VAR_JSON, 1,
0, JSON_NONE},
{NULL, VAR_NONE, 1,
0, JSON_NONE}
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
};
curl tool: add filename_effective token for --write-out By modifying the parameter list for ourWriteOut() and passing the OutStruct that collects data in tool_operate, we get access to the remote name that we're writing to. Shell scripters should find this useful when used in conjuntion with the --remote-header-name option.
2012-03-04 18:07:03 -05:00
void ourWriteOut(CURL *curl, struct OutStruct *outs, const char *writeinfo)
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
{
FILE *stream = stdout;
curl tool: reviewed code moved to tool_*.[ch] files
2011-10-06 11:39:00 -04:00
const char *ptr = writeinfo;
tool_writeout.c: initialize string pointer variable
2014-04-18 18:24:25 -04:00
char *stringp = NULL;
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
long longinfo;
double doubleinfo;
Attempt to silence bogus compiler warning: "Potential null pointer dereference through ptr is detected"
2009-09-16 12:49:02 -04:00
while(ptr && *ptr) {
tool_writeout: fixed a buffer read overrun on --write-out If a % ended the statement, the string's trailing NUL would be skipped and memory past the end of the buffer would be accessed and potentially displayed as part of the --write-out output. Added tests 1440 and 1441 to check for this kind of condition. Reported-by: Brian Carpenter
2017-03-11 04:59:34 -05:00
if('%' == *ptr && ptr[1]) {
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
if('%' == ptr[1]) {
/* an escaped %-letter */
fputc('%', stream);
curl tool: reviewed code moved to tool_*.[ch] files
2011-10-06 11:39:00 -04:00
ptr += 2;
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
}
else {
/* this is meant as a variable to output */
char *end;
checksrc: warn for assignments within if() expressions ... they're already frowned upon in our source code style guide, this now enforces the rule harder.
2016-12-13 19:29:44 -05:00
if('{' == ptr[1]) {
cppcheck: fix warnings - Get rid of variable that was generating false positive warning (unitialized) - Fix issues in tests - Reduce scope of several variables all over etc Closes #2631
2018-06-02 16:52:56 -04:00
char keepit;
int i;
Now curl warns if an unknown variable is used in the -w/--writeout argument.
2005-09-06 09:27:18 -04:00
bool match = FALSE;
checksrc: warn for assignments within if() expressions ... they're already frowned upon in our source code style guide, this now enforces the rule harder.
2016-12-13 19:29:44 -05:00
end = strchr(ptr, '}');
curl tool: reviewed code moved to tool_*.[ch] files
2011-10-06 11:39:00 -04:00
ptr += 2; /* pass the % and the { */
checksrc: warn for assignments within if() expressions ... they're already frowned upon in our source code style guide, this now enforces the rule harder.
2016-12-13 19:29:44 -05:00
if(!end) {
fputs("%{", stream);
continue;
}
curl tool: reviewed code moved to tool_*.[ch] files
2011-10-06 11:39:00 -04:00
keepit = *end;
*end = 0; /* zero terminate */
writeout: support to generate JSON output This commit adds support to generate JSON via the writeout feature: -w "%{json}" It leverages the existing infrastructure as much as possible. Thus, generating the JSON on STDERR is possible by: -w "%{stderr}%{json}" This implements a variant of https://github.com/curl/curl/wiki/JSON#--write-out-json. Closes #4870
2020-02-01 12:55:24 -05:00
for(i = 0; variables[i].name; i++) {
if(curl_strequal(ptr, variables[i].name)) {
Now curl warns if an unknown variable is used in the -w/--writeout argument.
2005-09-06 09:27:18 -04:00
match = TRUE;
writeout: support to generate JSON output This commit adds support to generate JSON via the writeout feature: -w "%{json}" It leverages the existing infrastructure as much as possible. Thus, generating the JSON on STDERR is possible by: -w "%{stderr}%{json}" This implements a variant of https://github.com/curl/curl/wiki/JSON#--write-out-json. Closes #4870
2020-02-01 12:55:24 -05:00
switch(variables[i].id) {
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
case VAR_EFFECTIVE_URL:
When CURLINFO_CONTENT_TYPE returns a NULL pointer, don't try to fputs() it!
2002-07-30 07:07:59 -04:00
if((CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &stringp))
&& stringp)
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
fputs(stringp, stream);
break;
case VAR_HTTP_CODE:
if(CURLE_OK ==
CURLINFO_RESPONSE_CODE replaces CURLINFO_HTTP_CODE
2003-08-20 11:42:24 -04:00
curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &longinfo))
use %ld when printfing longs
2004-02-25 10:41:36 -05:00
fprintf(stream, "%03ld", longinfo);
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
break;
Added test case 217 that verified CURLINFO_HTTP_CONNECTCODE, and I made the -w option support 'http_connect' to make it easier to verify!
2004-12-21 14:59:35 -05:00
case VAR_HTTP_CODE_PROXY:
if(CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_HTTP_CONNECTCODE,
&longinfo))
fprintf(stream, "%03ld", longinfo);
break;
-w supports size_header and size_request
2000-10-04 09:08:17 -04:00
case VAR_HEADER_SIZE:
if(CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_HEADER_SIZE, &longinfo))
use %ld when printfing longs
2004-02-25 10:41:36 -05:00
fprintf(stream, "%ld", longinfo);
-w supports size_header and size_request
2000-10-04 09:08:17 -04:00
break;
case VAR_REQUEST_SIZE:
if(CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_REQUEST_SIZE, &longinfo))
use %ld when printfing longs
2004-02-25 10:41:36 -05:00
fprintf(stream, "%ld", longinfo);
-w supports size_header and size_request
2000-10-04 09:08:17 -04:00
break;
CURLINFO_NUM_CONNECTS and more
2004-10-19 11:30:08 -04:00
case VAR_NUM_CONNECTS:
if(CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_NUM_CONNECTS, &longinfo))
fprintf(stream, "%ld", longinfo);
break;
new -w variables supported
2004-11-15 06:25:39 -05:00
case VAR_REDIRECT_COUNT:
if(CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_REDIRECT_COUNT, &longinfo))
fprintf(stream, "%ld", longinfo);
break;
case VAR_REDIRECT_TIME:
if(CURLE_OK ==
checksrc: whitespace and code style cleanup Make everything adhere to the standards upheld by checksrc.pl and now run checksrc from the makefile on debug builds.
2011-04-25 16:44:39 -04:00
curl_easy_getinfo(curl, CURLINFO_REDIRECT_TIME,
&doubleinfo))
curl -w: added more decimal digits to timing counters Now showing microsecond resolution. Closes #1106
2016-11-04 10:45:49 -04:00
fprintf(stream, "%.6f", doubleinfo);
new -w variables supported
2004-11-15 06:25:39 -05:00
break;
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
case VAR_TOTAL_TIME:
if(CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_TOTAL_TIME, &doubleinfo))
curl -w: added more decimal digits to timing counters Now showing microsecond resolution. Closes #1106
2016-11-04 10:45:49 -04:00
fprintf(stream, "%.6f", doubleinfo);
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
break;
case VAR_NAMELOOKUP_TIME:
if(CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_NAMELOOKUP_TIME,
&doubleinfo))
curl -w: added more decimal digits to timing counters Now showing microsecond resolution. Closes #1106
2016-11-04 10:45:49 -04:00
fprintf(stream, "%.6f", doubleinfo);
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
break;
case VAR_CONNECT_TIME:
if(CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_CONNECT_TIME, &doubleinfo))
curl -w: added more decimal digits to timing counters Now showing microsecond resolution. Closes #1106
2016-11-04 10:45:49 -04:00
fprintf(stream, "%.6f", doubleinfo);
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
break;
Introcuding a new timestamp for curl_easy_getinfo(): CURLINFO_APPCONNECT_TIME. This is set with the "application layer" handshake/connection is completed (typically SSL, TLS or SSH). By using this you can figure out the application layer's own connect time. You can extract the time stamp using curl's -w option and the new variable named 'time_appconnect'. This feature was sponsored by Lenny Rachitsky at NeuStar.
2008-07-03 02:56:03 -04:00
case VAR_APPCONNECT_TIME:
if(CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_APPCONNECT_TIME,
&doubleinfo))
curl -w: added more decimal digits to timing counters Now showing microsecond resolution. Closes #1106
2016-11-04 10:45:49 -04:00
fprintf(stream, "%.6f", doubleinfo);
Introcuding a new timestamp for curl_easy_getinfo(): CURLINFO_APPCONNECT_TIME. This is set with the "application layer" handshake/connection is completed (typically SSL, TLS or SSH). By using this you can figure out the application layer's own connect time. You can extract the time stamp using curl's -w option and the new variable named 'time_appconnect'. This feature was sponsored by Lenny Rachitsky at NeuStar.
2008-07-03 02:56:03 -04:00
break;
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
case VAR_PRETRANSFER_TIME:
if(CURLE_OK ==
Introcuding a new timestamp for curl_easy_getinfo(): CURLINFO_APPCONNECT_TIME. This is set with the "application layer" handshake/connection is completed (typically SSL, TLS or SSH). By using this you can figure out the application layer's own connect time. You can extract the time stamp using curl's -w option and the new variable named 'time_appconnect'. This feature was sponsored by Lenny Rachitsky at NeuStar.
2008-07-03 02:56:03 -04:00
curl_easy_getinfo(curl, CURLINFO_PRETRANSFER_TIME,
&doubleinfo))
curl -w: added more decimal digits to timing counters Now showing microsecond resolution. Closes #1106
2016-11-04 10:45:49 -04:00
fprintf(stream, "%.6f", doubleinfo);
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
break;
Georg Horn's STARTTRANSFER_TIME patch
2001-11-20 10:00:50 -05:00
case VAR_STARTTRANSFER_TIME:
if(CURLE_OK ==
Introcuding a new timestamp for curl_easy_getinfo(): CURLINFO_APPCONNECT_TIME. This is set with the "application layer" handshake/connection is completed (typically SSL, TLS or SSH). By using this you can figure out the application layer's own connect time. You can extract the time stamp using curl's -w option and the new variable named 'time_appconnect'. This feature was sponsored by Lenny Rachitsky at NeuStar.
2008-07-03 02:56:03 -04:00
curl_easy_getinfo(curl, CURLINFO_STARTTRANSFER_TIME,
&doubleinfo))
curl -w: added more decimal digits to timing counters Now showing microsecond resolution. Closes #1106
2016-11-04 10:45:49 -04:00
fprintf(stream, "%.6f", doubleinfo);
Georg Horn's STARTTRANSFER_TIME patch
2001-11-20 10:00:50 -05:00
break;
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
case VAR_SIZE_UPLOAD:
if(CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_SIZE_UPLOAD, &doubleinfo))
A Linus Nielsen Feltzing-patch that removes the decimals from the size outputs...
2001-04-19 07:24:29 -04:00
fprintf(stream, "%.0f", doubleinfo);
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
break;
case VAR_SIZE_DOWNLOAD:
if(CURLE_OK ==
checksrc: whitespace and code style cleanup Make everything adhere to the standards upheld by checksrc.pl and now run checksrc from the makefile on debug builds.
2011-04-25 16:44:39 -04:00
curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD,
&doubleinfo))
A Linus Nielsen Feltzing-patch that removes the decimals from the size outputs...
2001-04-19 07:24:29 -04:00
fprintf(stream, "%.0f", doubleinfo);
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
break;
case VAR_SPEED_DOWNLOAD:
if(CURLE_OK ==
checksrc: whitespace and code style cleanup Make everything adhere to the standards upheld by checksrc.pl and now run checksrc from the makefile on debug builds.
2011-04-25 16:44:39 -04:00
curl_easy_getinfo(curl, CURLINFO_SPEED_DOWNLOAD,
&doubleinfo))
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
fprintf(stream, "%.3f", doubleinfo);
break;
case VAR_SPEED_UPLOAD:
if(CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_SPEED_UPLOAD, &doubleinfo))
fprintf(stream, "%.3f", doubleinfo);
break;
"Yet Another Geek" made %{content_type} work in the -w/--writeout option.
2002-02-25 02:40:49 -05:00
case VAR_CONTENT_TYPE:
When CURLINFO_CONTENT_TYPE returns a NULL pointer, don't try to fputs() it!
2002-07-30 07:07:59 -04:00
if((CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_CONTENT_TYPE, &stringp))
&& stringp)
fputs(stringp, stream);
David McCreedy added CURLINFO_FTP_ENTRY_PATH to export the FTP entry path
2006-03-21 17:30:03 -05:00
break;
case VAR_FTP_ENTRY_PATH:
if((CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_FTP_ENTRY_PATH, &stringp))
&& stringp)
- To make it easier for applications that want lots of magic stuff done on redirections and thus cannot use CURLOPT_FOLLOWLOCATION easily, we now introduce the new CURLINFO_REDIRECT_URL option that lets applications extract the URL libcurl would've redirected to if it had been told to. This then enables the application to continue to that URL as it thinks is suitable, without having to re-implement the magic of creating the new URL from the Location: header etc. Test 1029 verifies it.
2008-04-30 17:20:08 -04:00
fputs(stringp, stream);
break;
case VAR_REDIRECT_URL:
if((CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_REDIRECT_URL, &stringp))
&& stringp)
David McCreedy added CURLINFO_FTP_ENTRY_PATH to export the FTP entry path
2006-03-21 17:30:03 -05:00
fputs(stringp, stream);
break;
- Made the curl tool's -w option support the %{ssl_verify_result} variable
2008-07-30 17:24:19 -04:00
case VAR_SSL_VERIFY_RESULT:
if(CURLE_OK ==
checksrc: whitespace and code style cleanup Make everything adhere to the standards upheld by checksrc.pl and now run checksrc from the makefile on debug builds.
2011-04-25 16:44:39 -04:00
curl_easy_getinfo(curl, CURLINFO_SSL_VERIFYRESULT,
&longinfo))
- Made the curl tool's -w option support the %{ssl_verify_result} variable
2008-07-30 17:24:19 -04:00
fprintf(stream, "%ld", longinfo);
break;
proxy: Support HTTPS proxy and SOCKS+HTTP(s) * HTTPS proxies: An HTTPS proxy receives all transactions over an SSL/TLS connection. Once a secure connection with the proxy is established, the user agent uses the proxy as usual, including sending CONNECT requests to instruct the proxy to establish a [usually secure] TCP tunnel with an origin server. HTTPS proxies protect nearly all aspects of user-proxy communications as opposed to HTTP proxies that receive all requests (including CONNECT requests) in vulnerable clear text. With HTTPS proxies, it is possible to have two concurrent _nested_ SSL/TLS sessions: the "outer" one between the user agent and the proxy and the "inner" one between the user agent and the origin server (through the proxy). This change adds supports for such nested sessions as well. A secure connection with a proxy requires its own set of the usual SSL options (their actual descriptions differ and need polishing, see TODO): --proxy-cacert FILE CA certificate to verify peer against --proxy-capath DIR CA directory to verify peer against --proxy-cert CERT[:PASSWD] Client certificate file and password --proxy-cert-type TYPE Certificate file type (DER/PEM/ENG) --proxy-ciphers LIST SSL ciphers to use --proxy-crlfile FILE Get a CRL list in PEM format from the file --proxy-insecure Allow connections to proxies with bad certs --proxy-key KEY Private key file name --proxy-key-type TYPE Private key file type (DER/PEM/ENG) --proxy-pass PASS Pass phrase for the private key --proxy-ssl-allow-beast Allow security flaw to improve interop --proxy-sslv2 Use SSLv2 --proxy-sslv3 Use SSLv3 --proxy-tlsv1 Use TLSv1 --proxy-tlsuser USER TLS username --proxy-tlspassword STRING TLS password --proxy-tlsauthtype STRING TLS authentication type (default SRP) All --proxy-foo options are independent from their --foo counterparts, except --proxy-crlfile which defaults to --crlfile and --proxy-capath which defaults to --capath. Curl now also supports %{proxy_ssl_verify_result} --write-out variable, similar to the existing %{ssl_verify_result} variable. Supported backends: OpenSSL, GnuTLS, and NSS. * A SOCKS proxy + HTTP/HTTPS proxy combination: If both --socks* and --proxy options are given, Curl first connects to the SOCKS proxy and then connects (through SOCKS) to the HTTP or HTTPS proxy. TODO: Update documentation for the new APIs and --proxy-* options. Look for "Added in 7.XXX" marks.
2016-11-16 12:49:15 -05:00
case VAR_PROXY_SSL_VERIFY_RESULT:
if(CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_PROXY_SSL_VERIFYRESULT,
&longinfo))
fprintf(stream, "%ld", longinfo);
break;
curl tool: add filename_effective token for --write-out By modifying the parameter list for ourWriteOut() and passing the OutStruct that collects data in tool_operate, we get access to the remote name that we're writing to. Shell scripters should find this useful when used in conjuntion with the --remote-header-name option.
2012-03-04 18:07:03 -05:00
case VAR_EFFECTIVE_FILENAME:
if(outs->filename)
fprintf(stream, "%s", outs->filename);
break;
writeout: -w now supports remote_ip/port and local_ip/port Added mention to the curl.1 man page. Test case 1223 verifies remote_ip/port.
2012-11-07 17:30:25 -05:00
case VAR_PRIMARY_IP:
if(CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_PRIMARY_IP,
&stringp))
fprintf(stream, "%s", stringp);
break;
case VAR_PRIMARY_PORT:
if(CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_PRIMARY_PORT,
&longinfo))
fprintf(stream, "%ld", longinfo);
break;
case VAR_LOCAL_IP:
if(CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_LOCAL_IP,
&stringp))
fprintf(stream, "%s", stringp);
break;
case VAR_LOCAL_PORT:
if(CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_LOCAL_PORT,
&longinfo))
fprintf(stream, "%ld", longinfo);
break;
http: add CURLINFO_HTTP_VERSION and %{http_version} Adds access to the effectively used http version to both libcurl and curl. Closes #799
2016-05-11 08:23:37 -04:00
case VAR_HTTP_VERSION:
if(CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_HTTP_VERSION,
&longinfo)) {
const char *version = "0";
checksrc: stricter no-space-before-paren enforcement In order to make the code style more uniform everywhere
2016-12-13 17:34:59 -05:00
switch(longinfo) {
http: add CURLINFO_HTTP_VERSION and %{http_version} Adds access to the effectively used http version to both libcurl and curl. Closes #799
2016-05-11 08:23:37 -04:00
case CURL_HTTP_VERSION_1_0:
version = "1.0";
break;
case CURL_HTTP_VERSION_1_1:
version = "1.1";
break;
case CURL_HTTP_VERSION_2_0:
version = "2";
break;
curl: have -w's 'http_version' show '3' for HTTP/3 Closes #4196
2019-08-07 03:52:14 -04:00
case CURL_HTTP_VERSION_3:
version = "3";
break;
http: add CURLINFO_HTTP_VERSION and %{http_version} Adds access to the effectively used http version to both libcurl and curl. Closes #799
2016-05-11 08:23:37 -04:00
}
fprintf(stream, version);
}
break;
add CURLINFO_SCHEME, CURLINFO_PROTOCOL, and %{scheme} Adds access to the effectively used protocol/scheme to both libcurl and curl, both in string and numeric (CURLPROTO_*) form. Note that the string form will be uppercase, as it is just the internal string. As these strings are declared internally as const, and all other strings returned by curl_easy_getinfo() are de-facto const as well, string handling in getinfo.c got const-ified. Closes #1137
2016-11-23 04:44:18 -05:00
case VAR_SCHEME:
if(CURLE_OK ==
curl_easy_getinfo(curl, CURLINFO_SCHEME,
&stringp))
fprintf(stream, "%s", stringp);
curl: correct the switch() logic in ourWriteOut Follow-up to e431daf013, as I did the wrong correction for a compiler warning. It should be a break and not a fall-through. Pointed-out-by: Frank Gevaerts
2018-11-07 05:14:20 -05:00
break;
curl: add %{stderr} and %{stdout} for --write-out Closes #3115
2018-10-08 17:54:01 -04:00
case VAR_STDOUT:
stream = stdout;
break;
case VAR_STDERR:
stream = stderr;
add CURLINFO_SCHEME, CURLINFO_PROTOCOL, and %{scheme} Adds access to the effectively used protocol/scheme to both libcurl and curl, both in string and numeric (CURLPROTO_*) form. Note that the string form will be uppercase, as it is just the internal string. As these strings are declared internally as const, and all other strings returned by curl_easy_getinfo() are de-facto const as well, string handling in getinfo.c got const-ified. Closes #1137
2016-11-23 04:44:18 -05:00
break;
writeout: support to generate JSON output This commit adds support to generate JSON via the writeout feature: -w "%{json}" It leverages the existing infrastructure as much as possible. Thus, generating the JSON on STDERR is possible by: -w "%{stderr}%{json}" This implements a variant of https://github.com/curl/curl/wiki/JSON#--write-out-json. Closes #4870
2020-02-01 12:55:24 -05:00
case VAR_JSON:
ourWriteOutJSON(variables, curl, outs, stream);
removed pedantic compiler warnings
2000-11-21 04:38:41 -05:00
default:
break;
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
}
break;
}
}
fix bool variables checking and assignment
2011-09-05 14:46:09 -04:00
if(!match) {
Fixed typo, the option is called --write-out. Bob Bagwill pointed out.
2006-02-23 16:33:02 -05:00
fprintf(stderr, "curl: unknown --write-out variable: '%s'\n", ptr);
Now curl warns if an unknown variable is used in the -w/--writeout argument.
2005-09-06 09:27:18 -04:00
}
curl tool: reviewed code moved to tool_*.[ch] files
2011-10-06 11:39:00 -04:00
ptr = end + 1; /* pass the end */
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
*end = keepit;
}
else {
/* illegal syntax, then just output the characters that are used */
fputc('%', stream);
fputc(ptr[1], stream);
curl tool: reviewed code moved to tool_*.[ch] files
2011-10-06 11:39:00 -04:00
ptr += 2;
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
}
}
}
curl: check for end of input in writeout backslash handling Reported-by: Brian Carpenter Added test 1442 to verify
2017-03-24 05:14:21 -04:00
else if('\\' == *ptr && ptr[1]) {
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
switch(ptr[1]) {
case 'r':
fputc('\r', stream);
break;
case 'n':
fputc('\n', stream);
break;
case 't':
fputc('\t', stream);
break;
default:
/* unknown, just output this */
fputc(*ptr, stream);
fputc(ptr[1], stream);
break;
}
curl tool: reviewed code moved to tool_*.[ch] files
2011-10-06 11:39:00 -04:00
ptr += 2;
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
}
else {
fputc(*ptr, stream);
ptr++;
}
}
removed trailing whitespace
2004-07-26 05:09:26 -04:00
moved out from the library and put here, uses the new curl_easy_getinfo()
2000-10-02 02:30:40 -04:00
}
Reference in New Issue Copy Permalink