NotificationsYou must be signed in to change notification settings
Fork425
Star2k

Commit90a1b0b

committed

Merge branch 'master' into http-server-rewrite

Conflicts:concurrency/src/CMakeLists.txtconcurrency/test/CMakeLists.txthttp/src/CMakeLists.txthttp/test/CMakeLists.txthttp/test/server_async_less_copy.cpphttp/test/server_async_run_stop_concurrency.cpphttp/test/server_include_inlined.cpplogging/src/CMakeLists.txtmessage/src/CMakeLists.txtmessage/test/CMakeLists.txt

2 parentse772881 +5a369fc commit90a1b0bCopy full SHA for 90a1b0b

File tree

20 files changed

+272

-64

lines changed

CMakeLists.txt
concurrency
- CMakeLists.txt
- src
  - CMakeLists.txt
- test
  - CMakeLists.txt
  - thread_pool_test.cpp
contrib/http_examples
- CMakeLists.txt
- http
  - fileserver.cpp
http
- CMakeLists.txt
- src
  - CMakeLists.txt
  - network/protocol/http
    - policies
      - async_connection.hpp
    - server/connection
      - async.hpp
      - sync.hpp
logging
- CMakeLists.txt
- src
  - CMakeLists.txt
- test
  - CMakeLists.txt
message
- CMakeLists.txt
- src
  - CMakeLists.txt
- test
  - CMakeLists.txt
mime/test
- mime-roundtrip.cpp
uri

20 files changed

+272

-64

lines changed

`‎CMakeLists.txt‎`

