<!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change - [x ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail --> Just small notes on $http_req(timeout) usage. You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/1913
-- Commit Summary --
* Notes on use http_req(timeout) * Typo * Fix README
-- File Changes --
M src/modules/http_async_client/doc/http_async_client_admin.xml (2)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1913.patch https://github.com/kamailio/kamailio/pull/1913.diff
grumvalski commented on this pull request.
Thank you! Just a small comment on the PR.
@@ -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, cause transaction timeout has a higher priority over HTTP timeout)</para></listitem>
s/cause/because/ and s/less,/less/
@samael33 pushed 1 commit.
a1a2617c4320bcfea291b87197d4b4185920b8a2 Per Federico Cabiddu comments
samael33 commented on this pull request.
@@ -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, cause transaction timeout has a higher priority over HTTP timeout)</para></listitem>
Thanks, fixed
Merged #1913 into master.
@samael33, @grumvalski -- the commit messages on this pull are really inappropriate for development history.
Next time check the contribution guidelines:
* https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
You're right, I missed it sorry.
Federico
On Fri, Mar 29, 2019 at 9:36 AM Daniel-Constantin Mierla < notifications@github.com> wrote:
@samael33 https://github.com/samael33, @grumvalski https://github.com/grumvalski -- the commit messages on this pull are really inappropriate for development history.
Next time check the contribution guidelines:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/kamailio/kamailio/pull/1913#issuecomment-477914492, or mute the thread https://github.com/notifications/unsubscribe-auth/ADip4799S3PxRSOVf5QUkkj4SAjbiatkks5vbdCYgaJpZM4cQJrV .
I'm sorry as well, just was too excited on my first commit.
On Mar 29 2019, at 11:00 am, Federico Cabiddu notifications@github.com wrote:
You're right, I missed it sorry.
Federico On Fri, Mar 29, 2019 at 9:36 AM Daniel-Constantin Mierla < notifications@github.com> wrote:
@samael33 https://github.com/samael33, @grumvalski https://github.com/grumvalski -- the commit messages on this pull are really inappropriate for development history.
Next time check the contribution guidelines:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/kamailio/kamailio/pull/1913#issuecomment-477914492, or mute the thread https://github.com/notifications/unsubscribe-auth/ADip4799S3PxRSOVf5QUkkj4SAjbiatkks5vbdCYgaJpZM4cQJrV .
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub (https://link.getmailspring.com/link/3618C5FA-8E0A-416A-9CB4-3A62BA641883@get...), or mute the thread (https://link.getmailspring.com/link/3618C5FA-8E0A-416A-9CB4-3A62BA641883@get...).
I rebased, edited the commits and then did a forced push -- worked this time, but this is usually dangerous to do, can break the repo. Better have the commit messages written properly.
Thanks!
Regards, Igor On Mar 29, 2019, 11:24 AM +0200, Daniel-Constantin Mierla notifications@github.com, wrote:
I rebased, edited the commits and then did a forced push -- worked this time, but this is usually dangerous to do, can break the repo. Better have the commit messages written properly. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or mute the thread.
-
Daniel-Constantin Mierla -
Federico Cabiddu
-
Igor Olhovskiy