Skip to content

Remove apreq from trunk #637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
notroj wants to merge 6 commits into from
Closed

Remove apreq from trunk #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f14b39
Remove apreq from trunk per PMC vote:
notroj Apr 23, 2026
c9da8bc
Revert "Added apreq to NetWare build." r1201918
notroj Apr 23, 2026
fbc88b4
Revert "add apreq in Win32" r1825396
notroj Apr 23, 2026
fc92921
Remove references to apreq from CHANGES, httpd.spec.in.
notroj Apr 23, 2026
d9d330d
Partial revert of r1825400.
notroj Apr 23, 2026
ad5c5c4
Revert apreq support from cmake.
notroj Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions Apache-apr2.dsw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@ Package=<4>
Project_Dep_Name httpd
End Project Dependency
Begin Project Dependency
Project_Dep_Name mod_apreq
End Project Dependency
Begin Project Dependency
Project_Dep_Name ApacheMonitor
End Project Dependency
Begin Project Dependency
Expand Down Expand Up @@ -744,27 +741,6 @@ Package=<4>

###############################################################################

Project: "libapreq"=.\libapreq.dsp - Package Owner=<4>

Package=<5>
{{{
}}}

Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name libapr
End Project Dependency
Begin Project Dependency
Project_Dep_Name libapriconv
End Project Dependency
Begin Project Dependency
Project_Dep_Name libhttpd
End Project Dependency
}}}

###############################################################################

Project: "libhttpd"=.\libhttpd.dsp - Package Owner=<4>

Package=<5>
Expand Down
52 changes: 1 addition & 51 deletions Apache.dsw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,6 @@ Package=<4>
Project_Dep_Name httpd
End Project Dependency
Begin Project Dependency
Project_Dep_Name mod_apreq
End Project Dependency
Begin Project Dependency
Project_Dep_Name ApacheMonitor
End Project Dependency
Begin Project Dependency
Expand Down Expand Up @@ -906,30 +903,6 @@ Package=<4>

###############################################################################

Project: "libapreq"=.\libapreq.dsp - Package Owner=<4>

Package=<5>
{{{
}}}

Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name libapr
End Project Dependency
Begin Project Dependency
Project_Dep_Name libapriconv
End Project Dependency
Begin Project Dependency
Project_Dep_Name libaprutil
End Project Dependency
Begin Project Dependency
Project_Dep_Name libhttpd
End Project Dependency
}}}

###############################################################################

Project: "libhttpd"=.\libhttpd.dsp - Package Owner=<4>

Package=<5>
Expand Down Expand Up @@ -1056,30 +1029,6 @@ Package=<4>

###############################################################################

Project: "mod_apreq"=.\modules\apreq\mod_apreq.dsp - Package Owner=<4>

Package=<5>
{{{
}}}

Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name libapr
End Project Dependency
Begin Project Dependency
Project_Dep_Name libaprutil
End Project Dependency
Begin Project Dependency
Project_Dep_Name libhttpd
End Project Dependency
Begin Project Dependency
Project_Dep_Name libapreq
End Project Dependency
}}}

###############################################################################

Project: "mod_asis"=.\modules\generators\mod_asis.dsp - Package Owner=<4>

Package=<5>
Expand All @@ -1099,6 +1048,7 @@ Package=<4>
End Project Dependency
}}}


###############################################################################

Project: "mod_access_compat"=.\modules\aaa\mod_access_compat.dsp - Package Owner=<4>
Expand Down
6 changes: 0 additions & 6 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2005,10 +2005,6 @@ Changes with Apache 2.5.0-alpha
*) mod_authnz_ldap: Resolve crashes with LDAP authz and non-LDAP authn since
r1608202. [Eric Covener]

*) apreq: Content-Length header should be always interpreted as a decimal.
Leading 0 could be erroneously considered as an octal value. PR 56598.
[Chris Card <ctcard hotmail com>]

*) mod_proxy: Now allow for 191 character worker names, with non-fatal
errors if name is truncated. PR53218. [Jim Jagielski]

Expand Down Expand Up @@ -2229,8 +2225,6 @@ Changes with Apache 2.5.0-alpha

*) mod_noloris

*) APREQ

*) Simple MPM

