You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2026/04/23 16:08:21 UTC
svn commit: r1933271 - in httpd/httpd/trunk: . build build/rpm include modules modules/apreq os/win32 server
Author: jorton
Date: Thu Apr 23 16:08:21 2026
New Revision: 1933271
Log:
Remove apreq from trunk per PMC vote:
https://lists.apache.org/thread/hlvtnmg8qq1m10xlmgvyn12wrw4z3gp3
Revert \"Added apreq to NetWare build.\" r1201918
Revert \"add apreq in Win32\" r1825396
Remove references to apreq from CHANGES, httpd.spec.in.
Partial revert of r1825400.
Revert apreq support from cmake.
GitHub: closes #637
Deleted:
httpd/httpd/trunk/include/apreq.h
httpd/httpd/trunk/include/apreq_cookie.h
httpd/httpd/trunk/include/apreq_error.h
httpd/httpd/trunk/include/apreq_module.h
httpd/httpd/trunk/include/apreq_param.h
httpd/httpd/trunk/include/apreq_parser.h
httpd/httpd/trunk/include/apreq_util.h
httpd/httpd/trunk/libapreq.dsp
httpd/httpd/trunk/modules/apreq/Makefile.in
httpd/httpd/trunk/modules/apreq/NWGNUmakefile
httpd/httpd/trunk/modules/apreq/apreq_module_apache2.h
httpd/httpd/trunk/modules/apreq/apreq_private_apache2.h
httpd/httpd/trunk/modules/apreq/config.m4
httpd/httpd/trunk/modules/apreq/filter.c
httpd/httpd/trunk/modules/apreq/handle.c
httpd/httpd/trunk/modules/apreq/mod_apreq.dsp
httpd/httpd/trunk/server/apreq_cookie.c
httpd/httpd/trunk/server/apreq_error.c
httpd/httpd/trunk/server/apreq_module.c
httpd/httpd/trunk/server/apreq_module_cgi.c
httpd/httpd/trunk/server/apreq_module_custom.c
httpd/httpd/trunk/server/apreq_param.c
httpd/httpd/trunk/server/apreq_parser.c
httpd/httpd/trunk/server/apreq_parser_header.c
httpd/httpd/trunk/server/apreq_parser_multipart.c
httpd/httpd/trunk/server/apreq_parser_urlencoded.c
httpd/httpd/trunk/server/apreq_util.c
Modified:
httpd/httpd/trunk/Apache-apr2.dsw
httpd/httpd/trunk/Apache.dsw
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/CMakeLists.txt
httpd/httpd/trunk/Makefile.win
httpd/httpd/trunk/NWGNUmakefile
httpd/httpd/trunk/build/installwinconf.awk
httpd/httpd/trunk/build/make_nw_export.awk
httpd/httpd/trunk/build/nw_export.inc
httpd/httpd/trunk/build/rpm/httpd.spec.in
httpd/httpd/trunk/modules/NWGNUmakefile
httpd/httpd/trunk/os/win32/BaseAddr.ref
httpd/httpd/trunk/server/Makefile.in
Modified: httpd/httpd/trunk/Apache-apr2.dsw
==============================================================================
--- httpd/httpd/trunk/Apache-apr2.dsw Thu Apr 23 14:39:16 2026 (r1933270)
+++ httpd/httpd/trunk/Apache-apr2.dsw Thu Apr 23 16:08:21 2026 (r1933271)
@@ -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
@@ -742,27 +739,6 @@ Package=<4>
End Project Dependency
}}}
-###############################################################################
-
-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>
Modified: httpd/httpd/trunk/Apache.dsw
==============================================================================
--- httpd/httpd/trunk/Apache.dsw Thu Apr 23 14:39:16 2026 (r1933270)
+++ httpd/httpd/trunk/Apache.dsw Thu Apr 23 16:08:21 2026 (r1933271)
@@ -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
@@ -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>
@@ -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>
@@ -1099,6 +1048,7 @@ Package=<4>
End Project Dependency
}}}
+
###############################################################################
Project: "mod_access_compat"=.\modules\aaa\mod_access_compat.dsp - Package Owner=<4>
Modified: httpd/httpd/trunk/CHANGES
==============================================================================
--- httpd/httpd/trunk/CHANGES Thu Apr 23 14:39:16 2026 (r1933270)
+++ httpd/httpd/trunk/CHANGES Thu Apr 23 16:08:21 2026 (r1933271)
@@ -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]
@@ -2229,8 +2225,6 @@ Changes with Apache 2.5.0-alpha
*) mod_noloris
- *) APREQ
-
*) Simple MPM
*) mod_serf
Modified: httpd/httpd/trunk/CMakeLists.txt
==============================================================================
--- httpd/httpd/trunk/CMakeLists.txt Thu Apr 23 14:39:16 2026 (r1933270)
+++ httpd/httpd/trunk/CMakeLists.txt Thu Apr 23 16:08:21 2026 (r1933271)
@@ -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"
@@ -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)
@@ -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
@@ -921,7 +906,6 @@ TARGET_COMPILE_DEFINITIONS(libhttpd PRIV
"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)
Modified: httpd/httpd/trunk/Makefile.win
==============================================================================
--- httpd/httpd/trunk/Makefile.win Thu Apr 23 14:39:16 2026 (r1933270)
+++ httpd/httpd/trunk/Makefile.win Thu Apr 23 16:08:21 2026 (r1933271)
@@ -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
@@ -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 ..\..\..
@@ -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")
@@ -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
Modified: httpd/httpd/trunk/NWGNUmakefile
==============================================================================
--- httpd/httpd/trunk/NWGNUmakefile Thu Apr 23 14:39:16 2026 (r1933270)
+++ httpd/httpd/trunk/NWGNUmakefile Thu Apr 23 16:08:21 2026 (r1933271)
@@ -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 \
Modified: httpd/httpd/trunk/build/installwinconf.awk
==============================================================================
--- httpd/httpd/trunk/build/installwinconf.awk Thu Apr 23 14:39:16 2026 (r1933270)
+++ httpd/httpd/trunk/build/installwinconf.awk Thu Apr 23 16:08:21 2026 (r1933271)
@@ -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;
Modified: httpd/httpd/trunk/build/make_nw_export.awk
==============================================================================
--- httpd/httpd/trunk/build/make_nw_export.awk Thu Apr 23 14:39:16 2026 (r1933270)
+++ httpd/httpd/trunk/build/make_nw_export.awk Thu Apr 23 16:08:21 2026 (r1933271)
@@ -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)
Modified: httpd/httpd/trunk/build/nw_export.inc
==============================================================================
--- httpd/httpd/trunk/build/nw_export.inc Thu Apr 23 14:39:16 2026 (r1933270)
+++ httpd/httpd/trunk/build/nw_export.inc Thu Apr 23 16:08:21 2026 (r1933271)
@@ -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"
@@ -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"
Modified: httpd/httpd/trunk/build/rpm/httpd.spec.in
==============================================================================
--- httpd/httpd/trunk/build/rpm/httpd.spec.in Thu Apr 23 14:39:16 2026 (r1933270)
+++ httpd/httpd/trunk/build/rpm/httpd.spec.in Thu Apr 23 16:08:21 2026 (r1933271)
@@ -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
Modified: httpd/httpd/trunk/modules/NWGNUmakefile
==============================================================================
--- httpd/httpd/trunk/modules/NWGNUmakefile Thu Apr 23 14:39:16 2026 (r1933270)
+++ httpd/httpd/trunk/modules/NWGNUmakefile Thu Apr 23 16:08:21 2026 (r1933271)
@@ -33,7 +33,6 @@ endif
SUBDIRS = \
aaa \
- apreq \
cache \
cluster \
core \
Modified: httpd/httpd/trunk/os/win32/BaseAddr.ref
==============================================================================
--- httpd/httpd/trunk/os/win32/BaseAddr.ref Thu Apr 23 14:39:16 2026 (r1933270)
+++ httpd/httpd/trunk/os/win32/BaseAddr.ref Thu Apr 23 16:08:21 2026 (r1933271)
@@ -123,7 +123,6 @@ mod_cache_socache.so 0x70B60000
mod_allowhandlers.so 0x70B80000 0x00010000
mod_macro.so 0x70B90000 0x00020000
mod_proxy_wstunnel.so 0x70BB0000 0x00020000
-mod_apreq.so 0x70BD0000 0x00020000
mod_authnz_fcgi.so 0x70BF0000 0x00020000
mod_dialup.so 0x70C10000 0x00010000
mod_optional_fn_export.so 0x70C20000 0x00010000
@@ -139,5 +138,4 @@ mod_proxy_hcheck.so 0x70E00000
mod_socache_redis.so 0x70E20000 0x00020000
mod_md.so 0x70E40000 0x00030000
mod_proxy_uwsgi.so 0x70E70000 0x00020000
-libapreq.dll 0x70E90000 0x00020000
mod_log_json.so 0x70EB0000 0x00020000
Modified: httpd/httpd/trunk/server/Makefile.in
==============================================================================
--- httpd/httpd/trunk/server/Makefile.in Thu Apr 23 14:39:16 2026 (r1933270)
+++ httpd/httpd/trunk/server/Makefile.in Thu Apr 23 16:08:21 2026 (r1933271)
@@ -15,11 +15,7 @@ LTLIBRARY_SOURCES = \
util_filter.c util_pcre.c util_regex.c $(EXPORTS_DOT_C) \
scoreboard.c error_bucket.c protocol.c core.c request.c ssl.c provider.c \
eoc_bucket.c eor_bucket.c headers_bucket.c core_filters.c \
- util_expr_parse.c util_expr_scan.c util_expr_eval.c \
- apreq_cookie.c apreq_error.c apreq_module.c \
- apreq_module_cgi.c apreq_module_custom.c apreq_param.c \
- apreq_parser.c apreq_parser_header.c apreq_parser_multipart.c \
- apreq_parser_urlencoded.c apreq_util.c
+ util_expr_parse.c util_expr_scan.c util_expr_eval.c
LTLIBRARY_DEPENDENCIES = test_char.h