summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-08 18:49:18 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-08 18:49:18 +0000
commit645f82d5e7c5d580e3f795af70d0bdbe7872b880 (patch)
treedf71b3e0559381285b373581a2189c866173f73b /net
parented52e4de98333d2edeb02962421560643f149350 (diff)
downloadchromium_src-645f82d5e7c5d580e3f795af70d0bdbe7872b880.zip
chromium_src-645f82d5e7c5d580e3f795af70d0bdbe7872b880.tar.gz
chromium_src-645f82d5e7c5d580e3f795af70d0bdbe7872b880.tar.bz2
net: use a char array for the False Start blacklist.
Windows fails to build if any strings are > 64K long. Since the next blacklist update breaks this limit, we have to switch the blacklist to being a char array. BUG=none TEST=net_unittests git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65402 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/ssl_false_start_blacklist_process.cc17
1 files changed, 5 insertions, 12 deletions
diff --git a/net/base/ssl_false_start_blacklist_process.cc b/net/base/ssl_false_start_blacklist_process.cc
index a20dd1e..e538fdb 100644
--- a/net/base/ssl_false_start_blacklist_process.cc
+++ b/net/base/ssl_false_start_blacklist_process.cc
@@ -238,23 +238,16 @@ int main(int argc, char** argv) {
fprintf(out, " %u,\n", (unsigned) table_data.size());
fprintf(out, "};\n\n");
- fprintf(out, "const char SSLFalseStartBlacklist::kHashData[] = \n");
+ fprintf(out, "const char SSLFalseStartBlacklist::kHashData[] = {\n");
for (unsigned i = 0, line_length = 0; i < table_data.size(); i++) {
if (line_length == 0)
- fprintf(out, " \"");
+ fprintf(out, " ");
uint8 c = static_cast<uint8>(table_data[i]);
- if (c < 32 || c > 127 || c == '"') {
- fprintf(out, "\\%c%c%c", '0' + ((c >> 6) & 7), '0' + ((c >> 3) & 7),
- '0' + (c & 7));
- line_length += 4;
- } else {
- fprintf(out, "%c", c);
- line_length++;
- }
+ line_length += fprintf(out, "%d, ", c);
if (i == table_data.size() - 1) {
- fprintf(out, "\";\n");
+ fprintf(out, "\n};\n");
} else if (line_length >= 70) {
- fprintf(out, "\"\n");
+ fprintf(out, "\n");
line_length = 0;
}
}