tyler.durden
/
centreon-plugins
mirror of https://github.com/centreon/centreon-plugins.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #2038 #2036

This commit is contained in:
garnier-quentin 2020-06-05 09:45:29 +02:00
parent 137af8b8c3
commit 6355543cf3
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
centreon-plugins/apps/protocols/http/mode/expectedcontent.pm
View File

@ -148,7 +148,8 @@ sub load_request {
$self->{options_request} = {};
if (defined($self->{option_results}->{data}) && $self->{option_results}->{data} ne '') {
$self->{option_results}->{method} = 'POST';
$self->{option_results}->{method} = defined($self->{option_results}->{method}) && $self->{option_results}->{method} ne '' ?
$self->{option_results}->{method} : 'POST';
if (-f $self->{option_results}->{data} and -r $self->{option_results}->{data}) {
local $/ = undef;
my $fh;

3
centreon-plugins/centreon/plugins/backend/http/curl.pm
View File

@ -180,6 +180,9 @@ sub set_method {
if ($options{request}->{method} eq 'DELETE') {
$self->curl_setopt(option => $self->{constant_cb}->(name => 'CURLOPT_CUSTOMREQUEST'), parameter => $options{request}->{method});
}
if ($options{request}->{method} eq 'PATCH') {
$self->curl_setopt(option => $self->{constant_cb}->(name => 'CURLOPT_CUSTOMREQUEST'), parameter => $options{request}->{method});
}
}
sub set_auth {

4
centreon-plugins/centreon/plugins/backend/http/lwp.pm
View File

@ -166,7 +166,7 @@ sub request {
if (defined($request_options->{no_follow})) {
$self->{ua}->requests_redirectable(undef);
} else {
$self->{ua}->requests_redirectable([ 'GET', 'HEAD', 'POST' ]);
$self->{ua}->requests_redirectable([ 'GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'PATCH' ]);
}
if (defined($request_options->{http_peer_addr})) {
push @LWP::Protocol::http::EXTRA_SOCK_OPTS, PeerAddr => $request_options->{http_peer_addr};
@ -196,7 +196,7 @@ sub request {
}
}
if ($request_options->{method} eq 'POST') {
if ($request_options->{method} ne 'GET') {
if (defined($content_type_forced)) {
$req->content_type($content_type_forced);
$req->content($request_options->{query_form_post});