diff --git a/www/cpp-httplib/Makefile b/www/cpp-httplib/Makefile
index 912bc83fc326..08ef295e21a0 100644
--- a/www/cpp-httplib/Makefile
+++ b/www/cpp-httplib/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	cpp-httplib
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.20.1
+DISTVERSION=	0.23.1
 CATEGORIES=	www devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ header-only HTTP/HTTPS server and client library
 WWW=		https://github.com/yhirose/cpp-httplib
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_FreeBSD_13=	configure fails: OpenSSL is too old: Found unsuitable version "1.1.1t", but required is at least "3.0.0"
 
 TEST_DEPENDS=	gmake:devel/gmake
 
 USES=		cmake localbase:ldflags python:test # localbase only for tests
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yhirose
 
 CMAKE_ON=	HTTPLIB_REQUIRE_ZLIB
 
 NO_ARCH=	yes
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} # only for tests
 
 PLIST_FILES=	include/httplib.h \
 		lib/cmake/httplib/FindBrotli.cmake \
 		share/doc/httplib/README.md \
 		lib/cmake/httplib/httplibConfig.cmake \
 		lib/cmake/httplib/httplibConfigVersion.cmake \
 		lib/cmake/httplib/httplibTargets.cmake
 
 CONFLICTS_BUILD=	googletest # should be CONFLICTS_TEST
 
 OPTIONS_DEFINE=		BROTLI SSL
 OPTIONS_DEFAULT=	BROTLI SSL
 
 BROTLI_CMAKE_BOOL=	HTTPLIB_REQUIRE_BROTLI HTTPLIB_USE_BROTLI_IF_AVAILABLE
 BROTLI_BUILD_DEPENDS=	brotli>0:archivers/brotli
 BROTLI_RUN_DEPENDS=	brotli>0:archivers/brotli
 
 SSL_USES=		ssl
 SSL_CMAKE_BOOL=		HTTPLIB_REQUIRE_OPENSSL HTTPLIB_USE_OPENSSL_IF_AVAILABLE
 
 do-test:
 	@cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${GMAKE} CXXFLAGS="${CXXFLAGS} -I${WRKSRC}/test" LDFLAGS="${LDFLAGS}"
 
 # tests as of 0.18.6:
 # [  FAILED  ] 1 test, listed below:
 # [  FAILED  ] SpecifyServerIPAddressTest.RealHostname_Online
 
 
 .include <bsd.port.mk>
diff --git a/www/cpp-httplib/distinfo b/www/cpp-httplib/distinfo
index a8edba732768..b7b2d0d7153b 100644
--- a/www/cpp-httplib/distinfo
+++ b/www/cpp-httplib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746349039
-SHA256 (yhirose-cpp-httplib-v0.20.1_GH0.tar.gz) = b74b1c2c150be2841eba80192f64d93e9a6711985b3ae8aaa1a9cec4863d1dd9
-SIZE (yhirose-cpp-httplib-v0.20.1_GH0.tar.gz) = 1408474
+TIMESTAMP = 1752733579
+SHA256 (yhirose-cpp-httplib-v0.23.1_GH0.tar.gz) = 410a1347ed6bcbcc4a19af8ed8ad3873fe9fa97731d52db845c4c78f3f9c31e6
+SIZE (yhirose-cpp-httplib-v0.23.1_GH0.tar.gz) = 1300345
diff --git a/www/cpp-httplib/files/patch-test_Makefile b/www/cpp-httplib/files/patch-test_Makefile
index fa193597150c..f3e7d7b3699c 100644
--- a/www/cpp-httplib/files/patch-test_Makefile
+++ b/www/cpp-httplib/files/patch-test_Makefile
@@ -1,36 +1,46 @@
---- test/Makefile.orig	2025-03-17 01:24:53 UTC
+--- test/Makefile.orig	2025-07-16 21:59:52 UTC
 +++ test/Makefile
