Dec 18, 2013 · Jun 23, 2013 · Jun 23, 2013 · Jun 23, 2013 · Jun 23, 2013 · Jun 23, 2013
diff --git a/http/src/network/http/v2/client_options.hpp b/http/src/network/http/v2/client_options.hpp
      return timeout_;
    }

    client_options &openssl_certificate_path(std::string path) {
      openssl_certificate_paths_.emplace_back(std::move(path));
      return *this;
    }

    std::vector<std::string> openssl_certificate_paths() const {
      return openssl_certificate_paths_;
    }

    client_options &openssl_verify_path(std::string path) {
      openssl_verify_paths_.emplace_back(std::move(path));
      return *this;
    }

    std::vector<std::string> openssl_verify_paths() const {
      return openssl_verify_paths_;
    }
diff --git a/http/src/network/http/v2/request_options.hpp b/http/src/network/http/v2/request_options.hpp
    constexpr request_options()
      : resolve_timeout_(30000)
      , read_timeout_(30000)
      , total_timeout_(30000) { }
      , total_timeout_(30000)
      , max_redirects_(10) { }

    request_options(request_options const &) = default;
    request_options(request_options &&) = default;
      return total_timeout_;
    }

    request_options &max_redirects(int max_redirects) noexcept {
      max_redirects_ = max_redirects;
      return *this;
    }

    constexpr int max_redirects() const noexcept {
      return max_redirects_;
    }

  private:

    std::uint64_t resolve_timeout_;
    std::uint64_t read_timeout_;
    std::uint64_t total_timeout_;
    int max_redirects_;

  };
 } // namespace v2
diff --git a/http/test/client/v2/request_options_test.cpp b/http/test/client/v2/request_options_test.cpp
diff --git a/http/test/v2/CMakeLists.txt b/http/test/v2/CMakeLists.txt
    ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-v2-${test})

 endforeach(test)

 add_subdirectory(client)
diff --git a/http/test/v2/client/client_options_test.cpp b/http/test/v2/client/client_options_test.cpp
  opts.use_proxy(true);
  ASSERT_TRUE(opts.use_proxy());
 }

 TEST(client_options_test, set_option_openssl_certificate_path) {
  network::http::v2::client_options opts;
  opts.openssl_certificate_path("openssl_certificate");
  ASSERT_EQ(std::vector<std::string>{"openssl_certificate"}, opts.openssl_certificate_paths());
 }

 TEST(client_options_test, set_option_openssl_verify_path) {
  network::http::v2::client_options opts;
  opts.openssl_verify_path("openssl_verify");
  ASSERT_EQ(std::vector<std::string>{"openssl_verify"}, opts.openssl_verify_paths());
 }
diff --git a/http/test/v2/client/regression/request_base_test.cpp b/http/test/v2/client/regression/request_base_test.cpp
diff --git a/http/test/v2/client/regression/request_incremental_parser_test.cpp b/http/test/v2/client/regression/request_incremental_parser_test.cpp
Original file line number	Diff line number	Diff line change
Expand Up		@@ -79,10 +79,20 @@ namespace v2 {
		return timeout_;
		}

		client_options &openssl_certificate_path(std::string path) {
		openssl_certificate_paths_.emplace_back(std::move(path));
		return *this;
		}

		std::vector<std::string> openssl_certificate_paths() const {
		return openssl_certificate_paths_;
		}

		client_options &openssl_verify_path(std::string path) {
		openssl_verify_paths_.emplace_back(std::move(path));
		return *this;
		}

		std::vector<std::string> openssl_verify_paths() const {
		return openssl_verify_paths_;
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,7 +20,8 @@ namespace v2 {
		constexpr request_options()
		: resolve_timeout_(30000)
		, read_timeout_(30000)
		, total_timeout_(30000) { }
		, total_timeout_(30000)
		, max_redirects_(10) { }

		request_options(request_options const &) = default;
		request_options(request_options &&) = default;
Expand DownExpand Up		@@ -63,11 +64,21 @@ namespace v2 {
		return total_timeout_;
		}

		request_options &max_redirects(int max_redirects) noexcept {
		max_redirects_ = max_redirects;
		return *this;
		}

		constexpr int max_redirects() const noexcept {
		return max_redirects_;
		}

		private:

		std::uint64_t resolve_timeout_;
		std::uint64_t read_timeout_;
		std::uint64_t total_timeout_;
		int max_redirects_;

		};
		} // namespace v2
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,3 +27,5 @@ foreach(test ${CPP-NETLIB_CLIENT_TESTS})
		${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-v2-${test})

		endforeach(test)

		add_subdirectory(client)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -48,3 +48,15 @@ TEST(client_options_test, set_option_use_proxy) {
		opts.use_proxy(true);
		ASSERT_TRUE(opts.use_proxy());
		}

		TEST(client_options_test, set_option_openssl_certificate_path) {
		network::http::v2::client_options opts;
		opts.openssl_certificate_path("openssl_certificate");
		ASSERT_EQ(std::vector<std::string>{"openssl_certificate"}, opts.openssl_certificate_paths());
		}

		TEST(client_options_test, set_option_openssl_verify_path) {
		network::http::v2::client_options opts;
		opts.openssl_verify_path("openssl_verify");
		ASSERT_EQ(std::vector<std::string>{"openssl_verify"}, opts.openssl_verify_paths());
		}