Skip to content

E
eepm
Commit 997fcff7 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

eget: use timeout 20s for response checking, only one try by default

parent d084d69d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
bin/tools_eget
View file @ 997fcff7
...@@ -329,7 +329,7 @@ CURLMAXTIME='' ...@@ -329,7 +329,7 @@ CURLMAXTIME=''
WGETREADTIMEOUT='' WGETREADTIMEOUT=''
WGETRETRYCONNREFUSED='' WGETRETRYCONNREFUSED=''
CURLRETRYCONNREFUSED='' CURLRETRYCONNREFUSED=''
WGETTRIES='' WGETTRIES='--tries 1'
CURLRETRY='' CURLRETRY=''
WGETLOADCOOKIES='' WGETLOADCOOKIES=''
CURLCOOKIE='' CURLCOOKIE=''
...@@ -1067,7 +1067,7 @@ url_get_response() ...@@ -1067,7 +1067,7 @@ url_get_response()
{ {
local URL="$1" local URL="$1"
local answer local answer
answer="$(quiet=1 __wget --spider -S "$URL" 2>&1)" answer="$(quiet=1 __wget --timeout 20 --tries 1 --spider -S "$URL" 2>&1)"
# HTTP/1.1 405 Method Not Allowed # HTTP/1.1 405 Method Not Allowed
# HTTP/1.1 404 Not Found # HTTP/1.1 404 Not Found
if echo "$answer" | grep -q "^ *HTTP/[12.]* 40[45]" ; then if echo "$answer" | grep -q "^ *HTTP/[12.]* 40[45]" ; then
...@@ -1114,11 +1114,11 @@ url_get_response() ...@@ -1114,11 +1114,11 @@ url_get_response()
{ {
local URL="$1" local URL="$1"
local answer local answer
answer="$(quiet=1 __curl -LI "$URL" 2>&1)" answer="$(quiet=1 __curl --max-time 20 --retry 0 -LI "$URL" 2>&1)"
# HTTP/1.1 405 Method Not Allowed # HTTP/1.1 405 Method Not Allowed
# HTTP/1.1 404 Not Found # HTTP/1.1 404 Not Found
if echo "$answer" | grep -q "^ *HTTP/[12.]* 40[45]" ; then if echo "$answer" | grep -q "^ *HTTP/[12.]* 40[45]" ; then
(quiet=1 __curl -L -i -r0-0 "$URL" 2>&1) (quiet=1 __curl --max-time 20 --retry 0 -L -i -r0-0 "$URL" 2>&1)
return return
fi fi
echo "$answer" echo "$answer"
......
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