Lines changed: 34 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ cmake_minimum_required(VERSION 2.8)`
`8`	`8`	`project(CPP-NETLIB)`
`9`	`9`
`10`	`10`	`option( CPP-NETLIB_BUILD_SHARED_LIBS"Build cpp-netlib as shared libraries."OFF )`
	`11`	`+option( CPP-NETLIB_BUILD_SINGLE_LIB"Build cpp-netlib into a single library"OFF )`
`11`	`12`	`option( CPP-NETLIB_BUILD_TESTS"Build the unit tests."ON )`
`12`	`13`	`option( CPP-NETLIB_BUILD_EXAMPLES"Build the examples using cpp-netlib."ON )`
`13`	`14`	`option( CPP-NETLIB_ALWAYS_LOGGING"Allow cpp-netlib to log debug messages even in non-debug mode."OFF )`
`@@ -18,10 +19,14 @@ option( CPP-NETLIB_DISABLE_LIBCXX "Disable using libc++ when compiling with clan`
`18`	`19`	`set(CMAKE_MODULE_PATH${CMAKE_CURRENT_SOURCE_DIR})`
`19`	`20`	`find_package( ICU )`
`20`	`21`
`21`		`-if(CPP-NETLIB_BUILD_SHARED_LIBS)`
	`22`	`+if(CPP-NETLIB_BUILD_SHARED_LIBSORBUILD_SHARED_LIBS)`
`22`	`23`	`set(Boost_USE_STATIC_LIBSOFF)`
	`24`	`+ set(CPP-NETLIB_BUILD_SHARED_LIBSON)`
	`25`	`+ set(BUILD_SHARED_LIBSON)`
`23`	`26`	`else()`
`24`	`27`	`set(Boost_USE_STATIC_LIBSON)`
	`28`	`+ set(CPP-NETLIB_BUILD_SHARED_LIBSOFF)`
	`29`	`+ set(BUILD_SHARED_LIBSOFF)`
`25`	`30`	`endif()`
`26`	`31`	`set(Boost_USE_MULTITHREADEDON)`
`27`	`32`	`set(Boost_COMPONENTSsystemregex date_time filesystem program_options )`
`@@ -82,6 +87,7 @@ endif(Boost_FOUND)`
`82`	`87`
`83`	`88`	`message(STATUS"CPP-NETLIB options selected:")`
`84`	`89`	`message(STATUS" CPP-NETLIB_BUILD_SHARED_LIBS: ${CPP-NETLIB_BUILD_SHARED_LIBS}\t(Build cpp-netlib as shared libraries: OFF, ON)")`
	`90`	`+message(STATUS" CPP-NETLIB_BUILD_SINGLE_LIB: ${CPP-NETLIB_BUILD_SINGLE_LIB}\t(Build cpp-netlib into a single library: OFF, ON)")`
`85`	`91`	`message(STATUS" CPP-NETLIB_BUILD_TESTS: ${CPP-NETLIB_BUILD_TESTS}\t(Build the unit tests: ON, OFF)")`
`86`	`92`	`message(STATUS" CPP-NETLIB_BUILD_EXAMPLES: ${CPP-NETLIB_BUILD_EXAMPLES}\t(Build the examples using cpp-netlib: ON, OFF)")`
`87`	`93`	`message(STATUS" CPP-NETLIB_ALWAYS_LOGGING: ${CPP-NETLIB_ALWAYS_LOGGING}\t(Allow cpp-netlib to log debug messages even in non-debug mode: ON, OFF)")`
`@@ -122,6 +128,16 @@ if(CPP-NETLIB_BUILD_TESTS)`
`122`	`128`	`set(GMOCK_BOTH_LIBRARIES${GMOCK_LIBRARIES}${GMOCK_MAIN_LIBRARIES})`
`123`	`129`	`endif()`
`124`	`130`
	`131`	`+if(CPP-NETLIB_BUILD_SINGLE_LIB)`
	`132`	`+ include_directories(`
	`133`	`+${CMAKE_CURRENT_SOURCE_DIR}/concurrency/src`
	`134`	`+${CMAKE_CURRENT_SOURCE_DIR}/http/src`
	`135`	`+${CMAKE_CURRENT_SOURCE_DIR}/logging/src`
	`136`	`+${CMAKE_CURRENT_SOURCE_DIR}/message/src`
	`137`	`+${CMAKE_CURRENT_SOURCE_DIR}/uri/src`
	`138`	`+ )`
	`139`	`+endif()`
	`140`	`+`
`125`	`141`	`add_subdirectory(uri)`
`126`	`142`	`add_subdirectory(message)`
`127`	`143`	`add_subdirectory(logging)`
`@@ -131,3 +147,20 @@ add_subdirectory(http)`
`131`	`147`	`if(CPP-NETLIB_BUILD_EXAMPLES)`
`132`	`148`	`add_subdirectory(contrib/http_examples)`
`133`	`149`	`endif()`
	`150`	`+`
	`151`	`+if(CPP-NETLIB_BUILD_SINGLE_LIB)`
	`152`	`+ add_library(cppnetlib`
	`153`	`+${Uri_SRCS}`
	`154`	`+ ${CPP-NETLIB_MESSAGE_SRCS}`
	`155`	`+ ${CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS}`
	`156`	`+ ${CPP-NETLIB_MESSAGE_WRAPPERS_SRCS}`
	`157`	`+ ${CPP-NETLIB_LOGGING_SRCS}`
	`158`	`+ ${CPP-NETLIB_HTTP_CLIENT_SRCS}`
	`159`	`+ ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS}`
	`160`	`+ ${CPP-NETLIB_HTTP_MESSAGE_SRCS}`
	`161`	`+ ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS}`
	`162`	`+ ${CPP-NETLIB_CONSTANTS_SRCS}`
	`163`	`+ ${CPP-NETLIB_CONCURRENCY_SRCS}`
	`164`	`+ )`
	`165`	`+ target_link_libraries(cppnetlib${Boost_LIBRARIES})`
	`166`	`+endif()`

`‎concurrency/CMakeLists.txt‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,3 +9,6 @@ if(CPP-NETLIB_BUILD_TESTS)`
`9`	`9`	`enable_testing()`
`10`	`10`	`add_subdirectory(test)`
`11`	`11`	`endif(CPP-NETLIB_BUILD_TESTS)`
	`12`	`+`
	`13`	`+# propagate sources to parent directory for one-lib-build`
	`14`	`+set(CPP-NETLIB_CONCURRENCY_SRCS ${CPP-NETLIB_CONCURRENCY_SRCS} PARENT_SCOPE)`

`‎concurrency/src/CMakeLists.txt‎`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,10 @@`
`5`	`5`
`6`	`6`	`include_directories(${CPP-NETLIB_SOURCE_DIR}/concurrency/src)`
`7`	`7`
`8`		`-set(CPP-NETLIB_CONCURRENCY_SRCS thread_pool.cpp)`
`9`		`-add_library(cppnetlib-concurrency ${CPP-NETLIB_CONCURRENCY_SRCS})`
	`8`	`+set(CPP-NETLIB_CONCURRENCY_SRCS${CMAKE_CURRENT_SOURCE_DIR}/thread_pool.cpp)`
	`9`	`+if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)`
	`10`	`+ add_library(cppnetlib-concurrency ${CPP-NETLIB_CONCURRENCY_SRCS})`
	`11`	`+endif()`
	`12`	`+`
	`13`	`+# propagate sources to parent directory for one-lib-build`
	`14`	`+set(CPP-NETLIB_CONCURRENCY_SRCS ${CPP-NETLIB_CONCURRENCY_SRCS} PARENT_SCOPE)`

