maint: Merge stable to default.

gnu-octave · Oct 29, 2023 · 17a918e · 17a918e
2 parents f7c1a48 + 286ddb0
commit 17a918e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/liboctave/util/url-transfer.cc b/liboctave/util/url-transfer.cc
@@ -746,7 +746,8 @@ class curl_transfer : public base_url_transfer
 
     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 ());

diff --git a/scripts/web/webread.m b/scripts/web/webread.m
@@ -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