Merge branch 'develop'

godai0519 · Mar 29, 2013 · c9e0574 · c9e0574
2 parents 56729bd + ef74695
commit c9e0574
Show file tree

Hide file tree

Showing 50 changed files with 87 additions and 53 deletions.
diff --git a/example/client/async_client/async_client.cpp b/example/client/async_client/async_client.cpp
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <boostconnect/config.hpp>
 #include <boostconnect/connection_type/async_connection.hpp>
 #include <boostconnect/client.hpp>
 
@@ -7,7 +8,7 @@ int main()
     typedef boost::system::error_code error_code;
     typedef bstcon::client::response_type response_type; // = boost::shared_ptr<bstcon::response>
     typedef bstcon::client::connection_ptr connection_ptr;
-    
+
     // Make: request header and body
     boost::shared_ptr<boost::asio::streambuf> request_keep(new boost::asio::streambuf());
     {
@@ -71,7 +72,7 @@ int main()
                         [](bstcon::client::response_type response, boost::system::error_code ec)->void  // Callback
                         {
                             if(ec && ec != boost::asio::error::eof) throw;
-                            
+
                             // Show second response
                             std::cout << "Status Code: " << response->status_code << " " << response->status_message << std::endl;
                             std::cout << response->body + "\n\n" << std::endl;

diff --git a/example/client/sync_client/sync_client.cpp b/example/client/sync_client/sync_client.cpp
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <boostconnect/config.hpp>
 #include <boostconnect/connection_type/async_connection.hpp>
 #include <boostconnect/client.hpp>
 

diff --git a/example/server/server.cpp b/example/server/server.cpp
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <boostconnect/config.hpp>
 #include <boostconnect/server.hpp>
 #include <boost/format.hpp>
 #include <boost/foreach.hpp>

diff --git a/include/boostconnect/application_layer/impl/socket_base.ipp b/include/boostconnect/application_layer/impl/socket_base.ipp
@@ -2,7 +2,7 @@
 // socket_base.ipp
 // ~~~~~~~~~~
 //
-// socket_baseの実装
+// TCP/SSL/TLS sockets wrapper(common) classes
 //
 
 #ifndef BOOSTCONNECT_APPLAYER_SOCKET_BASE_IPP

diff --git a/include/boostconnect/application_layer/impl/ssl_socket.ipp b/include/boostconnect/application_layer/impl/ssl_socket.ipp
@@ -2,7 +2,7 @@
 // ssl_socket.ipp
 // ~~~~~~~~~~
 //
-// ssl_socketの実装
+// Specialization from socket_base to SSL connection
 //
 
 #ifdef USE_SSL_BOOSTCONNECT

diff --git a/include/boostconnect/application_layer/impl/tcp_socket.ipp b/include/boostconnect/application_layer/impl/tcp_socket.ipp
@@ -2,7 +2,7 @@
 // tcp_socket.ipp
 // ~~~~~~~~~~
 //
-// tcp_socketの実装
+// Specialization from socket_base to TCP connection
 //
 
 #ifndef BOOSTCONNECT_APPLAYER_TCP_SOCKET_IPP

diff --git a/include/boostconnect/application_layer/socket_base.hpp b/include/boostconnect/application_layer/socket_base.hpp
@@ -2,7 +2,7 @@
 // socket_base.hpp
 // ~~~~~~~~~~
 //
-// ソケットラッパーベースクラス
+// TCP/SSL/TLS sockets wrapper(common) classes
 //
 
 #ifndef BOOSTCONNECT_APPLAYER_SOCKET_BASE_HPP

diff --git a/include/boostconnect/application_layer/ssl_socket.hpp b/include/boostconnect/application_layer/ssl_socket.hpp
@@ -2,7 +2,7 @@
 // ssl_socket.hpp
 // ~~~~~~~~~~
 //
-// SSL通信で特別に行われることを行う
+// Specialization from socket_base to SSL connection
 //
 
 #ifdef USE_SSL_BOOSTCONNECT

diff --git a/include/boostconnect/application_layer/tcp_socket.hpp b/include/boostconnect/application_layer/tcp_socket.hpp
@@ -2,7 +2,7 @@
 // tcp_socket.hpp
 // ~~~~~~~~~~
 //
-// TCP通信で特別に行われることを行う
+// Specialization from socket_base to TCP connection
 //
 
 #ifndef BOOSTCONNECT_APPLAYER_TCP_SOCKET_HPP

diff --git a/include/boostconnect/client.hpp b/include/boostconnect/client.hpp
@@ -2,7 +2,7 @@
 // client.hpp
 // ~~~~~~~~~~
 //
-// クライアント接続のメイン管理クラス
+// Main Client Connection provide class
 //
 
 #ifndef BOOSTCONNECT_CLIENT_HPP

diff --git a/include/boostconnect/connection_type/async_connection.hpp b/include/boostconnect/connection_type/async_connection.hpp
@@ -2,7 +2,7 @@
 // async_connection.hpp
 // ~~~~~~~~~~
 //
-// 非同期のためのクラス群
+// Specialization from connection_base to ASync Connection
 //
 
 #ifndef BOOSTCONNECT_CONNECTTYPE_ASYNC_CONNECTION_HPP

diff --git a/include/boostconnect/connection_type/connection_base.hpp b/include/boostconnect/connection_type/connection_base.hpp
@@ -2,7 +2,7 @@
 // connection_base.hpp
 // ~~~~~~~~~~
 //
-// 同期や非同期判断のための、Boost.Asioを使用したクラス群
+// Provide Sync/ASync Connection Common Class powered by Boost.Asio
 //
 
 #ifndef BOOSTCONNECT_CONNECTTYPE_CONNECTION_BASE_HPP

diff --git a/include/boostconnect/connection_type/impl/async_connection.ipp b/include/boostconnect/connection_type/impl/async_connection.ipp
@@ -2,7 +2,7 @@
 // async_connection.ipp
 // ~~~~~~~~~~
 //
-// async_connectionの実装
+// Specialization from connection_base to ASync Connection
 //
 
 #ifndef BOOSTCONNECT_CONNECTTYPE_ASYNC_CONNECTION_IPP

diff --git a/include/boostconnect/connection_type/impl/connection_base.ipp b/include/boostconnect/connection_type/impl/connection_base.ipp
@@ -2,7 +2,7 @@
 // connection_base.ipp
 // ~~~~~~~~~~
 //
-// connection_baseの実装
+// Provide Sync/ASync Connection Common Class powered by Boost.Asio
 //
 
 #ifndef BOOSTCONNECT_CONNECTTYPE_CONNECTION_BASE_IPP

diff --git a/include/boostconnect/connection_type/impl/sync_connection.ipp b/include/boostconnect/connection_type/impl/sync_connection.ipp
@@ -2,7 +2,7 @@
 // sync_connection.ipp
 // ~~~~~~~~~~
 //
-// sync_connectionの実装
+// Specialization from connection_base to Sync Connection
 //
 
 #ifndef BOOSTCONNECT_CONNECTTYPE_SYNC_CONNECTION_IPP

diff --git a/include/boostconnect/connection_type/sync_connection.hpp b/include/boostconnect/connection_type/sync_connection.hpp
@@ -2,7 +2,7 @@
 // sync_connection.hpp
 // ~~~~~~~~~~
 //
-// 同期のためのクラス群
+// Specialization from connection_base to Sync Connection
 //
 
 #ifndef BOOSTCONNECT_CONNECTTYPE_SYNC_CONNECTION_HPP

diff --git a/include/boostconnect/content/binary.hpp b/include/boostconnect/content/binary.hpp
@@ -2,7 +2,7 @@
 // urlencode.hpp
 // ~~~~~~~~~~
 //
-// 
+// For application/* Data
 //
 
 #ifndef BOOSTCONNECT_CONTENT_BINARY_HPP

diff --git a/include/boostconnect/content/content_base.hpp b/include/boostconnect/content/content_base.hpp
@@ -2,7 +2,7 @@
 // content_base.hpp
 // ~~~~~~~~~~
 //
-// サーバー接続のメイン管理クラス
+// Provide common function for HTTPs body make
 //
 
 #ifndef BOOSTCONNECT_CONTENT_BASE_HPP

diff --git a/include/boostconnect/content/impl/binary.ipp b/include/boostconnect/content/impl/binary.ipp
@@ -2,7 +2,7 @@
 // urlencode.hpp
 // ~~~~~~~~~~
 //
-// 
+// For application/* Data
 //
 
 #ifndef BOOSTCONNECT_CONTENT_BINARY_IPP

diff --git a/include/boostconnect/content/impl/content_base.ipp b/include/boostconnect/content/impl/content_base.ipp
@@ -2,7 +2,7 @@
 // content_base.ipp
 // ~~~~~~~~~~
 //
-// 
+// Provide common function for HTTP body make
 //
 
 #ifndef BOOSTCONNECT_CONTENT_BASE_IPP

diff --git a/include/boostconnect/content/impl/multipart.ipp b/include/boostconnect/content/impl/multipart.ipp
@@ -2,7 +2,7 @@
 // multipart.hpp
 // ~~~~~~~~~~
 //
-// 
+// Provide common for multipart/* Data (Able recursive structure)
 //
 
 #ifndef BOOSTCONNECT_CONTENT_MULTIPART_IPP

diff --git a/include/boostconnect/content/impl/multipart_form_data.ipp b/include/boostconnect/content/impl/multipart_form_data.ipp
@@ -2,7 +2,7 @@
 // multipart_form_data.hpp
 // ~~~~~~~~~~
 //
-// 
+// For multipart/form_data Data
 //
 
 #ifndef BOOSTCONNECT_CONTENT_MULTIPART_FORM_DATA_IPP

diff --git a/include/boostconnect/content/impl/multipart_mixed.ipp b/include/boostconnect/content/impl/multipart_mixed.ipp
@@ -2,7 +2,7 @@
 // multipart_mixed.hpp
 // ~~~~~~~~~~
 //
-// 
+// For multipart/mixed Data
 //
 
 #ifndef BOOSTCONNECT_CONTENT_MULTIPART_MIXED_IPP

diff --git a/include/boostconnect/content/impl/text.ipp b/include/boostconnect/content/impl/text.ipp
@@ -2,7 +2,7 @@
 // text.hpp
 // ~~~~~~~~~~
 //
-// 
+// For text/* Data
 //
 
 #ifndef BOOSTCONNECT_CONTENT_TEXT_IPP

diff --git a/include/boostconnect/content/impl/urlencoded.ipp b/include/boostconnect/content/impl/urlencoded.ipp
@@ -2,7 +2,7 @@
 // urlencoded.ipp
 // ~~~~~~~~~~
 //
-// 
+// For application/x-www-form-urlencoded Data
 //
 
 #ifndef BOOSTCONNECT_CONTENT_URLENCODED_IPP

diff --git a/include/boostconnect/content/multipart.hpp b/include/boostconnect/content/multipart.hpp
@@ -2,7 +2,7 @@
 // multipart.hpp
 // ~~~~~~~~~~
 //
-// 
+// Provide common for multipart/* Data (Able recursive structure)
 //
 
 #ifndef BOOSTCONNECT_CONTENT_MULTIPART_HPP

diff --git a/include/boostconnect/content/multipart_form_data.hpp b/include/boostconnect/content/multipart_form_data.hpp
@@ -2,7 +2,7 @@
 // multipart_form_data.hpp
 // ~~~~~~~~~~
 //
-// 
+// For multipart/form_data Data
 //
 
 #ifndef BOOSTCONNECT_CONTENT_MULTIPART_FORM_DATA_HPP

diff --git a/include/boostconnect/content/multipart_mixed.hpp b/include/boostconnect/content/multipart_mixed.hpp
@@ -2,7 +2,7 @@
 // multipart_mixed.hpp
 // ~~~~~~~~~~
 //
-// 
+// For multipart/mixed Data
 //
 
 #ifndef BOOSTCONNECT_CONTENT_MULTIPART_MIXED_HPP

diff --git a/include/boostconnect/content/text.hpp b/include/boostconnect/content/text.hpp
@@ -2,7 +2,7 @@
 // text.hpp
 // ~~~~~~~~~~
 //
-// 
+// For text/* Data
 //
 
 #ifndef BOOSTCONNECT_CONTENT_TEXT_HPP

diff --git a/include/boostconnect/content/urlencoded.hpp b/include/boostconnect/content/urlencoded.hpp
@@ -2,7 +2,7 @@
 // urlencoded.hpp
 // ~~~~~~~~~~
 //
-// 
+// For application/x-www-form-urlencoded Data
 //
 
 #ifndef BOOSTCONNECT_CONTENT_URLENCODED_HPP

diff --git a/include/boostconnect/impl/client.ipp b/include/boostconnect/impl/client.ipp
@@ -2,7 +2,7 @@
 // client.ipp
 // ~~~~~~~~~~
 //
-// clientの実装
+// Main Client Connection provide class
 //
 
 #ifndef BOOSTCONNECT_CLIENT_IPP

diff --git a/include/boostconnect/impl/manager.ipp b/include/boostconnect/impl/manager.ipp
@@ -2,7 +2,7 @@
 // manager.ipp
 // ~~~~~~~~~~
 //
-// managerの実装
+// Session Manager
 //
 
 #ifndef BOOSTCONNECT_MANAGER_IPP

diff --git a/include/boostconnect/impl/server.ipp b/include/boostconnect/impl/server.ipp
@@ -2,7 +2,7 @@
 // server.ipp
 // ~~~~~~~~~~
 //
-// serverの実装
+// Main Sever Connection provide class
 //
 
 #ifndef BOOSTCONNECT_SERVER_IPP

diff --git a/include/boostconnect/manager.hpp b/include/boostconnect/manager.hpp
@@ -2,7 +2,7 @@
 // manager.hpp
 // ~~~~~~~~~~
 //
-// Sessionの寿命を管理するmanager
+// Session Manager
 //
 
 #ifndef BOOSTCONNECT_MANAGER_HPP

diff --git a/include/boostconnect/request.hpp b/include/boostconnect/request.hpp
@@ -2,7 +2,7 @@
 // request.hpp
 // ~~~~~~~~~~
 //
-// リクエストコンテナー
+// Request Containar
 //
 
 #ifndef BOOSTCONNECT_REQUEST

diff --git a/include/boostconnect/response.hpp b/include/boostconnect/response.hpp
@@ -2,7 +2,7 @@
 // response.hpp
 // ~~~~~~~~~~
 //
-// レスポンスコンテナー
+// Response Containar
 //
 
 #ifndef BOOSTCONNECT_RESPONSE

diff --git a/include/boostconnect/server.hpp b/include/boostconnect/server.hpp
@@ -2,7 +2,7 @@
 // server.hpp
 // ~~~~~~~~~~
 //
-// サーバー接続のメイン管理クラス
+// Main Sever Connection provide class
 //
 
 #ifndef BOOSTCONNECT_SERVER_HPP

diff --git a/include/boostconnect/session/http_session.hpp b/include/boostconnect/session/http_session.hpp
@@ -2,7 +2,7 @@
 // http_session.hpp
 // ~~~~~~~~~~
 //
-// HTTP通信のセッションを管理
+// Management a HTTP Connection's Session
 //
 
 #ifndef BOOSTCONNECT_SESSION_HTTP_HPP

diff --git a/include/boostconnect/session/impl/http_session.ipp b/include/boostconnect/session/impl/http_session.ipp
@@ -2,7 +2,7 @@
 // http_session.ipp
 // ~~~~~~~~~~
 //
-// http_sessionの実装
+// Management a HTTP Connection's Session
 //
 
 #ifndef BOOSTCONNECT_SESSION_HTTP_IPP

diff --git a/include/boostconnect/session/impl/session_base.ipp b/include/boostconnect/session/impl/session_base.ipp
@@ -2,7 +2,7 @@
 // session_base.ipp
 // ~~~~~~~~~~
 //
-// session_baseの実装
+// Provide Connection's Session for HTTP(etc.)
 //
 
 #ifndef BOOSTCONNECT_SESSION_BASE_IPP

diff --git a/include/boostconnect/session/session_base.hpp b/include/boostconnect/session/session_base.hpp
@@ -2,7 +2,7 @@
 // session_base.hpp
 // ~~~~~~~~~~
 //
-// Session共通設定
+// Provide Connection's Session for HTTP(etc.)
 //
 
 #ifndef BOOSTCONNECT_SESSION_BASE_HPP

diff --git a/include/boostconnect/system/error_code.hpp b/include/boostconnect/system/error_code.hpp
@@ -2,7 +2,7 @@
 // error_code.hpp
 // ~~~~~~~~~~
 //
-// 例外処理とか
+// Provide Error System
 //
 
 #ifndef BOOSTCONNECT_SYSTEM_ERROR_CODE_HPP

diff --git a/include/boostconnect/system/impl/error_code.ipp b/include/boostconnect/system/impl/error_code.ipp
@@ -2,7 +2,7 @@
 // error_code.ipp
 // ~~~~~~~~~~
 //
-// error_codeの実装
+// Provide Error System
 //
 
 #ifndef BOOSTCONNECT_SYSTEM_ERROR_CODE_IPP