Unverified Commit f4e81953 authored by Matthew Turney's avatar Matthew Turney
Browse files

provide a more general purpose request function

This allows for more flexibility in the future. Most importantly being
able to do more than just GET requests but any HTTP method. Specifically
needed for DELETE requests.
parent 2b092539
...@@ -1592,12 +1592,17 @@ _post() { ...@@ -1592,12 +1592,17 @@ _post() {
return $_ret return $_ret
} }
# url getheader timeout
_get() { _get() {
_debug GET _request "$1" "$2" "$3" GET
}
# url getheader timeout
_request() {
url="$1" url="$1"
onlyheader="$2" onlyheader="$2"
t="$3" t="$3"
method="$4"
_debug method $method
_debug url "$url" _debug url "$url"
_debug "timeout" "$t" _debug "timeout" "$t"
...@@ -1611,6 +1616,9 @@ _get() { ...@@ -1611,6 +1616,9 @@ _get() {
if [ "$t" ]; then if [ "$t" ]; then
_CURL="$_CURL --connect-timeout $t" _CURL="$_CURL --connect-timeout $t"
fi fi
if [ "$method" ]; then
_CURL="$_CURL -X $method"
fi
_debug "_CURL" "$_CURL" _debug "_CURL" "$_CURL"
if [ "$onlyheader" ]; then if [ "$onlyheader" ]; then
$_CURL -I --user-agent "$USER_AGENT" -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" "$url" $_CURL -I --user-agent "$USER_AGENT" -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" "$url"
...@@ -1633,6 +1641,9 @@ _get() { ...@@ -1633,6 +1641,9 @@ _get() {
if [ "$t" ]; then if [ "$t" ]; then
_WGET="$_WGET --timeout=$t" _WGET="$_WGET --timeout=$t"
fi fi
if [ "$method" ]; then
_WGET="$_WGET --method=$method"
fi
_debug "_WGET" "$_WGET" _debug "_WGET" "$_WGET"
if [ "$onlyheader" ]; then if [ "$onlyheader" ]; then
$_WGET --user-agent="$USER_AGENT" --header "$_H5" --header "$_H4" --header "$_H3" --header "$_H2" --header "$_H1" -S -O /dev/null "$url" 2>&1 | sed 's/^[ ]*//g' $_WGET --user-agent="$USER_AGENT" --header "$_H5" --header "$_H4" --header "$_H3" --header "$_H2" --header "$_H1" -S -O /dev/null "$url" 2>&1 | sed 's/^[ ]*//g'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment