.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,11 +1,5 @@
 name: CIFuzz
-
 on: [pull_request]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: true
-
 jobs:
   Fuzzing:
     runs-on: ubuntu-latest
@@ -25,7 +19,7 @@ jobs:
         dry-run: false
         language: c++
     - name: Upload Crash
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v1
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts

.github/workflows/test.yaml

@@ -1,126 +1,41 @@
 name: test
 
-on:
-  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 || '*' }}
+on: [push, pull_request]
 
 jobs:
-  style-check:
-    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
-    continue-on-error: true
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-      - name: run style check
-        run: |
-          clang-format --version
-          cd test && make style_check
+  build:
+    runs-on: ${{ matrix.os }}
 
-  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:
-        - with_ssl: false
-          name: without SSL
-        - with_ssl: true
-          name: with SSL
-    name: windows ${{ matrix.config.name }}
+        os: [macOS-latest, ubuntu-latest, windows-latest]
+
     steps:
-    - name: Prepare Git for Checkout on Windows
+    - name: prepare git for checkout on windows
+      if: matrix.os == 'windows-latest'
       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:
-      VCPKG_ROOT: "C:/vcpkg"
-      VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+    - name: checkout
+      uses: actions/checkout@v2
+    - name: install brotli library on ubuntu
+      if: matrix.os == 'ubuntu-latest'
+      run: sudo apt update && sudo apt-get install -y libbrotli-dev
+    - name: install brotli library on macOS
+      if: matrix.os == 'macOS-latest'
+      run: brew install brotli
+    - name: make
+      if: matrix.os != 'windows-latest'
+      run: cd test && make -j2
+    - name: check fuzz test target
+      if: matrix.os == 'ubuntu-latest'
+      run: cd test && make fuzz_test
+    - name: setup msbuild on windows
+      if: matrix.os == 'windows-latest'
+      uses: microsoft/setup-msbuild@v1.0.2
+    - name: make-windows
+      if: matrix.os == 'windows-latest'
+      run: |
+        cd test
+        msbuild.exe test.sln /verbosity:minimal /t:Build "/p:Configuration=Release;Platform=x64"
+        x64\Release\test.exe

.gitignore

@@ -9,27 +9,19 @@ example/benchmark
 example/redirect
 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 +31,5 @@ Release
 *.db
 ipch
 *.dSYM
-*.pyc
 .*
-!/.gitattributes
 !/.travis.yml

CMakeLists.txt

@@ -3,21 +3,18 @@
 	* 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_USE_BROTLI_IF_AVAILABLE (default on)
 	* 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).
+	After installation with Cmake, a find_package(httplib) is available.
+	This creates a httplib::httplib target (if found).
 	It can be linked like so:
 
 	target_link_libraries(your_exe httplib::httplib)
@@ -45,7 +42,6 @@
 	* 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).
@@ -59,48 +55,42 @@
 
 	-------------------------------------------------------------------------------
 
+	FindPython3 requires Cmake v3.12
 	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.
+# Get the user agent and use it as a version
+# This gets the string with the user agent 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]+)\"")
+file(STRINGS httplib.h _raw_version_string REGEX "User\-Agent.*cpp\-httplib/([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
+# Needed since git tags have "v" prefixing them.
+# Also used if the fallback to user agent string is being used.
 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"
-)
+project(httplib VERSION ${_httplib_version} LANGUAGES CXX)
 
 # 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")
+set(_HTTPLIB_OPENSSL_MIN_VER "1.1.1")
 
-# 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.
+# Allow for a build to casually enable OpenSSL/ZLIB support, but silenty 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)
+# Just setting this variable here for people building in-tree
+if(HTTPLIB_COMPILE)
+	set(HTTPLIB_IS_COMPILED TRUE)
+endif()
+
 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)
@@ -109,48 +99,40 @@ if (BUILD_SHARED_LIBS AND WIN32 AND HTTPLIB_COMPILE)
 	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()
+# Just setting this variable here for people building in-tree
+if(OPENSSL_FOUND)
+	set(HTTPLIB_IS_USING_OPENSSL TRUE)
 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()
+# Just setting this variable here for people building in-tree
+# FindZLIB doesn't have a ZLIB_FOUND variable, so check the target.
+if(TARGET ZLIB::ZLIB)
+	set(HTTPLIB_IS_USING_ZLIB TRUE)
 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()
+# Just setting this variable here for people building in-tree
+if(Brotli_FOUND)
+	set(HTTPLIB_IS_USING_BROTLI TRUE)
 endif()
 
 # Used for default, common dirs that the end-user can change (if needed)
@@ -178,7 +160,7 @@ if(HTTPLIB_COMPILE)
 		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}")
+		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"
@@ -190,12 +172,6 @@ if(HTTPLIB_COMPILE)
 			$<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)
@@ -206,10 +182,22 @@ endif()
 # 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)
+# Might be missing some, but this list is somewhat comprehensive
+target_compile_features(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
+	cxx_std_11
+	cxx_nullptr
+	cxx_lambdas
+	cxx_override
+	cxx_defaulted_functions
+	cxx_attribute_deprecated
+	cxx_auto_type
+	cxx_decltype
+	cxx_deleted_functions
+	cxx_range_for
+	cxx_sizeof_member
+)
 
-target_include_directories(${PROJECT_NAME} SYSTEM ${_INTERFACE_OR_PUBLIC}
+target_include_directories(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
     $<BUILD_INTERFACE:${_httplib_build_includedir}>
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
@@ -220,8 +208,7 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
 		# 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>"
+		$<$<PLATFORM_ID:Windows>:cryptui>
 		# 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>
@@ -233,77 +220,74 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
 
 # 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}")
+# Cmake's find_package search path is different based on the system
+# See https://cmake.org/cmake/help/latest/command/find_package.html for the list
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	set(_TARGET_INSTALL_CMAKEDIR "${CMAKE_INSTALL_PREFIX}/cmake/${PROJECT_NAME}")
+else()
+	# On Non-Windows, it should be /usr/lib/cmake/<name>/<name>Config.cmake
+	# NOTE: This may or may not work for macOS...
+	set(_TARGET_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+endif()
 
 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"
+configure_package_config_file("${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
+	# There aren't any components, so don't use the macro
+	NO_CHECK_REQUIRED_COMPONENTS_MACRO
 )
 
 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
+		# then anything >= 0.5 and <= 1.0 is accepted
+		COMPATIBILITY SameMajorVersion
 	)
 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
+		# then anything >= 0.5 and <= 1.0 is accepted
+		COMPATIBILITY SameMajorVersion
 		# 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)
+# 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
+	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
 
-	install(FILES "${_httplib_build_includedir}/httplib.h" TYPE INCLUDE)
+install(FILES "${_httplib_build_includedir}/httplib.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
-	install(FILES
+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}
-	)
+	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()
+# 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}
+)

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

@@ -7,13 +7,12 @@ 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!
 
-> [!IMPORTANT]
-> 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.
+NOTE: This is a multi-threaded 'blocking' HTTP library. If you are looking for a 'non-blocking' library, this is not the one that you want.
 
 Simple examples
 ---------------
 
-#### Server (Multi-threaded)
+#### Server
 
 ```c++
 #define CPPHTTPLIB_OPENSSL_SUPPORT
@@ -39,26 +38,27 @@ svr.listen("0.0.0.0", 8080);
 #include "path/to/httplib.h"
 
 // HTTP
-httplib::Client cli("http://yhirose.github.io");
+httplib::Client cli("http://cpp-httplib-server.yhirose.repl.co");
 
 // HTTPS
-httplib::Client cli("https://yhirose.github.io");
+httplib::Client cli("https://cpp-httplib-server.yhirose.repl.co");
 
 auto res = cli.Get("/hi");
 res->status;
 res->body;
 ```
 
+### Try out the examples on Repl.it!
+
+1. Run server at https://repl.it/@yhirose/cpp-httplib-server
+2. Run client at https://repl.it/@yhirose/cpp-httplib-client
+
 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`.
+NOTE: cpp-httplib currently supports only version 1.1.1.
 
 ```c++
 #define CPPHTTPLIB_OPENSSL_SUPPORT
@@ -70,20 +70,15 @@ 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.
+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
 ------
@@ -101,20 +96,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 +111,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();
   });
@@ -212,17 +183,7 @@ The followings are built-in mappings:
 | webm       | video/webm                  | zip        | application/zip             |
 | mp3        | audio/mp3                   | wasm       | application/wasm            |
 
-> [!WARNING]
-> 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) {
-  ...
-});
-```
+NOTE: These static file server methods are not thread-safe.
 
 ### Logging
 
@@ -247,24 +208,15 @@ svr.set_error_handler([](const auto& req, auto& res) {
 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) {
+svr.set_exception_handler([](const auto& req, auto& res, std::exception &e) {
+  res.status = 500;
   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");
-  }
+  snprintf(buf, sizeof(buf), fmt, e.what());
   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
@@ -336,7 +288,7 @@ svr.Get("/stream", [&](const Request &req, Response &res) {
   res.set_content_provider(
     data->size(), // Content length
     "text/plain", // Content type
-    [&, data](size_t offset, size_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.
@@ -351,7 +303,7 @@ Without content length:
 svr.Get("/stream", [&](const Request &req, Response &res) {
   res.set_content_provider(
     "text/plain", // Content type
-    [&](size_t offset, DataSink &sink) {
+    [&](size_t offset, size_t length, DataSink &sink) {
       if (/* there is still data */) {
         std::vector<char> data;
         // prepare data...
@@ -381,39 +333,6 @@ svr.Get("/chunked", [&](const Request& req, Response& res) {
 });
 ```
 
-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.
@@ -421,14 +340,14 @@ By default, the server sends a `100 Continue` response for an `Expect: 100-conti
 ```cpp
 // Send a '417 Expectation Failed' response.
 svr.set_expect_100_continue_handler([](const Request &req, Response &res) {
-  return StatusCode::ExpectationFailed_417;
+  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 = StatusCode::Unauthorized_401;
+  return res.status = 401;
 });
 ```
 
@@ -453,16 +372,13 @@ svr.set_idle_interval(0, 100000); // 100 milliseconds
 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).
 
 ### 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`.
+`ThreadPool` is used as a **default** task queue, and the default thread count is 8, or `std::thread::hardware_concurrency()`. 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.
 
@@ -470,17 +386,6 @@ If you want to set the thread count at runtime, there is no convenient way... Bu
 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.
@@ -492,10 +397,8 @@ public:
     pool_.start_with_thread_count(n);
   }
 