*) mod_serf
Expand Down
16 changes: 0 additions & 16 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,6 @@ SET(MODULE_LIST
"modules/aaa/mod_authz_host+A+host-based authorization control"
"modules/aaa/mod_authz_owner+I+'require file-owner' authorization control"
"modules/aaa/mod_authz_user+A+'require user' authorization control"
"modules/apreq/mod_apreq+i+Apache Request Filter"
"modules/arch/win32/mod_isapi+I+isapi extension support"
"modules/cache/mod_cache+I+dynamic file caching. At least one storage management module (e.g. mod_cache_disk) is also necessary."
"modules/cache/mod_cache_disk+I+disk caching module"
Expand Down Expand Up @@ -437,9 +436,6 @@ SET(installed_mod_libs_exps)
# Define extra definitions, sources, headers, etc. required by some modules.
# This could be included in the master list of modules above, though it
# certainly would get a lot more unreadable.
SET(mod_apreq_extra_defines APREQ_DECLARE_EXPORT)
SET(mod_apreq_extra_sources modules/apreq/handle.c)
SET(mod_apreq_main_source modules/apreq/filter.c)
SET(mod_authz_dbd_extra_defines AUTHZ_DBD_DECLARE_EXPORT)
SET(mod_authnz_ldap_requires APR_HAS_LDAP)
SET(mod_authnz_ldap_extra_libs mod_ldap)
Expand Down Expand Up @@ -684,17 +680,6 @@ SET(HTTPD_MAIN_SOURCES
SET(LIBHTTPD_SOURCES
${extra_builtin_modules}
${PROJECT_BINARY_DIR}/modules.c
server/apreq_cookie.c
server/apreq_error.c
server/apreq_module.c
server/apreq_module_cgi.c
server/apreq_module_custom.c
server/apreq_param.c
server/apreq_parser.c
server/apreq_parser_header.c
server/apreq_parser_multipart.c
server/apreq_parser_urlencoded.c
server/apreq_util.c
modules/arch/win32/mod_win32.c
modules/core/mod_so.c
modules/http/byterange_filter.c
Expand Down Expand Up @@ -921,7 +906,6 @@ TARGET_COMPILE_DEFINITIONS(libhttpd PRIVATE
"LONG_NAME=Apache HTTP Server Core"
"BIN_NAME=libhttpd.dll"
"AP_DECLARE_EXPORT"
"APREQ_DECLARE_EXPORT"
)
TARGET_COMPILE_OPTIONS(libhttpd PRIVATE ${PCRE_CFLAGS} ${EXTRA_COMPILE_FLAGS})
ADD_DEPENDENCIES(libhttpd test_char_header)
Expand Down
6 changes: 0 additions & 6 deletions Makefile.win
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,6 @@ _build:
$(MAKE) $(MAKEOPT) -f gen_test_char.mak CFG="gen_test_char - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..
$(MAKE) $(MAKEOPT) -f libhttpd.mak CFG="libhttpd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f libapreq.mak CFG="libapreq - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f httpd.mak CFG="httpd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
# build ldap prior to authnz_ldap
cd modules\ldap
Expand Down Expand Up @@ -540,9 +539,6 @@ _build:
$(MAKE) $(MAKEOPT) -f mod_authz_owner.mak CFG="mod_authz_owner - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_authz_user.mak CFG="mod_authz_user - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
cd modules\apreq
$(MAKE) $(MAKEOPT) -f mod_apreq.mak CFG="mod_apreq - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
cd modules\arch\win32
$(MAKE) $(MAKEOPT) -f mod_isapi.mak CFG="mod_isapi - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..\..
Expand Down Expand Up @@ -828,7 +824,6 @@ _build:

_copybin:
copy $(LONG)\httpd.$(src_exe) "$(inst_exe)" <.y
copy $(LONG)\libapreq.$(src_dll) "$(inst_dll)" <.y
copy $(LONG)\libhttpd.$(src_dll) "$(inst_dll)" <.y
copy srclib\apr\$(LONG)\libapr-1.$(src_dll) "$(inst_dll)" <.y
!IF EXIST("srclib\apr-util")
Expand Down Expand Up @@ -872,7 +867,6 @@ _copybin:
copy modules\aaa\$(LONG)\mod_authz_host.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authz_owner.$(src_so) "$(inst_so)" <.y
copy modules\aaa\$(LONG)\mod_authz_user.$(src_so) "$(inst_so)" <.y
copy modules\apreq\$(LONG)\mod_apreq.$(src_so) "$(inst_so)" <.y
copy modules\arch\win32\$(LONG)\mod_isapi.$(src_so) "$(inst_so)" <.y
copy modules\cache\$(LONG)\mod_cache.$(src_so) "$(inst_so)" <.y
copy modules\cache\$(LONG)\mod_cache_disk.$(src_so) "$(inst_so)" <.y
Expand Down
11 changes: 0 additions & 11 deletions NWGNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,17 +218,6 @@ TARGET_lib = \
# Paths must all use the '/' character
#
FILES_nlm_objs = \
$(OBJDIR)/apreq_cookie.o \
$(OBJDIR)/apreq_error.o \
$(OBJDIR)/apreq_module.o \
$(OBJDIR)/apreq_module_cgi.o \
$(OBJDIR)/apreq_module_custom.o \
$(OBJDIR)/apreq_param.o \
$(OBJDIR)/apreq_parser.o \
$(OBJDIR)/apreq_parser_header.o \
$(OBJDIR)/apreq_parser_multipart.o \
$(OBJDIR)/apreq_parser_urlencoded.o \
$(OBJDIR)/apreq_util.o \
$(OBJDIR)/buildmark.o \
$(OBJDIR)/config.o \
$(OBJDIR)/connection.o \
Expand Down
1 change: 0 additions & 1 deletion build/installwinconf.awk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ BEGIN {
print "LoadModule alias_module modules/mod_alias.so" > dstfl;
print "#LoadModule allowhandlers_module modules/mod_allowhandlers.so" > dstfl;
print "#LoadModule allowmethods_module modules/mod_allowmethods.so" > dstfl;
print "#LoadModule apreq_module modules/mod_apreq.so" > dstfl;
print "LoadModule asis_module modules/mod_asis.so" > dstfl;
print "LoadModule auth_basic_module modules/mod_auth_basic.so" > dstfl;
print "#LoadModule auth_digest_module modules/mod_auth_digest.so" > dstfl;
Expand Down
4 changes: 2 additions & 2 deletions build/make_nw_export.awk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ function add_symbol(sym_name) {
# List of functions that we don't support, yet??
#/ap_some_name/{next}

/^[ \t]*(AP|DAV|CACHE|PROXY)([RU]|REQ|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
sub("[ \t]*(AP|DAV|CACHE|PROXY)([RU]|REQ|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
/^[ \t]*(AP|DAV|CACHE|PROXY)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
sub("[ \t]*(AP|DAV|CACHE|PROXY)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
sub("[(].*", "")
sub("([^ ]* (^([ \t]*[(])))+", "")
add_symbol($0)
Expand Down
12 changes: 0 additions & 12 deletions build/nw_export.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@
#define APR_DECLARE_OPTIONAL_FN APR_DECLARE_OPTIONAL_FN
#undef APR_DECLARE_EXTERNAL_HOOK
#define APR_DECLARE_EXTERNAL_HOOK APR_DECLARE_EXTERNAL_HOOK
#undef APREQ_DECLARE
#define APREQ_DECLARE APREQ_DECLARE
#undef APREQ_DECLARE_NONSTD
#define APREQ_DECLARE_NONSTD APREQ_DECLARE_NONSTD
#undef APREQ_DECLARE_DATA
#define APREQ_DECLARE_DATA APREQ_DECLARE_DATA
#undef APACHE_OS_H

#include "httpd.h"
Expand All @@ -41,12 +35,6 @@
#include "ap_provider.h"
#include "ap_release.h"
#include "ap_expr.h"
#include "apreq_cookie.h"
#include "apreq_error.h"
#include "apreq_module.h"
#include "apreq_param.h"
#include "apreq_parser.h"
#include "apreq_util.h"
#include "http_config.h"
#include "http_connection.h"
#include "http_core.h"
Expand Down
1 change: 0 additions & 1 deletion build/rpm/httpd.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/modules/mod_alias.so
%{_libdir}/httpd/modules/mod_allowhandlers.so
%{_libdir}/httpd/modules/mod_allowmethods.so
%{_libdir}/httpd/modules/mod_apreq.so
%{_libdir}/httpd/modules/mod_asis.so
%{_libdir}/httpd/modules/mod_auth_basic.so
%{_libdir}/httpd/modules/mod_auth_digest.so
Expand Down
Loading
Loading