Skip to content

Commit 1e3795b

Browse files
MungoGMungoG
committed
Move zlib and brotli compression from capy to http
Add zlib and brotli compression services from capy. These services provide HTTP content encoding support (gzip, deflate, br) and are better placed in the http library where they are actually used. - Add all zlib/brotli headers, sources, and tests - Change namespace from boost::capy to boost::http - Add compression documentation with cross-references - Update build files (CMake, B2, CI) - Update parser/serializer to use new namespace
1 parent 5ef14b2 commit 1e3795b

63 files changed

Lines changed: 4125 additions & 78 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,8 @@ jobs:
290290
apt-get: >-
291291
${{ matrix.install }}
292292
build-essential
293-
${{ matrix.x86 && '' || '' }}
293+
zlib1g-dev libbrotli-dev
294+
${{ matrix.x86 && 'zlib1g-dev:i386 libbrotli-dev:i386' || '' }}
294295
295296
- name: Clone Capy
296297
uses: actions/checkout@v4
@@ -392,6 +393,7 @@ jobs:
392393
build-type: ${{ matrix.build-type }}
393394
build-target: tests
394395
run-tests: true
396+
install: true
395397
install-prefix: .local
396398
cxxstd: ${{ matrix.latest-cxxstd }}
397399
cc: ${{ steps.setup-cpp.outputs.cc || matrix.cc }}
@@ -416,9 +418,13 @@ jobs:
416418
run: |
417419
echo "LD_LIBRARY_PATH=$GITHUB_WORKSPACE/.local/lib:$LD_LIBRARY_PATH" >> "$GITHUB_ENV"
418420
421+
# Disabled: Boost's CMake infrastructure does not generate install rules for
422+
# the "main" library in BOOST_INCLUDE_LIBRARIES, only for its dependencies.
423+
# This causes find_package(Boost COMPONENTS http) to fail because
424+
# boost_httpConfig.cmake is never installed.
419425
- name: Find Package Integration Workflow
420426
uses: alandefreitas/cpp-actions/cmake-workflow@v1.9.0
421-
if: ${{ matrix.build-cmake || matrix.is-earliest }}
427+
if: false # ${{ matrix.build-cmake || matrix.is-earliest }}
422428
with:
423429
source-dir: boost-root/libs/${{ steps.patch.outputs.module }}/test/cmake_test
424430
build-dir: __build_cmake_install_test__

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
/.clangd
44
/build/*
55
!/build/Jamfile
6+
!/build/brotli.jam
67
/out/
78
/CMakeUserPresets.json
89
/tmpclaude-*-cwd

‎CMakeLists.txt‎

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ set(BOOST_HTTP_DEPENDENCIES
5858
Boost::capy
5959
Boost::config
6060
Boost::core
61-
Boost::corosio
6261
Boost::json
6362
Boost::mp11
6463
Boost::static_assert
@@ -68,23 +67,32 @@ set(BOOST_HTTP_DEPENDENCIES
6867
Boost::url
6968
Boost::winapi)
7069

70+
# corosio is used header-only (only io_buffer_param.hpp)
71+
# We include it separately to avoid linking against the full library
72+
set(BOOST_HTTP_HEADER_ONLY_DEPENDENCIES corosio)
73+
7174
foreach (BOOST_HTTP_DEPENDENCY ${BOOST_HTTP_DEPENDENCIES})
7275
if (BOOST_HTTP_DEPENDENCY MATCHES "^[ ]*Boost::([A-Za-z0-9_]+)[ ]*$")
7376
list(APPEND BOOST_HTTP_INCLUDE_LIBRARIES ${CMAKE_MATCH_1})
7477
endif ()
7578
endforeach ()
79+
# Add header-only dependencies to include list (but not link list)
80+
list(APPEND BOOST_HTTP_INCLUDE_LIBRARIES ${BOOST_HTTP_HEADER_ONLY_DEPENDENCIES})
7681
# Conditional dependencies
77-
if (NOT BOOST_URL_MRDOCS_BUILD)
82+
if (NOT BOOST_HTTP_MRDOCS_BUILD)
7883
if (BOOST_HTTP_BUILD_TESTS)
7984
set(BOOST_HTTP_UNIT_TEST_LIBRARIES asio filesystem)
8085
endif ()
8186
if (BOOST_HTTP_BUILD_EXAMPLES)
8287
# set(BOOST_HTTP_EXAMPLE_LIBRARIES json)
8388
endif ()
8489
endif ()
85-
# Complete dependency list
86-
set(BOOST_INCLUDE_LIBRARIES ${BOOST_HTTP_INCLUDE_LIBRARIES} ${BOOST_HTTP_UNIT_TEST_LIBRARIES} ${BOOST_HTTP_EXAMPLE_LIBRARIES})
87-
set(BOOST_EXCLUDE_LIBRARIES http)
90+
# Complete dependency list (only set when http is the root project)
91+
# When built as part of the superproject, these are set by the superproject
92+
if (BOOST_HTTP_IS_ROOT)
93+
set(BOOST_INCLUDE_LIBRARIES ${BOOST_HTTP_INCLUDE_LIBRARIES} ${BOOST_HTTP_UNIT_TEST_LIBRARIES} ${BOOST_HTTP_EXAMPLE_LIBRARIES})
94+
set(BOOST_EXCLUDE_LIBRARIES http)
95+
endif()
8896

8997
#-------------------------------------------------
9098
#
@@ -151,6 +159,10 @@ function(boost_http_setup_properties target)
151159
target_include_directories(${target} PUBLIC "${PROJECT_SOURCE_DIR}/include")
152160
target_include_directories(${target} PRIVATE "${PROJECT_SOURCE_DIR}")
153161
target_link_libraries(${target} PUBLIC ${BOOST_HTTP_DEPENDENCIES})
162+
# Add corosio headers without linking (header-only usage)
163+
# BUILD_INTERFACE: only during build (installed headers are in standard Boost include path)
164+
target_include_directories(${target} PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/../corosio/include>)
165+
target_compile_definitions(${target} PUBLIC BOOST_COROSIO_NO_LIB) # Disable corosio auto-linking
154166
target_compile_definitions(${target} PUBLIC BOOST_HTTP_NO_LIB)
155167
target_compile_definitions(${target} PRIVATE BOOST_HTTP_SOURCE)
156168
if (BUILD_SHARED_LIBS)
@@ -180,6 +192,39 @@ elseif (APPLE)
180192
target_link_libraries(boost_http PRIVATE "-framework Security")
181193
endif ()
182194

195+
# Zlib
196+
find_package(ZLIB)
197+
if (ZLIB_FOUND)
198+
file(GLOB_RECURSE BOOST_HTTP_ZLIB_HEADERS CONFIGURE_DEPENDS include/boost/http/zlib/*.hpp)
199+
file(GLOB_RECURSE BOOST_HTTP_ZLIB_SOURCES CONFIGURE_DEPENDS src_zlib/*.cpp src_zlib/*.hpp)
200+
source_group("" FILES "include/boost/http/zlib.hpp")
201+
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/include/boost/http/zlib PREFIX "include" FILES ${BOOST_HTTP_ZLIB_HEADERS})
202+
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src_zlib PREFIX "src" FILES ${BOOST_HTTP_ZLIB_SOURCES})
203+
add_library(boost_http_zlib include/boost/http/zlib.hpp build/Jamfile ${BOOST_HTTP_ZLIB_HEADERS} ${BOOST_HTTP_ZLIB_SOURCES})
204+
add_library(Boost::http_zlib ALIAS boost_http_zlib)
205+
target_link_libraries(boost_http_zlib PUBLIC boost_http)
206+
target_link_libraries(boost_http_zlib PRIVATE ZLIB::ZLIB)
207+
target_compile_definitions(boost_http_zlib PUBLIC BOOST_HTTP_HAS_ZLIB)
208+
target_compile_definitions(boost_http_zlib PRIVATE BOOST_HTTP_SOURCE)
209+
endif ()
210+
211+
# Brotli
212+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
213+
find_package(Brotli)
214+
if (Brotli_FOUND)
215+
file(GLOB_RECURSE BOOST_HTTP_BROTLI_HEADERS CONFIGURE_DEPENDS include/boost/http/brotli/*.hpp)
216+
file(GLOB_RECURSE BOOST_HTTP_BROTLI_SOURCES CONFIGURE_DEPENDS src_brotli/*.cpp src_brotli/*.hpp)
217+
source_group("" FILES "include/boost/http/brotli.hpp")
218+
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/include/boost/http/brotli PREFIX "include" FILES ${BOOST_HTTP_BROTLI_HEADERS})
219+
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src_brotli PREFIX "src" FILES ${BOOST_HTTP_BROTLI_SOURCES})
220+
add_library(boost_http_brotli include/boost/http/brotli.hpp build/Jamfile ${BOOST_HTTP_BROTLI_HEADERS} ${BOOST_HTTP_BROTLI_SOURCES})
221+
add_library(Boost::http_brotli ALIAS boost_http_brotli)
222+
target_link_libraries(boost_http_brotli PUBLIC boost_http)
223+
target_link_libraries(boost_http_brotli PRIVATE Brotli::common Brotli::decoder Brotli::encoder)
224+
target_compile_definitions(boost_http_brotli PUBLIC BOOST_HTTP_HAS_BROTLI)
225+
target_compile_definitions(boost_http_brotli PRIVATE BOOST_HTTP_SOURCE)
226+
endif ()
227+
183228
#-------------------------------------------------
184229
#
185230
# Tests

‎build/Jamfile‎

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# Official repository: https://github.com/vinniefalco/http
88
#
99

10+
import ac ;
1011
import ../../config/checks/config : requires ;
1112

1213
constant c11-requires :
@@ -43,20 +44,56 @@ lib boost_http
4344
: http_sources
4445
: requirements
4546
<library>/boost//capy
46-
<library>/boost/corosio//boost_corosio
4747
<library>/boost/json//boost_json/<warnings-as-errors>off
4848
<library>/boost//url
4949
<include>../
50+
<include>../../corosio/include
5051
<define>BOOST_HTTP_SOURCE
52+
<define>BOOST_COROSIO_NO_LIB
5153
<target-os>windows:<library>bcrypt_sys
5254
<target-os>darwin:<linkflags>"-framework Security"
5355
: usage-requirements
5456
<library>/boost//capy
55-
<library>/boost/corosio//boost_corosio
5657
<library>/boost/json//boost_json/<warnings-as-errors>off
5758
<library>/boost//url
59+
<include>../../corosio/include
60+
<define>BOOST_COROSIO_NO_LIB
5861
<target-os>windows:<library>bcrypt_sys
5962
<target-os>darwin:<linkflags>"-framework Security"
6063
;
6164

62-
boost-install boost_http ;
65+
# Zlib
66+
using zlib ;
67+
68+
alias http_zlib_sources : [ glob-tree-ex src_zlib : *.cpp ] ;
69+
70+
lib boost_http_zlib
71+
: http_zlib_sources
72+
: requirements
73+
<library>/boost/http//boost_http
74+
<define>BOOST_HTTP_SOURCE
75+
[ ac.check-library /zlib//zlib : <library>/zlib//zlib : <build>no ]
76+
: usage-requirements
77+
<library>/boost/http//boost_http
78+
<define>BOOST_HTTP_HAS_ZLIB
79+
;
80+
81+
# Brotli
82+
using brotli ;
83+
84+
alias http_brotli_sources : [ glob-tree-ex src_brotli : *.cpp ] ;
85+
86+
lib boost_http_brotli
87+
: http_brotli_sources
88+
: requirements
89+
<library>/boost/http//boost_http
90+
<define>BOOST_HTTP_SOURCE
91+
[ ac.check-library /brotli//brotlicommon : <library>/brotli//brotlicommon : <build>no ]
92+
[ ac.check-library /brotli//brotlidec : <library>/brotli//brotlidec : <build>no ]
93+
[ ac.check-library /brotli//brotlienc : <library>/brotli//brotlienc : <build>no ]
94+
: usage-requirements
95+
<library>/boost/http//boost_http
96+
<define>BOOST_HTTP_HAS_BROTLI
97+
;
98+
99+
boost-install boost_http boost_http_zlib boost_http_brotli ;

‎build/brotli.jam‎

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
# Copyright (c) 2025 Mohammad Nejati
2+
#
3+
# Use, modification and distribution is subject to the Boost Software
4+
# License Version 1.0. (See accompanying file LICENSE.txt or
5+
# https://www.bfgroup.xyz/b2/LICENSE.txt)
6+
7+
# Supports the brotli library
8+
#
9+
# After 'using brotli', the following targets are available:
10+
#
11+
# /brotli//brotlicommon -- The brotli common library
12+
# /brotli//brotlidec -- The brotli decoder library
13+
# /brotli//brotlienc -- The brotli encoder library
14+
15+
import project ;
16+
import ac ;
17+
import errors ;
18+
import feature ;
19+
import "class" : new ;
20+
import targets ;
21+
import path ;
22+
import modules ;
23+
import indirect ;
24+
import property ;
25+
import property-set ;
26+
import args ;
27+
28+
header = brotli/decode.h ;
29+
brotlicommon_names = brotlicommon libbrotlicommon ;
30+
brotlidec_names = brotlidec libbrotlidec ;
31+
brotlienc_names = brotlienc libbrotlienc ;
32+
33+
library-id = 0 ;
34+
35+
.debug = [ args.get-arg debug-configuration ] ;
36+
37+
# Initializes the brotli library.
38+
#
39+
# Options for configuring brotli::
40+
#
41+
# <search>
42+
# The directory containing the brotli binaries.
43+
# <brotlicommon-name>
44+
# Overrides the default name of brotlicommon library.
45+
# <brotlidec-name>
46+
# Overrides the default name of brotlidec library.
47+
# <brotlienc-name>
48+
# Overrides the default name of brotlienc library.
49+
# <include>
50+
# The directory containing the brotli headers.
51+
# <dll-path>
52+
# Extra directories to add to library search paths of consumers during
53+
# runtime (multiple instances are allowed).
54+
#
55+
# If none of these options is specified, then the environmental
56+
# variables BROTLI_LIBRARY_PATH, BROTLI_NAME, and BROTLI_INCLUDE will
57+
# be used instead.
58+
#
59+
# Examples::
60+
#
61+
# # Find brotli in the default system location
62+
# using brotli ;
63+
# # Find brotli in /usr/local
64+
# using brotli : 1.1.0
65+
# : <include>/usr/local/include <search>/usr/local/lib ;
66+
#
67+
rule init (
68+
version ?
69+
# (currently ignored)
70+
71+
: options *
72+
# A list of the options to use
73+
74+
: requirements *
75+
# The requirements for the target
76+
77+
: is-default ?
78+
)
79+
{
80+
local caller = [ project.current ] ;
81+
82+
if ! $(.initialized)
83+
{
84+
.initialized = true ;
85+
86+
project.initialize $(__name__) ;
87+
.project = [ project.current ] ;
88+
project brotli ;
89+
}
90+
91+
local library-path = [ feature.get-values <search> : $(options) ] ;
92+
local include-path = [ feature.get-values <include> : $(options) ] ;
93+
local brotlicommon-name = [ feature.get-values <brotlicommon-name> : $(options) ] ;
94+
local brotlidec-name = [ feature.get-values <brotlidec-name> : $(options) ] ;
95+
local brotlienc-name = [ feature.get-values <brotlienc-name> : $(options) ] ;
96+
local dll-paths = [ property.select <dll-path> : $(options) ] ;
97+
98+
if ! $(options)
99+
{
100+
is-default = true ;
101+
}
102+
103+
condition = [ property-set.create $(requirements) ] ;
104+
condition = [ property-set.create [ $(condition).base ] ] ;
105+
106+
if $(.configured.$(condition))
107+
{
108+
if $(is-default)
109+
{
110+
if $(.debug)
111+
{
112+
ECHO "notice: [brotli] brotli is already configured" ;
113+
}
114+
}
115+
else
116+
{
117+
errors.user-error "brotli is already configured" ;
118+
}
119+
return ;
120+
}
121+
else
122+
{
123+
if $(.debug)
124+
{
125+
ECHO "notice: [brotli] Using pre-installed library" ;
126+
if $(condition)
127+
{
128+
ECHO "notice: [brotli] Condition" [ $(condition).raw ] ;
129+
}
130+
}
131+
132+
local brotlicommon = [ new ac-library brotlicommon : $(.project) : $(condition) :
133+
$(include-path) : $(library-path) : $(brotlicommon-name) ] ;
134+
$(brotlicommon).set-header $(header) ;
135+
$(brotlicommon).set-default-names $(brotlicommon_names) ;
136+
$(brotlicommon).add-usage-requirements $(dll-paths) ;
137+
138+
local brotlidec = [ new ac-library brotlidec : $(.project) : $(condition) :
139+
$(include-path) : $(library-path) : $(brotlidec-name) ] ;
140+
$(brotlidec).set-header $(header) ;
141+
$(brotlidec).set-default-names $(brotlidec_names) ;
142+
$(brotlidec).add-usage-requirements $(dll-paths) ;
143+
144+
local brotlienc = [ new ac-library brotlienc : $(.project) : $(condition) :
145+
$(include-path) : $(library-path) : $(brotlienc-name) ] ;
146+
$(brotlienc).set-header $(header) ;
147+
$(brotlienc).set-default-names $(brotlienc_names) ;
148+
$(brotlienc).add-usage-requirements $(dll-paths) ;
149+
150+
targets.main-target-alternative $(brotlicommon) ;
151+
targets.main-target-alternative $(brotlidec) ;
152+
targets.main-target-alternative $(brotlienc) ;
153+
}
154+
.configured.$(condition) = true ;
155+
}

0 commit comments

Comments
 (0)