.gitattributes

@@ -1,2 +0,0 @@
-/test/www*/dir/*.html text eol=lf
-/test/www*/dir/*.txt text eol=lf

.github/workflows/abidiff.yaml

@@ -1,69 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Andrea Pappacoda <andrea@pappacoda.it>
-# SPDX-License-Identifier: MIT
-
-name: abidiff
-
-on: [push, pull_request]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: true
-
-defaults:
-  run:
-    shell: sh
-
-jobs:
-  abi:
-    runs-on: ubuntu-latest
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
-    container:
-      image: debian:testing
-
-    steps:
-    - name: Install dependencies
-      run: apt -y --update install --no-install-recommends
-        abigail-tools
-        ca-certificates
-        g++
-        git
-        libbrotli-dev
-        libssl-dev
-        meson
-        pkg-config
-        python3
-        zlib1g-dev
-
-    - uses: actions/checkout@v4
-      with:
-        path: current
-
-    - uses: actions/checkout@v4
-      with:
-        path: previous
-        fetch-depth: 0
-
-    - name: Checkout previous
-      working-directory: previous
-      run: |
-        git switch master
-        git describe --tags --abbrev=0 master | xargs git checkout
-
-    - name: Build current
-      working-directory: current
-      run: |
-        meson setup --buildtype=debug -Dcpp-httplib_compile=true build
-        ninja -C build
-
-    - name: Build previous
-      working-directory: previous
-      run: |
-        meson setup --buildtype=debug -Dcpp-httplib_compile=true build
-        ninja -C build
-
-    - name: Run abidiff
-      run: abidiff
-        --headers-dir1 previous/build
-        --headers-dir2 current/build
-        previous/build/libcpp-httplib.so
-        current/build/libcpp-httplib.so

.github/workflows/cifuzz.yaml

@@ -1,32 +0,0 @@
-name: CIFuzz
-
-on: [pull_request]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  Fuzzing:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Build Fuzzers
-      id: build
-      uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
-      with:
-        oss-fuzz-project-name: 'cpp-httplib'
-        dry-run: false
-        language: c++
-    - name: Run Fuzzers
-      uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
-      with:
-        oss-fuzz-project-name: 'cpp-httplib'
-        fuzz-seconds: 600
-        dry-run: false
-        language: c++
-    - name: Upload Crash
-      uses: actions/upload-artifact@v4
-      if: failure() && steps.build.outcome == 'success'
-      with:
-        name: artifacts
-        path: ./out/artifacts

.github/workflows/test.yaml

@@ -1,126 +1,17 @@
 name: test
 
-on:
+on: [push, pull_request]
-  push:
-  pull_request:
-  workflow_dispatch:
-    inputs:
-      gtest_filter:
-        description: 'Google Test filter'
-      test_linux:
-        description: 'Test on Linux'
-        type: boolean
-        default: true
-      test_macos:
-        description: 'Test on MacOS'
-        type: boolean
-        default: true
-      test_windows:
-        description: 'Test on Windows'
-        type: boolean
-        default: true
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: true
-
-env:
-  GTEST_FILTER: ${{ github.event.inputs.gtest_filter || '*' }}
 
 jobs:
-  style-check:
+  build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
-    continue-on-error: true
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-      - name: run style check
-        run: |
-          clang-format --version
-          cd test && make style_check
 
-  ubuntu:
-    runs-on: ubuntu-latest
-    if: >
-      (github.event_name == 'push') ||
-      (github.event_name == 'pull_request'  &&
-       github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name) ||
-      (github.event_name == 'workflow_dispatch' && github.event.inputs.test_linux == 'true')
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-      - name: install libraries
-        run: sudo apt-get update && sudo apt-get install -y libbrotli-dev libcurl4-openssl-dev
-      - name: build and run tests
-        run: cd test && make
-      - name: run fuzz test target
-        run: cd test && make fuzz_test
-
-  macos:
-    runs-on: macos-latest
-    if: >
-      (github.event_name == 'push') ||
-      (github.event_name == 'pull_request'  &&
-       github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name) ||
-      (github.event_name == 'workflow_dispatch' && github.event.inputs.test_macos == 'true')
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-      - name: build and run tests
-        run: cd test && make
-      - name: run fuzz test target
-        run: cd test && make fuzz_test
-
-  windows:
-    runs-on: windows-latest
-    if: >
-      (github.event_name == 'push') ||
-      (github.event_name == 'pull_request'  &&
-       github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name) ||
-      (github.event_name == 'workflow_dispatch' && github.event.inputs.test_windows == 'true')
     strategy:
       matrix:
-        config:
+        os: [macOS-latest, ubuntu-latest]
-        - with_ssl: false
-          name: without SSL
-        - with_ssl: true
-          name: with SSL
-    name: windows ${{ matrix.config.name }}
-    steps:
-    - name: Prepare Git for Checkout on Windows
-      run: |
-        git config --global core.autocrlf false
-        git config --global core.eol lf
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: Export GitHub Actions cache environment variables
-      uses: actions/github-script@v7
-      with:
-        script: |
-          core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-    - name: Setup msbuild on windows
-      uses: microsoft/setup-msbuild@v2
-    - name: Install vcpkg dependencies
-      run: vcpkg install gtest curl zlib brotli
-    - name: Install OpenSSL
-      if: ${{ matrix.config.with_ssl }}
-      run: choco install openssl
-    - name: Configure CMake ${{ matrix.config.name }}
-      run: >
-        cmake -B build -S .
-        -DCMAKE_BUILD_TYPE=Release
-        -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake
-        -DHTTPLIB_TEST=ON
-        -DHTTPLIB_REQUIRE_ZLIB=ON
-        -DHTTPLIB_REQUIRE_BROTLI=ON
-        -DHTTPLIB_REQUIRE_OPENSSL=${{ matrix.config.with_ssl && 'ON' || 'OFF' }}
-    - name: Build ${{ matrix.config.name }}
-      run: cmake --build build --config Release -- /v:m /clp:ShowCommandLine
-    - name: Run tests ${{ matrix.config.name }}
-      run: ctest --output-on-failure --test-dir build -C Release
 
-    env:
+    steps:
-      VCPKG_ROOT: "C:/vcpkg"
+    - name: checkout
-      VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+      uses: actions/checkout@v1
+    - name: make
+      run: cd test && make

.gitignore

@@ -3,33 +3,21 @@ tags
 example/server
 example/client
 example/hello
-example/simplecli
 example/simplesvr
 example/benchmark
 example/redirect
-example/sse*
+example/sse
 example/upload
-example/one_time_request
-example/server_and_client
 example/*.pem
-test/httplib.cc
-test/httplib.h
 test/test
-test/server_fuzzer
 test/test_proxy
-test/test_split
 test/test.xcodeproj/xcuser*
 test/test.xcodeproj/*/xcuser*
