Skip to content

Commit 0a84248

Browse files
authored
Merge branch 'jupp0r:master' into feature/summaryhistogramenhancedapi
2 parents a7460b8 + d2c9d38 commit 0a84248

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

bazel/repositories.bzl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,22 @@ def prometheus_cpp_repositories():
2626
maybe(
2727
http_archive,
2828
name = "com_github_curl",
29-
sha256 = "dab997c9b08cb4a636a03f2f7f985eaba33279c1c52692430018fae4a4878dc7",
30-
strip_prefix = "curl-7.80.0",
29+
sha256 = "910cc5fe279dc36e2cca534172c94364cf3fcf7d6494ba56e6c61a390881ddce",
30+
strip_prefix = "curl-7.82.0",
3131
urls = [
32-
"https://github.com/curl/curl/releases/download/curl-7_80_0/curl-7.80.0.tar.gz",
33-
"https://curl.haxx.se/download/curl-7.80.0.tar.gz",
32+
"https://github.com/curl/curl/releases/download/curl-7_82_0/curl-7.82.0.tar.gz",
33+
"https://curl.haxx.se/download/curl-7.82.0.tar.gz",
3434
],
3535
build_file = "@com_github_jupp0r_prometheus_cpp//bazel:curl.BUILD",
3636
)
3737

3838
maybe(
3939
http_archive,
4040
name = "com_github_google_benchmark",
41-
sha256 = "1f71c72ce08d2c1310011ea6436b31e39ccab8c2db94186d26657d41747c85d6",
42-
strip_prefix = "benchmark-1.6.0",
41+
sha256 = "6132883bc8c9b0df5375b16ab520fac1a85dc9e4cf5be59480448ece74b278d4",
42+
strip_prefix = "benchmark-1.6.1",
4343
urls = [
44-
"https://github.com/google/benchmark/archive/v1.6.0.tar.gz",
44+
"https://github.com/google/benchmark/archive/v1.6.1.tar.gz",
4545
],
4646
)
4747

push/src/curl_wrapper.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ int CurlWrapper::performHttpRequest(HttpMethod method, const std::string& uri,
4646
if (!body.empty()) {
4747
curl_easy_setopt(curl_, CURLOPT_POSTFIELDSIZE, body.size());
4848
curl_easy_setopt(curl_, CURLOPT_POSTFIELDS, body.data());
49+
} else {
50+
curl_easy_setopt(curl_, CURLOPT_POSTFIELDSIZE, 0L);
4951
}
5052

5153
if (!auth_.empty()) {

0 commit comments

Comments
 (0)