`‎concurrency/test/CMakeLists.txt‎`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,16 @@ include_directories(${CPP-NETLIB_SOURCE_DIR}/concurrency/src`
`8`	`8`	`${CPP-NETLIB_SOURCE_DIR}`
`9`	`9`	`)`
`10`	`10`
	`11`	`+if(CPP-NETLIB_BUILD_SINGLE_LIB)`
	`12`	`+ set(link_cppnetlib_lib cppnetlib)`
	`13`	`+else()`
	`14`	`+ set(link_cppnetlib_lib cppnetlib-concurrency)`
	`15`	`+endif()`
	`16`	`+`
`11`	`17`	`if (CPP-NETLIB_BUILD_TESTS)`
`12`	`18`	`add_executable(cpp-netlib-thread_pool_test thread_pool_test.cpp)`
`13`	`19`	`target_link_libraries(cpp-netlib-thread_pool_test`
`14`		`-cppnetlib-concurrency`
	`20`	`+${link_cppnetlib_lib}`
`15`	`21`	`${Boost_LIBRARIES}`
`16`	`22`	`${GTEST_BOTH_LIBRARIES}`
`17`	`23`	`${CMAKE_THREAD_LIBS_INIT})`

`‎concurrency/test/thread_pool_test.cpp‎`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@`
`8`	`8`
`9`	`9`	`#include<gtest/gtest.h>`
`10`	`10`	`#include<network/concurrency/thread_pool.hpp>`
`11`		`-#include<boost/bind.hpp>`
	`11`	`+// #include <boost/bind.hpp>`
	`12`	`+#include<functional>`
`12`	`13`
`13`	`14`	`using network::concurrency::thread_pool;`
`14`	`15`
`@@ -37,8 +38,8 @@ TEST(concurrency_test, post_work) {`
`37`	`38`	`foo instance;`
`38`	`39`	`{`
`39`	`40`	`thread_pool pool;`
`40`		`-ASSERT_NO_THROW(pool.post(boost::bind(&foo::bar, &instance,1)));`
`41`		`-ASSERT_NO_THROW(pool.post(boost::bind(&foo::bar, &instance,2)));`
	`41`	`+ASSERT_NO_THROW(pool.post(std::bind(&foo::bar, &instance,1)));`
	`42`	`+ASSERT_NO_THROW(pool.post(std::bind(&foo::bar, &instance,2)));`
`42`	`43`	`// require that pool is destroyed here, RAII baby`
`43`	`44`	`}`
`44`	`45`	`ASSERT_EQ(instance.val(),3);`

`‎contrib/http_examples/CMakeLists.txt‎`

