[sr-dev] git:master:6224a38d: Merge pull request #1913 from samael33/master

Module: kamailio Branch: master Commit: 6224a38df635876333749d6fc6919f31dc087991 URL: https://github.com/kamailio/kamailio/commit/6224a38df635876333749d6fc6919f3… Author: Federico Cabiddu &lt;federico.cabiddu(a)gmail.com&gt; Committer: GitHub &lt;noreply(a)github.com&gt; Date: 2019-03-29T07:53:29+01:00 Merge pull request #1913 from samael33/master Small notes on $http_req(timeout) usage. --- Modified: src/modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6224a38df635876333749d6fc6919f3… Patch: https://github.com/kamailio/kamailio/commit/6224a38df635876333749d6fc6919f3… --- diff --git a/src/modules/http_async_client/doc/http_async_client_admin.xml b/src/modules/http_async_client/doc/http_async_client_admin.xml index 5a050bf424..a9e344a5dc 100644 --- a/src/modules/http_async_client/doc/http_async_client_admin.xml +++ b/src/modules/http_async_client/doc/http_async_client_admin.xml @@ -435,7 +435,7 @@ xlog("L_INFO", "received reply for query $http_req_id\n"); <listitem><para><emphasis>hdr</emphasis>: sets/modifies/removes a HTTP header. N.B.: setting this variable multiple times will add several headers to the query.</para></listitem> <listitem><para><emphasis>body</emphasis>: sets/modifies/removes the request body</para></listitem> <listitem><para><emphasis>method</emphasis>: sets the HTTP method: either "GET", "POST", "PUT" or "DELETE" (these are the supported methods). (Note: if the method is not set, curl will use GET, or POST if a body is specified)</para></listitem> - <listitem><para><emphasis>timeout</emphasis>: sets the HTTP timeout</para></listitem> + <listitem><para><emphasis>timeout</emphasis>: sets the HTTP timeout. (Note, this timeout should be normally less than <literal>tm.fr_timer</literal> timeout, because transaction timeout has a higher priority over HTTP timeout)</para></listitem> <listitem><para><emphasis>tls_client_cert</emphasis>: sets the client certificate to use</para></listitem> <listitem><para><emphasis>tls_client_key</emphasis>: sets the client certificate key to use</para></listitem> <listitem><para><emphasis>tls_ca_path</emphasis>: sets the CA certificate path to use</para></listitem>