-  virtual bool enqueue(std::function<void()> fn) override {
-    /* Return true if the task was actually enqueued, or false
-     * if the caller must drop the corresponding connection. */
-    return pool_.enqueue(fn);
+  virtual void enqueue(std::function<void()> fn) override {
+    pool_.enqueue(fn);
   }
 
   virtual void shutdown() override {
@@ -523,18 +426,17 @@ int main(void)
   httplib::Client cli("localhost", 1234);
 
   if (auto res = cli.Get("/hi")) {
-    if (res->status == StatusCode::OK_200) {
+    if (res->status == 200) {
       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!
+NOTE: Constructor with scheme-host-port string is now supported!
 
 ```c++
 httplib::Client cli("localhost");
@@ -562,9 +464,7 @@ enum Error {
   SSLConnection,
   SSLLoadingCerts,
   SSLServerVerification,
-  UnsupportedMultipartBoundaryChars,
-  Compression,
-  ConnectionTimeout,
+  UnsupportedMultipartBoundaryChars
 };
 ```
 
@@ -572,18 +472,14 @@ enum Error {
 
 ```c++
 httplib::Headers headers = {
-  { "Hello", "World!" }
+  { "Accept-Encoding", "gzip, deflate" }
 };
 auto res = cli.Get("/hi", headers);
 ```
 or
 ```c++
-auto res = cli.Get("/hi", {{"Hello", "World!"}});
-```
-or
-```c++
 cli.set_default_headers({
-  { "Hello", "World!" }
+  { "Accept-Encoding", "gzip, deflate" }
 });
 auto res = cli.Get("/hi");
 ```
@@ -654,9 +550,6 @@ res = cli.Options("/resource/foo");
 cli.set_connection_timeout(0, 300000); // 300 milliseconds
 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
@@ -677,7 +570,7 @@ std::string body;
 auto res = cli.Get(
   "/stream", Headers(),
   [&](const Response &response) {
-    EXPECT_EQ(StatusCode::OK_200, response.status);
+    EXPECT_EQ(200, response.status);
     return true; // return 'false' if you want to cancel the request.
   },
   [&](const char *data, size_t data_length) {
@@ -718,7 +611,7 @@ auto res = cli.Post(
 ### 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) {
@@ -745,8 +638,7 @@ cli.set_digest_auth("user", "pass");
 cli.set_bearer_token_auth("token");
 ```
 
-> [!NOTE]
-> OpenSSL is required for Digest Authentication.
+NOTE: OpenSSL is required for Digest Authentication.
 
 ### Proxy server support
 
@@ -763,8 +655,7 @@ cli.set_proxy_digest_auth("user", "pass");
 cli.set_proxy_bearer_token_auth("pass");
 ```
 
-> [!NOTE]
-> OpenSSL is required for Digest Authentication.
+NOTE: OpenSSL is required for Digest Authentication.
 
 ### Range
 
@@ -813,8 +704,7 @@ res->status; // 200
 
 ### Use a specific network interface
 
-> [!NOTE]
-> This feature is not available on Windows, yet.
+NOTE: This feature is not available on Windows, yet.
 
 ```cpp
 cli.set_interface("eth0"); // Interface name, IP address or host name
@@ -841,21 +731,6 @@ The server can apply compression to the following MIME type contents:
 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++
@@ -867,27 +742,14 @@ res = cli.Post("/resource/foo", "...", "text/plain");
 
 ```c++
 cli.set_decompress(false);
-res = cli.Get("/resource/foo");
+res = cli.Get("/resource/foo", {{"Accept-Encoding", "gzip, deflate, br"}});
 res->body; // Compressed data
-
 ```
 
-Unix Domain Socket Support
---------------------------
+Use `poll` instead of `select`
+------------------------------
 
-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.
+`select` system call is used as default since it's more widely supported. If you want to let cpp-httplib use `poll` instead, you can do so with `CPPHTTPLIB_USE_POLL`.
 
 
 Split httplib.h into .h and .cc
@@ -909,32 +771,6 @@ $ ./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 .
-...
-
-> 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 +793,14 @@ Include `httplib.h` before `Windows.h` or include `Windows.h` by defining `WIN32
 #include <httplib.h>
 ```
 
-> [!NOTE]
-> 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: 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.
+Note: Windows 8 or lower and Cygwin on Windows are not supported.
 
 License
 -------
 
-MIT license (© 2025 Yuji Hirose)
+MIT license (© 2021 Yuji Hirose)
 
 Special Thanks To
 -----------------

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,6 +1,6 @@
 # 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.
 #
@@ -14,7 +14,7 @@
 
 # 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
+# But currently there's a version header that doesn't seem to get installed.
 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
@@ -68,24 +68,29 @@ if(BROTLI_USE_STATIC_LIBS)
 	set(_brotli_stat_str "_STATIC")
 endif()
 
+# Lets us know we are using the PkgConfig libraries
+# Will be set false if any non-pkgconf vars are used
+set(_brotli_using_pkgconf TRUE)
+
 # 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)
+	if(PKG_CONFIG_FOUND)
 		# 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})
+		if(BROTLI_USE_STATIC_LIBS)
+			# Have to use _STATIC to tell PkgConfig to find the static libs.
+			pkg_check_modules(Brotli_${_component_name}_STATIC QUIET GLOBAL IMPORTED_TARGET libbrotli${_libname})
+		else()
+			pkg_check_modules(Brotli_${_component_name} QUIET GLOBAL IMPORTED_TARGET libbrotli${_libname})
+		endif()
 	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)
+	# Check if the target was already found by Pkgconf 
+	if(TARGET PkgConfig::Brotli_${_component_name} OR TARGET PkgConfig::Brotli_${_component_name}_STATIC)
+		# Can't use generators for ALIAS targets, so you get this jank
 		add_library(Brotli::${_component_name} ALIAS PkgConfig::Brotli_${_component_name}${_brotli_stat_str})
 
 		# Tells HANDLE_COMPONENTS we found the component
@@ -104,18 +109,23 @@ foreach(_listvar "common;common" "decoder;dec" "encoder;enc")
 		continue()
 	endif()
 
+	# Lets us know we aren't using the PkgConfig libraries
+	set(_brotli_using_pkgconf FALSE)
 	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")
+		list(APPEND _brotli_lib_names
+			"brotli${_libname}-static"
+			"libbrotli${_libname}-static"
+		)
+	else()
+		list(APPEND _brotli_lib_names
+			"brotli${_libname}"
+			"libbrotli${_libname}"
+		)
 	endif()
 
 	find_library(Brotli_${_component_name}
@@ -158,7 +168,7 @@ find_package_handle_standard_args(Brotli
 		Brotli_FOUND
 	REQUIRED_VARS
 		Brotli_INCLUDE_DIR
-		${_brotli_req_vars}
+		${_brotli_required_targets}
 	HANDLE_COMPONENTS
 )
 

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,24 +1,19 @@
 #CXX = clang++
-CXXFLAGS = -O2 -std=c++11 -I.. -Wall -Wextra -pthread
+CXXFLAGS = -std=c++11 -I.. -Wall -Wextra -pthread
 
-PREFIX ?= $(shell brew --prefix)
+PREFIX = /usr/local
+#PREFIX = $(shell brew --prefix)
 
-OPENSSL_DIR = $(PREFIX)/opt/openssl@3
+OPENSSL_DIR = $(PREFIX)/opt/openssl@1.1
+#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
 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
+all: server client hello simplecli simplesvr upload redirect ssesvr ssecli benchmark
 
 server : server.cc ../httplib.h Makefile
 	$(CXX) -o server $(CXXFLAGS) server.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT)
@@ -50,15 +45,9 @@ ssecli : ssecli.cc ../httplib.h Makefile
 benchmark : benchmark.cc ../httplib.h Makefile
 	$(CXX) -o benchmark $(CXXFLAGS) benchmark.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_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 simplecli simplesvr upload redirect ssesvr ssecli 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.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", 8080);
 }

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/ssesvr.cc

@@ -12,13 +12,14 @@ using namespace std;
 
 class EventDispatcher {
 public:
-  EventDispatcher() {}
+  EventDispatcher() {
+  }
 
   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) {

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

httplibConfig.cmake.in

@@ -12,19 +12,19 @@ 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)
+find_dependency(Threads REQUIRED)
 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@)
+		find_dependency(OpenSSL @_HTTPLIB_OPENSSL_MIN_VER@ REQUIRED)
 	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)
+		find_dependency(OpenSSL @_HTTPLIB_OPENSSL_MIN_VER@ COMPONENTS Crypto SSL REQUIRED)
 	endif()
 endif()
 if(@HTTPLIB_IS_USING_ZLIB@)
-	find_dependency(ZLIB)
+	find_dependency(ZLIB REQUIRED)
 endif()
 
 if(@HTTPLIB_IS_USING_BROTLI@)
@@ -32,7 +32,7 @@ if(@HTTPLIB_IS_USING_BROTLI@)
 	# 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)
+	find_dependency(Brotli COMPONENTS common encoder decoder REQUIRED)
 endif()
 
 # Mildly useful for end-users
@@ -42,19 +42,10 @@ set_and_check(HTTPLIB_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_FULL_INCLUDEDIR@")
 # 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@)
+# Brings in the target library
+include("${CMAKE_CURRENT_LIST_DIR}/httplibTargets.cmake")
 
-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)
+# Ouputs a "found httplib /usr/include/httplib.h" message when using find_package(httplib)
 include(FindPackageMessage)
 if(TARGET httplib::httplib)
 	set(HTTPLIB_FOUND TRUE)

meson.build

@@ -13,34 +13,30 @@ project(
     'b_lto=true',
     'warning_level=3'
   ],
-  meson_version: '>=0.62.0'
+  meson_version: '>=0.47.0'
 )
 
 # Check just in case downstream decides to edit the source
 # and add a project version
 version = meson.project_version()
+python = import('python').find_installation('python3')
 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')
+  # Meson doesn't have regular expressions, but since it is implemented
+  # in python we can be sure we can use it to parse the file manually
+  version = run_command(
+      python, '-c', 'import re; raw_version = re.search("User\-Agent.*cpp\-httplib/([0-9]+\.?)+", open("httplib.h").read()).group(0); print(re.search("([0-9]+\\.?)+", raw_version).group(0))'
+  ).stdout().strip()
 endif
 
+message('cpp-httplib version ' + version)
+
 deps = [dependency('threads')]
 args = []
 
-openssl_dep = dependency('openssl', version: '>=3.0.0', required: get_option('cpp-httplib_openssl'))
+openssl_dep = dependency('openssl', version: ['>=1.1.1', '<1.1.2'], 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'))
@@ -68,13 +64,11 @@ 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()],
+    command: [python, files('split.py'), '--out', meson.current_build_dir()],
     install: true,
     install_dir: [false, get_option('includedir')]
   )
@@ -84,7 +78,6 @@ if get_option('cpp-httplib_compile')
     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])
@@ -98,18 +91,12 @@ if get_option('cpp-httplib_compile')
   )
 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
-  )
+  cpp_httplib_dep = declare_dependency(compile_args: args, dependencies: deps, include_directories: include_directories('.'))
 endif
 
-meson.override_dependency('cpp-httplib', cpp_httplib_dep)
+if meson.version().version_compare('>=0.54.0')
+  meson.override_dependency('cpp-httplib', cpp_httplib_dep)
+endif
 
 if get_option('cpp-httplib_test')
   subdir('test')

meson_options.txt

@@ -5,6 +5,5 @@
 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_compile', type: 'boolean', value: false,  description: 'Split the header into a compilable header & source file (requires Python 3)')
 option('cpp-httplib_test',    type: 'boolean', value: false,  description: 'Build tests')

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,24 +1,19 @@
 CXX = clang++
-CXXFLAGS = -g -std=c++11 -I. -Wall -Wextra -Wtype-limits -Wconversion -Wshadow # -fno-exceptions -DCPPHTTPLIB_NO_EXCEPTIONS -fsanitize=address
+CXXFLAGS = -g -std=c++11 -I. -Wall -Wextra -Wtype-limits -Wconversion # -fno-exceptions -DCPPHTTPLIB_NO_EXCEPTIONS -fsanitize=address
 
-PREFIX ?= $(shell brew --prefix)
+PREFIX = /usr/local
+#PREFIX = $(shell brew --prefix)
 
-OPENSSL_DIR = $(PREFIX)/opt/openssl@3
+OPENSSL_DIR = $(PREFIX)/opt/openssl@1.1
+#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 += -DCPPHTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN -framework CoreFoundation -framework Security
-	endif
-endif
-
 ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz
 
 BROTLI_DIR = $(PREFIX)/opt/brotli
 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
+TEST_ARGS = gtest/gtest-all.cc gtest/gtest_main.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT) -pthread
 
 # By default, use standalone_fuzz_target_runner.
 # This runner does no fuzzing, but simply executes the inputs
@@ -28,11 +23,6 @@ TEST_ARGS = gtest/gtest-all.cc gtest/gtest_main.cc $(OPENSSL_SUPPORT) $(ZLIB_SUP
 # 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
 
@@ -47,31 +37,6 @@ test : test.cc include_httplib.cc ../httplib.h Makefile cert.pem
 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)
 
@@ -93,8 +58,14 @@ 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 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 -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_split test_proxy server_fuzzer *.pem *.0 *.o *.1 *.srl httplib.h httplib.cc

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/server_fuzzer.cc

@@ -1,6 +1,5 @@
-#include <cstdint>
-
 #include <httplib.h>
+#include <memory>
 
 class FuzzedStream : public httplib::Stream {
 public:
@@ -23,26 +22,19 @@ public:
 
   ssize_t write(const std::string &s) { return write(s.data(), s.size()); }
 
+  std::string get_remote_addr() const { return ""; }
+
   bool is_readable() const override { return true; }
 
-  bool wait_readable() const override { return true; }
-
-  bool wait_writable() const override { return true; }
+  bool is_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_;
@@ -54,12 +46,8 @@ 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);
+    process_request(stream, /*last_connection=*/false, connection_close,
+                    nullptr);
   }
 };
 

test/fuzzing/standalone_fuzz_target_runner.cpp

@@ -5,13 +5,13 @@
 // on the test corpus or on a single file,
 // e.g. the one that comes from a bug report.
 
-#include <cstdint>
-#include <fstream>
+#include <cassert>
 #include <iostream>
+#include <fstream>
 #include <vector>
 
 // Forward declare the "fuzz target" interface.
-// We deliberately keep this interface simple and header-free.
+// We deliberately keep this inteface 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
@@ -21,7 +21,7 @@ int main(int argc, char **argv) {
     std::ifstream in(argv[i]);
     in.seekg(0, in.end);
     size_t length = static_cast<size_t>(in.tellg());
-    in.seekg(0, in.beg);
+    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);

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-all.cc

@@ -1912,7 +1912,7 @@ void AssertHelper::operator=(const Message& message) const {
 namespace {
 
 // When TEST_P is found without a matching INSTANTIATE_TEST_SUITE_P
-// to creates test cases for it, a synthetic test case is
+// to creates test cases for it, a syntetic test case is
 // inserted to report ether an error or a log message.
 //
 // This configuration bit will likely be removed at some point.

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

@@ -3,10 +3,8 @@
 # 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',
@@ -32,20 +30,7 @@ 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']
+  command: [openssl, 'req', '-x509', '-config', test_conf, '-key', '@INPUT@', '-sha256', '-days', '3650', '-nodes', '-out', '@OUTPUT@', '-extensions', 'SAN']
 )
 
 rootca_key_pem = custom_target(
@@ -58,7 +43,7 @@ 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@']
+  command: [openssl, 'req', '-x509', '-new', '-batch', '-config', files('test.rootCA.conf'), '-key', '@INPUT@', '-days', '1024', '-out', '@OUTPUT@']
 )
 
 client_key_pem = custom_target(
@@ -81,38 +66,12 @@ client_cert_pem = custom_target(
   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
+subdir(join_paths('www', 'dir'))
+subdir(join_paths('www2', 'dir'))
+subdir(join_paths('www3', 'dir'))
 
 test(
   'main',
@@ -121,23 +80,17 @@ test(
     'test.cc',
     dependencies: [
       cpp_httplib_dep,
-      gtest_dep,
-      libcurl_dep
-    ],
-    override_options: test_options
+      gtest_dep
+    ]
   ),
   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
+    client_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.vcxproj

@@ -28,26 +28,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v142</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>v142</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>
@@ -116,7 +116,6 @@
       <AdditionalUsingDirectories>
       </AdditionalUsingDirectories>
       <SDLCheck>true</SDLCheck>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -159,7 +158,6 @@
       <AdditionalUsingDirectories>
       </AdditionalUsingDirectories>
       <SDLCheck>true</SDLCheck>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -177,4 +175,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

test/test_proxy.cc

@@ -5,11 +5,12 @@
 using namespace std;
 using namespace httplib;
 
-template <typename T> void ProxyTest(T &cli, bool basic) {
+template <typename T>
+void ProxyTest(T& cli, bool basic) {
   cli.set_proxy("localhost", basic ? 3128 : 3129);
   auto res = cli.Get("/httpbin/get");
   ASSERT_TRUE(res != nullptr);
-  EXPECT_EQ(StatusCode::ProxyAuthenticationRequired_407, res->status);
+  EXPECT_EQ(407, res->status);
 }
 
 TEST(ProxyTest, NoSSLBasic) {
@@ -37,7 +38,7 @@ TEST(ProxyTest, SSLDigest) {
 // ----------------------------------------------------------------------------
 
 template <typename T>
-void RedirectProxyText(T &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,7 +51,7 @@ 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) {
@@ -81,7 +82,7 @@ TEST(RedirectTest, YouTubeNoSSLBasic) {
   RedirectProxyText(cli, "/", true);
 }
 
-TEST(RedirectTest, DISABLED_YouTubeNoSSLDigest) {
+TEST(RedirectTest, YouTubeNoSSLDigest) {
   Client cli("youtube.com");
   RedirectProxyText(cli, "/", false);
 }
@@ -99,46 +100,46 @@ TEST(RedirectTest, YouTubeSSLDigest) {
 
 // ----------------------------------------------------------------------------
 
-template <typename T> void BaseAuthTestFromHTTPWatch(T &cli) {
+template <typename T>
+void BaseAuthTestFromHTTPWatch(T& 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",
-                       {make_basic_authentication_header("hello", "world")});
+    auto res =
+        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",
-              res->body);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
+    EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
+    EXPECT_EQ(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",
-              res->body);
-    EXPECT_EQ(StatusCode::OK_200, res->status);
+    EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
+    EXPECT_EQ(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 +158,15 @@ TEST(BaseAuthTest, SSL) {
 // ----------------------------------------------------------------------------
 
 #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-template <typename T> void DigestAuthTestFromHTTPWatch(T &cli) {
+template <typename T>
+void DigestAuthTestFromHTTPWatch(T& 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,25 +181,24 @@ 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",
-                res->body);
-      EXPECT_EQ(StatusCode::OK_200, res->status);
+      EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
+      EXPECT_EQ(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(401, res->status);
     }
 
     // NOTE: Until httpbin.org fixes issue #46, the following test is commented
-    // out. Please see https://httpbin.org/digest-auth/auth/hello/world
+    // out. Plese see https://httpbin.org/digest-auth/auth/hello/world
     // cli.set_digest_auth("bad", "world");
     // for (auto path : paths) {
     //   auto res = cli.Get(path.c_str());
     //   ASSERT_TRUE(res != nullptr);
-    //   EXPECT_EQ(StatusCode::Unauthorized_401, res->status);
+    //   EXPECT_EQ(401, res->status);
     // }
   }
 }
@@ -215,7 +216,8 @@ TEST(DigestAuthTest, NoSSL) {
 
 // ----------------------------------------------------------------------------
 
-template <typename T> void KeepAliveTest(T &cli, bool basic) {
+template <typename T>
+void KeepAliveTest(T& cli, bool basic) {
   cli.set_proxy("localhost", basic ? 3128 : 3129);
   if (basic) {
     cli.set_proxy_basic_auth("hello", "world");
@@ -232,11 +234,11 @@ template <typename T> void KeepAliveTest(T &cli, bool basic) {
 
   {
     auto res = cli.Get("/httpbin/get");
-    EXPECT_EQ(StatusCode::OK_200, res->status);
+    EXPECT_EQ(200, res->status);
   }
   {
     auto res = cli.Get("/httpbin/redirect/2");
-    EXPECT_EQ(StatusCode::OK_200, res->status);
+    EXPECT_EQ(200, res->status);
   }
 
   {
@@ -247,11 +249,10 @@ template <typename T> void KeepAliveTest(T &cli, bool basic) {
         "/httpbin/digest-auth/auth-int/hello/world/MD5",
     };
 
-    for (auto path : paths) {
+    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);
+      EXPECT_EQ("{\n  \"authenticated\": true, \n  \"user\": \"hello\"\n}\n", res->body);
+      EXPECT_EQ(200, res->status);
     }
   }
 
@@ -259,7 +260,7 @@ template <typename T> void KeepAliveTest(T &cli, bool basic) {
     int count = 10;
     while (count--) {
       auto res = cli.Get("/httpbin/get");
-      EXPECT_EQ(StatusCode::OK_200, res->status);
+      EXPECT_EQ(200, res->status);
     }
   }
 }

test/www/dir/meson.build

@@ -5,4 +5,3 @@
 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 @@
-日本語コンテンツ