commit 56aeae9b065578e56222618886ef0e42488397e2
author Torne (Richard Coles) <torne@google.com> Wed Jun 25 10:31:42 2014 +0100
committer Torne (Richard Coles) <torne@google.com> Wed Jun 25 10:31:42 2014 +0100
tree 96c32febb356465e7f7b0e20b901c9726be0982a
parent 90e5a593cc6df2f5eb3ceca723b63f6eef1ea156
parent 4f17781540e08047f7cee3b0af41639fa8c1e3dd

Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: I88982c1c25f25ef846e6bda10aececd98d25d2c1

openssl.target.darwin-arm.mk

diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk
index f65c45b..83ff2d8 100644
--- a/openssl.target.darwin-arm.mk
+++ b/openssl.target.darwin-arm.mk
@@ -652,6 +652,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
@@ -769,6 +770,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \

openssl.target.darwin-arm64.mk

diff --git a/openssl.target.darwin-arm64.mk b/openssl.target.darwin-arm64.mk
index 30a6383..40e0e03 100644
--- a/openssl.target.darwin-arm64.mk
+++ b/openssl.target.darwin-arm64.mk
@@ -633,6 +633,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
@@ -733,6 +734,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \

openssl.target.darwin-mips.mk

diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk
index a0056aa..c6c51fa 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -641,6 +641,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
@@ -750,6 +751,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \

openssl.target.darwin-x86.mk

diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk
index 6b89fc4..ec1bdb7 100644
--- a/openssl.target.darwin-x86.mk
+++ b/openssl.target.darwin-x86.mk
@@ -647,6 +647,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
@@ -764,6 +765,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \

openssl.target.darwin-x86_64.mk

diff --git a/openssl.target.darwin-x86_64.mk b/openssl.target.darwin-x86_64.mk
index 1d79fe8..95d3124 100644
--- a/openssl.target.darwin-x86_64.mk
+++ b/openssl.target.darwin-x86_64.mk
@@ -649,6 +649,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
@@ -765,6 +766,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \

openssl.target.linux-arm.mk

diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk
index f65c45b..83ff2d8 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -652,6 +652,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
@@ -769,6 +770,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \

openssl.target.linux-arm64.mk

diff --git a/openssl.target.linux-arm64.mk b/openssl.target.linux-arm64.mk
index 30a6383..40e0e03 100644
--- a/openssl.target.linux-arm64.mk
+++ b/openssl.target.linux-arm64.mk
@@ -633,6 +633,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
@@ -733,6 +734,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \

openssl.target.linux-mips.mk

diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk
index a0056aa..c6c51fa 100644
--- a/openssl.target.linux-mips.mk
+++ b/openssl.target.linux-mips.mk
@@ -641,6 +641,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
@@ -750,6 +751,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \

openssl.target.linux-x86.mk

diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk
index 6b89fc4..ec1bdb7 100644
--- a/openssl.target.linux-x86.mk
+++ b/openssl.target.linux-x86.mk
@@ -647,6 +647,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
@@ -764,6 +765,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \

openssl.target.linux-x86_64.mk

diff --git a/openssl.target.linux-x86_64.mk b/openssl.target.linux-x86_64.mk
index 1d79fe8..95d3124 100644
--- a/openssl.target.linux-x86_64.mk
+++ b/openssl.target.linux-x86_64.mk
@@ -649,6 +649,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \
@@ -765,6 +766,7 @@
 	'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
 	'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
 	'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+	'-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
 	'-DVIDEO_HOLE=1' \
 	'-DNO_WINDOWS_BRAINDEATH' \
 	'-DPURIFY' \