diff --git a/www/cpp-httplib/Makefile b/www/cpp-httplib/Makefile
index afa37deeeb24..cd8a0db16421 100644
--- a/www/cpp-httplib/Makefile
+++ b/www/cpp-httplib/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	cpp-httplib
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.30.2
+DISTVERSION=	0.31.0
 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.30.0:
+# tests as of 0.31.0:
 # [----------] Global test environment tear-down
-# [==========] 542 tests from 117 test suites ran. (203930 ms total)
-# [  PASSED  ] 542 tests.
+# [==========] 567 tests from 125 test suites ran. (254378 ms total)
+# [  PASSED  ] 567 tests.
+
 
 .include <bsd.port.mk>
diff --git a/www/cpp-httplib/distinfo b/www/cpp-httplib/distinfo
index 5e0efe9240c9..216bb1e1ba57 100644
--- a/www/cpp-httplib/distinfo
+++ b/www/cpp-httplib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1770014784
-SHA256 (yhirose-cpp-httplib-v0.30.2_GH0.tar.gz) = 35fb1bc4cc688d81ca2e5a97e472b407bc57aeb5c3469a4260070b7c9cf8fc45
-SIZE (yhirose-cpp-httplib-v0.30.2_GH0.tar.gz) = 1351033
+TIMESTAMP = 1770694555
+SHA256 (yhirose-cpp-httplib-v0.31.0_GH0.tar.gz) = 35fd2ea19c1776af013c302e925950fd39a7ea413acb07dbbc2e40a1cd541fb6
+SIZE (yhirose-cpp-httplib-v0.31.0_GH0.tar.gz) = 1379520
diff --git a/www/cpp-httplib/files/patch-test_Makefile b/www/cpp-httplib/files/patch-test_Makefile
index f3e7d7b3699c..c00bc738f36a 100644
--- a/www/cpp-httplib/files/patch-test_Makefile
+++ b/www/cpp-httplib/files/patch-test_Makefile
@@ -1,46 +1,45 @@
---- test/Makefile.orig	2025-07-16 21:59:52 UTC
+--- test/Makefile.orig	2026-02-10 03:44:48 UTC
 +++ test/Makefile
-@@ -27,9 +27,6 @@ ifneq ($(OS), Windows_NT)
- 	ifeq ($(UNAME_S), Darwin)
- 		LIBS += -framework CoreFoundation -framework CFNetwork
+@@ -32,7 +32,7 @@ ifneq ($(OS), Windows_NT)
+ 		# Linux: use system paths
+ 		BROTLI_SUPPORT = -DCPPHTTPLIB_BROTLI_SUPPORT -lbrotlicommon -lbrotlienc -lbrotlidec
+ 		ZSTD_SUPPORT = -DCPPHTTPLIB_ZSTD_SUPPORT -lzstd
+-		LIBS = -lpthread -lcurl -lanl
++		LIBS = -lpthread -lcurl
  	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
+@@ -95,13 +95,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
-@@ -104,7 +101,7 @@ test_proxy : test_proxy.cc ../httplib.h Makefile cert.
+ # Mbed TLS backend targets
+ test_mbedtls : test.cc include_httplib.cc ../httplib.h Makefile cert.pem
+@@ -145,7 +145,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
-@@ -113,7 +110,7 @@ server_fuzzer : fuzzing/server_fuzzer.cc ../httplib.h 
+ test_proxy_mbedtls : test_proxy.cc ../httplib.h Makefile cert.pem
+ 	$(CXX) -o $@ -I.. $(CXXFLAGS) test_proxy.cc $(TEST_ARGS_MBEDTLS)
+@@ -157,7 +157,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) $(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