Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release/0.7' (#492)
Browse files Browse the repository at this point in the history
* support customized UserAgent in http client (#479)

Signed-off-by: liulanzheng <lanzheng.liulz@alibaba-inc.com>

* fix gcc13

* fix

* cherry-pick fix for timer stack overflow (#489)

---------

Signed-off-by: liulanzheng <lanzheng.liulz@alibaba-inc.com>
Co-authored-by: Lanzheng Liu <lanzheng.liulz@alibaba-inc.com>
Co-authored-by: lihuiba <huiba.lhb@alibaba-inc.com>
  • Loading branch information
3 people committed May 27, 2024
1 parent 38c06d9 commit 0db8545
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion common/iovector.h
Original file line number Diff line number Diff line change
Expand Up @@ -1081,4 +1081,4 @@ class SmartCloneIOV

#undef IF_ASSERT_RETURN

#pragma GCC diagnostic pop
#pragma GCC diagnostic pop
5 changes: 5 additions & 0 deletions common/test/test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,12 @@ TEST(Callback, virtual_function)
Callback<int> dd(lambda);
// Callback<int> ee([&](int x){ return RET + x/2; });

#pragma GCC diagnostic push
#if __GNUC__ >= 13
#pragma GCC diagnostic ignored "-Wdangling-pointer"
#endif
THIS = (BB*)&c;
#pragma GCC diagnostic pop
LOG_DEBUG(VALUE(THIS), VALUE(&c));

for (int i=0; i<100; ++i)
Expand Down
2 changes: 1 addition & 1 deletion net/http/test/client_function_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ TEST(http_client, user_agent) {
client->set_user_agent("TEST_UA");
DEFER(delete client);
auto op = client->new_operation(Verb::GET, target_get);
DEFER(op->destroy());
DEFER(client->destroy_operation(op));
op->req.headers.content_length(0);
client->call(op);
EXPECT_EQ(op->status_code, 200);
Expand Down
2 changes: 1 addition & 1 deletion thread/thread11.h
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ namespace photon {

void asdf()
{
int a; char b;
int a = 0; char b = 0;
auto func = &__Example_of_Thread11__::member_function;
auto cfunc = &__Example_of_Thread11__::const_member_function;

Expand Down

0 comments on commit 0db8545

Please sign in to comment.