Skip to content

Commit 48e9e82

Browse files
notrojnotroj
committed
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 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933271 13f79535-47bb-0310-9956-ffa450edef68
1 parent d6d9801 commit 48e9e82

40 files changed

Lines changed: 4 additions & 9238 deletions

‎Apache-apr2.dsw‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ Package=<4>
8787
Project_Dep_Name httpd
8888
End Project Dependency
8989
Begin Project Dependency
90-
Project_Dep_Name mod_apreq
91-
End Project Dependency
92-
Begin Project Dependency
9390
Project_Dep_Name ApacheMonitor
9491
End Project Dependency
9592
Begin Project Dependency
@@ -744,27 +741,6 @@ Package=<4>
744741

745742
###############################################################################
746743

747-
Project: "libapreq"=.\libapreq.dsp - Package Owner=<4>
748-
749-
Package=<5>
750-
{{{
751-
}}}
752-
753-
Package=<4>
754-
{{{
755-
Begin Project Dependency
756-
Project_Dep_Name libapr
757-
End Project Dependency
758-
Begin Project Dependency
759-
Project_Dep_Name libapriconv
760-
End Project Dependency
761-
Begin Project Dependency
762-
Project_Dep_Name libhttpd
763-
End Project Dependency
764-
}}}
765-
766-
###############################################################################
767-
768744
Project: "libhttpd"=.\libhttpd.dsp - Package Owner=<4>
769745

770746
Package=<5>

‎Apache.dsw‎

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,6 @@ Package=<4>
9090
Project_Dep_Name httpd
9191
End Project Dependency
9292
Begin Project Dependency
93-
Project_Dep_Name mod_apreq
94-
End Project Dependency
95-
Begin Project Dependency
9693
Project_Dep_Name ApacheMonitor
9794
End Project Dependency
9895
Begin Project Dependency
@@ -906,30 +903,6 @@ Package=<4>
906903

907904
###############################################################################
908905

909-
Project: "libapreq"=.\libapreq.dsp - Package Owner=<4>
910-
911-
Package=<5>
912-
{{{
913-
}}}
914-
915-
Package=<4>
916-
{{{
917-
Begin Project Dependency
918-
Project_Dep_Name libapr
919-
End Project Dependency
920-
Begin Project Dependency
921-
Project_Dep_Name libapriconv
922-
End Project Dependency
923-
Begin Project Dependency
924-
Project_Dep_Name libaprutil
925-
End Project Dependency
926-
Begin Project Dependency
927-
Project_Dep_Name libhttpd
928-
End Project Dependency
929-
}}}
930-
931-
###############################################################################
932-
933906
Project: "libhttpd"=.\libhttpd.dsp - Package Owner=<4>
934907

935908
Package=<5>
@@ -1056,30 +1029,6 @@ Package=<4>
10561029

10571030
###############################################################################
10581031

1059-
Project: "mod_apreq"=.\modules\apreq\mod_apreq.dsp - Package Owner=<4>
1060-
1061-
Package=<5>
1062-
{{{
1063-
}}}
1064-
1065-
Package=<4>
1066-
{{{
1067-
Begin Project Dependency
1068-
Project_Dep_Name libapr
1069-
End Project Dependency
1070-
Begin Project Dependency
1071-
Project_Dep_Name libaprutil
1072-
End Project Dependency
1073-
Begin Project Dependency
1074-
Project_Dep_Name libhttpd
1075-
End Project Dependency
1076-
Begin Project Dependency
1077-
Project_Dep_Name libapreq
1078-
End Project Dependency
1079-
}}}
1080-
1081-
###############################################################################
1082-
10831032
Project: "mod_asis"=.\modules\generators\mod_asis.dsp - Package Owner=<4>
10841033

10851034
Package=<5>
@@ -1099,6 +1048,7 @@ Package=<4>
10991048
End Project Dependency
11001049
}}}
11011050

1051+
11021052
###############################################################################
11031053

11041054
Project: "mod_access_compat"=.\modules\aaa\mod_access_compat.dsp - Package Owner=<4>

‎CHANGES‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2005,10 +2005,6 @@ Changes with Apache 2.5.0-alpha
20052005
*) mod_authnz_ldap: Resolve crashes with LDAP authz and non-LDAP authn since
20062006
r1608202. [Eric Covener]
20072007

2008-
*) apreq: Content-Length header should be always interpreted as a decimal.
2009-
Leading 0 could be erroneously considered as an octal value. PR 56598.
2010-
[Chris Card <ctcard hotmail com>]
2011-
20122008
*) mod_proxy: Now allow for 191 character worker names, with non-fatal
20132009
errors if name is truncated. PR53218. [Jim Jagielski]
20142010

@@ -2229,8 +2225,6 @@ Changes with Apache 2.5.0-alpha
22292225

22302226
*) mod_noloris
22312227

2232-
*) APREQ
2233-
22342228
*) Simple MPM
22352229

22362230
*) mod_serf

