Moved http subdirectory; includes version.hpp and constants.

cpp-netlib · deanberris · Jan 2, 2013 · Dec 27, 2012 · Dec 27, 2012 · Dec 29, 2012
commit feecbc2be0a92611e91bd56ed7845010cd49c9ee
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -78,10 +78,10 @@ if (Boost_FOUND)
     if(CPP-NETLIB_BUILD_TESTS)
       enable_testing()
     endif()
-    add_subdirectory(libs/network/src)
+    #add_subdirectory(libs/network/src)
     if(CPP-NETLIB_BUILD_TESTS)
       enable_testing()
-      add_subdirectory(libs/network/test)
+      #add_subdirectory(libs/network/test)
       if (NOT MSVC)
         #add_subdirectory(libs/mime/test)
       endif(NOT MSVC)
@@ -111,3 +111,4 @@ add_subdirectory(uri)
 add_subdirectory(message)
 add_subdirectory(logging)
 add_subdirectory(concurrency)
+add_subdirectory(http)
diff --git a/http/CMakeLists.txt b/http/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Copyright (c) Glyn Matthews 2012.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+add_subdirectory(src)
+
+if(CPP-NETLIB_BUILD_TESTS)
+  enable_testing()
+  add_subdirectory(test)
+endif(CPP-NETLIB_BUILD_TESTS)
diff --git a/http/src/CMakeLists.txt b/http/src/CMakeLists.txt
@@ -0,0 +1,185 @@
+# Copyright (c) Glyn Matthews 2011, 2012.
+# Copyright 2011 Dean Michael Berris (dberris@google.com)
+# Copyright 2012 A. Joel Lamotte (mjklaim@gmail.com)
+# Copyright 2011 Google, Inc.
+# Distributed under the Boost Software License, Version 1.0.
+#    (See accompanying file LICENSE_1_0.txt or copy at
+#          http://www.boost.org/LICENSE_1_0.txt)
+
+
+include_directories(
+  ${CPP-NETLIB_SOURCE_DIR}/uri/src
+  ${CPP-NETLIB_SOURCE_DIR}/message/src
+  ${CPP-NETLIB_SOURCE_DIR}/logging/src
+  ${CPP-NETLIB_SOURCE_DIR}/include
+  ${CPP-NETLIB_SOURCE_DIR})
+
+if (OPENSSL_FOUND)
+include_directories(${OPENSSL_INCLUDE_DIR})
+endif()
+
+if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
+  if (HAVE_STD11)
+    set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11")
+  elseif (HAVE_STD0X)
+    set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++0x")
+  endif()
+elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
+  CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
+  set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
+  set(CPP-NETLIB_CXXFLAGS "-Wall -std=c++11 -stdlib=libc++")
+endif()
+
+set(CPP-NETLIB_HTTP_MESSAGE_SRCS http/request.cpp http/response.cpp)
+add_library(cppnetlib-http-message ${CPP-NETLIB_HTTP_MESSAGE_SRCS})
+add_dependencies(cppnetlib-http-message
+#   ${Boost_LIBRARIES}
+  cppnetlib-message)
+target_link_libraries(cppnetlib-http-message
+  ${Boost_LIBRARIES}
+  cppnetlib-message)
+foreach (src_file ${CPP-NETLIB_HTTP_MESSAGE_SRCS})
+if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
+    set_source_files_properties(${src_file}
+        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
+elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
+    set_source_files_properties(${src_file}
+        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
+endif()
+endforeach(src_file)
+
+set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS http/message/wrappers.cpp)
+add_library(cppnetlib-http-message-wrappers ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS})
+foreach (src_file ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS})
+if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
+    set_source_files_properties(${src_file}
+        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
+elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
+    set_source_files_properties(${src_file}
+        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
+endif()
+endforeach(src_file)
+
+#set(CPP-NETLIB_HTTP_SERVER_PARSERS_SRCS server_request_parsers_impl.cpp)
+#add_library(cppnetlib-http-server-parsers ${CPP-NETLIB_HTTP_SERVER_PARSERS_SRCS})
+#foreach (src_file ${CPP-NETLIB_HTTP_SERVER_PARSERS_SRCS})
+#if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
+#    set_source_files_properties(${src_file}
+#        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
+#elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
+#    set_source_files_properties(${src_file}
+#        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
+#endif()
+#endforeach(src_file)
+#
+#set(CPP-NETLIB_HTTP_SERVER_SRCS
+#    http/server_async_impl.cpp
+#    http/server_options.cpp
+#    http/server_socket_options_setter.cpp
+#    http/server_sync_impl.cpp
+#    )
+#add_library(cppnetlib-http-server ${CPP-NETLIB_HTTP_SERVER_SRCS})
+#add_dependencies(cppnetlib-http-server
+#  ${CPP-NETLIB_LOGGING_LIB}
+#  cppnetlib-constants
+#  cppnetlib-uri
+#  cppnetlib-message
+#  cppnetlib-message-wrappers
+#  cppnetlib-message-directives
+#  cppnetlib-http-message
+#  cppnetlib-http-message-wrappers
+#  cppnetlib-http-server-parsers
+#  cppnetlib-utils-thread_pool
+#  )
+#target_link_libraries(cppnetlib-http-server
+#  ${Boost_LIBRARIES}
+#  ${CPP-NETLIB_LOGGING_LIB}
+#  cppnetlib-constants
+#  cppnetlib-uri
+#  cppnetlib-message
+#  cppnetlib-message-wrappers
+#  cppnetlib-message-directives
+#  cppnetlib-http-message
+#  cppnetlib-http-message-wrappers
+#  cppnetlib-http-server-parsers
+#  cppnetlib-utils-thread_pool
+#  )
+#foreach (src_file ${CPP-NETLIB_HTTP_SERVER_SRCS})
+#if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
+#    set_source_files_properties(${src_file}
+#        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
+#elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
+#    set_source_files_properties(${src_file}
+#        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
+#endif()
+#endforeach(src_file)
+
+set(CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS
+    http/client_connections.cpp
+    http/simple_connection_manager.cpp
+    http/simple_connection_factory.cpp
+    http/connection_delegate_factory.cpp
+    http/client_resolver_delegate.cpp
+    http/client_resolver_delegate_factory.cpp
+    http/client_connection_delegates.cpp
+    http/client_connection_factory.cpp
+    http/client_async_resolver.cpp
+    http/client_connection_normal.cpp)
+add_library(cppnetlib-http-client-connections ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS})
+foreach (src_file ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS})
+if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
+    set_source_files_properties(${src_file}
+        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
+elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
+    set_source_files_properties(${src_file}
+        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
+endif()
+endforeach(src_file)
+
+set(CPP-NETLIB_HTTP_CLIENT_SRCS
+    http/client.cpp)
+add_library(cppnetlib-http-client ${CPP-NETLIB_HTTP_CLIENT_SRCS})
+add_dependencies(cppnetlib-http-client
+  ${CPP-NETLIB_LOGGING_LIB}
+  cppnetlib-constants
+  cppnetlib-uri
+  cppnetlib-message
+  cppnetlib-message-wrappers
+  cppnetlib-message-directives
+  cppnetlib-http-message
+  cppnetlib-http-message-wrappers
+  cppnetlib-http-client-connections
+  )
+target_link_libraries(cppnetlib-http-client
+  ${Boost_LIBRARIES}
+  ${CPP-NETLIB_LOGGING_LIB}
+  cppnetlib-constants
+  cppnetlib-uri
+  cppnetlib-message
+  cppnetlib-message-wrappers
+  cppnetlib-message-directives
+  cppnetlib-http-message
+  cppnetlib-http-message-wrappers
+  cppnetlib-http-client-connections
+  )
+foreach (src_file ${CPP-NETLIB_HTTP_CLIENT_SRCS})
+if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
+    set_source_files_properties(${src_file}
+        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
+elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
+    set_source_files_properties(${src_file}
+        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
+endif()
+endforeach(src_file)
+
+set(CPP-NETLIB_CONSTANTS_SRCS constants.cpp)
+add_library(cppnetlib-constants ${CPP-NETLIB_CONSTANTS_SRCS})
+foreach (src_file ${CPP-NETLIB_CONSTANTS_SRCS})
+if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
+    set_source_files_properties(${src_file}
+        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
+elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
+    set_source_files_properties(${src_file}
+        PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
+endif()
+endforeach(src_file)
diff --git a/http/src/client.cpp b/http/src/client.cpp
@@ -0,0 +1,17 @@
+
+// Copyright 2011 Dean Michael Berris (dberris@google.com).
+// Copyright 2011 Google, Inc.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifdef NETWORK_NO_LIB
+#warn Building the library even with NETWORK_NO_LIB defined.
+#undef NETWORK_NO_LIB
+#endif
+
+#include <network/protocol/http/client/connection/normal_delegate.ipp>
+
+#ifdef NETWORK_ENABLE_HTTPS
+#include <network/protocol/http/client/connection/ssl_delegate.ipp>
+#endif
diff --git a/http/src/constants.cpp b/http/src/constants.cpp
@@ -0,0 +1,11 @@
+// Copyright 2011 Dean Michael Berris <dberris@google.com>.
+// Copyright 2011 Google, Inc.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifdef NETWORK_NO_LIB
+#undef NETWORK_NO_LIB
+#endif
+
+#include <network/constants.ipp>
diff --git a/http/src/http/client.cpp b/http/src/http/client.cpp
@@ -0,0 +1,15 @@
+// Copyright 2011 Dean Michael Berris <dberris@google.com>.
+// Copyright 2011 Google, Inc.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifdef NETWORK_NO_LIB
+#undef NETWORK_NO_LIB
+#endif
+
+#include <network/protocol/http/client.ipp>
+#include <network/protocol/http/client/base.ipp>
+#include <network/protocol/http/client/facade.ipp>
+#include <network/protocol/http/client/options.ipp>
+
diff --git a/http/src/http/client_async_resolver.cpp b/http/src/http/client_async_resolver.cpp
@@ -0,0 +1,11 @@
+// Copyright 2011 Dean Michael Berris <dberris@google.com>.
+// Copyright 2011 Google, Inc.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifdef NETWORK_NO_LIB
+#undef NETWORK_NO_LIB
+#endif
+
+#include <network/protocol/http/client/connection/async_resolver.ipp>
diff --git a/http/src/http/client_connection_delegates.cpp b/http/src/http/client_connection_delegates.cpp
@@ -0,0 +1,14 @@
+// Copyright 2011 Dean Michael Berris <dberris@google.com>.
+// Copyright 2011 Google, Inc.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifdef NETWORK_NO_LIB
+#undef NETWORK_NO_LIB 
+#endif
+
+#include <network/protocol/http/client/connection/normal_delegate.ipp>
+#ifdef NETWORK_ENABLE_HTTPS
+#include <network/protocol/http/client/connection/ssl_delegate.ipp>
+#endif
diff --git a/http/src/http/client_connection_factory.cpp b/http/src/http/client_connection_factory.cpp
@@ -0,0 +1,11 @@
+// Copyright 2011 Dean Michael Berris <dberris@google.com>.
+// Copyright 2011 Google, Inc.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifdef NETWORK_NO_LIB
+#undef NETWORK_NO_LIB
+#endif
+
+#include <network/protocol/http/client/connection/connection_factory.ipp>
diff --git a/http/src/http/client_connection_normal.cpp b/http/src/http/client_connection_normal.cpp
@@ -0,0 +1,11 @@
+// Copyright 2011 Dean Michael Berris <dberris@google.com>.
+// Copyright 2011 Google, Inc.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifdef NETWORK_NO_LIB
+#undef NETWORK_NO_LIB
+#endif
+
+#include <network/protocol/http/client/connection/async_normal.ipp>
diff --git a/http/src/http/client_connections.cpp b/http/src/http/client_connections.cpp
@@ -0,0 +1,16 @@
+// Copyright 2011 Dean Michael Berris <dberris@google.com>.
+// Copyright 2011 Google, Inc.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifdef NETWORK_NO_LIB
+#undef NETWORK_NO_LIB
+#endif
+
+#include <network/protocol/http/impl/access.hpp>
+#include <network/protocol/http/response.hpp>
+#include <network/protocol/http/request.hpp>
+#include <network/protocol/http/client/connection_manager.ipp>
+#include <network/protocol/http/client/client_connection.ipp>
+#include <network/protocol/http/impl/access.ipp>
diff --git a/http/src/http/client_resolver_delegate.cpp b/http/src/http/client_resolver_delegate.cpp
@@ -0,0 +1,11 @@
+// Copyright 2011 Dean Michael Berris <dberris@google.com>.
+// Copyright 2011 Google, Inc.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifdef NETWORK_NO_LIB
+#undef NETWORK_NO_LIB
+#endif
+
+#include <network/protocol/http/client/connection/resolver_delegate.ipp>
diff --git a/http/src/http/client_resolver_delegate_factory.cpp b/http/src/http/client_resolver_delegate_factory.cpp
@@ -0,0 +1,11 @@
+// Copyright 2011 Dean Michael Berris <dberris@google.com>.
+// Copyright 2011 Google, Inc.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifdef NETWORK_NO_LIB
+#undef NETWORK_NO_LIB
+#endif
+
+#include <network/protocol/http/client/connection/resolver_delegate_factory.ipp>
diff --git a/http/src/http/connection_delegate_factory.cpp b/http/src/http/connection_delegate_factory.cpp
@@ -0,0 +1,11 @@
+// Copyright 2011 Dean Michael Berris <dberris@google.com>.
+// Copyright 2011 Google, Inc.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifdef NETWORK_NO_LIB
+#undef NETWORK_NO_LIB
+#endif
+
+#include <network/protocol/http/client/connection/connection_delegate_factory.ipp>
diff --git a/http/src/http/message/wrappers.cpp b/http/src/http/message/wrappers.cpp
@@ -0,0 +1,12 @@
+// Copyright 2012 Dean Michael Berris <dberris@google.com>.
+// Copyright 2012 Google, Inc.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <network/protocol/http/message/wrappers/uri.ipp>
+#include <network/protocol/http/message/wrappers/anchor.ipp>
+#include <network/protocol/http/message/wrappers/host.ipp>
+#include <network/protocol/http/message/wrappers/path.ipp>
+#include <network/protocol/http/message/wrappers/port.ipp>
+#include <network/protocol/http/message/wrappers/query.ipp>
diff --git a/http/src/http/request.cpp b/http/src/http/request.cpp
@@ -0,0 +1,12 @@
+// Copyright 2011 Dean Michael Berris <dberris@google.com>.
+// Copyright 2011 Google, Inc.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifdef NETWORK_NO_LIB
+#undef NETWORK_NO_LIB
+#endif
+
+#include <network/protocol/http/request/request.ipp>
+#include <network/protocol/http/request/request_base.ipp>