-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
merge: master <--- feature/v17.2.5-6
* HEAD | \ | * 948bd85 <github@luxolus.com> pkgbuild: pkgrel=6 | * d470b03 <github@luxolus.com> pkgbuild: use ceph-17.2.5-rgw-client-boost-string-view.patch | * 5bc29e5 <github@luxolus.com> pkgbuild: add ceph-17.2.5-rgw-client-boost-string-view.patch | * dd2565d <github@luxolus.com> pkgbuild: use rdkafka.mpatch + set env | * d045174 <github@luxolus.com> pkgbuild: add rdkafka.mpatch | / | master Fixes: #11 Signed-off-by: Bazaah <github@luxolus.com>
- Loading branch information
Showing
4 changed files
with
91 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| diff --git a/src/rgw/rgw_asio_client.cc b/src/rgw/rgw_asio_client.cc | ||
| index 82d5d43f8b8..ad6723a6436 100644 | ||
| --- a/src/rgw/rgw_asio_client.cc | ||
| +++ b/src/rgw/rgw_asio_client.cc | ||
| @@ -39,11 +39,11 @@ int ClientIO::init_env(CephContext *cct) | ||
| const auto& value = header->value(); | ||
|
|
||
| if (field == beast::http::field::content_length) { | ||
| - env.set("CONTENT_LENGTH", value.to_string()); | ||
| + env.set("CONTENT_LENGTH", value); | ||
| continue; | ||
| } | ||
| if (field == beast::http::field::content_type) { | ||
| - env.set("CONTENT_TYPE", value.to_string()); | ||
| + env.set("CONTENT_TYPE", value); | ||
| continue; | ||
| } | ||
|
|
||
| @@ -62,26 +62,26 @@ int ClientIO::init_env(CephContext *cct) | ||
| } | ||
| *dest = '\0'; | ||
|
|
||
| - env.set(buf, value.to_string()); | ||
| + env.set(buf, value); | ||
| } | ||
|
|
||
| int major = request.version() / 10; | ||
| int minor = request.version() % 10; | ||
| env.set("HTTP_VERSION", std::to_string(major) + '.' + std::to_string(minor)); | ||
|
|
||
| - env.set("REQUEST_METHOD", request.method_string().to_string()); | ||
| + env.set("REQUEST_METHOD", request.method_string()); | ||
|
|
||
| // split uri from query | ||
| auto uri = request.target(); | ||
| auto pos = uri.find('?'); | ||
| if (pos != uri.npos) { | ||
| auto query = uri.substr(pos + 1); | ||
| - env.set("QUERY_STRING", query.to_string()); | ||
| + env.set("QUERY_STRING", query); | ||
| uri = uri.substr(0, pos); | ||
| } | ||
| - env.set("SCRIPT_URI", uri.to_string()); | ||
| + env.set("SCRIPT_URI", uri); | ||
|
|
||
| - env.set("REQUEST_URI", request.target().to_string()); | ||
| + env.set("REQUEST_URI", request.target()); | ||
|
|
||
| char port_buf[16]; | ||
| snprintf(port_buf, sizeof(port_buf), "%d", local_endpoint.port()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/rdkakfa.pc b/rdkakfa.pc | ||
| index 0069888..523aa23 100644 | ||
| --- a/rdkakfa.pc | ||
| +++ b/rdkakfa.pc | ||
| @@ -6,7 +6,7 @@ libdir=${prefix}/lib | ||
| Name: librdkafka | ||
| Description: The Apache Kafka C/C++ library | ||
| Version: 2.0.2 | ||
| -Requires: curl zlib libssl libsasl2 libzstd liblz4 | ||
| +Requires: libcurl zlib libssl libsasl2 libzstd liblz4 | ||
| Cflags: -I${includedir} | ||
| Libs: -L${libdir} -lrdkafka | ||
| Libs.private: -lpthread -lrt -ldl -lm |