Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1274)

Unified Diff: crash_sender

Issue 6802003: crash-reporter: Make use of list_proxies to send crashes via a proxy when appropriate (Closed) Base URL: ssh://gitrw.chromium.org:9222/crash-reporter.git@master
Patch Set: Rename 'get_proxies' command to 'list_proxies' Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crash_sender
diff --git a/crash_sender b/crash_sender
index 10fdf37bfc8fea40db166f1ac8e90894a74fd741..21bd48846dca1eebeb9e2c7220b39e159987260f 100644
--- a/crash_sender
+++ b/crash_sender
@@ -68,6 +68,9 @@ RESTRICTED_CERTIFICATES_PATH="/usr/share/chromeos-ca-certificates"
# Temp directory for this process.
TMP_DIR=""
+# Path to list_proxies.
+LIST_PROXIES="/usr/bin/list_proxies"
+
lecho() {
logger -t "${TAG}" "$@"
}
@@ -258,11 +261,18 @@ send_crash() {
return 1
fi
+ # Read in the first proxy, if any, for a given URL. NOTE: The
+ # double-quotes are necessary due to a bug in dash with the "local"
+ # builtin command and values that have spaces in them (see
+ # "https://bugs.launchpad.net/ubuntu/+source/dash/+bug/139097").
+ local proxy="`${LIST_PROXIES} -quiet "${url}" | head -1`"
+ # if a direct connection should be used, unset the proxy variable.
+ [ "${proxy}" = "direct://" ] && proxy=
local report_id="${TMP_DIR}/report_id"
local curl_stderr="${TMP_DIR}/curl_stderr"
set +e
- curl "${url}" \
+ curl "${url}" ${proxy:+--proxy "$proxy"} \
--capath "${RESTRICTED_CERTIFICATES_PATH}" --ciphers HIGH \
-F "prod=${CHROMEOS_PRODUCT}" \
-F "ver=${chromeos_version}" \
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698