Skip to content

Commit ba0d8c5

Browse files
committed
backport upstream fix for net_http/server and arm32
1 parent ef6bd20 commit ba0d8c5

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Diff for: Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ DOCKER_REPO=tensorflow-serving
1919
DOCKER_TAG?=master
2020

2121
bin_path=/usr/bin/tensorflow_model_server
22-
bin_container=tfs
22+
bin_container=tfsbin
2323

2424
.PHONY: all devel arm64v8 arm32v7 arm32v7_vfpv3 push _validate-release release
2525

Diff for: tensorflow_serving/tools/docker/Dockerfile.arm

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ COPY third_party/libevent.BUILD /tensorflow-serving/third_party/libevent.BUILD
2626
COPY WORKSPACE /tensorflow-serving/WORKSPACE
2727
COPY tensorflow_serving/repo.bzl /tensorflow-serving/tensorflow_serving/repo.bzl
2828
COPY external/aws.BUILD.patch /tensorflow-serving/external/aws.BUILD.patch
29-
# patches gzip implementation causing build failures for 32-bit targets
29+
# backport upstream patch for gzip implementation causing build failures for 32-bit
3030
COPY tensorflow_serving/util/net_http/server/internal/evhttp_request.cc /tensorflow-serving/tensorflow_serving/util/net_http/server/internal/evhttp_request.cc
3131
# add new sources
3232
# adds bazel C++ toolchains for armhf and arm64

Diff for: tensorflow_serving/util/net_http/server/internal/evhttp_request.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ void EvHTTPRequest::UncompressGzipContent(void* input, size_t input_size,
216216
int err = zlib.UncompressGzipAndAllocate(
217217
reinterpret_cast<Bytef**>(uncompressed_input),
218218
reinterpret_cast<uLongf*>(uncompressed_input_size),
219-
reinterpret_cast<Bytef*>(input), input_size);
219+
static_cast<Bytef*>(input), static_cast<uLong>(input_size));
220220
if (err != Z_OK) {
221221
ABSL_RAW_LOG(ERROR, "Got zlib error: %d", err);
222222
}

0 commit comments

Comments
 (0)