-@@ -43,13 +43,13 @@ test : test.cc include_httplib.cc ../httplib.h Makefil
- 	./test_proxy
+@@ -27,9 +27,6 @@ ifneq ($(OS), Windows_NT)
+ 	ifeq ($(UNAME_S), Darwin)
+ 		LIBS += -framework CoreFoundation -framework CFNetwork
+ 	endif
+-	ifneq ($(UNAME_S), Darwin)
+-		LIBS += -lanl
+-	endif
+ endif
+ 
+ TEST_ARGS = gtest/src/gtest-all.cc gtest/src/gtest_main.cc -Igtest -Igtest/include $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT) $(ZSTD_SUPPORT) $(LIBS)
+@@ -70,13 +67,13 @@ test : test.cc include_httplib.cc ../httplib.h Makefil
+ 	exit $$exit_code
  
  test : test.cc include_httplib.cc ../httplib.h Makefile cert.pem
 -	$(CXX) -o $@ -I.. $(CXXFLAGS) test.cc include_httplib.cc $(TEST_ARGS)
 +	$(CXX) -o $@ -I.. $(CXXFLAGS) test.cc include_httplib.cc ${LDFLAGS} $(TEST_ARGS)
  	@file $@
  
  # Note: The intention of test_split is to verify that it works to compile and
  # link the split httplib.h, so there is normally no need to execute it.
  test_split : test.cc ../httplib.h httplib.cc Makefile cert.pem
 -	$(CXX) -o $@ $(CXXFLAGS) test.cc httplib.cc $(TEST_ARGS)
 +	$(CXX) -o $@ $(CXXFLAGS) test.cc httplib.cc ${LDFLAGS} $(TEST_ARGS)
  
  check_abi:
  	@./check-shared-library-abi-compatibility.sh
-@@ -77,7 +77,7 @@ test_proxy : test_proxy.cc ../httplib.h Makefile cert.
+@@ -104,7 +101,7 @@ test_proxy : test_proxy.cc ../httplib.h Makefile cert.
  	fi
  
  test_proxy : test_proxy.cc ../httplib.h Makefile cert.pem
 -	$(CXX) -o $@ -I.. $(CXXFLAGS) test_proxy.cc $(TEST_ARGS)
 +	$(CXX) -o $@ -I.. $(CXXFLAGS) test_proxy.cc ${LDFLAGS} $(TEST_ARGS)
  
  # Runs server_fuzzer.cc based on value of $(LIB_FUZZING_ENGINE).
  # Usage: make fuzz_test LIB_FUZZING_ENGINE=/path/to/libFuzzer
-@@ -86,7 +86,7 @@ server_fuzzer : fuzzing/server_fuzzer.cc ../httplib.h 
+@@ -113,7 +110,7 @@ server_fuzzer : fuzzing/server_fuzzer.cc ../httplib.h 
  
  # Fuzz target, so that you can choose which $(LIB_FUZZING_ENGINE) to use.
  server_fuzzer : fuzzing/server_fuzzer.cc ../httplib.h standalone_fuzz_target_runner.o
--	$(CXX) -o $@ -I.. $(CXXFLAGS) $< $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT) $(LIB_FUZZING_ENGINE) -pthread
-+	$(CXX) -o $@ -I.. $(CXXFLAGS) $< $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT) $(LIB_FUZZING_ENGINE) ${LDFLAGS} -pthread
+-	$(CXX) -o $@ -I.. $(CXXFLAGS) $< $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT) $(LIB_FUZZING_ENGINE) $(ZSTD_SUPPORT) $(LIBS)
++	$(CXX) -o $@ -I.. $(CXXFLAGS) $< $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT) $(LIB_FUZZING_ENGINE) $(ZSTD_SUPPORT) $(LIBS) -pthread
  	@file $@
  
  # Standalone fuzz runner, which just reads inputs from fuzzing/corpus/ dir and