Skip to content

fix: curl_wrapper #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jqctop1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: curl_wrapper #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NetworkKMM/ohosApp/pbcurlwrapper/src/main/cpp/wrapper/include/curl_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ typedef struct {
// Curl 响应信息
typedef struct {
int code;
int httpCode;
const char *errorMsg;
int errorMsgLen;
const char *headers;
Expand Down
8 changes: 3 additions & 5 deletions NetworkKMM/ohosApp/pbcurlwrapper/src/main/cpp/wrapper/src/curl_wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,6 @@ class CurlClient {
std::string header_opt = key + ": " + value;
logI(log_tag_, "request header[" + std::to_string(i) + "]: " + header_opt);
header_list_ = curl_slist_append(header_list_, header_opt.c_str());
if (header_list_ == nullptr) {
header_list_ = curl_slist_append(header_list_, header_opt.c_str());
} else {
curl_slist_append(header_list_, header_opt.c_str());
}
}

// url
Expand Down Expand Up @@ -280,6 +275,7 @@ class CurlClient {

// 处理 gzip 响应数据
int errorCode = res;
int httpCode = 0;
if (res == CURLE_OK) {
// 请求成功才执行 gzip 解压
int upzipCode = HandleGzipDataIfNeed();
Expand All @@ -291,6 +287,7 @@ class CurlClient {
std::string error_msg = "gzip unzip failed";
std::memcpy(curl_error_msg_, error_msg.c_str(), error_msg.length());
}
curl_easy_getinfo(curl_, CURLINFO_RESPONSE_CODE, &httpCode);
}

char *ip = nullptr;
Expand All @@ -302,6 +299,7 @@ class CurlClient {

curl_response_ = new CurlResponse();
curl_response_->code = errorCode;
curl_response_->httpCode = httpCode;
curl_response_->headerLen = headers_.length();
curl_response_->headers = const_cast<char *>(reinterpret_cast<const char *>(headers_.c_str()));
curl_response_->redirectUrl = const_cast<char *>(reinterpret_cast<const char *>(redirect_url_.c_str()));
Expand Down