Mercurial > octave
changeset 32452:943a95892df0
maint: Merge stable to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sun, 29 Oct 2023 16:22:54 +0100 |
parents | 1f77c3f61aea (current diff) 9c3bffcc2fb9 (diff) |
children | 52d64865afdb |
files | liboctave/util/url-transfer.cc |
diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/util/url-transfer.cc Sun Oct 29 14:28:43 2023 +0100 +++ b/liboctave/util/url-transfer.cc Sun Oct 29 16:22:54 2023 +0100 @@ -746,7 +746,8 @@ set_header_fields (options.HeaderFields); - SETOPT (CURLOPT_TIMEOUT, options.Timeout); + SETOPT (CURLOPT_TIMEOUT_MS, options.Timeout); + SETOPT (CURLOPT_CONNECTTIMEOUT_MS, options.Timeout); if (! options.UserAgent.empty ()) SETOPT (CURLOPT_USERAGENT, options.UserAgent.c_str ());
--- a/scripts/web/webread.m Sun Oct 29 14:28:43 2023 +0100 +++ b/scripts/web/webread.m Sun Oct 29 16:22:54 2023 +0100 @@ -86,14 +86,14 @@ ## Flatten the cell array because the internal processing takes place on ## a flattened array. - options.HeaderFields = options.HeaderFields(:)'; + options.HeaderFields = options.HeaderFields(:).'; nargs = 1 + numel (varargin); if (nargs == 1) response = __restful_service__ (url, cell (), options); elseif (rem (nargs, 2) == 1) if (! iscellstr (varargin)) - error ("webwrite: KEYS and VALUES must be strings"); + error ("webread: KEYS and VALUES must be strings"); else response = __restful_service__ (url, varargin, options); endif