‎CMakeLists.txt‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@ SET(MODULE_LIST
321321
"modules/aaa/mod_authz_host+A+host-based authorization control"
322322
"modules/aaa/mod_authz_owner+I+'require file-owner' authorization control"
323323
"modules/aaa/mod_authz_user+A+'require user' authorization control"
324-
"modules/apreq/mod_apreq+i+Apache Request Filter"
325324
"modules/arch/win32/mod_isapi+I+isapi extension support"
326325
"modules/cache/mod_cache+I+dynamic file caching. At least one storage management module (e.g. mod_cache_disk) is also necessary."
327326
"modules/cache/mod_cache_disk+I+disk caching module"
@@ -437,9 +436,6 @@ SET(installed_mod_libs_exps)
437436
# Define extra definitions, sources, headers, etc. required by some modules.
438437
# This could be included in the master list of modules above, though it
439438
# certainly would get a lot more unreadable.
440-
SET(mod_apreq_extra_defines APREQ_DECLARE_EXPORT)
441-
SET(mod_apreq_extra_sources modules/apreq/handle.c)
442-
SET(mod_apreq_main_source modules/apreq/filter.c)
443439
SET(mod_authz_dbd_extra_defines AUTHZ_DBD_DECLARE_EXPORT)
444440
SET(mod_authnz_ldap_requires APR_HAS_LDAP)
445441
SET(mod_authnz_ldap_extra_libs mod_ldap)
@@ -684,17 +680,6 @@ SET(HTTPD_MAIN_SOURCES
684680
SET(LIBHTTPD_SOURCES
685681
${extra_builtin_modules}
686682
${PROJECT_BINARY_DIR}/modules.c
687-
server/apreq_cookie.c
688-
server/apreq_error.c
689-
server/apreq_module.c
690-
server/apreq_module_cgi.c
691-
server/apreq_module_custom.c
692-
server/apreq_param.c
693-
server/apreq_parser.c
694-
server/apreq_parser_header.c
695-
server/apreq_parser_multipart.c
696-
server/apreq_parser_urlencoded.c
697-
server/apreq_util.c
698683
modules/arch/win32/mod_win32.c
699684
modules/core/mod_so.c
700685
modules/http/byterange_filter.c
@@ -921,7 +906,6 @@ TARGET_COMPILE_DEFINITIONS(libhttpd PRIVATE
921906
"LONG_NAME=Apache HTTP Server Core"
922907
"BIN_NAME=libhttpd.dll"
923908
"AP_DECLARE_EXPORT"
924-
"APREQ_DECLARE_EXPORT"
925909
)
926910
TARGET_COMPILE_OPTIONS(libhttpd PRIVATE ${PCRE_CFLAGS} ${EXTRA_COMPILE_FLAGS})
927911
ADD_DEPENDENCIES(libhttpd test_char_header)

‎Makefile.win‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,6 @@ _build:
508508
$(MAKE) $(MAKEOPT) -f gen_test_char.mak CFG="gen_test_char - Win32 $(LONG)" RECURSE=0 $(CTARGET)
509509
cd ..
510510
$(MAKE) $(MAKEOPT) -f libhttpd.mak CFG="libhttpd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
511-
$(MAKE) $(MAKEOPT) -f libapreq.mak CFG="libapreq - Win32 $(LONG)" RECURSE=0 $(CTARGET)
512511
$(MAKE) $(MAKEOPT) -f httpd.mak CFG="httpd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
513512
# build ldap prior to authnz_ldap
514513
cd modules\ldap
@@ -540,9 +539,6 @@ _build:
540539
$(MAKE) $(MAKEOPT) -f mod_authz_owner.mak CFG="mod_authz_owner - Win32 $(LONG)" RECURSE=0 $(CTARGET)
541540
$(MAKE) $(MAKEOPT) -f mod_authz_user.mak CFG="mod_authz_user - Win32 $(LONG)" RECURSE=0 $(CTARGET)
542541
cd ..\..
543-
cd modules\apreq
544-
$(MAKE) $(MAKEOPT) -f mod_apreq.mak CFG="mod_apreq - Win32 $(LONG)" RECURSE=0 $(CTARGET)
545-
cd ..\..
546542
cd modules\arch\win32
547543
$(MAKE) $(MAKEOPT) -f mod_isapi.mak CFG="mod_isapi - Win32 $(LONG)" RECURSE=0 $(CTARGET)
548544
cd ..\..\..
@@ -828,7 +824,6 @@ _build:
828824

829825
_copybin:
830826
copy $(LONG)\httpd.$(src_exe) "$(inst_exe)" <.y
831-
copy $(LONG)\libapreq.$(src_dll) "$(inst_dll)" <.y
832827
copy $(LONG)\libhttpd.$(src_dll) "$(inst_dll)" <.y
833828
copy srclib\apr\$(LONG)\libapr-1.$(src_dll) "$(inst_dll)" <.y
834829
!IF EXIST("srclib\apr-util")
@@ -872,7 +867,6 @@ _copybin:
872867
copy modules\aaa\$(LONG)\mod_authz_host.$(src_so) "$(inst_so)" <.y
873868
copy modules\aaa\$(LONG)\mod_authz_owner.$(src_so) "$(inst_so)" <.y
874869
copy modules\aaa\$(LONG)\mod_authz_user.$(src_so) "$(inst_so)" <.y
875-
copy modules\apreq\$(LONG)\mod_apreq.$(src_so) "$(inst_so)" <.y
876870
copy modules\arch\win32\$(LONG)\mod_isapi.$(src_so) "$(inst_so)" <.y
877871
copy modules\cache\$(LONG)\mod_cache.$(src_so) "$(inst_so)" <.y
878872
copy modules\cache\$(LONG)\mod_cache_disk.$(src_so) "$(inst_so)" <.y

‎NWGNUmakefile‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -218,17 +218,6 @@ TARGET_lib = \
218218
# Paths must all use the '/' character
219219
#
220220
FILES_nlm_objs = \
221-
$(OBJDIR)/apreq_cookie.o \
222-
$(OBJDIR)/apreq_error.o \
223-
$(OBJDIR)/apreq_module.o \
224-
$(OBJDIR)/apreq_module_cgi.o \
225-
$(OBJDIR)/apreq_module_custom.o \
226-
$(OBJDIR)/apreq_param.o \
227-
$(OBJDIR)/apreq_parser.o \
228-
$(OBJDIR)/apreq_parser_header.o \
229-
$(OBJDIR)/apreq_parser_multipart.o \
230-
$(OBJDIR)/apreq_parser_urlencoded.o \
231-
$(OBJDIR)/apreq_util.o \
232221
$(OBJDIR)/buildmark.o \
233222
$(OBJDIR)/config.o \
234223
$(OBJDIR)/connection.o \

‎build/installwinconf.awk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ BEGIN {
9999
print "LoadModule alias_module modules/mod_alias.so" > dstfl;
100100
print "#LoadModule allowhandlers_module modules/mod_allowhandlers.so" > dstfl;
101101
print "#LoadModule allowmethods_module modules/mod_allowmethods.so" > dstfl;
102-
print "#LoadModule apreq_module modules/mod_apreq.so" > dstfl;
103102
print "LoadModule asis_module modules/mod_asis.so" > dstfl;
104103
print "LoadModule auth_basic_module modules/mod_auth_basic.so" > dstfl;
105104
print "#LoadModule auth_digest_module modules/mod_auth_digest.so" > dstfl;

‎build/make_nw_export.awk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ function add_symbol(sym_name) {
2828
# List of functions that we don't support, yet??
2929
#/ap_some_name/{next}
3030

31-
/^[ \t]*(AP|DAV|CACHE|PROXY)([RU]|REQ|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
32-
sub("[ \t]*(AP|DAV|CACHE|PROXY)([RU]|REQ|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
31+
/^[ \t]*(AP|DAV|CACHE|PROXY)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)]([^ ]* )*[^(]+[(]/ {
32+
sub("[ \t]*(AP|DAV|CACHE|PROXY)([RU]|_CORE)?_DECLARE[^(]*[(][^)]*[)][ \t]*", "")
3333
sub("[(].*", "")
3434
sub("([^ ]* (^([ \t]*[(])))+", "")
3535
add_symbol($0)

‎build/nw_export.inc‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@
2323
#define APR_DECLARE_OPTIONAL_FN APR_DECLARE_OPTIONAL_FN
2424
#undef APR_DECLARE_EXTERNAL_HOOK
2525
#define APR_DECLARE_EXTERNAL_HOOK APR_DECLARE_EXTERNAL_HOOK
26-
#undef APREQ_DECLARE
27-
#define APREQ_DECLARE APREQ_DECLARE
28-
#undef APREQ_DECLARE_NONSTD
29-
#define APREQ_DECLARE_NONSTD APREQ_DECLARE_NONSTD
30-
#undef APREQ_DECLARE_DATA
31-
#define APREQ_DECLARE_DATA APREQ_DECLARE_DATA
3226
#undef APACHE_OS_H
3327

3428
#include "httpd.h"
@@ -41,12 +35,6 @@
4135
#include "ap_provider.h"
4236
#include "ap_release.h"
4337
#include "ap_expr.h"
44-
#include "apreq_cookie.h"
45-
#include "apreq_error.h"
46-
#include "apreq_module.h"
47-
#include "apreq_param.h"
48-
#include "apreq_parser.h"
49-
#include "apreq_util.h"
5038
#include "http_config.h"
5139
#include "http_connection.h"
5240
#include "http_core.h"

‎build/rpm/httpd.spec.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@ rm -rf $RPM_BUILD_ROOT
306306
%{_libdir}/httpd/modules/mod_alias.so
307307
%{_libdir}/httpd/modules/mod_allowhandlers.so
308308
%{_libdir}/httpd/modules/mod_allowmethods.so
309-
%{_libdir}/httpd/modules/mod_apreq.so
310309
%{_libdir}/httpd/modules/mod_asis.so
311310
%{_libdir}/httpd/modules/mod_auth_basic.so
312311
%{_libdir}/httpd/modules/mod_auth_digest.so

0 commit comments

Comments
 (0)