From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail2.eckelmann.de ([217.19.183.93]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1TDWxB-0003a3-05 for ptxdist@pengutronix.de; Mon, 17 Sep 2012 10:45:18 +0200 Received: from mail2.eckelmann.de (localhost.localdomain [127.0.0.1]) by localhost (Email Security Appliance) with SMTP id B619DE9DB1D_56E31CB for ; Mon, 17 Sep 2012 08:45:16 +0000 (GMT) Received: from dag.eckelmann.group (ex-dag01.eckelmann.group [192.168.13.8]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "*.eckelmann.group", Issuer "Eckelmann Root CA" (not verified)) by mail2.eckelmann.de (Sophos Email Appliance) with ESMTPS id 7FC2CE9DB13_56E31CF for ; Mon, 17 Sep 2012 08:45:16 +0000 (GMT) From: "Schenk, Gavin" Date: Mon, 17 Sep 2012 08:45:15 +0000 Message-ID: References: <201209170948.46722.jbe@pengutronix.de> In-Reply-To: <201209170948.46722.jbe@pengutronix.de> Content-Language: de-DE MIME-Version: 1.0 Subject: Re: [ptxdist] making HTTP proxy timeout adjustable Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: "ptxdist@pengutronix.de" > > Seconds? Hours? Months? Years? > seconds :) --- diff -Naur orig/ptxdist-2012.09.0/config/setup/Kconfig ptxdist-2012.09.0/config/setup/Kconfig --- orig/ptxdist-2012.09.0/config/setup/Kconfig 2012-09-06 18:13:48.000000000 +0200 +++ ptxdist-2012.09.0/config/setup/Kconfig 2012-09-17 10:11:50.481985838 +0200 @@ -56,6 +56,14 @@ http://your.proxy.org:80 +config SETUP_HTTP_PROXY_TIMEOUT + prompt "HTTP Proxy timeout" + int + default "30" + help + Set maximum timeout in seconds for downloads via a http proxy + + endmenu menu "Project Searchpath" diff -Naur orig/ptxdist-2012.09.0/config/setup/ptxdistrc.default ptxdist-2012.09.0/config/setup/ptxdistrc.default --- orig/ptxdist-2012.09.0/config/setup/ptxdistrc.default 2012-09-06 18:13:48.000000000 +0200 +++ ptxdist-2012.09.0/config/setup/ptxdistrc.default 2012-09-17 09:11:43.399225416 +0200 @@ -18,7 +18,7 @@ # PTXCONF_SETUP_FTP_PROXY="" PTXCONF_SETUP_HTTP_PROXY="" - +PTXCONF_SETUP_HTTP_PROXY_TIMEOUT="30" # # Project Searchpath # diff -Naur orig/ptxdist-2012.09.0/scripts/lib/ptxd_make_get.sh ptxdist-2012.09.0/scripts/lib/ptxd_make_get.sh --- orig/ptxdist-2012.09.0/scripts/lib/ptxd_make_get.sh 2012-09-06 18:13:48.000000000 +0200 +++ ptxdist-2012.09.0/scripts/lib/ptxd_make_get.sh 2012-09-17 10:14:11.037982356 +0200 @@ -43,6 +43,13 @@ # local file="${url##*/}" + # + # Proxy timeout + local proxytimeout=${PTXCONF_SETUP_HTTP_PROXY_TIMEOUT} + if [ -z ${proxytimeout} ]; then + proxytimeout=30 + fi + # remove any pending or half downloaded files rm -f -- "${path}."* @@ -50,7 +57,7 @@ wget \ --passive-ftp \ --progress=bar:force \ - --timeout=30 \ + --timeout=${proxytimeout} \ --tries=5 \ ${PTXDIST_QUIET:+--quiet} \ "${opts[@]}" \ -- Regards Gavin Eckelmann Aktiengesellschaft Vorstand: Dr.-Ing. Gerd Eckelmann (Vorsitzender) Dr.-Ing. Peter Cordes, Dr.-Ing. Frank-Thomas Mellert Vorsitzender des Aufsichtsrats: Hubertus G. Krossa Sitz der Gesellschaft: Wiesbaden Amtsgericht Wiesbaden HRB 12636 -- ptxdist mailing list ptxdist@pengutronix.de