Skip to content

Commit f0e2107

Browse files
committed
Merge branch 'development' of https://git01.codeplex.com/casablanca into deprecate_guarantee
2 parents 86aecb8 + 39ab76a commit f0e2107

File tree

5 files changed

+220
-240
lines changed

5 files changed

+220
-240
lines changed

Release/include/cpprest/details/http_client_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class request_context
139139
report_exception(std::make_exception_ptr(e));
140140
}
141141

142-
void report_exception(std::exception_ptr exceptionPtr)
142+
virtual void report_exception(std::exception_ptr exceptionPtr)
143143
{
144144
auto response_impl = m_response._get_impl();
145145

Release/include/cpprest/details/http_server_asio.h

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class connection
6868
bool m_close;
6969
bool m_chunked;
7070
std::atomic<int> m_refs; // track how many threads are still referring to this
71-
71+
7272
public:
7373
connection(std::unique_ptr<boost::asio::ip::tcp::socket> socket, http_linux_server* server, hostport_listener* parent)
7474
: m_socket(std::move(socket))
@@ -94,16 +94,15 @@ class connection
9494
void handle_chunked_header(const boost::system::error_code& ec);
9595
void handle_chunked_body(const boost::system::error_code& ec, int toWrite);
9696
void dispatch_request_to_listener();
97-
void request_data_avail(size_t size);
9897
void do_response(bool bad_request);
9998
template <typename ReadHandler>
100-
void async_read_until_buffersize(size_t size, ReadHandler handler);
99+
void async_read_until_buffersize(size_t size, const ReadHandler &handler);
101100
void async_process_response(http_response response);
102-
void cancel_sending_response_with_error(http_response response, std::exception_ptr);
103-
void handle_headers_written(http_response response, const boost::system::error_code& ec);
104-
void handle_write_large_response(http_response response, const boost::system::error_code& ec);
105-
void handle_write_chunked_response(http_response response, const boost::system::error_code& ec);
106-
void handle_response_written(http_response response, const boost::system::error_code& ec);
101+
void cancel_sending_response_with_error(const http_response &response, const std::exception_ptr &);
102+
void handle_headers_written(const http_response &response, const boost::system::error_code& ec);
103+
void handle_write_large_response(const http_response &response, const boost::system::error_code& ec);
104+
void handle_write_chunked_response(const http_response &response, const boost::system::error_code& ec);
105+
void handle_response_written(const http_response &response, const boost::system::error_code& ec);
107106
void finish_request_response();
108107
};
109108

0 commit comments

Comments
 (0)