Index: crash_sender |
diff --git a/crash_sender b/crash_sender |
index 10fdf37bfc8fea40db166f1ac8e90894a74fd741..b9834207547c103fcc2980e7c3c1b89c5a5c63f4 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 get_proxies. |
+GET_PROXIES="/usr/bin/get_proxies" |
+ |
lecho() { |
logger -t "${TAG}" "$@" |
} |
@@ -258,11 +261,15 @@ send_crash() { |
return 1 |
fi |
+ # read in the first proxy, if any, for a given URL. |
+ local proxy=`${GET_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"} \ |
kmixter1
2011/04/12 00:35:40
I'm assuming you've checked that "$proxy" ends up
Michael Krebs
2011/04/12 23:00:59
Yeah, that works correctly. However, I just tried
|
--capath "${RESTRICTED_CERTIFICATES_PATH}" --ciphers HIGH \ |
-F "prod=${CHROMEOS_PRODUCT}" \ |
-F "ver=${chromeos_version}" \ |