Modified some code to get as much working on MSVC 10 as possible. There is still a compiler error in protocol/http/algorithms/linearize.hpp.

Author: glynos

CMakeLists.txt

@@ -11,10 +11,18 @@ if (Boost_FOUND)
     set(Boost_USE_STATIC_LIBS ON)
     set(Boost_USE_MULTI_THREADED ON)
     include_directories(${Boost_INCLUDE_DIRS})
-endif()
+endif(Boost_FOUND)
+if (MSVC)
+  add_definitions(-D_SCL_SECURE_NO_WARNINGS)
+endif(MSVC)
+if (WIN32)
+  add_definitions(-D_WIN32_WINNT=0x0501)
+endif(WIN32)
 enable_testing()
 add_subdirectory(libs/network/build)
 add_subdirectory(libs/network/test)
-add_subdirectory(libs/mime/test)
+if (NOT MSVC)
+  add_subdirectory(libs/mime/test)
+endif(NOT_MSVC)
 add_subdirectory(libs/network/example)
 

boost/network/protocol/http/policies/simple_connection.hpp

@@ -29,9 +29,9 @@ namespace boost { namespace network { namespace http {
         typedef function<typename resolver_base::resolver_iterator_pair(resolver_type &, string_type const &, string_type const &)> resolver_function_type;
 
         struct connection_impl {
-            connection_impl(resolver_type & resolver, bool follow_redirect, string_type const & hostname, string_type const & port, resolver_function_type resolve, bool https, optional<string_type> const & certificate_filename = optional<string_type>(), optional<string_type> const & verify_path = optional<string_type>()) 
+            connection_impl(resolver_type & resolver, bool follow_redirect, string_type const & hostname, string_type const & port, resolver_function_type resolve, bool https, optional<string_type> const & certificate_filename = optional<string_type>(), optional<string_type> const & verify_path = optional<string_type>())
             : pimpl()
-            , follow_redirect_(follow_redirect) 
+            , follow_redirect_(follow_redirect)
             {
                 pimpl.reset(impl::sync_connection_base<Tag,version_major,version_minor>::new_connection(resolver, resolve, https, certificate_filename, verify_path));
             }
@@ -54,7 +54,7 @@ namespace boost { namespace network { namespace http {
                         boost::uint16_t status = response_.status();
                         if (status >= 300 && status <= 307) {
                             typename headers_range<http::basic_response<Tag> >::type location_range = headers(response_)["Location"];
-                            typename range_iterator<typename headers_range<http::basic_request<Tag> >::type>::type location_header = boost::begin(location_range);
+                            typename range_iterator<typename headers_range<http::basic_response<Tag> >::type>::type location_header = boost::begin(location_range);
                             if (location_header != boost::end(location_range)) {
                                 request_.uri(location_header->second);
                             } else throw std::runtime_error("Location header not defined in redirect response.");
@@ -97,7 +97,7 @@ namespace boost { namespace network { namespace http {
 
         void cleanup() { }
 
-        simple_connection_policy(bool cache_resolved, bool follow_redirect) 
+        simple_connection_policy(bool cache_resolved, bool follow_redirect)
         : resolver_base(cache_resolved), follow_redirect_(follow_redirect) {}
 
         // member variables

libs/network/example/CMakeLists.txt

@@ -6,28 +6,40 @@
 include_directories(${CPP-NETLIB_SOURCE_DIR})
 find_package( Boost 1.41.0 COMPONENTS program_options system regex date_time thread filesystem )
 find_package( OpenSSL )
-include_directories(${OPENSSL_INCLUDE_DIR})
 find_package( Threads )
-set(Boost_USE_STATIC_LIBS ON)
-set(Boost_USE_MULTITHREADED ON)
+
+if (Boost_FOUND)
+    set(Boost_USE_STATIC_LIBS ON)
+    set(Boost_USE_MULTITHREADED ON)
+endif (Boost_FOUND)
+
+if (OPENSSL_FOUND)
+    include_directories(${OPENSSL_INCLUDE_DIR})
+endif (OPENSSL_FOUND)
 
 if (Boost_FOUND)
     add_executable(http_client http_client.cpp)
+    add_dependencies(http_client cppnetlib-uri-parsers)
+    target_link_libraries(http_client ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri-parsers)
+    set_target_properties(http_client PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
+
     add_executable(simple_wget simple_wget.cpp)
+    add_dependencies(simple_wget cppnetlib-uri-parsers)
+    target_link_libraries(simple_wget ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri-parsers)
+    set_target_properties(simple_wget PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
+
     add_executable(hello_world_server http/hello_world_server.cpp)
-    add_executable(fileserver http/fileserver.cpp)
+    target_link_libraries(hello_world_server ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} )
+    set_target_properties(hello_world_server PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
+
+    if (UNIX)
+      add_executable(fileserver http/fileserver.cpp)
+      target_link_libraries(fileserver ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-server-parsers)
+      set_target_properties(fileserver PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
+    endif (UNIX)
+
     add_executable(uri uri.cpp)
-    add_dependencies(http_client cppnetlib-uri-parsers)
-    add_dependencies(simple_wget cppnetlib-uri-parsers)
     add_dependencies(uri cppnetlib-uri-parsers)
-    target_link_libraries(http_client ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES} cppnetlib-uri-parsers)
-    target_link_libraries(simple_wget ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES} cppnetlib-uri-parsers)
-    target_link_libraries(hello_world_server ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES} )
-    target_link_libraries(fileserver ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-server-parsers)
     target_link_libraries(uri cppnetlib-uri-parsers)
-    set_target_properties(http_client PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
-    set_target_properties(simple_wget PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
-    set_target_properties(hello_world_server PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
-    set_target_properties(fileserver PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
     set_target_properties(uri PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
 endif()

libs/network/test/http/http_test_server.hpp

@@ -1,4 +1,4 @@
-// 
+//
 //          Copyright Kim Grasman 2008.
 // Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
@@ -16,14 +16,14 @@
     #include <windows.h>
 
     // ShellExecuteEx
-    #include <shellapi.h> 
+    #include <shellapi.h>
     #pragma comment( lib, "shell32" )
 #else
     #include <unistd.h>     // fork, execlp etc.
     #include <sys/types.h>
     #include <sys/wait.h>   // for waitpid
     #include <sys/stat.h>   // for chmod
-    #include <signal.h>     // for kill 
+    #include <signal.h>     // for kill
 #endif
 
 struct http_test_server
@@ -61,7 +61,7 @@ struct http_test_server
     boost::filesystem::path get_server_path(const boost::filesystem::path& base_path) {
         using namespace boost::filesystem;
 
-        const path script_name = 
+        const path script_name =
 #if defined(HTTPS_SERVER_TEST)
             "https_test_server.py"
 #else
@@ -84,17 +84,17 @@ struct http_test_server
     script_handle_t launch_python_script(const boost::filesystem::path& python_script_path) {
         using namespace boost::filesystem;
 
-        path::string_type script_name = python_script_path.filename().string();
-        path::string_type script_dir = python_script_path.parent_path().string();
+        path::string_type script_name = python_script_path.filename().native();
+        path::string_type script_dir = python_script_path.parent_path().native();
 
 #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
         SHELLEXECUTEINFOA sei = {0};
         sei.cbSize = sizeof(sei);
         sei.fMask = SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI;
         sei.lpVerb = "open";
         sei.lpFile = "python.exe";
-        sei.lpParameters = script_name.c_str();
-        sei.lpDirectory = script_dir.c_str();
+        sei.lpParameters = reinterpret_cast<LPCSTR>(script_name.c_str());
+        sei.lpDirectory = reinterpret_cast<LPCSTR>(script_dir.c_str());
         sei.nShow = SW_SHOWNOACTIVATE;
 
         if (!ShellExecuteExA(&sei))
@@ -107,16 +107,16 @@ struct http_test_server
         if (child_process < 0)
             return false;
 
-        if (child_process == 0) { 
+        if (child_process == 0) {
             // child process
-            
+
             // cd into script dir and launch python script
             current_path(script_dir);
 
             if (execlp("python", "python", script_name.c_str(), (char*)NULL) == -1)
                 return 0;
-        } 
-        else { 
+        }
+        else {
             // parent
             sleep(1);
         }