-test/*.o
 test/*.pem
 test/*.srl
-test/_build_*
-work/
-benchmark/server*
 
 *.swp
 
-build/
 Debug
 Release
 *.vcxproj.user
@@ -39,7 +27,5 @@ Release
 *.db
 ipch
 *.dSYM
-*.pyc
 .*
-!/.gitattributes
 !/.travis.yml

.travis.yml

@@ -0,0 +1,14 @@
+# Environment
+language: cpp
+os:
+  - linux
+  - osx
+
+# Compiler selection
+compiler:
+  - clang
+
+# Build/test steps
+script:
+  - cd ${TRAVIS_BUILD_DIR}/test
+  - make all

CMakeLists.txt

@@ -1,309 +0,0 @@
-#[[
-	Build options:
-	* BUILD_SHARED_LIBS (default off) builds as a shared library (if HTTPLIB_COMPILE is ON)
-	* HTTPLIB_USE_OPENSSL_IF_AVAILABLE (default on)
-	* HTTPLIB_USE_ZLIB_IF_AVAILABLE (default on)
-	* HTTPLIB_USE_BROTLI_IF_AVAILABLE (default on)
-	* HTTPLIB_REQUIRE_OPENSSL (default off)
-	* HTTPLIB_REQUIRE_ZLIB (default off)
-	* HTTPLIB_REQUIRE_BROTLI (default off)
-	* HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN (default on)
-	* HTTPLIB_COMPILE (default off)
-	* HTTPLIB_INSTALL (default on)
-	* HTTPLIB_TEST (default off)
-	* BROTLI_USE_STATIC_LIBS - tells Cmake to use the static Brotli libs (only works if you have them installed).
-	* OPENSSL_USE_STATIC_LIBS - tells Cmake to use the static OpenSSL libs (only works if you have them installed).
-
-	-------------------------------------------------------------------------------
-
-	After installation with Cmake, a find_package(httplib COMPONENTS OpenSSL ZLIB Brotli) is available.
-	This creates a httplib::httplib target (if found and if listed components are supported).
-	It can be linked like so:
-
-	target_link_libraries(your_exe httplib::httplib)
-
-	The following will build & install for later use.
-
-	Linux/macOS:
-
-	mkdir -p build
-	cd build
-	cmake -DCMAKE_BUILD_TYPE=Release ..
-	sudo cmake --build . --target install
-
-	Windows:
-
-	mkdir build
-	cd build
-	cmake ..
-	runas /user:Administrator "cmake --build . --config Release --target install"
-
-	-------------------------------------------------------------------------------
-
-	These variables are available after you run find_package(httplib)
-	* HTTPLIB_HEADER_PATH - this is the full path to the installed header (e.g. /usr/include/httplib.h).
-	* HTTPLIB_IS_USING_OPENSSL - a bool for if OpenSSL support is enabled.
-	* HTTPLIB_IS_USING_ZLIB - a bool for if ZLIB support is enabled.
-	* HTTPLIB_IS_USING_BROTLI - a bool for if Brotli support is enabled.
-	* HTTPLIB_IS_USING_CERTS_FROM_MACOSX_KEYCHAIN - a bool for if support of loading system certs from the Apple Keychain is enabled.
-	* HTTPLIB_IS_COMPILED - a bool for if the library is compiled, or otherwise header-only.
-	* HTTPLIB_INCLUDE_DIR - the root path to httplib's header (e.g. /usr/include).
-	* HTTPLIB_LIBRARY - the full path to the library if compiled (e.g. /usr/lib/libhttplib.so).
-	* httplib_VERSION or HTTPLIB_VERSION - the project's version string.
-	* HTTPLIB_FOUND - a bool for if the target was found.
-
-	Want to use precompiled headers (Cmake feature since v3.16)?
-	It's as simple as doing the following (before linking):
-
-	target_precompile_headers(httplib::httplib INTERFACE "${HTTPLIB_HEADER_PATH}")
-
-	-------------------------------------------------------------------------------
-
-	ARCH_INDEPENDENT option of write_basic_package_version_file() requires Cmake v3.14
-]]
-cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
-
-# Get the CPPHTTPLIB_VERSION value and use it as a version
-# This gets the string with the CPPHTTPLIB_VERSION value from the header.
-# This is so the maintainer doesn't actually need to update this manually.
-file(STRINGS httplib.h _raw_version_string REGEX "CPPHTTPLIB_VERSION \"([0-9]+\\.[0-9]+\\.[0-9]+)\"")
-
-# Extracts just the version string itself from the whole string contained in _raw_version_string
-# since _raw_version_string would contain the entire line of code where it found the version string
-string(REGEX MATCH "([0-9]+\\.?)+" _httplib_version "${_raw_version_string}")
-
-project(httplib
-	VERSION ${_httplib_version}
-	LANGUAGES CXX
-	DESCRIPTION "A C++ header-only HTTP/HTTPS server and client library."
-	HOMEPAGE_URL "https://github.com/yhirose/cpp-httplib"
-)
-
-# Change as needed to set an OpenSSL minimum version.
-# This is used in the installed Cmake config file.
-set(_HTTPLIB_OPENSSL_MIN_VER "3.0.0")
-
-# Lets you disable C++ exception during CMake configure time.
-# The value is used in the install CMake config file.
-option(HTTPLIB_NO_EXCEPTIONS "Disable the use of C++ exceptions" OFF)
-# Allow for a build to require OpenSSL to pass, instead of just being optional
-option(HTTPLIB_REQUIRE_OPENSSL "Requires OpenSSL to be found & linked, or fails build." OFF)
-option(HTTPLIB_REQUIRE_ZLIB "Requires ZLIB to be found & linked, or fails build." OFF)
-# Allow for a build to casually enable OpenSSL/ZLIB support, but silently continue if not found.
-# Make these options so their automatic use can be specifically disabled (as needed)
-option(HTTPLIB_USE_OPENSSL_IF_AVAILABLE "Uses OpenSSL (if available) to enable HTTPS support." ON)
-option(HTTPLIB_USE_ZLIB_IF_AVAILABLE "Uses ZLIB (if available) to enable Zlib compression support." ON)
-# Lets you compile the program as a regular library instead of header-only
-option(HTTPLIB_COMPILE "If ON, uses a Python script to split the header into a compilable header & source file (requires Python v3)." OFF)
-# Lets you disable the installation (useful when fetched from another CMake project)
-option(HTTPLIB_INSTALL "Enables the installation target" ON)
-option(HTTPLIB_TEST "Enables testing and builds tests" OFF)
-option(HTTPLIB_REQUIRE_BROTLI "Requires Brotli to be found & linked, or fails build." OFF)
-option(HTTPLIB_USE_BROTLI_IF_AVAILABLE "Uses Brotli (if available) to enable Brotli decompression support." ON)
-option(HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN "Enable feature to load system certs from the Apple Keychain." ON)
-# Defaults to static library
-option(BUILD_SHARED_LIBS "Build the library as a shared library instead of static. Has no effect if using header-only." OFF)
-if (BUILD_SHARED_LIBS AND WIN32 AND HTTPLIB_COMPILE)
-	# Necessary for Windows if building shared libs
-	# See https://stackoverflow.com/a/40743080
-	set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif()
-
-# Set some variables that are used in-tree and while building based on our options
-set(HTTPLIB_IS_COMPILED ${HTTPLIB_COMPILE})
-set(HTTPLIB_IS_USING_CERTS_FROM_MACOSX_KEYCHAIN ${HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN})
-
-# Threads needed for <thread> on some systems, and for <pthread.h> on Linux
-set(THREADS_PREFER_PTHREAD_FLAG TRUE)
-find_package(Threads REQUIRED)
-# Since Cmake v3.11, Crypto & SSL became optional when not specified as COMPONENTS.
-if(HTTPLIB_REQUIRE_OPENSSL)
-	find_package(OpenSSL ${_HTTPLIB_OPENSSL_MIN_VER} COMPONENTS Crypto SSL REQUIRED)
-	set(HTTPLIB_IS_USING_OPENSSL TRUE)
-elseif(HTTPLIB_USE_OPENSSL_IF_AVAILABLE)
-	find_package(OpenSSL ${_HTTPLIB_OPENSSL_MIN_VER} COMPONENTS Crypto SSL QUIET)
-	# Avoid a rare circumstance of not finding all components but the end-user did their
-	# own call for OpenSSL, which might trick us into thinking we'd otherwise have what we wanted
-	if (TARGET OpenSSL::SSL AND TARGET OpenSSL::Crypto)
-		set(HTTPLIB_IS_USING_OPENSSL ${OPENSSL_FOUND})
-	else()
-		set(HTTPLIB_IS_USING_OPENSSL FALSE)
-	endif()
-endif()
-
-if(HTTPLIB_REQUIRE_ZLIB)
-	find_package(ZLIB REQUIRED)
-	set(HTTPLIB_IS_USING_ZLIB TRUE)
-elseif(HTTPLIB_USE_ZLIB_IF_AVAILABLE)
-	find_package(ZLIB QUIET)
-	# FindZLIB doesn't have a ZLIB_FOUND variable, so check the target.
-	if(TARGET ZLIB::ZLIB)
-		set(HTTPLIB_IS_USING_ZLIB TRUE)
-	endif()
-endif()
-
-# Adds our cmake folder to the search path for find_package
-# This is so we can use our custom FindBrotli.cmake
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-if(HTTPLIB_REQUIRE_BROTLI)
-	find_package(Brotli COMPONENTS encoder decoder common REQUIRED)
-	set(HTTPLIB_IS_USING_BROTLI TRUE)
-elseif(HTTPLIB_USE_BROTLI_IF_AVAILABLE)
-	find_package(Brotli COMPONENTS encoder decoder common QUIET)
-	set(HTTPLIB_IS_USING_BROTLI ${Brotli_FOUND})
-endif()
-
-# Used for default, common dirs that the end-user can change (if needed)
-# like CMAKE_INSTALL_INCLUDEDIR or CMAKE_INSTALL_DATADIR
-include(GNUInstallDirs)
-
-if(HTTPLIB_COMPILE)
-	# Put the split script into the build dir
-	configure_file(split.py "${CMAKE_CURRENT_BINARY_DIR}/split.py"
-		COPYONLY
-	)
-	# Needs to be in the same dir as the python script
-	configure_file(httplib.h "${CMAKE_CURRENT_BINARY_DIR}/httplib.h"
-		COPYONLY
-	)
-
-	# Used outside of this if-else
-	set(_INTERFACE_OR_PUBLIC PUBLIC)
-	# Brings in the Python3_EXECUTABLE path we can use.
-	find_package(Python3 REQUIRED)
-	# Actually split the file
-	# Keeps the output in the build dir to not pollute the main dir
-	execute_process(COMMAND ${Python3_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/split.py"
-		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-		ERROR_VARIABLE _httplib_split_error
-	)
-	if(_httplib_split_error)
-		message(FATAL_ERROR "Failed when trying to split cpp-httplib with the Python script.\n${_httplib_split_error}")
-	endif()
-
-	# split.py puts output in "out"
-	set(_httplib_build_includedir "${CMAKE_CURRENT_BINARY_DIR}/out")
-	# This will automatically be either static or shared based on the value of BUILD_SHARED_LIBS
-	add_library(${PROJECT_NAME} "${_httplib_build_includedir}/httplib.cc")
-	target_sources(${PROJECT_NAME}
-		PUBLIC
-			$<BUILD_INTERFACE:${_httplib_build_includedir}/httplib.h>
-			$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/httplib.h>
-	)
-	set_target_properties(${PROJECT_NAME}
-		PROPERTIES
-			VERSION ${${PROJECT_NAME}_VERSION}
-			SOVERSION "${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}"
-			OUTPUT_NAME cpp-httplib
-	)
-else()
-	# This is for header-only.
-	set(_INTERFACE_OR_PUBLIC INTERFACE)
-	add_library(${PROJECT_NAME} INTERFACE)
-	set(_httplib_build_includedir "${CMAKE_CURRENT_SOURCE_DIR}")
-endif()
-# Lets you address the target with httplib::httplib
-# Only useful if building in-tree, versus using it from an installation.
-add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
-
-# Require C++11
-target_compile_features(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC} cxx_std_11)
-
-target_include_directories(${PROJECT_NAME} SYSTEM ${_INTERFACE_OR_PUBLIC}
-    $<BUILD_INTERFACE:${_httplib_build_includedir}>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-)
-
-# Always require threads
-target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
-		Threads::Threads
-		# Needed for Windows libs on Mingw, as the pragma comment(lib, "xyz") aren't triggered.
-		$<$<PLATFORM_ID:Windows>:ws2_32>
-		$<$<PLATFORM_ID:Windows>:crypt32>
-		# Needed for API from MacOS Security framework
-		"$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>,$<BOOL:${HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN}>>:-framework CoreFoundation -framework Security>"
-		# Can't put multiple targets in a single generator expression or it bugs out.
-		$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:Brotli::common>
-		$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:Brotli::encoder>
-		$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:Brotli::decoder>
-		$<$<BOOL:${HTTPLIB_IS_USING_ZLIB}>:ZLIB::ZLIB>
-		$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:OpenSSL::SSL>
-		$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:OpenSSL::Crypto>
-)
-
-# Set the definitions to enable optional features
-target_compile_definitions(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
-	$<$<BOOL:${HTTPLIB_NO_EXCEPTIONS}>:CPPHTTPLIB_NO_EXCEPTIONS>
-	$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:CPPHTTPLIB_BROTLI_SUPPORT>
-	$<$<BOOL:${HTTPLIB_IS_USING_ZLIB}>:CPPHTTPLIB_ZLIB_SUPPORT>
-	$<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:CPPHTTPLIB_OPENSSL_SUPPORT>
-	$<$<AND:$<PLATFORM_ID:Darwin>,$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>,$<BOOL:${HTTPLIB_IS_USING_CERTS_FROM_MACOSX_KEYCHAIN}>>:CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN>
-)
-
-# CMake configuration files installation directory
-set(_TARGET_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-
-include(CMakePackageConfigHelpers)
-
-# Configures the meta-file httplibConfig.cmake.in to replace variables with paths/values/etc.
-configure_package_config_file("cmake/${PROJECT_NAME}Config.cmake.in"
-	"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-	INSTALL_DESTINATION "${_TARGET_INSTALL_CMAKEDIR}"
-	# Passes the includedir install path
-	PATH_VARS CMAKE_INSTALL_FULL_INCLUDEDIR
-)
-
-if(HTTPLIB_COMPILE)
-	write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-		# Example: if you find_package(httplib 0.5.4)
-		# then anything >= 0.5.4 and < 0.6 is accepted
-		COMPATIBILITY SameMinorVersion
-	)
-else()
-	write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-		# Example: if you find_package(httplib 0.5.4)
-		# then anything >= 0.5.4 and < 0.6 is accepted
-		COMPATIBILITY SameMinorVersion
-		# Tells Cmake that it's a header-only lib
-		# Mildly useful for end-users :)
-		ARCH_INDEPENDENT
-	)
-endif()
-
-if(HTTPLIB_INSTALL)
-	# Creates the export httplibTargets.cmake
-	# This is strictly what holds compilation requirements
-	# and linkage information (doesn't find deps though).
-	install(TARGETS ${PROJECT_NAME} EXPORT httplibTargets)
-
-	install(FILES "${_httplib_build_includedir}/httplib.h" TYPE INCLUDE)
-
-	install(FILES
-		"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-		"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
-		# Install it so it can be used later by the httplibConfig.cmake file.
-		# Put it in the same dir as our config file instead of a global path so we don't potentially stomp on other packages.
-		"${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindBrotli.cmake"
-		DESTINATION ${_TARGET_INSTALL_CMAKEDIR}
-	)
-
-	# NOTE: This path changes depending on if it's on Windows or Linux
-	install(EXPORT httplibTargets
-		# Puts the targets into the httplib namespace
-		# So this makes httplib::httplib linkable after doing find_package(httplib)
-		NAMESPACE ${PROJECT_NAME}::
-		DESTINATION ${_TARGET_INSTALL_CMAKEDIR}
-	)
-
-	# Install documentation & license
-	# ex: /usr/share/doc/httplib/README.md and /usr/share/licenses/httplib/LICENSE
-	install(FILES "README.md" DESTINATION "${CMAKE_INSTALL_DOCDIR}")
-	install(FILES "LICENSE" DESTINATION "${CMAKE_INSTALL_DATADIR}/licenses/${PROJECT_NAME}")
-
-	include(CPack)
-endif()
-
-if(HTTPLIB_TEST)
-    include(CTest)
-    add_subdirectory(test)
-endif()

Dockerfile

@@ -1,11 +0,0 @@
-FROM yhirose4dockerhub/ubuntu-builder AS builder
-WORKDIR /build
-COPY httplib.h .
-COPY docker/main.cc .
-RUN g++ -std=c++23 -static -o server -O2 -I. main.cc && strip server
-
-FROM scratch
-COPY --from=builder /build/server /server
-COPY docker/html/index.html /html/index.html
-EXPOSE 80
-CMD ["/server"]

README.md

@@ -2,91 +2,17 @@ cpp-httplib
 ===========
 
 [![](https://github.com/yhirose/cpp-httplib/workflows/test/badge.svg)](https://github.com/yhirose/cpp-httplib/actions)
+[![Build Status](https://travis-ci.org/yhirose/cpp-httplib.svg?branch=master)](https://travis-ci.org/yhirose/cpp-httplib)
+[![Bulid Status](https://ci.appveyor.com/api/projects/status/github/yhirose/cpp-httplib?branch=master&svg=true)](https://ci.appveyor.com/project/yhirose/cpp-httplib)
 
 A C++11 single-file header-only cross platform HTTP/HTTPS library.
 
-It's extremely easy to setup. Just include the **httplib.h** file in your code!
+It's extremely easy to setup. Just include **httplib.h** file in your code!
 
-> [!IMPORTANT]
+For Windows users: Please read [this note](https://github.com/yhirose/cpp-httplib#windows).
-> This library uses 'blocking' socket I/O. If you are looking for a library with 'non-blocking' socket I/O, this is not the one that you want.
 
-Simple examples
+Server Example
----------------
+--------------
-
-#### Server (Multi-threaded)
-
-```c++
-#define CPPHTTPLIB_OPENSSL_SUPPORT
-#include "path/to/httplib.h"
-
-// HTTP
-httplib::Server svr;
-
-// HTTPS
-httplib::SSLServer svr;
-
-svr.Get("/hi", [](const httplib::Request &, httplib::Response &res) {
-  res.set_content("Hello World!", "text/plain");
-});
-
-svr.listen("0.0.0.0", 8080);
-```
-
-#### Client
-
-```c++
-#define CPPHTTPLIB_OPENSSL_SUPPORT
-#include "path/to/httplib.h"
-
-// HTTP
-httplib::Client cli("http://yhirose.github.io");
-
-// HTTPS
-httplib::Client cli("https://yhirose.github.io");
-
-auto res = cli.Get("/hi");
-res->status;
-res->body;
-```
-
-SSL Support
------------
-
-SSL support is available with `CPPHTTPLIB_OPENSSL_SUPPORT`. `libssl` and `libcrypto` should be linked.
-
-> [!NOTE]
-> cpp-httplib currently supports only version 3.0 or later. Please see [this page](https://www.openssl.org/policies/releasestrat.html) to get more information.
-
-> [!TIP]
-> For macOS: cpp-httplib now can use system certs with `CPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN`. `CoreFoundation` and `Security` should be linked with `-framework`.
-
-```c++
-#define CPPHTTPLIB_OPENSSL_SUPPORT
-#include "path/to/httplib.h"
-
-// Server
-httplib::SSLServer svr("./cert.pem", "./key.pem");
-
-// Client
-httplib::Client cli("https://localhost:1234"); // scheme + host
-httplib::SSLClient cli("localhost:1234"); // host
-httplib::SSLClient cli("localhost", 1234); // host, port
-
-// Use your CA bundle
-cli.set_ca_cert_path("./ca-bundle.crt");
-
-// Disable cert verification
-cli.enable_server_certificate_verification(false);
-
-// Disable host verification
-cli.enable_server_hostname_verification(false);
-```
-
-> [!NOTE]
-> When using SSL, it seems impossible to avoid SIGPIPE in all cases, since on some operating systems, SIGPIPE can only be suppressed on a per-message basis, but there is no way to make the OpenSSL library do so for its internal communications. If your program needs to avoid being terminated on SIGPIPE, the only fully general way might be to set up a signal handler for SIGPIPE to handle or ignore it yourself.
-
-Server
-------
 
 ```c++
 #include <httplib.h>
@@ -101,20 +27,11 @@ int main(void)
     res.set_content("Hello World!", "text/plain");
   });
 
-  // Match the request path against a regular expression
-  // and extract its captures
   svr.Get(R"(/numbers/(\d+))", [&](const Request& req, Response& res) {
     auto numbers = req.matches[1];
     res.set_content(numbers, "text/plain");
   });
 
-  // Capture the second segment of the request path as "id" path param
-  svr.Get("/users/:id", [&](const Request& req, Response& res) {
-    auto user_id = req.path_params.at("id");
-    res.set_content(user_id, "text/plain");
-  });
-
-  // Extract values from HTTP headers and URL query params
   svr.Get("/body-header-param", [](const Request& req, Response& res) {
     if (req.has_header("Content-Length")) {
       auto val = req.get_header_value("Content-Length");
@@ -125,21 +42,6 @@ int main(void)
     res.set_content(req.body, "text/plain");
   });
 
-  // If the handler takes time to finish, you can also poll the connection state
-  svr.Get("/task", [&](const Request& req, Response& res) {
-    const char * result = nullptr;
-    process.run(); // for example, starting an external process
-    while (result == nullptr) {
-      sleep(1);
-      if (req.is_connection_closed()) {
-        process.kill(); // kill the process
-        return;
-      }
-      result = process.stdout(); // != nullptr if the process finishes
-    }
-    res.set_content(result, "text/plain");
-  });
-
   svr.Get("/stop", [&](const Request& req, Response& res) {
     svr.stop();
   });
@@ -189,40 +91,24 @@ svr.set_file_extension_and_mimetype_mapping("hh", "text/x-h");
 
 The followings are built-in mappings:
 
-| Extension  |          MIME Type          | Extension  |          MIME Type          |
+| Extension |     MIME Type          |
-| :--------- | :-------------------------- | :--------- | :-------------------------- |
+| :-------- | :--------------------- |
-| css        | text/css                    | mpga       | audio/mpeg                  |
+| txt       | text/plain             |
-| csv        | text/csv                    | weba       | audio/webm                  |
+| html, htm | text/html              |
-| txt        | text/plain                  | wav        | audio/wave                  |
+| css       | text/css               |
-| vtt        | text/vtt                    | otf        | font/otf                    |
+| jpeg, jpg | image/jpg              |
-| html, htm  | text/html                   | ttf        | font/ttf                    |
+| png       | image/png              |
-| apng       | image/apng                  | woff       | font/woff                   |
+| gif       | image/gif              |
-| avif       | image/avif                  | woff2      | font/woff2                  |
+| svg       | image/svg+xml          |
-| bmp        | image/bmp                   | 7z         | application/x-7z-compressed |
+| ico       | image/x-icon           |
-| gif        | image/gif                   | atom       | application/atom+xml        |
+| json      | application/json       |
-| png        | image/png                   | pdf        | application/pdf             |
+| pdf       | application/pdf        |
-| svg        | image/svg+xml               | mjs, js    | application/javascript      |
+| js        | application/javascript |
-| webp       | image/webp                  | json       | application/json            |
+| wasm      | application/wasm       |
-| ico        | image/x-icon                | rss        | application/rss+xml         |
+| xml       | application/xml        |
-| tif        | image/tiff                  | tar        | application/x-tar           |
+| xhtml     | application/xhtml+xml  |
-| tiff       | image/tiff                  | xhtml, xht | application/xhtml+xml       |
-| jpeg, jpg  | image/jpeg                  | xslt       | application/xslt+xml        |
-| mp4        | video/mp4                   | xml        | application/xml             |
-| mpeg       | video/mpeg                  | gz         | application/gzip            |
-| webm       | video/webm                  | zip        | application/zip             |
-| mp3        | audio/mp3                   | wasm       | application/wasm            |
 
-> [!WARNING]
+NOTE: These the static file server methods are not thread safe.
-> These static file server methods are not thread-safe.
-
-### File request handler
-
-```cpp
-// The handler is called right before the response is sent to a client
-svr.set_file_request_handler([](const Request &req, Response &res) {
-  ...
-});
-```
 
 ### Logging
 
@@ -243,48 +129,6 @@ svr.set_error_handler([](const auto& req, auto& res) {
 });
 ```
 
-### Exception handler
-The exception handler gets called if a user routing handler throws an error.
-
-```cpp
-svr.set_exception_handler([](const auto& req, auto& res, std::exception_ptr ep) {
-  auto fmt = "<h1>Error 500</h1><p>%s</p>";
-  char buf[BUFSIZ];
-  try {
-    std::rethrow_exception(ep);
-  } catch (std::exception &e) {
-    snprintf(buf, sizeof(buf), fmt, e.what());
-  } catch (...) { // See the following NOTE
-    snprintf(buf, sizeof(buf), fmt, "Unknown Exception");
-  }
-  res.set_content(buf, "text/html");
-  res.status = StatusCode::InternalServerError_500;
-});
-```
-
-> [!CAUTION]
-> if you don't provide the `catch (...)` block for a rethrown exception pointer, an uncaught exception will end up causing the server crash. Be careful!
-
-### Pre routing handler
-
-```cpp
-svr.set_pre_routing_handler([](const auto& req, auto& res) {
-  if (req.path == "/hello") {
-    res.set_content("world", "text/html");
-    return Server::HandlerResponse::Handled;
-  }
-  return Server::HandlerResponse::Unhandled;
-});
-```
-
-### Post routing handler
-
-```cpp
-svr.set_post_routing_handler([](const auto& req, auto& res) {
-  res.set_header("ADDITIONAL_HEADER", "value");
-});
-```
-
 ### 'multipart/form-data' POST data
 
 ```cpp
@@ -298,13 +142,12 @@ svr.Post("/multipart", [&](const auto& req, auto& res) {
 });
 ```
 
-### Receive content with a content receiver
+### Receive content with Content receiver
 
 ```cpp
 svr.Post("/content_receiver",
   [&](const Request &req, Response &res, const ContentReader &content_reader) {
     if (req.is_multipart_form_data()) {
-      // NOTE: `content_reader` is blocking until every form data field is read
       MultipartFormDataItems files;
       content_reader(
         [&](const MultipartFormData &file) {
@@ -321,46 +164,26 @@ svr.Post("/content_receiver",
         body.append(data, data_length);
         return true;
       });
+      res.set_content(body, "text/plain");
     }
   });
 ```
 
-### Send content with the content provider
+### Send content with Content provider
 
 ```cpp
-const size_t DATA_CHUNK_SIZE = 4;
+const uint64_t DATA_CHUNK_SIZE = 4;
 
 svr.Get("/stream", [&](const Request &req, Response &res) {
   auto data = new std::string("abcdefg");
 
   res.set_content_provider(
     data->size(), // Content length
-    "text/plain", // Content type
+    [data](uint64_t offset, uint64_t length, DataSink &sink) {
-    [&, data](size_t offset, size_t length, DataSink &sink) {
       const auto &d = *data;
       sink.write(&d[offset], std::min(length, DATA_CHUNK_SIZE));
-      return true; // return 'false' if you want to cancel the process.
     },
-    [data](bool success) { delete data; });
+    [data] { delete data; });
-});
-```
-
-Without content length:
-
-```cpp
-svr.Get("/stream", [&](const Request &req, Response &res) {
-  res.set_content_provider(
-    "text/plain", // Content type
-    [&](size_t offset, DataSink &sink) {
-      if (/* there is still data */) {
-        std::vector<char> data;
-        // prepare data...
-        sink.write(data.data(), data.size());
-      } else {
-        sink.done(); // No more data
-      }
-      return true; // return 'false' if you want to cancel the process.
-    });
 });
 ```
 
@@ -369,122 +192,29 @@ svr.Get("/stream", [&](const Request &req, Response &res) {
 ```cpp
 svr.Get("/chunked", [&](const Request& req, Response& res) {
   res.set_chunked_content_provider(
-    "text/plain",
+    [](uint64_t offset, DataSink &sink) {
-    [](size_t offset, DataSink &sink) {
+       sink.write("123", 3);
-      sink.write("123", 3);
+       sink.write("345", 3);
-      sink.write("345", 3);
+       sink.write("789", 3);
-      sink.write("789", 3);
+       sink.done();
-      sink.done(); // No more data
-      return true; // return 'false' if you want to cancel the process.
     }
   );
 });
 ```
 
-With trailer:
-
-```cpp
-svr.Get("/chunked", [&](const Request& req, Response& res) {
-  res.set_header("Trailer", "Dummy1, Dummy2");
-  res.set_chunked_content_provider(
-    "text/plain",
-    [](size_t offset, DataSink &sink) {
-      sink.write("123", 3);
-      sink.write("345", 3);
-      sink.write("789", 3);
-      sink.done_with_trailer({
-        {"Dummy1", "DummyVal1"},
-        {"Dummy2", "DummyVal2"}
-      });
-      return true;
-    }
-  );
-});
-```
-
-### Send file content
-
-```cpp
-svr.Get("/content", [&](const Request &req, Response &res) {
-  res.set_file_content("./path/to/content.html");
-});
-
-svr.Get("/content", [&](const Request &req, Response &res) {
-  res.set_file_content("./path/to/content", "text/html");
-});
-```
-
-### 'Expect: 100-continue' handler
-
-By default, the server sends a `100 Continue` response for an `Expect: 100-continue` header.
-
-```cpp
-// Send a '417 Expectation Failed' response.
-svr.set_expect_100_continue_handler([](const Request &req, Response &res) {
-  return StatusCode::ExpectationFailed_417;
-});
-```
-
-```cpp
-// Send a final status without reading the message body.
-svr.set_expect_100_continue_handler([](const Request &req, Response &res) {
-  return res.status = StatusCode::Unauthorized_401;
-});
-```
-
-### Keep-Alive connection
-
-```cpp
-svr.set_keep_alive_max_count(2); // Default is 5
-svr.set_keep_alive_timeout(10);  // Default is 5
-```
-
-### Timeout
-
-```c++
-svr.set_read_timeout(5, 0); // 5 seconds
-svr.set_write_timeout(5, 0); // 5 seconds
-svr.set_idle_interval(0, 100000); // 100 milliseconds
-```
-
-### Set maximum payload length for reading a request body
-
-```c++
-svr.set_payload_max_length(1024 * 1024 * 512); // 512MB
-```
-
-> [!NOTE]
-> When the request body content type is 'www-form-urlencoded', the actual payload length shouldn't exceed `CPPHTTPLIB_FORM_URL_ENCODED_PAYLOAD_MAX_LENGTH`.
-
 ### Server-Sent Events
 
-Please see [Server example](https://github.com/yhirose/cpp-httplib/blob/master/example/ssesvr.cc) and [Client example](https://github.com/yhirose/cpp-httplib/blob/master/example/ssecli.cc).
+Please check [here](https://github.com/yhirose/cpp-httplib/blob/master/example/sse.cc).
 
 ### Default thread pool support
 
-`ThreadPool` is used as the **default** task queue, with a default thread count of 8 or `std::thread::hardware_concurrency() - 1`, whichever is greater. You can change it with `CPPHTTPLIB_THREAD_POOL_COUNT`.
 
-If you want to set the thread count at runtime, there is no convenient way... But here is how.
+`ThreadPool` is used as a default task queue, and the default thread count is set to value from `std::thread::hardware_concurrency()`.
 
-```cpp
+You can change the thread count by setting `CPPHTTPLIB_THREAD_POOL_COUNT`.
-svr.new_task_queue = [] { return new ThreadPool(12); };
-```
-
-You can also provide an optional parameter to limit the maximum number
-of pending requests, i.e. requests `accept()`ed by the listener but
-still waiting to be serviced by worker threads.
-
-```cpp
-svr.new_task_queue = [] { return new ThreadPool(/*num_threads=*/12, /*max_queued_requests=*/18); };
-```
-
-Default limit is 0 (unlimited). Once the limit is reached, the listener
-will shutdown the client connection.
 
 ### Override the default thread pool with yours
 
-You can supply your own thread pool implementation according to your need.
-
 ```cpp
 class YourThreadPoolTaskQueue : public TaskQueue {
 public:
@@ -492,10 +222,8 @@ public:
     pool_.start_with_thread_count(n);
   }
 
-  virtual bool enqueue(std::function<void()> fn) override {
+  virtual void enqueue(std::function<void()> fn) override {
-    /* Return true if the task was actually enqueued, or false
+    pool_.enqueue(fn);
-     * if the caller must drop the corresponding connection. */
-    return pool_.enqueue(fn);
   }
 
   virtual void shutdown() override {
@@ -511,8 +239,26 @@ svr.new_task_queue = [] {
 };
 ```
 
-Client
+### 'Expect: 100-continue' handler
-------
+
+As default, the server sends `100 Continue` response for `Expect: 100-continue` header.
+
+```cpp
+// Send a '417 Expectation Failed' response.
+svr.set_expect_100_continue_handler([](const Request &req, Response &res) {
+  return 417;
+});
+```
+
+```cpp
+// Send a final status without reading the message body.
+svr.set_expect_100_continue_handler([](const Request &req, Response &res) {
+  return res.status = 401;
+});
+```
+
+Client Example
+--------------
 
 ```c++
 #include <httplib.h>
@@ -520,72 +266,37 @@ Client
 
 int main(void)
 {
+  // IMPORTANT: 1st parameter must be a hostname or an IP adress string.
   httplib::Client cli("localhost", 1234);
 
-  if (auto res = cli.Get("/hi")) {
+  auto res = cli.Get("/hi");
-    if (res->status == StatusCode::OK_200) {
+  if (res && res->status == 200) {
-      std::cout << res->body << std::endl;
+    std::cout << res->body << std::endl;
-    }
-  } else {
-    auto err = res.error();
-    std::cout << "HTTP error: " << httplib::to_string(err) << std::endl;
   }
 }
 ```
 
-> [!TIP]
-> Constructor with scheme-host-port string is now supported!
-
-```c++
-httplib::Client cli("localhost");
-httplib::Client cli("localhost:8080");
-httplib::Client cli("http://localhost");
-httplib::Client cli("http://localhost:8080");
-httplib::Client cli("https://localhost");
-httplib::SSLClient cli("localhost");
-```
-
-### Error code
-
-Here is the list of errors from `Result::error()`.
-
-```c++
-enum Error {
-  Success = 0,
-  Unknown,
-  Connection,
-  BindIPAddress,
-  Read,
-  Write,
-  ExceedRedirectCount,
-  Canceled,
-  SSLConnection,
-  SSLLoadingCerts,
-  SSLServerVerification,
-  UnsupportedMultipartBoundaryChars,
-  Compression,
-  ConnectionTimeout,
-};
-```
-
 ### GET with HTTP headers
 
 ```c++
 httplib::Headers headers = {
-  { "Hello", "World!" }
+  { "Accept-Encoding", "gzip, deflate" }
 };
 auto res = cli.Get("/hi", headers);
 ```
-or
+
+### GET with Content Receiver
+
 ```c++
-auto res = cli.Get("/hi", {{"Hello", "World!"}});
+std::string body;
-```
+
-or
+auto res = cli.Get("/large-data",
-```c++
+  [&](const char *data, uint64_t data_length) {
-cli.set_default_headers({
+    body.append(data, data_length);
-  { "Hello", "World!" }
+    return true;
-});
+  });
-auto res = cli.Get("/hi");
+
+assert(res->body.empty());
 ```
 
 ### POST
@@ -648,85 +359,24 @@ res = cli.Options("*");
 res = cli.Options("/resource/foo");
 ```
 
-### Timeout
+### Connection Timeout
 
 ```c++
-cli.set_connection_timeout(0, 300000); // 300 milliseconds
+cli.set_timeout_sec(5); // timeouts in 5 seconds
-cli.set_read_timeout(5, 0); // 5 seconds
-cli.set_write_timeout(5, 0); // 5 seconds
-
-// This method works the same as curl's `--max-timeout` option
-svr.set_max_timeout(5000); // 5 seconds
 ```
-
-### Receive content with a content receiver
-
-```c++
-std::string body;
-
-auto res = cli.Get("/large-data",
-  [&](const char *data, size_t data_length) {
-    body.append(data, data_length);
-    return true;
-  });
-```
-
-```cpp
-std::string body;
-
-auto res = cli.Get(
-  "/stream", Headers(),
-  [&](const Response &response) {
-    EXPECT_EQ(StatusCode::OK_200, response.status);
-    return true; // return 'false' if you want to cancel the request.
-  },
-  [&](const char *data, size_t data_length) {
-    body.append(data, data_length);
-    return true; // return 'false' if you want to cancel the request.
-  });
-```
-
-### Send content with a content provider
-
-```cpp
-std::string body = ...;
-
-auto res = cli.Post(
-  "/stream", body.size(),
-  [](size_t offset, size_t length, DataSink &sink) {
-    sink.write(body.data() + offset, length);
-    return true; // return 'false' if you want to cancel the request.
-  },
-  "text/plain");
-```
-
-### Chunked transfer encoding
-
-```cpp
-auto res = cli.Post(
-  "/stream",
-  [](size_t offset, DataSink &sink) {
-    sink.os << "chunked data 1";
-    sink.os << "chunked data 2";
-    sink.os << "chunked data 3";
-    sink.done();
-    return true; // return 'false' if you want to cancel the request.
-  },
-  "text/plain");
-```
-
 ### With Progress Callback
 
 ```cpp
-httplib::Client cli(url, port);
+httplib::Client client(url, port);
 
 // prints: 0 / 000 bytes => 50% complete
-auto res = cli.Get("/", [](uint64_t len, uint64_t total) {
+std::shared_ptr<httplib::Response> res =
-  printf("%lld / %lld bytes => %d%% complete\n",
+  cli.Get("/", [](uint64_t len, uint64_t total) {
-    len, total,
+    printf("%lld / %lld bytes => %d%% complete\n",
-    (int)(len*100/total));
+      len, total,
-  return true; // return 'false' if you want to cancel the request.
+      (int)(len*100/total));
-}
+    return true; // return 'false' if you want to cancel the request.
+  }
 );
 ```
 
@@ -740,13 +390,9 @@ cli.set_basic_auth("user", "pass");
 
 // Digest Authentication
 cli.set_digest_auth("user", "pass");
-
-// Bearer Token Authentication
-cli.set_bearer_token_auth("token");
 ```
 
-> [!NOTE]
+NOTE: OpenSSL is required for Digest Authentication.
-> OpenSSL is required for Digest Authentication.
 
 ### Proxy server support
 
@@ -758,13 +404,9 @@ cli.set_proxy_basic_auth("user", "pass");
 
 // Digest Authentication
 cli.set_proxy_digest_auth("user", "pass");
-
-// Bearer Token Authentication
-cli.set_proxy_bearer_token_auth("pass");
 ```
 
-> [!NOTE]
+NOTE: OpenSSL is required for Digest Authentication.
-> OpenSSL is required for Digest Authentication.
 
 ### Range
 
@@ -787,15 +429,20 @@ httplib::make_range_header({{0, 0}, {-1, 1}})        // 'Range: bytes=0-0, -1'
 ### Keep-Alive connection
 
 ```cpp
-httplib::Client cli("localhost", 1234);
+cli.set_keep_alive_max_count(2); // Default is 5
 
-cli.Get("/hello");         // with "Connection: close"
+std::vector<Request> requests;
+Get(requests, "/get-request1");
+Get(requests, "/get-request2");
+Post(requests, "/post-request1", "text", "text/plain");
+Post(requests, "/post-request2", "text", "text/plain");
 
-cli.set_keep_alive(true);
+std::vector<Response> responses;
-cli.Get("/world");
+if (cli.send(requests, responses)) {
-
+  for (const auto& res: responses) {
-cli.set_keep_alive(false);
+    ...
-cli.Get("/last-request");  // with "Connection: close"
+  }
+}
 ```
 
 ### Redirect
@@ -811,128 +458,59 @@ res = cli.Get("/");
 res->status; // 200
 ```
 
-### Use a specific network interface
+### Use a specitic network interface
 
-> [!NOTE]
+NOTE: This feature is not available on Windows, yet.
-> This feature is not available on Windows, yet.
 
 ```cpp
 cli.set_interface("eth0"); // Interface name, IP address or host name
 ```
 
-Compression
+OpenSSL Support
------------
+---------------
 
-The server can apply compression to the following MIME type contents:
+SSL support is available with `CPPHTTPLIB_OPENSSL_SUPPORT`. `libssl` and `libcrypto` should be linked.
 
-  * all text types except text/event-stream
+NOTE: cpp-httplib supports 1.1.1 (until 2023-09-11) and 1.0.2 (2019-12-31).
+
+```c++
+#define CPPHTTPLIB_OPENSSL_SUPPORT
+
+SSLServer svr("./cert.pem", "./key.pem");
+
+SSLClient cli("localhost", 8080);
+cli.set_ca_cert_path("./ca-bundle.crt");
+cli.enable_server_certificate_verification(true);
+```
+
+Zlib Support
+------------
+
+'gzip' compression is available with `CPPHTTPLIB_ZLIB_SUPPORT`.
+
+The server applies gzip compression to the following MIME type contents:
+
+  * all text types
   * image/svg+xml
   * application/javascript
   * application/json
   * application/xml
   * application/xhtml+xml
 
-### Zlib Support
+### Compress content on client
-
-'gzip' compression is available with `CPPHTTPLIB_ZLIB_SUPPORT`. `libz` should be linked.
-
-### Brotli Support
-
-Brotli compression is available with `CPPHTTPLIB_BROTLI_SUPPORT`. Necessary libraries should be linked.
-Please see https://github.com/google/brotli for more detail.
-
-### Default `Accept-Encoding` value
-
-The default `Accept-Encoding` value contains all possible compression types. So, the following two examples are same.
-
-```c++
-res = cli.Get("/resource/foo");
-res = cli.Get("/resource/foo", {{"Accept-Encoding", "gzip, deflate, br"}});
-```
-
-If we don't want a response without compression, we have to set `Accept-Encoding` to an empty string. This behavior is similar to curl.
-
-```c++
-res = cli.Get("/resource/foo", {{"Accept-Encoding", ""}});
-```
-
-### Compress request body on client
 
 ```c++
 cli.set_compress(true);
 res = cli.Post("/resource/foo", "...", "text/plain");
 ```
 
-### Compress response body on client
-
-```c++
-cli.set_decompress(false);
-res = cli.Get("/resource/foo");
-res->body; // Compressed data
-
-```
-
-Unix Domain Socket Support
---------------------------
-
-Unix Domain Socket support is available on Linux and macOS.
-
-```c++
-// Server
-httplib::Server svr;
-svr.set_address_family(AF_UNIX).listen("./my-socket.sock", 80);
-
-// Client
-httplib::Client cli("./my-socket.sock");
-cli.set_address_family(AF_UNIX);
-```
-
-"my-socket.sock" can be a relative path or an absolute path. You application must have the appropriate permissions for the path. You can also use an abstract socket address on Linux. To use an abstract socket address, prepend a null byte ('\x00') to the path.
-
-
 Split httplib.h into .h and .cc
 -------------------------------
 
-```console
-$ ./split.py -h
-usage: split.py [-h] [-e EXTENSION] [-o OUT]
-
-This script splits httplib.h into .h and .cc parts.
-
-optional arguments:
-  -h, --help            show this help message and exit
-  -e EXTENSION, --extension EXTENSION
-                        extension of the implementation file (default: cc)
-  -o OUT, --out OUT     where to write the files (default: out)
-
-$ ./split.py
-Wrote out/httplib.h and out/httplib.cc
-```
-
-Dockerfile for Static HTTP Server
----------------------------------
-
-Dockerfile for static HTTP server is available. Port number of this HTTP server is 80, and it serves static files from `/html` directory in the container.
-
 ```bash
-> docker build -t cpp-httplib-server .
+> python3 split.py
-...
+> ls out
-
+httplib.h  httplib.cc
-> docker run --rm -it -p 8080:80 -v ./docker/html:/html cpp-httplib-server
-Serving HTTP on 0.0.0.0 port 80 ...
-192.168.65.1 - - [31/Aug/2024:21:33:56 +0000] "GET / HTTP/1.1" 200 599 "-" "curl/8.7.1"
-192.168.65.1 - - [31/Aug/2024:21:34:26 +0000] "GET / HTTP/1.1" 200 599 "-" "Mozilla/5.0 ..."
-192.168.65.1 - - [31/Aug/2024:21:34:26 +0000] "GET /favicon.ico HTTP/1.1" 404 152 "-" "Mozilla/5.0 ..."
-```
-
-From Docker Hub
-
-```bash
-> docker run --rm -it -p 8080:80 -v ./docker/html:/html yhirose4dockerhub/cpp-httplib-server
-Serving HTTP on 0.0.0.0 port 80 ...
-192.168.65.1 - - [31/Aug/2024:21:33:56 +0000] "GET / HTTP/1.1" 200 599 "-" "curl/8.7.1"
-192.168.65.1 - - [31/Aug/2024:21:34:26 +0000] "GET / HTTP/1.1" 200 599 "-" "Mozilla/5.0 ..."
-192.168.65.1 - - [31/Aug/2024:21:34:26 +0000] "GET /favicon.ico HTTP/1.1" 404 152 "-" "Mozilla/5.0 ..."
 ```
 
 NOTE
@@ -957,16 +535,12 @@ Include `httplib.h` before `Windows.h` or include `Windows.h` by defining `WIN32
 #include <httplib.h>
 ```
 
-> [!NOTE]
+Note: Cygwin on Windows is not supported.
-> cpp-httplib officially supports only the latest Visual Studio. It might work with former versions of Visual Studio, but I can no longer verify it. Pull requests are always welcome for the older versions of Visual Studio unless they break the C++11 conformance.
-
-> [!NOTE]
-> Windows 8 or lower, Visual Studio 2015 or lower, and Cygwin and MSYS2 including MinGW are neither supported nor tested.
 
 License
 -------
 
-MIT license (© 2025 Yuji Hirose)
+MIT license (© 2020 Yuji Hirose)
 
 Special Thanks To
 -----------------

appveyor.yml

@@ -0,0 +1,9 @@
+version: 1.0.{build}
+image: Visual Studio 2017
+build_script:
+- cmd: >-
+    cd test
+
+    msbuild.exe test.sln /verbosity:minimal /t:Build /p:Configuration=Debug;Platform=Win32
+test_script:
+- cmd: Debug\test.exe

benchmark/Makefile

@@ -1,62 +0,0 @@
-CXXFLAGS = -std=c++11 -O2 -I..
-
-CPPHTTPLIB_FLAGS = -DCPPHTTPLIB_THREAD_POOL_COUNT=16
-
-BENCH = bombardier -c 10 -d 5s localhost:8080
-MONITOR = ali http://localhost:8080
-
-# cpp-httplib
-bench: server
-	@echo "--------------------\n cpp-httplib latest\n--------------------\n"
-	@./server & export PID=$$!; $(BENCH); kill $${PID}
-	@echo ""
-
-monitor: server
-	@./server & export PID=$$!; $(MONITOR); kill $${PID}
-
-run : server
-	@./server
-
-server : cpp-httplib/main.cpp ../httplib.h
-	g++ -o $@ $(CXXFLAGS) $(CPPHTTPLIB_FLAGS) cpp-httplib/main.cpp
-
-# cpp-httplib
-bench-base: server-base
-	@echo "---------------------\n cpp-httplib v0.18.0\n---------------------\n"
-	@./server-base & export PID=$$!; $(BENCH); kill $${PID}
-	@echo ""
-
-monitor-base: server-base
-	@./server-base & export PID=$$!; $(MONITOR); kill $${PID}
-
-run-base : server-base
-	@./server-base
-
-server-base : cpp-httplib-base/main.cpp cpp-httplib-base/httplib.h
-	g++ -o $@ $(CXXFLAGS) $(CPPHTTPLIB_FLAGS) cpp-httplib-base/main.cpp
-
-# crow
-bench-crow: server-crow
-	@echo "-------------\n Crow v1.2.0\n-------------\n"
-	@./server-crow & export PID=$$!; $(BENCH); kill $${PID}
-	@echo ""
-
-monitor-crow: server-crow
-	@./server-crow & export PID=$$!; $(MONITOR); kill $${PID}
-
-run-crow : server-crow
-	@./server-crow
-
-server-crow : crow/main.cpp
-	g++ -o $@ $(CXXFLAGS) crow/main.cpp
-
-# misc
-build: server server-base server-crow
-
-bench-all: bench-crow bench bench-base
-
-issue:
-	bombardier -c 10 -d 30s localhost:8080
-
-clean:
-	rm -rf server*

benchmark/cpp-httplib-base/main.cpp

@@ -1,12 +0,0 @@
-#include "./httplib.h"
-using namespace httplib;
-
-int main() {
-  Server svr;
-
-  svr.Get("/", [](const Request &, Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-
-  svr.listen("0.0.0.0", 8080);
-}

benchmark/cpp-httplib/main.cpp

@@ -1,12 +0,0 @@
-#include "httplib.h"
-using namespace httplib;
-
-int main() {
-  Server svr;
-
-  svr.Get("/", [](const Request &, Response &res) {
-    res.set_content("Hello World!", "text/plain");
-  });
-
-  svr.listen("0.0.0.0", 8080);
-}

benchmark/crow/main.cpp

@@ -1,17 +0,0 @@
-#include "crow_all.h"
-
-class CustomLogger : public crow::ILogHandler {
-public:
-  void log(std::string, crow::LogLevel) {}
-};
-
-int main() {
-  CustomLogger logger;
-  crow::logger::setHandler(&logger);
-
-  crow::SimpleApp app;
-
-  CROW_ROUTE(app, "/")([]() { return "Hello world!"; });
-
-  app.port(8080).multithreaded().run();
-}

benchmark/download.sh

@@ -1,2 +0,0 @@
-rm -f httplib.h
-wget https://raw.githubusercontent.com/yhirose/cpp-httplib/v$1/httplib.h

cmake/FindBrotli.cmake

@@ -1,168 +0,0 @@
-# A simple FindBrotli package for Cmake's find_package function.
-# Note: This find package doesn't have version support, as the version file doesn't seem to be installed on most systems.
-#
-# If you want to find the static packages instead of shared (the default), define BROTLI_USE_STATIC_LIBS as TRUE.
-# The targets will have the same names, but it will use the static libs.
-#
-# Valid find_package COMPONENTS names: "decoder", "encoder", and "common"
-# Note that if you're requiring "decoder" or "encoder", then "common" will be automatically added as required.
-#
-# Defines the libraries (if found): Brotli::decoder, Brotli::encoder, Brotli::common
-# and the includes path variable: Brotli_INCLUDE_DIR
-#
-# If it's failing to find the libraries, try setting BROTLI_ROOT_DIR to the folder containing your library & include dir.
-
-# If they asked for a specific version, warn/fail since we don't support it.
-# TODO: if they start distributing the version somewhere, implement finding it.
-# See https://github.com/google/brotli/issues/773#issuecomment-579133187
-if(Brotli_FIND_VERSION)
-	set(_brotli_version_error_msg "FindBrotli.cmake doesn't have version support!")
-	# If the package is required, throw a fatal error
-	# Otherwise, if not running quietly, we throw a warning
-	if(Brotli_FIND_REQUIRED)
-		message(FATAL_ERROR "${_brotli_version_error_msg}")
-	elseif(NOT Brotli_FIND_QUIETLY)
-		message(WARNING "${_brotli_version_error_msg}")
-	endif()
-endif()
-
-# Since both decoder & encoder require the common lib, force its requirement..
-# if the user is requiring either of those other libs.
-if(Brotli_FIND_REQUIRED_decoder OR Brotli_FIND_REQUIRED_encoder)
-	set(Brotli_FIND_REQUIRED_common TRUE)
-endif()
-
-# Support preference of static libs by adjusting CMAKE_FIND_LIBRARY_SUFFIXES
-# Credit to FindOpenSSL.cmake for this
-if(BROTLI_USE_STATIC_LIBS)
-  set(_brotli_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-  if(WIN32)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
-  else()
-    set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
-  endif()
-endif()
-
-# Make PkgConfig optional, since some users (mainly Windows) don't have it.
-# But it's a lot more clean than manually using find_library.
-find_package(PkgConfig QUIET)
-
-# Only used if the PkgConfig libraries aren't used.
-find_path(Brotli_INCLUDE_DIR
-	NAMES
-		"brotli/decode.h"
-		"brotli/encode.h"
-	HINTS
-		${BROTLI_ROOT_DIR}
-	PATH_SUFFIXES
-		"include"
-		"includes"
-	DOC "The path to Brotli's include directory."
-)
-# Hides this var from the GUI
-mark_as_advanced(Brotli_INCLUDE_DIR)
-
-# Just used for PkgConfig stuff in the loop below
-set(_brotli_stat_str "")
-if(BROTLI_USE_STATIC_LIBS)
-	set(_brotli_stat_str "_STATIC")
-endif()
-
-# Each string here is "ComponentName;LiteralName" (the semi-colon is a delimiter)
-foreach(_listvar "common;common" "decoder;dec" "encoder;enc")
-	# Split the component name and literal library name from the listvar
-	list(GET _listvar 0 _component_name)
-	list(GET _listvar 1 _libname)
-
-	# NOTE: We can't rely on PkgConf for static libs since the upstream static lib support is broken
-	# See https://github.com/google/brotli/issues/795
-	# TODO: whenever their issue is fixed upstream, remove this "AND NOT BROTLI_USE_STATIC_LIBS" check
-	if(PKG_CONFIG_FOUND AND NOT BROTLI_USE_STATIC_LIBS)
-		# These need to be GLOBAL for MinGW when making ALIAS libraries against them.
-		# Have to postfix _STATIC on the name to tell PkgConfig to find the static libs.
-		pkg_check_modules(Brotli_${_component_name}${_brotli_stat_str} QUIET GLOBAL IMPORTED_TARGET libbrotli${_libname})
-	endif()
-
-	# Check if the target was already found by Pkgconf
-	if(TARGET PkgConfig::Brotli_${_component_name}${_brotli_stat_str})
-		# ALIAS since we don't want the PkgConfig namespace on the Cmake library (for end-users)
-		add_library(Brotli::${_component_name} ALIAS PkgConfig::Brotli_${_component_name}${_brotli_stat_str})
-
-		# Tells HANDLE_COMPONENTS we found the component
-		set(Brotli_${_component_name}_FOUND TRUE)
-		if(Brotli_FIND_REQUIRED_${_component_name})
-			# If the lib is required, we can add its literal path as a required var for FindPackageHandleStandardArgs
-			# Since it won't accept the PkgConfig targets
-			if(BROTLI_USE_STATIC_LIBS)
-				list(APPEND _brotli_req_vars "Brotli_${_component_name}_STATIC_LIBRARIES")
-			else()
-				list(APPEND _brotli_req_vars "Brotli_${_component_name}_LINK_LIBRARIES")
-			endif()
-		endif()
-
-		# Skip searching for the libs with find_library since it was already found by Pkgconf
-		continue()
-	endif()
-
-	if(Brotli_FIND_REQUIRED_${_component_name})
-		# If it's required, we can set the name used in find_library as a required var for FindPackageHandleStandardArgs
-		list(APPEND _brotli_req_vars "Brotli_${_component_name}")
-	endif()
-
-	list(APPEND _brotli_lib_names
-		"brotli${_libname}"
-		"libbrotli${_libname}"
-	)
-	if(BROTLI_USE_STATIC_LIBS)
-		# Postfix "-static" to the libnames since we're looking for static libs
-		list(TRANSFORM _brotli_lib_names APPEND "-static")
-	endif()
-
-	find_library(Brotli_${_component_name}
-		NAMES ${_brotli_lib_names}
-		HINTS ${BROTLI_ROOT_DIR}
-		PATH_SUFFIXES
-			"lib"
-			"lib64"
-			"libs"
-			"libs64"
-			"lib/x86_64-linux-gnu"
-	)
-	# Hide the library variable from the Cmake GUI
-	mark_as_advanced(Brotli_${_component_name})
-
-	# Unset since otherwise it'll stick around for the next loop and break things
-	unset(_brotli_lib_names)
-
-	# Check if find_library found the library
-	if(Brotli_${_component_name})
-		# Tells HANDLE_COMPONENTS we found the component
-		set(Brotli_${_component_name}_FOUND TRUE)
-
-		add_library("Brotli::${_component_name}" UNKNOWN IMPORTED)
-		# Attach the literal library and include dir to the IMPORTED target for the end-user
-		set_target_properties("Brotli::${_component_name}" PROPERTIES
-			INTERFACE_INCLUDE_DIRECTORIES "${Brotli_INCLUDE_DIR}"
-			IMPORTED_LOCATION "${Brotli_${_component_name}}"
-		)
-	else()
-		# Tells HANDLE_COMPONENTS we found the component
-		set(Brotli_${_component_name}_FOUND FALSE)
-	endif()
-endforeach()
-
-include(FindPackageHandleStandardArgs)
-# Sets Brotli_FOUND, and fails the find_package(Brotli) call if it was REQUIRED but missing libs.
-find_package_handle_standard_args(Brotli
-	FOUND_VAR
-		Brotli_FOUND
-	REQUIRED_VARS
-		Brotli_INCLUDE_DIR
-		${_brotli_req_vars}
-	HANDLE_COMPONENTS
-)
-
-# Restore the original find library ordering
-if(BROTLI_USE_STATIC_LIBS)
-  set(CMAKE_FIND_LIBRARY_SUFFIXES ${_brotli_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-endif()

cmake/httplibConfig.cmake.in

@@ -1,84 +0,0 @@
-# Generates a macro to auto-configure everything
-@PACKAGE_INIT@
-
-# Setting these here so they're accessible after install.
-# Might be useful for some users to check which settings were used.
-set(HTTPLIB_IS_USING_OPENSSL @HTTPLIB_IS_USING_OPENSSL@)
-set(HTTPLIB_IS_USING_ZLIB @HTTPLIB_IS_USING_ZLIB@)
-set(HTTPLIB_IS_COMPILED @HTTPLIB_COMPILE@)
-set(HTTPLIB_IS_USING_BROTLI @HTTPLIB_IS_USING_BROTLI@)
-set(HTTPLIB_VERSION @PROJECT_VERSION@)
-
-include(CMakeFindDependencyMacro)
-
-# We add find_dependency calls here to not make the end-user have to call them.
-find_dependency(Threads)
-if(@HTTPLIB_IS_USING_OPENSSL@)
-	# OpenSSL COMPONENTS were added in Cmake v3.11
-	if(CMAKE_VERSION VERSION_LESS "3.11")
-		find_dependency(OpenSSL @_HTTPLIB_OPENSSL_MIN_VER@)
-	else()
-		# Once the COMPONENTS were added, they were made optional when not specified.
-		# Since we use both, we need to search for both.
-		find_dependency(OpenSSL @_HTTPLIB_OPENSSL_MIN_VER@ COMPONENTS Crypto SSL)
-	endif()
-endif()
-if(@HTTPLIB_IS_USING_ZLIB@)
-	find_dependency(ZLIB)
-endif()
-
-if(@HTTPLIB_IS_USING_BROTLI@)
-	# Needed so we can use our own FindBrotli.cmake in this file.
-	# Note that the FindBrotli.cmake file is installed in the same dir as this file.
-	list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
-	set(BROTLI_USE_STATIC_LIBS @BROTLI_USE_STATIC_LIBS@)
-	find_dependency(Brotli COMPONENTS common encoder decoder)
-endif()
-
-# Mildly useful for end-users
-# Not really recommended to be used though
-set_and_check(HTTPLIB_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_FULL_INCLUDEDIR@")
-# Lets the end-user find the header path with the header appended
-# This is helpful if you're using Cmake's pre-compiled header feature
-set_and_check(HTTPLIB_HEADER_PATH "@PACKAGE_CMAKE_INSTALL_FULL_INCLUDEDIR@/httplib.h")
-
-# Consider each library support as a "component"
-set(httplib_OpenSSL_FOUND @HTTPLIB_IS_USING_OPENSSL@)
-set(httplib_ZLIB_FOUND @HTTPLIB_IS_USING_ZLIB@)
-set(httplib_Brotli_FOUND @HTTPLIB_IS_USING_BROTLI@)
-
-check_required_components(httplib)
-
-# Brings in the target library, but only if all required components are found
-if(NOT DEFINED httplib_FOUND OR httplib_FOUND)
-	include("${CMAKE_CURRENT_LIST_DIR}/httplibTargets.cmake")
-endif()
-
-# Outputs a "found httplib /usr/include/httplib.h" message when using find_package(httplib)
-include(FindPackageMessage)
-if(TARGET httplib::httplib)
-	set(HTTPLIB_FOUND TRUE)
-
-	# Since the compiled version has a lib, show that in the message
-	if(@HTTPLIB_COMPILE@)
-		# The list of configurations is most likely just 1 unless they installed a debug & release
-		get_target_property(_httplib_configs httplib::httplib "IMPORTED_CONFIGURATIONS")
-		# Need to loop since the "IMPORTED_LOCATION" property isn't want we want.
-		# Instead, we need to find the IMPORTED_LOCATION_RELEASE or IMPORTED_LOCATION_DEBUG which has the lib path.
-		foreach(_httplib_conf "${_httplib_configs}")
-			# Grab the path to the lib and sets it to HTTPLIB_LIBRARY
-			get_target_property(HTTPLIB_LIBRARY httplib::httplib "IMPORTED_LOCATION_${_httplib_conf}")
-			# Check if we found it
-			if(HTTPLIB_LIBRARY)
-				break()
-			endif()
-		endforeach()
-
-		unset(_httplib_configs)
-		unset(_httplib_conf)
-
-		find_package_message(httplib "Found httplib: ${HTTPLIB_LIBRARY} (found version \"${HTTPLIB_VERSION}\")" "[${HTTPLIB_LIBRARY}][${HTTPLIB_HEADER_PATH}]")
-	else()
-		find_package_message(httplib "Found httplib: ${HTTPLIB_HEADER_PATH} (found version \"${HTTPLIB_VERSION}\")" "[${HTTPLIB_HEADER_PATH}]")
-	endif()
-endif()

docker-compose.yml

@@ -1,7 +0,0 @@
-services:
-  http:
-    build: .
-    ports:
-      - "8080:80"
-    volumes:
-      - ./docker/html:/html

docker/html/index.html

@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Welcome to cpp-httplib!</title>
-<style>
-html { color-scheme: light dark; }
-body { width: 35em; margin: 0 auto;
-font-family: Tahoma, Verdana, Arial, sans-serif; }
-</style>
-</head>
-<body>
-<h1>Welcome to cpp-httplib!</h1>
-<p>If you see this page, the cpp-httplib web server is successfully installed and
-working. Further configuration is required.</p>
-
-<p>For online documentation and support please refer to
-<a href="https://github.com/yhirose/cpp-httplib">github.com/yhirose/cpp-httplib</a>.<br/>
-
-<p><em>Thank you for using cpp-httplib.</em></p>
-</body>
-</html>

docker/main.cc

@@ -1,81 +0,0 @@
-//
-//  main.cc
-//
-//  Copyright (c) 2025 Yuji Hirose. All rights reserved.
-//  MIT License
-//
-
-#include <chrono>
-#include <ctime>
-#include <format>
-#include <iomanip>
-#include <iostream>
-#include <sstream>
-
-#include <httplib.h>
-
-constexpr auto error_html = R"(<html>
-<head><title>{} {}</title></head>
-<body>
-<center><h1>404 Not Found</h1></center>
-<hr><center>cpp-httplib/{}</center>
-</body>
-</html>
-)";
-
-void sigint_handler(int s) { exit(1); }
-
-std::string time_local() {
-  auto p = std::chrono::system_clock::now();
-  auto t = std::chrono::system_clock::to_time_t(p);
-
-  std::stringstream ss;
-  ss << std::put_time(std::localtime(&t), "%d/%b/%Y:%H:%M:%S %z");
-  return ss.str();
-}
-
-std::string log(auto &req, auto &res) {
-  auto remote_user = "-"; // TODO:
-  auto request = std::format("{} {} {}", req.method, req.path, req.version);
-  auto body_bytes_sent = res.get_header_value("Content-Length");
-  auto http_referer = "-"; // TODO:
-  auto http_user_agent = req.get_header_value("User-Agent", "-");
-
-  // NOTE: From NGINX default access log format
-  // log_format combined '$remote_addr - $remote_user [$time_local] '
-  //                     '"$request" $status $body_bytes_sent '
-  //                     '"$http_referer" "$http_user_agent"';
-  return std::format(R"({} - {} [{}] "{}" {} {} "{}" "{}")", req.remote_addr,
-                     remote_user, time_local(), request, res.status,
-                     body_bytes_sent, http_referer, http_user_agent);
-}
-
-int main(int argc, const char **argv) {
-  signal(SIGINT, sigint_handler);
-
-  auto base_dir = "./html";
-  auto host = "0.0.0.0";
-  auto port = 80;
-
-  httplib::Server svr;
-
-  svr.set_error_handler([](auto & /*req*/, auto &res) {
-    auto body =
-        std::format(error_html, res.status, httplib::status_message(res.status),
-                    CPPHTTPLIB_VERSION);
-
-    res.set_content(body, "text/html");
-  });
-
-  svr.set_logger(
-      [](auto &req, auto &res) { std::cout << log(req, res) << std::endl; });
-
-  svr.set_mount_point("/", base_dir);
-
-  std::cout << std::format("Serving HTTP on {0} port {1} ...", host, port)
-            << std::endl;
-
-  auto ret = svr.listen(host, port);
-
-  return ret ? 0 : 1;
-}

example/Dockerfile.hello

@@ -1,12 +0,0 @@
-FROM alpine as builder
-WORKDIR /src/example
-RUN apk add g++ make openssl-dev zlib-dev brotli-dev
-COPY ./httplib.h /src
-COPY ./example/hello.cc /src/example
-COPY ./example/Makefile /src/example
-RUN make hello
-
-FROM alpine
-RUN apk --no-cache add brotli libstdc++
-COPY --from=builder /src/example/hello /bin/hello
-CMD ["/bin/hello"]

example/Makefile

@@ -1,64 +1,39 @@
+
 #CXX = clang++
-CXXFLAGS = -O2 -std=c++11 -I.. -Wall -Wextra -pthread
+CXXFLAGS = -std=c++14 -I.. -Wall -Wextra -pthread
-
+OPENSSL_DIR = /usr/local/opt/openssl
-PREFIX ?= $(shell brew --prefix)
-
-OPENSSL_DIR = $(PREFIX)/opt/openssl@3
 OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I$(OPENSSL_DIR)/include -L$(OPENSSL_DIR)/lib -lssl -lcrypto
-
-ifneq ($(OS), Windows_NT)
-	UNAME_S := $(shell uname -s)
-	ifeq ($(UNAME_S), Darwin)
-		OPENSSL_SUPPORT += -framework CoreFoundation -framework Security
-	endif
-endif
-
 ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz
 
-BROTLI_DIR = $(PREFIX)/opt/brotli
+all: server client hello simplesvr upload redirect sse benchmark
-BROTLI_SUPPORT = -DCPPHTTPLIB_BROTLI_SUPPORT -I$(BROTLI_DIR)/include -L$(BROTLI_DIR)/lib -lbrotlicommon -lbrotlienc -lbrotlidec
-
-all: server client hello simplecli simplesvr upload redirect ssesvr ssecli benchmark one_time_request server_and_client
 
 server : server.cc ../httplib.h Makefile
-	$(CXX) -o server $(CXXFLAGS) server.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+	$(CXX) -o server $(CXXFLAGS) server.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT)
 
 client : client.cc ../httplib.h Makefile
-	$(CXX) -o client $(CXXFLAGS) client.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+	$(CXX) -o client $(CXXFLAGS) client.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT)
 
 hello : hello.cc ../httplib.h Makefile
-	$(CXX) -o hello $(CXXFLAGS) hello.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+	$(CXX) -o hello $(CXXFLAGS) hello.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT)
-
-simplecli : simplecli.cc ../httplib.h Makefile
-	$(CXX) -o simplecli $(CXXFLAGS) simplecli.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
 
 simplesvr : simplesvr.cc ../httplib.h Makefile
-	$(CXX) -o simplesvr $(CXXFLAGS) simplesvr.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+	$(CXX) -o simplesvr $(CXXFLAGS) simplesvr.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT)
 
 upload : upload.cc ../httplib.h Makefile
-	$(CXX) -o upload $(CXXFLAGS) upload.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+	$(CXX) -o upload $(CXXFLAGS) upload.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT)
 
 redirect : redirect.cc ../httplib.h Makefile
-	$(CXX) -o redirect $(CXXFLAGS) redirect.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+	$(CXX) -o redirect $(CXXFLAGS) redirect.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT)
 
-ssesvr : ssesvr.cc ../httplib.h Makefile
+sse : sse.cc ../httplib.h Makefile
-	$(CXX) -o ssesvr $(CXXFLAGS) ssesvr.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+	$(CXX) -o sse $(CXXFLAGS) sse.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT)
-
-ssecli : ssecli.cc ../httplib.h Makefile
-	$(CXX) -o ssecli $(CXXFLAGS) ssecli.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
 
 benchmark : benchmark.cc ../httplib.h Makefile
-	$(CXX) -o benchmark $(CXXFLAGS) benchmark.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
+	$(CXX) -o benchmark $(CXXFLAGS) benchmark.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT)
-
-one_time_request : one_time_request.cc ../httplib.h Makefile
-	$(CXX) -o one_time_request $(CXXFLAGS) one_time_request.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
-
-server_and_client : server_and_client.cc ../httplib.h Makefile
-	$(CXX) -o server_and_client $(CXXFLAGS) server_and_client.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
 
 pem:
 	openssl genrsa 2048 > key.pem
 	openssl req -new -key key.pem | openssl x509 -days 3650 -req -signkey key.pem > cert.pem
 
 clean:
-	rm server client hello simplecli simplesvr upload redirect ssesvr ssecli benchmark one_time_request server_and_client *.pem
+	rm server client hello simplesvr upload redirect sse benchmark *.pem

example/benchmark.cc

@@ -26,7 +26,7 @@ int main(void) {
   for (int i = 0; i < 3; i++) {
     StopWatch sw(to_string(i).c_str());
     auto res = cli.Post("/post", body, "application/octet-stream");
-    assert(res->status == httplib::StatusCode::OK_200);
+    assert(res->status == 200);
   }
 
   return 0;

example/client.cc

@@ -23,12 +23,12 @@ int main(void) {
   httplib::Client cli("localhost", 8080);
 #endif
 
-  if (auto res = cli.Get("/hi")) {
+  auto res = cli.Get("/hi");
+  if (res) {
     cout << res->status << endl;
     cout << res->get_header_value("Content-Type") << endl;
     cout << res->body << endl;
   } else {
-    cout << "error code: " << res.error() << std::endl;
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
     auto result = cli.get_openssl_verify_result();
     if (result) {

example/client.vcxproj

@@ -22,34 +22,34 @@
     <ProjectGuid>{6DB1FC63-B153-4279-92B7-D8A11AF285D6}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>client</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

example/hello.cc

@@ -15,5 +15,5 @@ int main(void) {
     res.set_content("Hello World!", "text/plain");
   });
 
-  svr.listen("0.0.0.0", 8080);
+  svr.listen("localhost", 1234);
 }

example/one_time_request.cc

@@ -1,56 +0,0 @@
-#include <httplib.h>
-#include <iostream>
-
-using namespace httplib;
-
-const char *HOST = "localhost";
-const int PORT = 1234;
-
-void one_time_request_server(const char *label) {
-  std::thread th;
-  Server svr;
-
-  svr.Get("/hi", [&](const Request & /*req*/, Response &res) {
-    res.set_content(std::string("Hello from ") + label, "text/plain");
-
-    // Stop server
-    th = std::thread([&]() { svr.stop(); });
-  });
-
-  svr.listen(HOST, PORT);
-  th.join();
-
-  std::cout << label << " ended..." << std::endl;
-}
-
-void send_request(const char *label) {
-  Client cli(HOST, PORT);
-
-  std::cout << "Send " << label << " request" << std::endl;
-  auto res = cli.Get("/hi");
-
-  if (res) {
-    std::cout << res->body << std::endl;
-  } else {
-    std::cout << "Request error: " + to_string(res.error()) << std::endl;
-  }
-}
-
-int main(void) {
-  auto th1 = std::thread([&]() { one_time_request_server("Server #1"); });
-  auto th2 = std::thread([&]() { one_time_request_server("Server #2"); });
-
-  std::this_thread::sleep_for(std::chrono::milliseconds(100));
-
-  send_request("1st");
-  std::this_thread::sleep_for(std::chrono::milliseconds(100));
-
-  send_request("2nd");
-  std::this_thread::sleep_for(std::chrono::milliseconds(100));
-
-  send_request("3rd");
-  std::this_thread::sleep_for(std::chrono::milliseconds(100));
-
-  th1.join();
-  th2.join();
-}

example/server.vcxproj

@@ -18,41 +18,38 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="simplesvr.cc" />
-  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{864CD288-050A-4C8B-9BEF-3048BD876C5B}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>sample</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -154,6 +151,9 @@
       <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="server.cc" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

example/server_and_client.cc

@@ -1,90 +0,0 @@
-//
-//  server_and_client.cc
-//
-//  Copyright (c) 2025 Yuji Hirose. All rights reserved.
-//  MIT License
-//
-
-#include <httplib.h>
-#include <iostream>
-#include <string>
-
-using namespace httplib;
-
-std::string dump_headers(const Headers &headers) {
-  std::string s;
-  char buf[BUFSIZ];
-
-  for (auto it = headers.begin(); it != headers.end(); ++it) {
-    const auto &x = *it;
-    snprintf(buf, sizeof(buf), "%s: %s\n", x.first.c_str(), x.second.c_str());
-    s += buf;
-  }
-
-  return s;
-}
-
-void logger(const Request &req, const Response &res) {
-  std::string s;
-  char buf[BUFSIZ];
-
-  s += "================================\n";
-
-  snprintf(buf, sizeof(buf), "%s %s %s", req.method.c_str(),
-           req.version.c_str(), req.path.c_str());
-  s += buf;
-
-  std::string query;
-  for (auto it = req.params.begin(); it != req.params.end(); ++it) {
-    const auto &x = *it;
-    snprintf(buf, sizeof(buf), "%c%s=%s",
-             (it == req.params.begin()) ? '?' : '&', x.first.c_str(),
-             x.second.c_str());
-    query += buf;
-  }
-  snprintf(buf, sizeof(buf), "%s\n", query.c_str());
-  s += buf;
-
-  s += dump_headers(req.headers);
-
-  s += "--------------------------------\n";
-
-  snprintf(buf, sizeof(buf), "%d %s\n", res.status, res.version.c_str());
-  s += buf;
-  s += dump_headers(res.headers);
-  s += "\n";
-
-  if (!res.body.empty()) { s += res.body; }
-
-  s += "\n";
-
-  std::cout << s;
-}
-
-int main(void) {
-  // Server
-  Server svr;
-  svr.set_logger(logger);
-
-  svr.Post("/post", [&](const Request & /*req*/, Response &res) {
-    res.set_content("POST", "text/plain");
-  });
-
-  auto th = std::thread([&]() { svr.listen("localhost", 8080); });
-
-  auto se = detail::scope_exit([&] {
-    svr.stop();
-    th.join();
-  });
-
-  svr.wait_until_ready();
-
-  // Client
-  Client cli{"localhost", 8080};
-
-  std::string body = R"({"hello": "world"})";
-
-  auto res = cli.Post("/post", body, "application/json");
-  std::cout << "--------------------------------" << std::endl;
-  std::cout << to_string(res.error()) << std::endl;
-}

example/simplecli.cc

@@ -1,29 +0,0 @@
-//
-//  simplecli.cc
-//
-//  Copyright (c) 2019 Yuji Hirose. All rights reserved.
-//  MIT License
-//
-
-#include <httplib.h>
-#include <iostream>
-
-using namespace std;
-
-int main(void) {
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-  auto scheme_host_port = "https://localhost:8080";
-#else
-  auto scheme_host_port = "http://localhost:8080";
-#endif
-
-  if (auto res = httplib::Client(scheme_host_port).Get("/hi")) {
-    cout << res->status << endl;
-    cout << res->get_header_value("Content-Type") << endl;
-    cout << res->body << endl;
-  } else {
-    cout << res.error() << endl;
-  }
-
-  return 0;
-}

example/simplesvr.cc

@@ -46,7 +46,7 @@ string dump_multipart_files(const MultipartFormDataMap &files) {
     snprintf(buf, sizeof(buf), "content type: %s\n", file.content_type.c_str());
     s += buf;
 
-    snprintf(buf, sizeof(buf), "text length: %zu\n", file.content.size());
+    snprintf(buf, sizeof(buf), "text length: %lu\n", file.content.size());
     s += buf;
 
     s += "----------------\n";

example/sse.cc

@@ -1,3 +1,10 @@
+//
+//  sse.cc
+//
+//  Copyright (c) 2020 Yuji Hirose. All rights reserved.
+//  MIT License
+//
+
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
@@ -12,13 +19,16 @@ using namespace std;
 
 class EventDispatcher {
 public:
-  EventDispatcher() {}
+  EventDispatcher() {
+    id_ = 0;
+    cid_ = -1;
+  }
 
   void wait_event(DataSink *sink) {
     unique_lock<mutex> lk(m_);
     int id = id_;
     cv_.wait(lk, [&] { return cid_ == id; });
-    sink->write(message_.data(), message_.size());
+    if (sink->is_writable()) { sink->write(message_.data(), message_.size()); }
   }
 
   void send_event(const string &message) {
@@ -31,8 +41,8 @@ public:
 private:
   mutex m_;
   condition_variable cv_;
-  atomic_int id_{0};
+  atomic_int id_;
-  atomic_int cid_{-1};
+  atomic_int cid_;
   string message_;
 };
 
@@ -69,20 +79,16 @@ int main(void) {
 
   svr.Get("/event1", [&](const Request & /*req*/, Response &res) {
     cout << "connected to event1..." << endl;
-    res.set_chunked_content_provider("text/event-stream",
+    res.set_header("Content-Type", "text/event-stream");
-                                     [&](size_t /*offset*/, DataSink &sink) {
+    res.set_chunked_content_provider(
-                                       ed.wait_event(&sink);
+        [&](uint64_t /*offset*/, DataSink &sink) { ed.wait_event(&sink); });
-                                       return true;
-                                     });
   });
 
   svr.Get("/event2", [&](const Request & /*req*/, Response &res) {
     cout << "connected to event2..." << endl;
-    res.set_chunked_content_provider("text/event-stream",
+    res.set_header("Content-Type", "text/event-stream");
-                                     [&](size_t /*offset*/, DataSink &sink) {
+    res.set_chunked_content_provider(
-                                       ed.wait_event(&sink);
+        [&](uint64_t /*offset*/, DataSink &sink) { ed.wait_event(&sink); });
-                                       return true;
-                                     });
   });
 
   thread t([&] {

example/ssecli.cc

@@ -1,21 +0,0 @@
-//
-//  ssecli.cc
-//
-//  Copyright (c) 2019 Yuji Hirose. All rights reserved.
-//  MIT License
-//
-
-#include <httplib.h>
-#include <iostream>
-
-using namespace std;
-
-int main(void) {
-  httplib::Client("http://localhost:1234")
-      .Get("/event1", [&](const char *data, size_t data_length) {
-        std::cout << string(data, data_length);
-        return true;
-      });
-
-  return 0;
-}

example/uploader.sh

@@ -1,6 +0,0 @@
-#/usr/bin/env bash
-for i in {1..1000000}
-do
-  echo "#### $i ####"
-  curl -X POST -F image_file=@$1 http://localhost:1234/post > /dev/null
-done

meson.build

@@ -1,116 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
-#
-# SPDX-License-Identifier: MIT
-
-project(
-  'cpp-httplib',
-  'cpp',
-  license: 'MIT',
-  default_options: [
-    'cpp_std=c++11',
-    'buildtype=release',
-    'b_ndebug=if-release',
-    'b_lto=true',
-    'warning_level=3'
-  ],
-  meson_version: '>=0.62.0'
-)
-
-# Check just in case downstream decides to edit the source
-# and add a project version
-version = meson.project_version()
-if version == 'undefined'
-  cxx = meson.get_compiler('cpp')
-  version = cxx.get_define('CPPHTTPLIB_VERSION',
-    prefix: '#include <httplib.h>',
-    include_directories: include_directories('.')).strip('"')
-  assert(version != '', 'failed to get version from httplib.h')
-endif
-
-deps = [dependency('threads')]
-args = []
-
-openssl_dep = dependency('openssl', version: '>=3.0.0', required: get_option('cpp-httplib_openssl'))
-if openssl_dep.found()
-  deps += openssl_dep
-  args += '-DCPPHTTPLIB_OPENSSL_SUPPORT'
-  if host_machine.system() == 'darwin'
-    macosx_keychain_dep = dependency('appleframeworks', modules: ['CoreFoundation', 'Security'], required: get_option('cpp-httplib_macosx_keychain'))
-    if macosx_keychain_dep.found()
-        deps += macosx_keychain_dep
-        args += '-DCPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN'
-    endif  
-  endif
-endif
-
-zlib_dep = dependency('zlib', required: get_option('cpp-httplib_zlib'))
-if zlib_dep.found()
-  deps += zlib_dep
-  args += '-DCPPHTTPLIB_ZLIB_SUPPORT'
-endif
-
-brotli_deps = [dependency('libbrotlicommon', required: get_option('cpp-httplib_brotli'))]
-brotli_deps += dependency('libbrotlidec',    required: get_option('cpp-httplib_brotli'))
-brotli_deps += dependency('libbrotlienc',    required: get_option('cpp-httplib_brotli'))
-
-brotli_found_all = true
-foreach brotli_dep : brotli_deps
-  if not brotli_dep.found()
-    brotli_found_all = false
-  endif
-endforeach
-
-if brotli_found_all
-  deps += brotli_deps
-  args += '-DCPPHTTPLIB_BROTLI_SUPPORT'
-endif
-
-cpp_httplib_dep = dependency('', required: false)
-
-if get_option('cpp-httplib_compile')
-  python3 = find_program('python3')
-
-  httplib_ch = custom_target(
-    'split',
-    input: 'httplib.h',
-    output: ['httplib.cc', 'httplib.h'],
-    command: [python3, files('split.py'), '--out', meson.current_build_dir()],
-    install: true,
-    install_dir: [false, get_option('includedir')]
-  )
-  lib = library(
-    'cpp-httplib',
-    sources: httplib_ch,
-    dependencies: deps,
-    cpp_args: args,
-    version: version,
-    soversion: version.split('.')[0] + '.' + version.split('.')[1],
-    install: true
-  )
-  cpp_httplib_dep = declare_dependency(compile_args: args, dependencies: deps, link_with: lib, sources: httplib_ch[1])
-
-  import('pkgconfig').generate(
-    lib,
-    description: 'A C++ HTTP/HTTPS server and client library',
-    extra_cflags: args,
-    url: 'https://github.com/yhirose/cpp-httplib',
-    version: version
-  )
-else
-  install_headers('httplib.h')
-  cpp_httplib_dep = declare_dependency(compile_args: args, dependencies: deps, include_directories: '.')
-
-  import('pkgconfig').generate(
-    name: 'cpp-httplib',
-    description: 'A C++ HTTP/HTTPS server and client library',
-    install_dir: get_option('datadir')/'pkgconfig',
-    url: 'https://github.com/yhirose/cpp-httplib',
-    version: version
-  )
-endif
-
-meson.override_dependency('cpp-httplib', cpp_httplib_dep)
-
-if get_option('cpp-httplib_test')
-  subdir('test')
-endif

meson_options.txt

@@ -1,10 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
-#
-# SPDX-License-Identifier: MIT
-
-option('cpp-httplib_openssl', type: 'feature', value: 'auto', description: 'Enable OpenSSL support')
-option('cpp-httplib_zlib',    type: 'feature', value: 'auto', description: 'Enable zlib support')
-option('cpp-httplib_brotli',  type: 'feature', value: 'auto', description: 'Enable Brotli support')
-option('cpp-httplib_macosx_keychain', type: 'feature', value: 'auto', description: 'Enable loading certs from the Keychain on Apple devices')
-option('cpp-httplib_compile', type: 'boolean', value: false,  description: 'Split the header into a compilable header & source file (requires python3)')
-option('cpp-httplib_test',    type: 'boolean', value: false,  description: 'Build tests')

split.py

@@ -1,67 +1,32 @@
-#!/usr/bin/env python3
-
-"""This script splits httplib.h into .h and .cc parts."""
-
-import argparse
 import os
 import sys
 
 border = '// ----------------------------------------------------------------------------'
 
-args_parser = argparse.ArgumentParser(description=__doc__)
+PythonVersion = sys.version_info[0];
-args_parser.add_argument(
-    "-e", "--extension", help="extension of the implementation file (default: cc)",
-    default="cc"
-)
-args_parser.add_argument(
-    "-o", "--out", help="where to write the files (default: out)", default="out"
-)
-args = args_parser.parse_args()
 
-cur_dir = os.path.dirname(sys.argv[0])
+with open('httplib.h') as f:
-lib_name = 'httplib'
+    lines = f.readlines()
-header_name = '/' + lib_name + '.h'
+    inImplementation = False
-source_name = '/' + lib_name + '.' + args.extension
-# get the input file
-in_file = cur_dir + header_name
-# get the output file
-h_out = args.out + header_name
-cc_out = args.out + source_name
     
-# if the modification time of the out file is after the in file,
+    if PythonVersion < 3:
-# don't split (as it is already finished)
+        os.makedirs('out')
-do_split = True
-
-if os.path.exists(h_out):
-    in_time = os.path.getmtime(in_file)
-    out_time = os.path.getmtime(h_out)
-    do_split = in_time > out_time
-
-if do_split:
-    with open(in_file) as f:
-        lines = f.readlines()
-
-    python_version = sys.version_info[0]
-    if python_version < 3:
-        os.makedirs(args.out)
     else:
-        os.makedirs(args.out, exist_ok=True)
+        os.makedirs('out', exist_ok=True)
         
-    in_implementation = False
+    with open('out/httplib.h', 'w') as fh:
-    cc_out = args.out + source_name
+        with open('out/httplib.cc', 'w') as fc:
-    with open(h_out, 'w') as fh, open(cc_out, 'w') as fc:
+            fc.write('#include "httplib.h"\n')
-        fc.write('#include "httplib.h"\n')
+            fc.write('namespace httplib {\n')
-        fc.write('namespace httplib {\n')
+            for line in lines:
-        for line in lines:
+                isBorderLine = border in line
-            is_border_line = border in line
+                if isBorderLine:
-            if is_border_line:
+                    inImplementation = not inImplementation
-                in_implementation = not in_implementation
+                else:
-            elif in_implementation:
+                    if inImplementation:
-                fc.write(line.replace('inline ', ''))
+                        fc.write(line.replace('inline ', ''))
-            else:
+                        pass
-                fh.write(line)
+                    else:
-        fc.write('} // namespace httplib\n')
+                        fh.write(line)
-
+                        pass
-    print("Wrote {} and {}".format(h_out, cc_out))
+            fc.write('} // namespace httplib\n')
-else:
-    print("{} and {} are up to date".format(h_out, cc_out))

test/CMakeLists.txt

@@ -1,121 +0,0 @@
-find_package(GTest)
-
-if(GTest_FOUND)
-    if(NOT TARGET GTest::gtest_main AND TARGET GTest::Main)
-        # CMake <3.20
-        add_library(GTest::gtest_main INTERFACE IMPORTED)
-        target_link_libraries(GTest::gtest_main INTERFACE GTest::Main)
-    endif()
-else()
-    if(POLICY CMP0135)
-        cmake_policy(SET CMP0135 NEW)
-    endif()
-
-    include(FetchContent)
-
-    set(BUILD_GMOCK OFF)
-    set(INSTALL_GTEST OFF)
-    set(gtest_force_shared_crt ON)
-
-    FetchContent_Declare(
-        gtest
-        URL https://github.com/google/googletest/archive/main.tar.gz
-    )
-    FetchContent_MakeAvailable(gtest)
-endif()
-
-find_package(CURL REQUIRED)
-
-add_executable(httplib-test test.cc include_httplib.cc $<$<BOOL:${WIN32}>:include_windows_h.cc>)
-target_compile_options(httplib-test PRIVATE "$<$<CXX_COMPILER_ID:MSVC>:/utf-8;/bigobj>")
-target_link_libraries(httplib-test PRIVATE httplib GTest::gtest_main CURL::libcurl)
-gtest_discover_tests(httplib-test)
-
-file(
-    COPY www www2 www3 ca-bundle.crt image.jpg
-    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
-)
-
-if(HTTPLIB_IS_USING_OPENSSL)
-    if (OPENSSL_VERSION VERSION_LESS "3.2.0")
-      set(OPENSSL_X509_FLAG "-x509")
-    else()
-      set(OPENSSL_X509_FLAG "-x509v1")
-    endif()
-    find_program(OPENSSL_COMMAND
-        NAMES openssl
-        PATHS ${OPENSSL_INCLUDE_DIR}/../bin
-        REQUIRED
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} genrsa 2048
-        OUTPUT_FILE key.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key key.pem
-        COMMAND ${OPENSSL_COMMAND} x509 -days 3650 -req -signkey key.pem
-        OUTPUT_FILE cert.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} req ${OPENSSL_X509_FLAG} -new -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key key.pem -sha256 -days 3650 -nodes -out cert2.pem -extensions SAN
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} genrsa 2048
-        OUTPUT_FILE rootCA.key.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} req ${OPENSSL_X509_FLAG} -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.rootCA.conf -key rootCA.key.pem -days 1024
-        OUTPUT_FILE rootCA.cert.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} genrsa 2048
-        OUTPUT_FILE client.key.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key client.key.pem
-        COMMAND ${OPENSSL_COMMAND} x509 -days 370 -req -CA rootCA.cert.pem -CAkey rootCA.key.pem -CAcreateserial
-        OUTPUT_FILE client.cert.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} genrsa -passout pass:test123! 2048
-        OUTPUT_FILE key_encrypted.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key key_encrypted.pem
-        COMMAND ${OPENSSL_COMMAND} x509 -days 3650 -req -signkey key_encrypted.pem
-        OUTPUT_FILE cert_encrypted.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} genrsa -aes256 -passout pass:test012! 2048
-        OUTPUT_FILE client_encrypted.key.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-    execute_process(
-        COMMAND ${OPENSSL_COMMAND} req -new -batch -config ${CMAKE_CURRENT_LIST_DIR}/test.conf -key client_encrypted.key.pem -passin pass:test012!
-        COMMAND ${OPENSSL_COMMAND} x509 -days 370 -req -CA rootCA.cert.pem -CAkey rootCA.key.pem -CAcreateserial
-        OUTPUT_FILE client_encrypted.cert.pem
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMAND_ERROR_IS_FATAL ANY
-    )
-endif()
-
-add_subdirectory(fuzzing)

test/Makefile

@@ -1,100 +1,30 @@
-CXX = clang++
-CXXFLAGS = -g -std=c++11 -I. -Wall -Wextra -Wtype-limits -Wconversion -Wshadow # -fno-exceptions -DCPPHTTPLIB_NO_EXCEPTIONS -fsanitize=address
 
-PREFIX ?= $(shell brew --prefix)
+#CXX = clang++
-
+CXXFLAGS = -ggdb -O0 -std=c++11 -DGTEST_USE_OWN_TR1_TUPLE -I.. -I. -Wall -Wextra -Wtype-limits -Wconversion
-OPENSSL_DIR = $(PREFIX)/opt/openssl@3
+OPENSSL_DIR = /usr/local/opt/openssl
 OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I$(OPENSSL_DIR)/include -L$(OPENSSL_DIR)/lib -lssl -lcrypto
-
-ifneq ($(OS), Windows_NT)
-	UNAME_S := $(shell uname -s)
-	ifeq ($(UNAME_S), Darwin)
-		OPENSSL_SUPPORT += -DCPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN -framework CoreFoundation -framework Security
-	endif
-endif
-
 ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz
 
-BROTLI_DIR = $(PREFIX)/opt/brotli
+all : test
-BROTLI_SUPPORT = -DCPPHTTPLIB_BROTLI_SUPPORT -I$(BROTLI_DIR)/include -L$(BROTLI_DIR)/lib -lbrotlicommon -lbrotlienc -lbrotlidec
-
-TEST_ARGS = gtest/gtest-all.cc gtest/gtest_main.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT) -pthread -lcurl
-
-# By default, use standalone_fuzz_target_runner.
-# This runner does no fuzzing, but simply executes the inputs
-# provided via parameters.
-# Run e.g. "make all LIB_FUZZING_ENGINE=/path/to/libFuzzer.a"
-# to link the fuzzer(s) against a real fuzzing engine.
-# OSS-Fuzz will define its own value for LIB_FUZZING_ENGINE.
-LIB_FUZZING_ENGINE ?= standalone_fuzz_target_runner.o
-
-CLANG_FORMAT = clang-format
-REALPATH = $(shell which grealpath 2>/dev/null || which realpath 2>/dev/null)
-STYLE_CHECK_FILES = $(filter-out httplib.h httplib.cc, \
-	$(wildcard example/*.h example/*.cc fuzzing/*.h fuzzing/*.cc *.h *.cc ../httplib.h))
-
-all : test test_split
 	./test
 
 proxy : test_proxy
 	./test_proxy
 
-test : test.cc include_httplib.cc ../httplib.h Makefile cert.pem
+test : test.cc ../httplib.h Makefile cert.pem
-	$(CXX) -o $@ -I.. $(CXXFLAGS) test.cc include_httplib.cc $(TEST_ARGS)
+	$(CXX) -o test $(CXXFLAGS) test.cc gtest/gtest-all.cc gtest/gtest_main.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) -pthread
-
-# Note: The intention of test_split is to verify that it works to compile and
-# link the split httplib.h, so there is normally no need to execute it.
-test_split : test.cc ../httplib.h httplib.cc Makefile cert.pem
-	$(CXX) -o $@ $(CXXFLAGS) test.cc httplib.cc $(TEST_ARGS)
-
-check_abi:
-	@./check-shared-library-abi-compatibility.sh
-
-.PHONY: style_check
-style_check: $(STYLE_CHECK_FILES)
-	@for file in $(STYLE_CHECK_FILES); do \
-		$(CLANG_FORMAT) $$file > $$file.formatted; \
-		if ! diff -u $$file $$file.formatted; then \
-			file2=$$($(REALPATH) --relative-to=.. $$file); \
-			printf "\n%*s\n" 80 | tr ' ' '#'; \
-			printf "##%*s##\n" 76; \
-			printf "##   %-70s   ##\n" "$$file2 not properly formatted. Please run clang-format."; \
-			printf "##%*s##\n" 76; \
-			printf "%*s\n\n" 80 | tr ' ' '#'; \
-			failed=1; \
-		fi; \
-		rm -f $$file.formatted; \
-	done; \
-	if [ -n "$$failed" ]; then \
-		echo "Style check failed for one or more files. See above for details."; \
-		false; \
-	else \
-		echo "All files are properly formatted."; \
-	fi
 
 test_proxy : test_proxy.cc ../httplib.h Makefile cert.pem
-	$(CXX) -o $@ -I.. $(CXXFLAGS) test_proxy.cc $(TEST_ARGS)
+	$(CXX) -o test_proxy $(CXXFLAGS) test_proxy.cc gtest/gtest-all.cc gtest/gtest_main.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) -pthread
-
-# Runs server_fuzzer.cc based on value of $(LIB_FUZZING_ENGINE).
-# Usage: make fuzz_test LIB_FUZZING_ENGINE=/path/to/libFuzzer
-fuzz_test: server_fuzzer
-	./server_fuzzer fuzzing/corpus/*
-
-# Fuzz target, so that you can choose which $(LIB_FUZZING_ENGINE) to use.
-server_fuzzer : fuzzing/server_fuzzer.cc ../httplib.h standalone_fuzz_target_runner.o
-	$(CXX) -o $@ -I.. $(CXXFLAGS) $< $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT) $(LIB_FUZZING_ENGINE) -pthread
-
-# Standalone fuzz runner, which just reads inputs from fuzzing/corpus/ dir and
-# feeds it to server_fuzzer.
-standalone_fuzz_target_runner.o : fuzzing/standalone_fuzz_target_runner.cpp
-	$(CXX) -o $@ -I.. $(CXXFLAGS) -c $<
-
-httplib.cc : ../httplib.h
-	python3 ../split.py -o .
 
 cert.pem:
-	./gen-certs.sh
+	openssl genrsa 2048 > key.pem
+	openssl req -new -batch -config test.conf -key key.pem | openssl x509 -days 3650 -req -signkey key.pem > cert.pem
+	openssl genrsa 2048 > rootCA.key.pem
+	openssl req -x509 -new -batch -config test.rootCA.conf -key rootCA.key.pem -days 1024 > rootCA.cert.pem
+	openssl genrsa 2048 > client.key.pem
+	openssl req -new -batch -config test.conf -key client.key.pem | openssl x509 -days 370 -req -CA rootCA.cert.pem -CAkey rootCA.key.pem -CAcreateserial > client.cert.pem
+	#c_rehash .
 
 clean:
-	rm -rf test test_split test_proxy server_fuzzer *.pem *.0 *.o *.1 *.srl httplib.h httplib.cc _build* *.dSYM
+	rm -f test test_proxy pem *.0 *.1 *.srl
-

test/fuzzing/CMakeLists.txt

@@ -1,10 +0,0 @@
-file(GLOB HTTPLIB_CORPUS corpus/*)
-add_executable(httplib-test-fuzz
-    server_fuzzer.cc
-    standalone_fuzz_target_runner.cpp
-)
-target_link_libraries(httplib-test-fuzz PRIVATE httplib)
-add_test(
-    NAME httplib-test-fuzz
-    COMMAND httplib-test-fuzz ${HTTPLIB_CORPUS}
-)

test/fuzzing/Makefile

@@ -1,27 +0,0 @@
-
-#CXX = clang++
-# Do not add default sanitizer flags here as OSS-fuzz adds its own sanitizer flags.
-CXXFLAGS += -ggdb -O0 -std=c++11 -DGTEST_USE_OWN_TR1_TUPLE -I../.. -I. -Wall -Wextra -Wtype-limits -Wconversion
-
-OPENSSL_DIR = /usr/local/opt/openssl@1.1
-
-# Using full path to libssl and libcrypto to avoid accidentally picking openssl libs brought in by msan.
-OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I$(OPENSSL_DIR)/include -I$(OPENSSL_DIR)/lib  /usr/local/lib/libssl.a /usr/local/lib/libcrypto.a
-
-ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz
-
-BROTLI_DIR = /usr/local/opt/brotli
-# BROTLI_SUPPORT = -DCPPHTTPLIB_BROTLI_SUPPORT -I$(BROTLI_DIR)/include -L$(BROTLI_DIR)/lib -lbrotlicommon -lbrotlienc -lbrotlidec
-
-# Runs all the tests and also fuzz tests against seed corpus.
-all : server_fuzzer
-	./server_fuzzer corpus/*
-
-# Fuzz target, so that you can choose which $(LIB_FUZZING_ENGINE) to use.
-server_fuzzer : server_fuzzer.cc ../../httplib.h
-# 	$(CXX) $(CXXFLAGS) -o $@  $<  -Wl,-Bstatic $(OPENSSL_SUPPORT)  -Wl,-Bdynamic -ldl  $(ZLIB_SUPPORT)  $(LIB_FUZZING_ENGINE) -pthread
-	$(CXX) $(CXXFLAGS) -o $@  $<  $(ZLIB_SUPPORT)  $(LIB_FUZZING_ENGINE) -pthread
-	zip -q -r server_fuzzer_seed_corpus.zip corpus
-
-clean:
-	rm -f server_fuzzer pem *.0 *.o *.1 *.srl *.zip

test/fuzzing/corpus/1

@@ -1 +0,0 @@
-PUT /search/sample?a=12 HTTP/1.1

test/fuzzing/corpus/2

@@ -1,5 +0,0 @@
-GET /hello.htm HTTP/1.1
-User-Agent: Mozilla/4.0 (compatible; MSIE5.01; Windows NT)
-Accept-Language: en-us
-Accept-Encoding: gzip, deflate
-Connection: Keep-Alive

test/fuzzing/server_fuzzer.cc

@@ -1,100 +0,0 @@
-#include <cstdint>
-
-#include <httplib.h>
-
-class FuzzedStream : public httplib::Stream {
-public:
-  FuzzedStream(const uint8_t *data, size_t size)
-      : data_(data), size_(size), read_pos_(0) {}
-
-  ssize_t read(char *ptr, size_t size) override {
-    if (size + read_pos_ > size_) { size = size_ - read_pos_; }
-    memcpy(ptr, data_ + read_pos_, size);
-    read_pos_ += size;
-    return static_cast<ssize_t>(size);
-  }
-
-  ssize_t write(const char *ptr, size_t size) override {
-    response_.append(ptr, size);
-    return static_cast<int>(size);
-  }
-
-  ssize_t write(const char *ptr) { return write(ptr, strlen(ptr)); }
-
-  ssize_t write(const std::string &s) { return write(s.data(), s.size()); }
-
-  bool is_readable() const override { return true; }
-
-  bool wait_readable() const override { return true; }
-
-  bool wait_writable() const override { return true; }
-
-  void get_remote_ip_and_port(std::string &ip, int &port) const override {
-    ip = "127.0.0.1";
-    port = 8080;
-  }
-
-  void get_local_ip_and_port(std::string &ip, int &port) const override {
-    ip = "127.0.0.1";
-    port = 8080;
-  }
-
-  socket_t socket() const override { return 0; }
-
-  time_t duration() const override { return 0; };
-
-private:
-  const uint8_t *data_;
-  size_t size_;
-  size_t read_pos_;
-  std::string response_;
-};
-
-class FuzzableServer : public httplib::Server {
-public:
-  void ProcessFuzzedRequest(FuzzedStream &stream) {
-    bool connection_close = false;
-    process_request(stream,
-                    /*remote_addr=*/"",
-                    /*remote_port =*/0,
-                    /*local_addr=*/"",
-                    /*local_port =*/0,
-                    /*last_connection=*/false, connection_close, nullptr);
-  }
-};
-
-static FuzzableServer g_server;
-
-extern "C" int LLVMFuzzerInitialize(int * /*argc*/, char *** /*argv*/) {
-  g_server.Get(R"(.*)",
-               [&](const httplib::Request & /*req*/, httplib::Response &res) {
-                 res.set_content("response content", "text/plain");
-               });
-  g_server.Post(R"(.*)",
-                [&](const httplib::Request & /*req*/, httplib::Response &res) {
-                  res.set_content("response content", "text/plain");
-                });
-  g_server.Put(R"(.*)",
-               [&](const httplib::Request & /*req*/, httplib::Response &res) {
-                 res.set_content("response content", "text/plain");
-               });
-  g_server.Patch(R"(.*)",
-                 [&](const httplib::Request & /*req*/, httplib::Response &res) {
-                   res.set_content("response content", "text/plain");
-                 });
-  g_server.Delete(
-      R"(.*)", [&](const httplib::Request & /*req*/, httplib::Response &res) {
-        res.set_content("response content", "text/plain");
-      });
-  g_server.Options(
-      R"(.*)", [&](const httplib::Request & /*req*/, httplib::Response &res) {
-        res.set_content("response content", "text/plain");
-      });
-  return 0;
-}
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
-  FuzzedStream stream{data, size};
-  g_server.ProcessFuzzedRequest(stream);
-  return 0;
-}

test/fuzzing/server_fuzzer.dict

@@ -1,224 +0,0 @@
-# Sources: https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
-
-# misc
-"HTTP/1.1"
-
-# verbs
-"CONNECT"
-"DELETE"
-"GET"
-"HEAD"
-"OPTIONS"
-"PATCH"
-"POST"
-"PUT"
-"TRACE"
-
-
-# Webdav/caldav verbs
-"ACL"
-"BASELINE-CONTROL"
-"BIND"
-"CHECKIN"
-"CHECKOUT"
-"COPY"
-"LABEL"
-"LINK"
-"LOCK"
-"MERGE"
-"MKACTIVITY"
-"MKCALENDAR"
-"MKCOL"
-"MKREDIRECTREF"
-"MKWORKSPACE"
-"MOVE"
-"ORDERPATCH"
-"PRI"
-"PROPFIND"
-"PROPPATCH"
-"REBIND"
-"REPORT"
-"SEARCH"
-"UNBIND"
-"UNCHECKOUT"
-"UNLINK"
-"UNLOCK"
-"UPDATE"
-"UPDATEREDIRECTREF"
-"VERSION-CONTROL"
-
-
-# Fields
-"A-IM"
-"Accept"
-"Accept-Charset"
-"Accept-Datetime"
-"Accept-Encoding"
-"Accept-Language"
-"Accept-Patch"
-"Accept-Ranges"
-"Access-Control-Allow-Credentials"
-"Access-Control-Allow-Headers"
-"Access-Control-Allow-Methods"
-"Access-Control-Allow-Origin"
-"Access-Control-Expose-Headers"
-"Access-Control-Max-Age"
-"Access-Control-Request-Headers"
-"Access-Control-Request-Method"
-"Age"
-"Allow"
-"Alt-Svc"
-"Authorization"
-"Cache-Control"
-"Connection"
-"Connection:"
-"Content-Disposition"
-"Content-Encoding"
-"Content-Language"
-"Content-Length"
-"Content-Location"
-"Content-MD5"
-"Content-Range"
-"Content-Security-Policy"
-"Content-Type"
-"Cookie"
-"DNT"
-"Date"
-"Delta-Base"
-"ETag"
-"Expect"
-"Expires"
-"Forwarded"
-"From"
-"Front-End-Https"
-"HTTP2-Settings"
-"Host"
-"IM"
-"If-Match"
-"If-Modified-Since"
-"If-None-Match"
-"If-Range"
-"If-Unmodified-Since"
-"Last-Modified"
-"Link"
-"Location"
-"Max-Forwards"
-"Origin"
-"P3P"
-"Pragma"
-"Proxy-Authenticate"
-"Proxy-Authorization"
-"Proxy-Connection"
-"Public-Key-Pins"
-"Range"
-"Referer"
-"Refresh"
-"Retry-After"
-"Save-Data"
-"Server"
-"Set-Cookie"
-"Status"
-"Strict-Transport-Security"
-"TE"
-"Timing-Allow-Origin"
-"Tk"
-"Trailer"
-"Transfer-Encoding"
-"Upgrade"
-"Upgrade-Insecure-Requests"
-"User-Agent"
-"Vary"
-"Via"
-"WWW-Authenticate"
-"Warning"
-"X-ATT-DeviceId"
-"X-Content-Duration"
-"X-Content-Security-Policy"
-"X-Content-Type-Options"
-"X-Correlation-ID"
-"X-Csrf-Token"
-"X-Forwarded-For"
-"X-Forwarded-Host"
-"X-Forwarded-Proto"
-"X-Frame-Options"
-"X-Http-Method-Override"
-"X-Powered-By"
-"X-Request-ID"
-"X-Requested-With"
-"X-UA-Compatible"
-"X-UIDH"
-"X-Wap-Profile"
-"X-WebKit-CSP"
-"X-XSS-Protection"
-
-# Source: string and character literals in httplib.h
-" "
-"&"
-", "
-"-"
-"--"
-"."
-".."
-":"
-"="
-" = = "
-"0123456789abcdef"
-"%02X"
-"%0A"
-"\\x0a\\x0d"
-"%0D"
-"%20"
-"%27"
-"%2B"
-"%2C"
-"%3A"
-"%3B"
-"application/javascript"
-"application/json"
-"application/pdf"
-"application/xhtml+xml"
-"application/xml"
-"application/x-www-form-urlencoded"
-"Bad Request"
-"boundary="
-"bytes="
-"chunked"
-"close"
-"CONNECT"
-"css"
-"Forbidden"
-"Found"
-"gif"
-"gzip"
-"html"
-"ico"
-"image/gif"
-"image/jpg"
-"image/png"
-"image/svg+xml"
-"image/x-icon"
-"index.html"
-"Internal Server Error"
-"jpeg"
-"js"
-"json"
-"Location"
-"Moved Permanently"
-"multipart/form-data"
-"Not Found"
-"Not Modified"
-"OK"
-"pdf"
-"png"
-"Range"
-"REMOTE_ADDR"
-"See Other"
-"svg"
-"text/"
-"text/css"
-"text/html"
-"text/plain"
-"txt"
-"Unsupported Media Type"
-"xhtml"
-"xml"

test/fuzzing/standalone_fuzz_target_runner.cpp

@@ -1,35 +0,0 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
-// Licensed under the Apache License, Version 2.0 (the "License");
-
-// This runner does not do any fuzzing, but allows us to run the fuzz target
-// on the test corpus or on a single file,
-// e.g. the one that comes from a bug report.
-
-#include <cstdint>
-#include <fstream>
-#include <iostream>
-#include <vector>
-
-// Forward declare the "fuzz target" interface.
-// We deliberately keep this interface simple and header-free.
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
-
-// It reads all files passed as parameters and feeds their contents
-// one by one into the fuzz target (LLVMFuzzerTestOneInput).
-int main(int argc, char **argv) {
-  for (int i = 1; i < argc; i++) {
-    std::ifstream in(argv[i]);
-    in.seekg(0, in.end);
-    size_t length = static_cast<size_t>(in.tellg());
-    in.seekg(0, in.beg);
-    std::cout << "Reading " << length << " bytes from " << argv[i] << std::endl;
-    // Allocate exactly length bytes so that we reliably catch buffer overflows.
-    std::vector<char> bytes(length);
-    in.read(bytes.data(), static_cast<std::streamsize>(bytes.size()));
-    LLVMFuzzerTestOneInput(reinterpret_cast<const uint8_t *>(bytes.data()),
-                           bytes.size());
-    std::cout << "Execution successful" << std::endl;
-  }
-  std::cout << "Execution finished" << std::endl;
-  return 0;
-}

test/gen-certs.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-if [[ $(openssl version) =~ 3\.[2-9]\.[0-9]+ ]]; then
-	OPENSSL_X509_FLAG='-x509v1'
-else
-	OPENSSL_X509_FLAG='-x509'
-fi
-
-openssl genrsa 2048 > key.pem
-openssl req -new -batch -config test.conf -key key.pem | openssl x509 -days 3650 -req -signkey key.pem > cert.pem
-openssl req -x509 -config test.conf -key key.pem -sha256 -days 3650 -nodes -out cert2.pem -extensions SAN
-openssl genrsa 2048 > rootCA.key.pem
-openssl req $OPENSSL_X509_FLAG -new -batch -config test.rootCA.conf -key rootCA.key.pem -days 1024 > rootCA.cert.pem
-openssl genrsa 2048 > client.key.pem
-openssl req -new -batch -config test.conf -key client.key.pem | openssl x509 -days 370 -req -CA rootCA.cert.pem -CAkey rootCA.key.pem -CAcreateserial > client.cert.pem
-openssl genrsa -passout pass:test123! 2048 > key_encrypted.pem
-openssl req -new -batch -config test.conf -key key_encrypted.pem | openssl x509 -days 3650 -req -signkey key_encrypted.pem > cert_encrypted.pem
-openssl genrsa -aes256 -passout pass:test012! 2048 > client_encrypted.key.pem
-openssl req -new -batch -config test.conf -key client_encrypted.key.pem -passin pass:test012! | openssl x509 -days 370 -req -CA rootCA.cert.pem -CAkey rootCA.key.pem -CAcreateserial > client_encrypted.cert.pem

test/gtest/gtest_main.cc

@@ -27,28 +27,13 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <cstdio>
+#include <iostream>
+
 #include "gtest/gtest.h"
 
-#if GTEST_OS_ESP8266 || GTEST_OS_ESP32
-#if GTEST_OS_ESP8266
-extern "C" {
-#endif
-void setup() {
-  testing::InitGoogleTest();
-}
-
-void loop() { RUN_ALL_TESTS(); }
-
-#if GTEST_OS_ESP8266
-}
-#endif
-
-#else
-
 GTEST_API_ int main(int argc, char **argv) {
-  printf("Running main() from %s\n", __FILE__);
+  std::cout << "Running main() from gtest_main.cc\n";
+
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }
-#endif

test/include_httplib.cc

@@ -1,5 +0,0 @@
-// The sole purpose of this file is to include httplib.h in a separate
-// compilation unit, thus verifying that inline keywords have not been forgotten
-// when linked together with test.cc.
-
-#include <httplib.h>

test/include_windows_h.cc

@@ -1,6 +0,0 @@
-// Test if including windows.h conflicts with httplib.h
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#include <httplib.h>

test/make-shared-library.sh

@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-if [ "$#" -ne 1 ]; then
-    echo "Usage: $0 build_dir"
-    exit 1
-fi
-
-BUILD_DIR=$1
-
-# Make the build directory
-rm -rf $BUILD_DIR
-mkdir -p $BUILD_DIR/out
-
-cd $BUILD_DIR
-
-# Build the version
-git checkout $BUILD_DIR -q
-
-cmake \
-  -DCMAKE_BUILD_TYPE=Debug \
-  -DCMAKE_CXX_FLAGS="-g -Og" \
-  -DBUILD_SHARED_LIBS=ON \
-  -DHTTPLIB_COMPILE=ON \
-  -DCMAKE_INSTALL_PREFIX=./out \
-  ../..
-
-cmake --build . --target install
-cmake --build . --target clean
-

test/meson.build

@@ -1,144 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
-#
-# SPDX-License-Identifier: MIT
-
-gtest_dep = dependency('gtest', main: true)
-libcurl_dep = dependency('libcurl')
-openssl = find_program('openssl')
-test_conf = files('test.conf')
-req_x509_flag = openssl.version().version_compare('>=3.2.0') ? '-x509v1' : '-x509'
-
-key_pem = custom_target(
-  'key_pem',
-  output: 'key.pem',
-  command: [openssl, 'genrsa', '-out', '@OUTPUT@', '2048']
-)
-
-temp_req = custom_target(
-  'temp_req',
-  input: key_pem,
-  output: 'temp_req',
-  command: [openssl, 'req', '-new', '-batch', '-config', test_conf, '-key', '@INPUT@', '-out', '@OUTPUT@']
-)
-
-cert_pem = custom_target(
-  'cert_pem',
-  input: [temp_req, key_pem],
-  output: 'cert.pem',
-  command: [openssl, 'x509', '-in', '@INPUT0@', '-days', '3650', '-req', '-signkey', '@INPUT1@', '-out', '@OUTPUT@']
-)
-
-cert2_pem = custom_target(
-  'cert2_pem',
-  input: key_pem,
-  output: 'cert2.pem',
-  command: [openssl, 'req', req_x509_flag, '-config', test_conf, '-key', '@INPUT@', '-sha256', '-days', '3650', '-nodes', '-out', '@OUTPUT@', '-extensions', 'SAN']
-)
-
-key_encrypted_pem = custom_target(
-  'key_encrypted_pem',
-  output: 'key_encrypted.pem',
-  command: [openssl, 'genrsa', '-passout', 'pass:test123!', '-out', '@OUTPUT@', '2048']
-)
-
-cert_encrypted_pem = custom_target(
-  'cert_encrypted_pem',
-  input: key_encrypted_pem,
-  output: 'cert_encrypted.pem',
-  command: [openssl, 'req', req_x509_flag, '-config', test_conf, '-key', '@INPUT@', '-sha256', '-days', '3650', '-nodes', '-out', '@OUTPUT@', '-extensions', 'SAN']
-)
-
-rootca_key_pem = custom_target(
-  'rootca_key_pem',
-  output: 'rootCA.key.pem',
-  command: [openssl, 'genrsa', '-out', '@OUTPUT@', '2048']
-)
-
-rootca_cert_pem = custom_target(
-  'rootca_cert_pem',
-  input: rootca_key_pem,
-  output: 'rootCA.cert.pem',
-  command: [openssl, 'req', req_x509_flag, '-new', '-batch', '-config', files('test.rootCA.conf'), '-key', '@INPUT@', '-days', '1024', '-out', '@OUTPUT@']
-)
-
-client_key_pem = custom_target(
-  'client_key_pem',
-  output: 'client.key.pem',
-  command: [openssl, 'genrsa', '-out', '@OUTPUT@', '2048']
-)
-
-client_temp_req = custom_target(
-  'client_temp_req',
-  input: client_key_pem,
-  output: 'client_temp_req',
-  command: [openssl, 'req', '-new', '-batch', '-config', test_conf, '-key', '@INPUT@', '-out', '@OUTPUT@']
-)
-
-client_cert_pem = custom_target(
-  'client_cert_pem',
-  input: [client_temp_req, rootca_cert_pem, rootca_key_pem],
-  output: 'client.cert.pem',
-  command: [openssl, 'x509', '-in', '@INPUT0@', '-days', '370', '-req', '-CA', '@INPUT1@', '-CAkey', '@INPUT2@', '-CAcreateserial', '-out', '@OUTPUT@']
-)
-
-client_encrypted_key_pem = custom_target(
-  'client_encrypted_key_pem',
-  output: 'client_encrypted.key.pem',
-  command: [openssl, 'genrsa', '-aes256', '-passout', 'pass:test012!', '-out', '@OUTPUT@', '2048']
-)
-
-client_encrypted_temp_req = custom_target(
-  'client_encrypted_temp_req',
-  input: client_encrypted_key_pem,
-  output: 'client_encrypted_temp_req',
-  command: [openssl, 'req', '-new', '-batch', '-config', test_conf, '-key', '@INPUT@', '-passin', 'pass:test012!', '-out', '@OUTPUT@']
-)
-
-client_encrypted_cert_pem = custom_target(
-  'client_encrypted_cert_pem',
-  input: [client_encrypted_temp_req, rootca_cert_pem, rootca_key_pem],
-  output: 'client_encrypted.cert.pem',
-  command: [openssl, 'x509', '-in', '@INPUT0@', '-days', '370', '-req', '-CA', '@INPUT1@', '-CAkey', '@INPUT2@', '-CAcreateserial', '-out', '@OUTPUT@']
-)
-
-# Copy test files to the build directory
-configure_file(input: 'ca-bundle.crt', output: 'ca-bundle.crt', copy: true)
-configure_file(input: 'image.jpg',     output: 'image.jpg',     copy: true)
-subdir('www')
-subdir('www2'/'dir')
-subdir('www3'/'dir')
-
-# GoogleTest 1.13.0 requires C++14
-test_options = []
-if gtest_dep.version().version_compare('>=1.13.0')
-  test_options += 'cpp_std=c++14'
-endif
-
-test(
-  'main',
-  executable(
-    'main',
-    'test.cc',
-    dependencies: [
-      cpp_httplib_dep,
-      gtest_dep,
-      libcurl_dep
-    ],
-    override_options: test_options
-  ),
-  depends: [
-    key_pem,
-    cert_pem,
-    cert2_pem,
-    key_encrypted_pem,
-    cert_encrypted_pem,
-    rootca_key_pem,
-    rootca_cert_pem,
-    client_key_pem,
-    client_cert_pem,
-    client_encrypted_key_pem,
-    client_encrypted_cert_pem
-  ],
-  workdir: meson.current_build_dir(),
-  timeout: 300
-)

test/proxy/down.sh

@@ -0,0 +1 @@
+docker-compose down --rmi all

test/proxy/up.sh

@@ -0,0 +1 @@
+docker-compose up -d

test/test.conf

@@ -16,6 +16,3 @@ emailAddress           = test@email.address
 
 [req_attributes]
 challengePassword              = 1234
-
-[SAN]
-subjectAltName=IP:127.0.0.1

test/test.vcxproj

@@ -22,32 +22,32 @@
     <ProjectGuid>{6B3E6769-052D-4BC0-9D2C-E9127C3DBB26}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>test</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -69,13 +69,13 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(IncludePath)</IncludePath>
+    <IncludePath>C:\Program Files\OpenSSL-Win64\lib\VC;C:\Program Files\OpenSSL-Win64\include;$(IncludePath)</IncludePath>
     <LibraryPath>$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(IncludePath)</IncludePath>
+    <IncludePath>C:\Program Files\OpenSSL-Win64\include;$(IncludePath)</IncludePath>
-    <LibraryPath>$(LibraryPath)</LibraryPath>
+    <LibraryPath>C:\Program Files\OpenSSL-Win64\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
@@ -84,20 +84,19 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(IncludePath)</IncludePath>
+    <IncludePath>C:\Program Files\OpenSSL-Win64\include;$(IncludePath)</IncludePath>
-    <LibraryPath>$(LibraryPath)</LibraryPath>
+    <LibraryPath>C:\Program Files\OpenSSL-Win64\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
       <AdditionalUsingDirectories>
       </AdditionalUsingDirectories>
-      <SDLCheck>true</SDLCheck>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -109,24 +108,22 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
       <AdditionalUsingDirectories>
       </AdditionalUsingDirectories>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Ws2_32.lib;libssl.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
@@ -136,7 +133,6 @@
       <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
       <AdditionalUsingDirectories>
       </AdditionalUsingDirectories>
-      <SDLCheck>true</SDLCheck>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -148,7 +144,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
@@ -158,15 +154,13 @@
       <AdditionalIncludeDirectories>./;../</AdditionalIncludeDirectories>
       <AdditionalUsingDirectories>
       </AdditionalUsingDirectories>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Ws2_32.lib;libssl.lib;libcrypto.lib;libssl.lib;libcrypto.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

test/test_proxy.cc

@@ -5,39 +5,38 @@
 using namespace std;
 using namespace httplib;
 
-template <typename T> void ProxyTest(T &cli, bool basic) {
+void ProxyTest(Client& cli, bool basic) {
   cli.set_proxy("localhost", basic ? 3128 : 3129);
-  auto res = cli.Get("/httpbin/get");
+  auto res = cli.Get("/get");
   ASSERT_TRUE(res != nullptr);
-  EXPECT_EQ(StatusCode::ProxyAuthenticationRequired_407, res->status);
+  EXPECT_EQ(407, res->status);
 }
 
 TEST(ProxyTest, NoSSLBasic) {
-  Client cli("nghttp2.org");
+  Client cli("httpbin.org");
   ProxyTest(cli, true);
 }
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
 TEST(ProxyTest, SSLBasic) {
-  SSLClient cli("nghttp2.org");
+  SSLClient cli("httpbin.org");
   ProxyTest(cli, true);
 }
 
 TEST(ProxyTest, NoSSLDigest) {
-  Client cli("nghttp2.org");
+  Client cli("httpbin.org");
   ProxyTest(cli, false);
 }
 
 TEST(ProxyTest, SSLDigest) {
-  SSLClient cli("nghttp2.org");
+  SSLClient cli("httpbin.org");
   ProxyTest(cli, false);
 }
 #endif
 
 // ----------------------------------------------------------------------------
 
-template <typename T>
+void RedirectProxyText(Client& cli, const char *path, bool basic) {
-void RedirectProxyText(T &cli, const char *path, bool basic) {
   cli.set_proxy("localhost", basic ? 3128 : 3129);
   if (basic) {
     cli.set_proxy_basic_auth("hello", "world");
@@ -50,28 +49,28 @@ void RedirectProxyText(T &cli, const char *path, bool basic) {
 
   auto res = cli.Get(path);
   ASSERT_TRUE(res != nullptr);
-  EXPECT_EQ(StatusCode::OK_200, res->status);
+  EXPECT_EQ(200, res->status);
 }
 
 TEST(RedirectTest, HTTPBinNoSSLBasic) {
-  Client cli("nghttp2.org");
+  Client cli("httpbin.org");
-  RedirectProxyText(cli, "/httpbin/redirect/2", true);
+  RedirectProxyText(cli, "/redirect/2", true);
 }
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
 TEST(RedirectTest, HTTPBinNoSSLDigest) {
-  Client cli("nghttp2.org");
+  Client cli("httpbin.org");
-  RedirectProxyText(cli, "/httpbin/redirect/2", false);
+  RedirectProxyText(cli, "/redirect/2", false);
 }
 
 TEST(RedirectTest, HTTPBinSSLBasic) {
-  SSLClient cli("nghttp2.org");
+  SSLClient cli("httpbin.org");
-  RedirectProxyText(cli, "/httpbin/redirect/2", true);
+  RedirectProxyText(cli, "/redirect/2", true);
 }
 
 TEST(RedirectTest, HTTPBinSSLDigest) {
-  SSLClient cli("nghttp2.org");
+  SSLClient cli("httpbin.org");
-  RedirectProxyText(cli, "/httpbin/redirect/2", false);
+  RedirectProxyText(cli, "/redirect/2", false);
 }
 #endif
 
@@ -81,7 +80,7 @@ TEST(RedirectTest, YouTubeNoSSLBasic) {
   RedirectProxyText(cli, "/", true);
 }
 
-TEST(RedirectTest, DISABLED_YouTubeNoSSLDigest) {
+TEST(RedirectTest, YouTubeNoSSLDigest) {
   Client cli("youtube.com");
   RedirectProxyText(cli, "/", false);
 }
@@ -99,46 +98,45 @@ TEST(RedirectTest, YouTubeSSLDigest) {
 
 // ----------------------------------------------------------------------------
 
-template <typename T> void BaseAuthTestFromHTTPWatch(T &cli) {
+void BaseAuthTestFromHTTPWatch(Client& cli) {
   cli.set_proxy("localhost", 3128);
   cli.set_proxy_basic_auth("hello", "world");
 
   {
     auto res = cli.Get("/basic-auth/hello/world");
     ASSERT_TRUE(res != nullptr);
-    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
+    EXPECT_EQ(401, res->status);
   }
 
   {
-    auto res = cli.Get("/basic-auth/hello/world",
+    auto res =
-                       {make_basic_authentication_header("hello", "world")});
+        cli.Get("/basic-auth/hello/world",
+                {make_basic_authentication_header("hello", "world")});
     ASSERT_TRUE(res != nullptr);
-    EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n",
+    EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
-              res->body);
+    EXPECT_EQ(200, res->status);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
   }
 
   {
     cli.set_basic_auth("hello", "world");
     auto res = cli.Get("/basic-auth/hello/world");
     ASSERT_TRUE(res != nullptr);
-    EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n",
+    EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
-              res->body);
+    EXPECT_EQ(200, res->status);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
   }
 
   {
     cli.set_basic_auth("hello", "bad");
     auto res = cli.Get("/basic-auth/hello/world");
     ASSERT_TRUE(res != nullptr);
-    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
+    EXPECT_EQ(401, res->status);
   }
 
   {
     cli.set_basic_auth("bad", "world");
     auto res = cli.Get("/basic-auth/hello/world");
     ASSERT_TRUE(res != nullptr);
-    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
+    EXPECT_EQ(401, res->status);
   }
 }
 
@@ -157,14 +155,14 @@ TEST(BaseAuthTest, SSL) {
 // ----------------------------------------------------------------------------
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-template <typename T> void DigestAuthTestFromHTTPWatch(T &cli) {
+void DigestAuthTestFromHTTPWatch(Client& cli) {
   cli.set_proxy("localhost", 3129);
   cli.set_proxy_digest_auth("hello", "world");
 
   {
     auto res = cli.Get("/digest-auth/auth/hello/world");
     ASSERT_TRUE(res != nullptr);
-    EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
+    EXPECT_EQ(401, res->status);
   }
 
   {
@@ -179,26 +177,23 @@ template <typename T> void DigestAuthTestFromHTTPWatch(T &cli) {
     for (auto path : paths) {
       auto res = cli.Get(path.c_str());
       ASSERT_TRUE(res != nullptr);
-      EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n",
+      EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
-                res->body);
+      EXPECT_EQ(200, res->status);
-      EXPECT_EQ(StatusCode::OK_200, res->status);
     }
 
     cli.set_digest_auth("hello", "bad");
     for (auto path : paths) {
       auto res = cli.Get(path.c_str());
       ASSERT_TRUE(res != nullptr);
-      EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
+      EXPECT_EQ(400, res->status);
     }
 
-    // NOTE: Until httpbin.org fixes issue #46, the following test is commented
+    cli.set_digest_auth("bad", "world");
-    // out. Please see https://httpbin.org/digest-auth/auth/hello/world
+    for (auto path : paths) {
-    // cli.set_digest_auth("bad", "world");
+      auto res = cli.Get(path.c_str());
-    // for (auto path : paths) {
+      ASSERT_TRUE(res != nullptr);
-    //   auto res = cli.Get(path.c_str());
+      EXPECT_EQ(400, res->status);
-    //   ASSERT_TRUE(res != nullptr);
+    }
-    //   EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
-    // }
   }
 }
 
@@ -215,7 +210,7 @@ TEST(DigestAuthTest, NoSSL) {
 
 // ----------------------------------------------------------------------------
 
-template <typename T> void KeepAliveTest(T &cli, bool basic) {
+void KeepAliveTest(Client& cli, bool basic) {
   cli.set_proxy("localhost", basic ? 3128 : 3129);
   if (basic) {
     cli.set_proxy_basic_auth("hello", "world");
@@ -225,63 +220,84 @@ template <typename T> void KeepAliveTest(T &cli, bool basic) {
 #endif
   }
 
+  cli.set_keep_alive_max_count(4);
   cli.set_follow_location(true);
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
   cli.set_digest_auth("hello", "world");
-#endif
 
-  {
+  std::vector<Request> requests;
-    auto res = cli.Get("/httpbin/get");
+
-    EXPECT_EQ(StatusCode::OK_200, res->status);
+  Get(requests, "/get");
-  }
+  Get(requests, "/redirect/2");
-  {
+
-    auto res = cli.Get("/httpbin/redirect/2");
+  std::vector<std::string> paths = {
-    EXPECT_EQ(StatusCode::OK_200, res->status);
+      "/digest-auth/auth/hello/world/MD5",
+      "/digest-auth/auth/hello/world/SHA-256",
+      "/digest-auth/auth/hello/world/SHA-512",
+      "/digest-auth/auth-int/hello/world/MD5",
+  };
+
+  for (auto path : paths) {
+    Get(requests, path.c_str());
   }
 
   {
-    std::vector<std::string> paths = {
+    int count = 100;
-        "/httpbin/digest-auth/auth/hello/world/MD5",
-        "/httpbin/digest-auth/auth/hello/world/SHA-256",
-        "/httpbin/digest-auth/auth/hello/world/SHA-512",
-        "/httpbin/digest-auth/auth-int/hello/world/MD5",
-    };
-
-    for (auto path : paths) {
-      auto res = cli.Get(path.c_str());
-      EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n",
-                res->body);
-      EXPECT_EQ(StatusCode::OK_200, res->status);
-    }
-  }
-
-  {
-    int count = 10;
     while (count--) {
-      auto res = cli.Get("/httpbin/get");
+      Get(requests, "/get");
-      EXPECT_EQ(StatusCode::OK_200, res->status);
     }
   }
+
+  std::vector<Response> responses;
+  auto ret = cli.send(requests, responses);
+  ASSERT_TRUE(ret == true);
+  ASSERT_TRUE(requests.size() == responses.size());
+
+  size_t i = 0;
+
+  {
+    auto &res = responses[i++];
+    EXPECT_EQ(200, res.status);
+  }
+
+  {
+    auto &res = responses[i++];
+    EXPECT_EQ(200, res.status);
+  }
+
+
+  {
+    int count = paths.size();
+    while (count--) {
+      auto &res = responses[i++];
+      EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res.body);
+      EXPECT_EQ(200, res.status);
+    }
+  }
+
+  for (; i < responses.size(); i++) {
+    auto &res = responses[i];
+    EXPECT_EQ(200, res.status);
+  }
 }
 
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
 TEST(KeepAliveTest, NoSSLWithBasic) {
-  Client cli("nghttp2.org");
+  Client cli("httpbin.org");
   KeepAliveTest(cli, true);
 }
 
 TEST(KeepAliveTest, SSLWithBasic) {
-  SSLClient cli("nghttp2.org");
+  SSLClient cli("httpbin.org");
   KeepAliveTest(cli, true);
 }
 
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
 TEST(KeepAliveTest, NoSSLWithDigest) {
-  Client cli("nghttp2.org");
+  Client cli("httpbin.org");
   KeepAliveTest(cli, false);
 }
 
 TEST(KeepAliveTest, SSLWithDigest) {
-  SSLClient cli("nghttp2.org");
+  SSLClient cli("httpbin.org");
   KeepAliveTest(cli, false);
 }
 #endif

test/www/dir/meson.build

@@ -1,8 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
-#
-# SPDX-License-Identifier: MIT
-
-configure_file(input: 'index.html', output: 'index.html', copy: true)
-configure_file(input: 'test.abcde', output: 'test.abcde', copy: true)
-configure_file(input: 'test.html',  output: 'test.html',  copy: true)
-configure_file(input: '1MB.txt',    output: '1MB.txt',    copy: true)

test/www/file

@@ -1 +0,0 @@
-file

test/www/meson.build

@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: 2024 Andrea Pappacoda
-#
-# SPDX-License-Identifier: MIT
-
-configure_file(input: 'empty_file', output: 'empty_file', copy: true)
-configure_file(input: 'file',       output: 'file',       copy: true)
-subdir('dir')

test/www/日本語Dir/日本語File.txt

@@ -1 +0,0 @@
-日本語コンテンツ

test/www2/dir/meson.build

@@ -1,6 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
-#
-# SPDX-License-Identifier: MIT
-
-configure_file(input: 'index.html', output: 'index.html', copy: true)
-configure_file(input: 'test.html',  output: 'test.html',  copy: true)

test/www3/dir/meson.build

@@ -1,6 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Andrea Pappacoda
-#
-# SPDX-License-Identifier: MIT
-
-configure_file(input: 'index.html', output: 'index.html', copy: true)
-configure_file(input: 'test.html',  output: 'test.html',  copy: true)