Skip to content

Commit 66b573d

Browse files
committed
burl: use zlib inflate service
1 parent 45197b5 commit 66b573d

File tree

9 files changed

+20
-18
lines changed

9 files changed

+20
-18
lines changed

doc/local-playbook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ content:
1414

1515
ui:
1616
bundle:
17-
url: https://github.com/boostorg/website-v2-docs/releases/download/ui-master/ui-bundle.zip
17+
url: https://github.com/boostorg/website-v2-docs/releases/download/ui-develop/ui-bundle.zip
1818
snapshot: true
1919

2020
antora:

example/client/burl/Jamfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ project
2222
[ ac.check-library /boost/http_proto//boost_http_proto_zlib : <library>/boost/http_proto//boost_http_proto_zlib : ]
2323
<library>/boost/http_io//boost_http_io
2424
<library>/boost/program_options//boost_program_options
25-
<library>/boost/scope//scope
25+
<library>/boost/scope//boost_scope
2626
<library>/openssl//ssl/<link>shared
2727
<library>/openssl//crypto/<link>shared
2828
<target-os>windows:<library>crypt32

example/client/burl/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ co_main(int argc, char* argv[])
753753
{
754754
parser_cfg.apply_gzip_decoder = true;
755755
parser_cfg.apply_deflate_decoder = true;
756-
http_proto::zlib::install_service(proto_ctx);
756+
http_proto::zlib::install_inflate_service(proto_ctx);
757757
}
758758
http_proto::install_parser_service(proto_ctx, parser_cfg);
759759

example/client/burl/message.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ string_body::string_body(std::string body, std::string content_type)
2626
}
2727

2828
http_proto::method
29-
string_body::method() const
29+
string_body::method() const noexcept
3030
{
3131
return http_proto::method::post;
3232
}
@@ -57,7 +57,7 @@ file_body::file_body(std::string path)
5757
}
5858

5959
http_proto::method
60-
file_body::method() const
60+
file_body::method() const noexcept
6161
{
6262
return http_proto::method::put;
6363
}
@@ -99,7 +99,7 @@ stdin_body::source::on_read(buffers::mutable_buffer mb)
9999
}
100100

101101
http_proto::method
102-
stdin_body::method() const
102+
stdin_body::method() const noexcept
103103
{
104104
return http_proto::method::put;
105105
}
@@ -111,7 +111,7 @@ stdin_body::content_type() const noexcept
111111
}
112112

113113
boost::optional<std::size_t>
114-
stdin_body::content_length() const
114+
stdin_body::content_length() const noexcept
115115
{
116116
return boost::none;
117117
}

example/client/burl/message.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class string_body
2929
string_body(std::string body, std::string content_type);
3030

3131
http_proto::method
32-
method() const;
32+
method() const noexcept;
3333

3434
core::string_view
3535
content_type() const noexcept;
@@ -49,7 +49,7 @@ class file_body
4949
file_body(std::string path);
5050

5151
http_proto::method
52-
method() const;
52+
method() const noexcept;
5353

5454
core::string_view
5555
content_type() const noexcept;
@@ -72,13 +72,13 @@ class stdin_body
7272
};
7373

7474
http_proto::method
75-
method() const;
75+
method() const noexcept;
7676

7777
core::string_view
7878
content_type() const noexcept;
7979

8080
boost::optional<std::size_t>
81-
content_length() const;
81+
content_length() const noexcept;
8282

8383
source
8484
body() const;

example/client/burl/multipart_form.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ multipart_form::append(
8484
}
8585

8686
http_proto::method
87-
multipart_form::method() const
87+
multipart_form::method() const noexcept
8888
{
8989
return http_proto::method::post;
9090
}

example/client/burl/multipart_form.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class multipart_form
5656
std::vector<std::string> headers = {});
5757

5858
http_proto::method
59-
method() const;
59+
method() const noexcept;
6060

6161
std::string
6262
content_type() const;

test/unit/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
#
99

1010
set(EXTRAFILES
11-
../../../url/extra/test_main.cpp
12-
../../../url/extra/test_suite.hpp
11+
../../../url/extra/test_suite/test_main.cpp
12+
../../../url/extra/test_suite/test_main.cpp
13+
../../../url/extra/test_suite/test_suite.hpp
1314
)
1415

1516
file(GLOB_RECURSE PFILES CONFIGURE_DEPENDS *.cpp *.hpp)
@@ -22,7 +23,7 @@ find_package(OpenSSL REQUIRED)
2223
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "" FILES ${PFILES})
2324
source_group("_extra" FILES ${EXTRAFILES})
2425
add_executable(boost_http_io_tests ${PFILES} ${EXTRAFILES})
25-
target_include_directories(boost_http_io_tests PRIVATE . ../../../url/extra)
26+
target_include_directories(boost_http_io_tests PRIVATE . ../../../url/extra/test_suite)
2627
target_link_libraries(boost_http_io_tests PRIVATE
2728
OpenSSL::SSL
2829
boost_beast

test/unit/Jamfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ project
1919
<library>/boost/beast//boost_beast/<warnings-as-errors>off
2020
[ ac.check-library /openssl//ssl/<warnings-as-errors>off : <library>/openssl//ssl/<warnings-as-errors>off : ]
2121
[ ac.check-library /boost/http_proto//boost_http_proto_zlib/<warnings-as-errors>off : <library>/boost/http_proto//boost_http_proto_zlib/<warnings-as-errors>off : ]
22-
<source>../../../url/extra/test_main.cpp
22+
<source>../../../url/extra/test_suite/test_main.cpp
23+
<source>../../../url/extra/test_suite/test_suite.cpp
2324
<include>.
24-
<include>../../../url/extra
25+
<include>../../../url/extra/test_suite
2526
<warnings>extra
2627
<warnings-as-errors>on
2728
<target-os>darwin,<undefined-sanitizer>norecover:<link>static

0 commit comments

Comments
 (0)