Lines changed: 34 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,10 @@ set(BOOST_SERVER_LIBS`
`40`	`40`	`${Boost_PROGRAM_OPTIONS_LIBRARY}`
`41`	`41`	`)`
`42`	`42`
`43`		`-target_link_libraries(simple_wget`
`44`		`-${BOOST_CLIENT_LIBS}`
`45`		`-${CMAKE_THREAD_LIBS_INIT}`
	`43`	`+if(CPP-NETLIB_BUILD_SINGLE_LIB)`
	`44`	`+ set(simple_wget_linklibs cppnetlib)`
	`45`	`+else()`
	`46`	`+ set(simple_wget_linklibs`
`46`	`47`	`cppnetlib-uri`
`47`	`48`	`cppnetlib-message`
`48`	`49`	`cppnetlib-message-directives`
`@@ -53,10 +54,16 @@ target_link_libraries(simple_wget`
`53`	`54`	`cppnetlib-http-client`
`54`	`55`	`cppnetlib-http-client-connections`
`55`	`56`	`${CPP-NETLIB_LOGGING_LIB})`
`56`		`-`
`57`		`-target_link_libraries(atom_reader`
	`57`	`+endif()`
	`58`	`+target_link_libraries(simple_wget`
`58`	`59`	`${BOOST_CLIENT_LIBS}`
`59`	`60`	`${CMAKE_THREAD_LIBS_INIT}`
	`61`	`+${simple_wget_linklibs})`
	`62`	`+`
	`63`	`+if(CPP-NETLIB_BUILD_SINGLE_LIB)`
	`64`	`+ set(atom_reader_linklibs cppnetlib)`
	`65`	`+else()`
	`66`	`+ set(atom_reader_linklibs`
`60`	`67`	`cppnetlib-uri`
`61`	`68`	`cppnetlib-message`
`62`	`69`	`cppnetlib-message-directives`
`@@ -67,10 +74,16 @@ target_link_libraries(atom_reader`
`67`	`74`	`cppnetlib-http-client`
`68`	`75`	`cppnetlib-http-client-connections`
`69`	`76`	`${CPP-NETLIB_LOGGING_LIB})`
`70`		`-`
`71`		`-target_link_libraries(rss_reader`
	`77`	`+endif()`
	`78`	`+target_link_libraries(atom_reader`
`72`	`79`	`${BOOST_CLIENT_LIBS}`
`73`	`80`	`${CMAKE_THREAD_LIBS_INIT}`
	`81`	`+${atom_reader_linklibs})`
	`82`	`+`
	`83`	`+if(CPP-NETLIB_BUILD_SINGLE_LIB)`
	`84`	`+ set(rss_reader_linklibs cppnetlib)`
	`85`	`+else()`
	`86`	`+ set(rss_reader_linklibs`
`74`	`87`	`cppnetlib-uri`
`75`	`88`	`cppnetlib-message`
`76`	`89`	`cppnetlib-message-directives`
`@@ -80,6 +93,11 @@ target_link_libraries(rss_reader`
`80`	`93`	`cppnetlib-http-client`
`81`	`94`	`cppnetlib-http-client-connections`
`82`	`95`	`${CPP-NETLIB_LOGGING_LIB})`
	`96`	`+endif()`
	`97`	`+target_link_libraries(rss_reader`
	`98`	`+${BOOST_CLIENT_LIBS}`
	`99`	`+${CMAKE_THREAD_LIBS_INIT}`
	`100`	`+${rss_reader_linklibs})`
`83`	`101`
`84`	`102`	`#target_link_libraries(twitter_search`
`85`	`103`	`# ${BOOST_CLIENT_LIBS}`
`@@ -102,9 +120,10 @@ target_link_libraries(rss_reader`
`102`	`120`	`# cppnetlib-http-server`
`103`	`121`	`# ${CPP-NETLIB_LOGGING_LIB})`
`104`	`122`
`105`		`-target_link_libraries(hello_world_client`
`106`		`-${BOOST_CLIENT_LIBS}`
`107`		`-${CMAKE_THREAD_LIBS_INIT}`
	`123`	`+if(CPP-NETLIB_BUILD_SINGLE_LIB)`
	`124`	`+ set(hello_world_client_linklibs cppnetlib)`
	`125`	`+else()`
	`126`	`+ set(hello_world_client_linklibs`
`108`	`127`	`cppnetlib-uri`
`109`	`128`	`cppnetlib-message`
`110`	`129`	`cppnetlib-message-directives`
`@@ -115,6 +134,11 @@ target_link_libraries(hello_world_client`
`115`	`134`	`cppnetlib-http-client`
`116`	`135`	`cppnetlib-http-client-connections`
`117`	`136`	`${CPP-NETLIB_LOGGING_LIB})`
	`137`	`+endif()`
	`138`	`+target_link_libraries(hello_world_client`
	`139`	`+${BOOST_CLIENT_LIBS}`
	`140`	`+${CMAKE_THREAD_LIBS_INIT}`
	`141`	`+${hello_world_client_linklibs})`
`118`	`142`
`119`	`143`	`if (OPENSSL_FOUND)`
`120`	`144`	`target_link_libraries(simple_wget${OPENSSL_LIBRARIES})`

`‎contrib/http_examples/http/fileserver.cpp‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ struct file_cache {`
`101`	`101`
`102`	`102`	`};`
`103`	`103`
`104`		`-structconnection_handler :boost::enable_shared_from_this<connection_handler> {`
	`104`	`+structconnection_handler :std::enable_shared_from_this<connection_handler> {`
`105`	`105`	`explicitconnection_handler(file_cache& cache) : file_cache_(cache) {}`
`106`	`106`
`107`	`107`	`voidoperator()(std::stringconst& path,`
`@@ -143,7 +143,7 @@ struct connection_handler : boost::enable_shared_from_this<connection_handler> {`
`143`	`143`	`connection->write(boost::asio::const_buffers_1(`
`144`	`144`	`static_cast<charconst*>(mmaped_region.first) + offset,`
`145`	`145`	`rightmost_bound),`
`146`		`-boost::bind(&connection_handler::handle_chunk,`
	`146`	`+std::bind(&connection_handler::handle_chunk,`
`147`	`147`	`connection_handler::shared_from_this(),`
`148`	`148`	`mmaped_region,`
`149`	`149`	`rightmost_bound,`

`‎http/CMakeLists.txt‎`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,3 +9,10 @@ if(CPP-NETLIB_BUILD_TESTS)`
`9`	`9`	`enable_testing()`
`10`	`10`	`add_subdirectory(test)`
`11`	`11`	`endif(CPP-NETLIB_BUILD_TESTS)`
	`12`	`+`
	`13`	`+# propagate sources to parent directory for one-lib-build`
	`14`	`+set(CPP-NETLIB_HTTP_MESSAGE_SRCS ${CPP-NETLIB_HTTP_MESSAGE_SRCS} PARENT_SCOPE)`
	`15`	`+set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS} PARENT_SCOPE)`
	`16`	`+set(CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS} PARENT_SCOPE)`
	`17`	`+set(CPP-NETLIB_HTTP_CLIENT_SRCS ${CPP-NETLIB_HTTP_CLIENT_SRCS} PARENT_SCOPE)`
	`18`	`+set(CPP-NETLIB_CONSTANTS_SRCS ${CPP-NETLIB_CONSTANTS_SRCS} PARENT_SCOPE)`

`‎http/src/CMakeLists.txt‎`

Lines changed: 101 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,17 +18,23 @@ if (OPENSSL_FOUND)`
`18`	`18`	`include_directories(${OPENSSL_INCLUDE_DIR})`
`19`	`19`	`endif()`
`20`	`20`
`21`		`-set(CPP-NETLIB_HTTP_MESSAGE_SRCS http/request.cpp http/response.cpp)`
`22`		`-add_library(cppnetlib-http-message ${CPP-NETLIB_HTTP_MESSAGE_SRCS})`
`23`		`-add_dependencies(cppnetlib-http-message`
`24`		`-# ${Boost_LIBRARIES}`
`25`		`- cppnetlib-message)`
`26`		`-target_link_libraries(cppnetlib-http-message`
`27`		`-${Boost_LIBRARIES}`
`28`		`- cppnetlib-message)`
	`21`	`+set(CPP-NETLIB_HTTP_MESSAGE_SRCS`
	`22`	`+${CMAKE_CURRENT_SOURCE_DIR}/http/request.cpp`
	`23`	`+${CMAKE_CURRENT_SOURCE_DIR}/http/response.cpp)`
	`24`	`+if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)`
	`25`	`+ add_library(cppnetlib-http-message ${CPP-NETLIB_HTTP_MESSAGE_SRCS})`
	`26`	`+ add_dependencies(cppnetlib-http-message`
	`27`	`+# ${Boost_LIBRARIES}`
	`28`	`+ cppnetlib-message)`
	`29`	`+ target_link_libraries(cppnetlib-http-message`
	`30`	`+${Boost_LIBRARIES}`
	`31`	`+ cppnetlib-message)`
	`32`	`+endif()`
`29`	`33`
`30`		`-set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS http/message/wrappers.cpp)`
`31`		`-add_library(cppnetlib-http-message-wrappers ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS})`
	`34`	`+set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS${CMAKE_CURRENT_SOURCE_DIR}/http/message/wrappers.cpp)`
	`35`	`+if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)`
	`36`	`+ add_library(cppnetlib-http-message-wrappers ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS})`
	`37`	`+endif()`
`32`	`38`
`33`	`39`	`#set(CPP-NETLIB_HTTP_SERVER_PARSERS_SRCS server_request_parsers_impl.cpp)`
`34`	`40`	`#add_library(cppnetlib-http-server-parsers ${CPP-NETLIB_HTTP_SERVER_PARSERS_SRCS})`
`@@ -85,6 +91,7 @@ add_library(cppnetlib-http-message-wrappers ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_S`
`85`	`91`	`#endforeach(src_file)`
`86`	`92`
`87`	`93`	`set(CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS`
	`94`	`+<<<<<<< HEAD`
`88`	`95`	`http/client_connections.cpp`
`89`	`96`	`http/simple_connection_manager.cpp`
`90`	`97`	`http/simple_connection_factory.cpp`
`@@ -132,3 +139,87 @@ set(CPP-NETLIB_HTTP_SERVER_SRCS`
`132`	`139`	`http/server/session.cpp http/server/simple_sessions.cpp`
`133`	`140`	`http/server/dynamic_dispatcher.cpp)`
`134`	`141`	`add_library(cppnetlib-http-server ${CPP-NETLIB_HTTP_SERVER_SRCS})`
	`142`	`+=======`
	`143`	`+${CMAKE_CURRENT_SOURCE_DIR}/http/client_connections.cpp`
	`144`	`+${CMAKE_CURRENT_SOURCE_DIR}/http/simple_connection_manager.cpp`
	`145`	`+${CMAKE_CURRENT_SOURCE_DIR}/http/simple_connection_factory.cpp`
	`146`	`+${CMAKE_CURRENT_SOURCE_DIR}/http/connection_delegate_factory.cpp`
	`147`	`+${CMAKE_CURRENT_SOURCE_DIR}/http/client_resolver_delegate.cpp`
	`148`	`+${CMAKE_CURRENT_SOURCE_DIR}/http/client_resolver_delegate_factory.cpp`
	`149`	`+${CMAKE_CURRENT_SOURCE_DIR}/http/client_connection_delegates.cpp`
	`150`	`+${CMAKE_CURRENT_SOURCE_DIR}/http/client_connection_factory.cpp`
	`151`	`+${CMAKE_CURRENT_SOURCE_DIR}/http/client_async_resolver.cpp`
	`152`	`+${CMAKE_CURRENT_SOURCE_DIR}/http/client_connection_normal.cpp)`
	`153`	`+if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)`
	`154`	`+ add_library(cppnetlib-http-client-connections ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS})`
	`155`	`+endif()`
	`156`	`+foreach (src_file ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS})`
	`157`	`+if (${CMAKE_CXX_COMPILER_ID}MATCHES GNU)`
	`158`	`+ set_source_files_properties(${src_file}`
	`159`	`+ PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})`
	`160`	`+elseif (${CMAKE_CXX_COMPILER_ID}MATCHES Clang)`
	`161`	`+ set_source_files_properties(${src_file}`
	`162`	`+ PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})`
	`163`	`+endif()`
	`164`	`+endforeach(src_file)`
	`165`	`+`
	`166`	`+set(CPP-NETLIB_HTTP_CLIENT_SRCS`
	`167`	`+${CMAKE_CURRENT_SOURCE_DIR}/http/client.cpp)`
	`168`	`+if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)`
	`169`	`+ add_library(cppnetlib-http-client ${CPP-NETLIB_HTTP_CLIENT_SRCS})`
	`170`	`+ add_dependencies(cppnetlib-http-client`
	`171`	`+ ${CPP-NETLIB_LOGGING_LIB}`
	`172`	`+ cppnetlib-constants`
	`173`	`+ cppnetlib-uri`
	`174`	`+ cppnetlib-message`
	`175`	`+ cppnetlib-message-wrappers`
	`176`	`+ cppnetlib-message-directives`
	`177`	`+ cppnetlib-http-message`
	`178`	`+ cppnetlib-http-message-wrappers`
	`179`	`+ cppnetlib-http-client-connections`
	`180`	`+ )`
	`181`	`+ target_link_libraries(cppnetlib-http-client`
	`182`	`+${Boost_LIBRARIES}`
	`183`	`+ ${CPP-NETLIB_LOGGING_LIB}`
	`184`	`+ cppnetlib-constants`
	`185`	`+ cppnetlib-uri`
	`186`	`+ cppnetlib-message`
	`187`	`+ cppnetlib-message-wrappers`
	`188`	`+ cppnetlib-message-directives`
	`189`	`+ cppnetlib-http-message`
	`190`	`+ cppnetlib-http-message-wrappers`
	`191`	`+ cppnetlib-http-client-connections`
	`192`	`+ )`
	`193`	`+endif()`
	`194`	`+foreach (src_file ${CPP-NETLIB_HTTP_CLIENT_SRCS})`
	`195`	`+if (${CMAKE_CXX_COMPILER_ID}MATCHES GNU)`
	`196`	`+ set_source_files_properties(${src_file}`
	`197`	`+ PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})`
	`198`	`+elseif (${CMAKE_CXX_COMPILER_ID}MATCHES Clang)`
	`199`	`+ set_source_files_properties(${src_file}`
	`200`	`+ PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})`
	`201`	`+endif()`
	`202`	`+endforeach(src_file)`
	`203`	`+`
	`204`	`+set(CPP-NETLIB_CONSTANTS_SRCS${CMAKE_CURRENT_SOURCE_DIR}/constants.cpp)`
	`205`	`+if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)`
	`206`	`+ add_library(cppnetlib-constants ${CPP-NETLIB_CONSTANTS_SRCS})`
	`207`	`+endif()`
	`208`	`+foreach (src_file ${CPP-NETLIB_CONSTANTS_SRCS})`
	`209`	`+if (${CMAKE_CXX_COMPILER_ID}MATCHES GNU)`
	`210`	`+ set_source_files_properties(${src_file}`
	`211`	`+ PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})`
	`212`	`+elseif (${CMAKE_CXX_COMPILER_ID}MATCHES Clang)`
	`213`	`+ set_source_files_properties(${src_file}`
	`214`	`+ PROPERTIESCOMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})`
	`215`	`+endif()`
	`216`	`+endforeach(src_file)`
	`217`	`+`
	`218`	`+`
	`219`	`+# propagate sources to parent directory for one-lib-build`
	`220`	`+set(CPP-NETLIB_HTTP_MESSAGE_SRCS ${CPP-NETLIB_HTTP_MESSAGE_SRCS} PARENT_SCOPE)`
	`221`	`+set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS} PARENT_SCOPE)`
	`222`	`+set(CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS} PARENT_SCOPE)`
	`223`	`+set(CPP-NETLIB_HTTP_CLIENT_SRCS ${CPP-NETLIB_HTTP_CLIENT_SRCS} PARENT_SCOPE)`
	`224`	`+set(CPP-NETLIB_CONSTANTS_SRCS ${CPP-NETLIB_CONSTANTS_SRCS} PARENT_SCOPE)`
	`225`	`+>>>>>>> master`

`‎http/src/network/protocol/http/policies/async_connection.hpp‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`#include<boost/shared_ptr.hpp>`
`14`	`14`	`#include<boost/lexical_cast.hpp>`
`15`	`15`	`#include<boost/cstdint.hpp>`
`16`		`-#include<boost/enable_shared_from_this.hpp>`
	`16`	`+//#include <boost/enable_shared_from_this.hpp>`
`17`	`17`	`#include<boost/tuple/tuple.hpp>`
`18`	`18`	`#include<functional>`
`19`	`19`	`#include<functional>`
`@@ -47,7 +47,7 @@ struct simple_async_connection_manager : connection_manager {`
`47`	`47`	`structhttp_1_1_async_connection;`
`48`	`48`
`49`	`49`	`structhttp_1_1_async_connection_manager : connection_manager,`
`50`		`- enable_shared_from_this<http_1_1_async_connection_manager> {`
	`50`	`+std::enable_shared_from_this<http_1_1_async_connection_manager> {`
`51`	`51`	`http_1_1_async_connection_manager(bool cache_resolved,`
`52`	`52`	`bool follow_redirects,`
`53`	`53`	`optional<std::string> openssl_certificate,`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit90a1b0b

File tree

20 files changed

20 files changed

`‎CMakeLists.txt‎`

`‎concurrency/CMakeLists.txt‎`

`‎concurrency/src/CMakeLists.txt‎`

`‎concurrency/test/CMakeLists.txt‎`

`‎concurrency/test/thread_pool_test.cpp‎`

`‎contrib/http_examples/CMakeLists.txt‎`

`‎contrib/http_examples/http/fileserver.cpp‎`

`‎http/CMakeLists.txt‎`

`‎http/src/CMakeLists.txt‎`

`‎http/src/network/protocol/http/policies/async_connection.hpp‎`

0 commit comments