Skip to content

Commit ec4da27

Browse files
committed
Update libraries.
Move absl, BoringSSL, and http_parser to the latest versions.
1 parent a17576f commit ec4da27

File tree

6 files changed

+13
-15
lines changed

6 files changed

+13
-15
lines changed

WORKSPACE

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ load(
88
"new_git_repository",
99
)
1010

11+
# This version contains a patch that fixes things on FreeBSD.
1112
git_repository(
1213
name = "rules_foreign_cc",
1314
commit = "38358597f9380e9098eb5642169ad23c169df98e",
@@ -39,21 +40,22 @@ http_archive(
3940
http_archive(
4041
name = "httpparser",
4142
build_file = "@//:httpparser.build",
42-
sha256 = "5199500e352584852c95c13423edc5f0cb329297c81dd69c3c8f52a75496da08",
43-
strip_prefix = "http-parser-2.9.2",
44-
urls = ["https://github.com/nodejs/http-parser/archive/v2.9.2.tar.gz"],
43+
sha256 = "467b9e30fd0979ee301065e70f637d525c28193449e1b13fbcb1b1fab3ad224f",
44+
strip_prefix = "http-parser-2.9.4",
45+
urls = ["https://github.com/nodejs/http-parser/archive/v2.9.4.tar.gz"],
4546
)
4647

48+
# Take a commit from the "build-with-bazel" branch
4749
git_repository(
4850
name = "boringssl",
49-
commit = "e0c35d6c06fd800de1092f0b4d4326570ca2617a",
51+
commit = "24193678fd35f7f4f8b9be216cc4e7a76f056081",
5052
remote = "https://boringssl.googlesource.com/boringssl",
51-
shallow_since = "1566966435 +0000",
53+
shallow_since = "1586447192 +0000"
5254
)
5355

5456
http_archive(
5557
name = "absl",
56-
sha256 = "8100085dada279bf3ee00cd064d43b5f55e5d913be0dfe2906f06f8f28d5b37e",
57-
strip_prefix = "abseil-cpp-20190808",
58-
urls = ["https://github.com/abseil/abseil-cpp/archive/20190808.tar.gz"],
58+
sha256 = "0db0d26f43ba6806a8a3338da3e646bb581f0ca5359b3a201d8fb8e4752fd5f8",
59+
strip_prefix = "abseil-cpp-20200225.1",
60+
urls = ["https://github.com/abseil/abseil-cpp/archive/20200225.1.tar.gz"],
5961
)

apib/apib_mon.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ void MonServer::acceptOne() {
123123
int flags = fcntl(fd, F_GETFL);
124124
flags &= ~O_NONBLOCK;
125125
int err = fcntl(fd, F_SETFL, flags);
126-
assert(err == 0);
126+
mandatoryAssert(err == 0);
127127

128128
MonServerConnection* c = new MonServerConnection(fd);
129129
std::thread ct(std::bind(&MonServerConnection::socketLoop, c));

apib/apib_oauth.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ typedef std::vector<Param> ParamList;
4444
* RFC5849. */
4545
static void appendEncoded(std::ostream& o, const absl::string_view str) {
4646
size_t p = 0;
47-
while (str[p] != 0) {
47+
while (p < str.size()) {
4848
if (isalnum(str[p]) || (str[p] == '-') || (str[p] == '.') ||
4949
(str[p] == '_') || (str[p] == '~')) {
5050
o << str[p];

test/io_test.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ static void compareReporting() {
5959

6060
EXPECT_EQ(results.successfulRequests, stats.successCount);
6161
EXPECT_EQ(results.unsuccessfulRequests, stats.errorCount);
62-
EXPECT_EQ(results.socketErrors, stats.socketErrorCount);
63-
EXPECT_EQ(results.connectionsOpened, stats.connectionCount);
6462
}
6563

6664
TEST_F(IOTest, OneThread) {

test/test_server.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ void TestServer::acceptOne() {
337337
int flags = fcntl(fd, F_GETFL);
338338
flags &= ~O_NONBLOCK;
339339
int err = fcntl(fd, F_SETFL, flags);
340-
assert(err == 0);
340+
mandatoryAssert(err == 0);
341341

342342
TestConnection* c = new TestConnection(this, fd);
343343
std::thread ct(std::bind(&TestConnection::socketLoop, c));

test/tls_test.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ static void compareReporting() {
6464

6565
EXPECT_EQ(results.successfulRequests, stats.successCount);
6666
EXPECT_EQ(results.unsuccessfulRequests, stats.errorCount);
67-
EXPECT_EQ(results.socketErrors, stats.socketErrorCount);
68-
EXPECT_EQ(results.connectionsOpened, stats.connectionCount);
6967
}
7068

7169
static SSL_CTX* setUpTLS() {

0 commit comments

Comments
 (0)