1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

212 Commits

Author SHA1 Message Date
Jacob Champion
9d1dad18d8 httpdunit: clean up after ourselves properly
Remove the testcase stubs and object files on `make clean`.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796207 13f79535-47bb-0310-9956-ffa450edef68
2017-05-25 21:18:40 +00:00
Jacob Champion
ac43c82539 httpdunit: simplify test case generation
Look, a legitimate use of cat!

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796204 13f79535-47bb-0310-9956-ffa450edef68
2017-05-25 21:18:35 +00:00
Jacob Champion
a4308d4c64 httpdunit_gen_cases: separate declarations from calls
This gets around strict compiler warnings.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796203 13f79535-47bb-0310-9956-ffa450edef68
2017-05-25 21:18:33 +00:00
Jacob Champion
d3289c73ee httpdunit: a Check-based unit test suite
Add a unit test suite based on Check:

    https://libcheck.github.io/check/

The suite depends on the build system to automatically generate the code
stubs that call every test case.

httpdunit is automatically enabled in the build if configure is able to
find Check via pkg-config. At the moment pkg-config is the only official
(non-deprecated) way to build and link against Check with an autoconf
system, since platforms may distribute Check as a static library.

Note that Check is an LGPL'd library, so we can't distribute test
objects and binaries. Building and running the suite remains optional
and is not required to run the server.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796202 13f79535-47bb-0310-9956-ffa450edef68
2017-05-25 21:18:32 +00:00
Jacob Champion
04ce4cacfa check: silence ServerName warnings with MPM DSOs
When using shared MPMs, `httpd -V` will perform a full configuration
check, which emits warnings when there is no defined ServerName.
Unfortunately the test suite does a -V check for every test section,
spamming the output with noise.

Work around this by just uncommenting the example ServerName in the test
config.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1782066 13f79535-47bb-0310-9956-ffa450edef68
2017-02-07 19:45:12 +00:00
Jacob Champion
90e1649ee4 check: allow config tests to pass if necessary
When MPM DSOs are enabled, Apache::Test's invocation of `httpd -V` runs
a full configuration test. To pass, ensure that *all* instances of the
configured prefix path in the test configuration are pointing to a real
directory in check/.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1778026 13f79535-47bb-0310-9956-ffa450edef68
2017-01-09 19:02:00 +00:00
Jacob Champion
fb5a4b4507 check: search for MPM modules in the correct directory
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1778025 13f79535-47bb-0310-9956-ffa450edef68
2017-01-09 19:01:58 +00:00
Jacob Champion
53a469280a check: enable all (non-MPM) modules when testing
We want to test everything the user builds, regardless of whether it's
enabled when first installed.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1777683 13f79535-47bb-0310-9956-ffa450edef68
2017-01-06 18:21:34 +00:00
Jacob Champion
a97103439a Enable zero-install testing
By pointing a local apxs script and corresponding config file into the
build tree, we can trick Apache::Test into testing a server that hasn't
actually been installed.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1777667 13f79535-47bb-0310-9956-ffa450edef68
2017-01-06 17:45:25 +00:00
Jacob Champion
c856f32b96 Add a --with-test-suite option for "in-tree" testing
Step one. It's not actually "in-tree" yet, since it requires running
`make install` first, but at least it gives us a `make check`.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1777384 13f79535-47bb-0310-9956-ffa450edef68
2017-01-04 23:14:27 +00:00
Rainer Jung
89605f9ee7 Use different variables to track normal
modules and MPMs during build.

Normal modules and MPMs follow different
rules in the config, e.g. we are only
allowed to have one active LoadModule
for an MPM in the config.

As a side effect, LoadModule for MPMs
will now come before LoadModule for
the normal modules.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730079 13f79535-47bb-0310-9956-ffa450edef68
2016-02-12 17:46:38 +00:00
Rainer Jung
3e6331e402 Exclude MPM modules from automatic LoadModule
enabling when configure was called with
-enable-load-all-modules. The default MPM
should still get enabled automatically.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729235 13f79535-47bb-0310-9956-ffa450edef68
2016-02-08 19:45:17 +00:00
Stefan Eissing
8b8f8fd062 exporting mod_http2.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1727934 13f79535-47bb-0310-9956-ffa450edef68
2016-02-01 13:30:32 +00:00
Rainer Jung
ff489513c8 Fix indentation and tab use after r1652955.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1652989 13f79535-47bb-0310-9956-ffa450edef68
2015-01-19 12:42:41 +00:00
Rainer Jung
4822ab9bd3 Addition to r1652955: Use "=" in combination
with "test" instead of "==".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1652985 13f79535-47bb-0310-9956-ffa450edef68
2015-01-19 12:34:29 +00:00
Rainer Jung
faac8c0c52 PR 57379: If mod_cgi and mod_cgid get installed,
use IfModule for MPM to LoadModule mod_cgi for
prefork and mod_cgid for all other MPMs.

Previously when combined with --enable-load-all-modules
both modules were loaded and it was undefined
which one actually handled cgi requests.

Based on a patch by olli hauer <ohauer gmx.de>.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1652955 13f79535-47bb-0310-9956-ffa450edef68
2015-01-19 10:32:51 +00:00
Jeff Trawick
f82af68aa4 mod_ssl: Add hooks to allow other modules to perform processing at
several stages of initialization and connection handling.  See
mod_ssl_openssl.h.

This is enough to allow implementation of Certificate Transparency
outside of mod_ssl.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1587607 13f79535-47bb-0310-9956-ffa450edef68
2014-04-15 15:25:03 +00:00
Jim Jagielski
9e645ff241 we need to remove this fluff as well
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553146 13f79535-47bb-0310-9956-ffa450edef68
2013-12-23 16:35:18 +00:00
Joe Orton
c19caf3219 Don't link support/* against systemd libs.
* Makefile.in: Link httpd using $(HTTPD_LIBS).

* configure.in: Add systemd to HTTPD_LIBS rather than LIBS.  Add PCRE
  libs to HTTPD_LIBS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1528034 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 10:25:02 +00:00
Graham Leggett
c5e77d9fa0 Install cache_common.h as required by mod_cache.h. Allows external modules
to use mod_cache.
Submitted by Niklas Edmundsson.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1422855 13f79535-47bb-0310-9956-ffa450edef68
2012-12-17 11:26:20 +00:00
Graham Leggett
81185b29db Export mod_xml2enc.h so that others can use the module.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1399413 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 20:17:46 +00:00
Joe Orton
beaee8f4e3 suexec: Support use of setgid/setuid capability bits on Linux, a
weaker set of privileges than the full setuid/setgid root binary.

* configure.in: Add --enable-suexec-capabilites flag.

* Makefile.in: If configured, use setcap instead of chmod 7555 on
  installed suexec binary.

* modules/arch/unix/mod_unixd.c (unixd_pre_config): Drop test for
  setuid bit if capability bits are used.

* docs/manual/: Add docs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1342065 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 21:38:39 +00:00
Stefan Fritsch
4fca50f997 Install multiple files per install.sh invocation
Libtool and BSD install support installing several files in one run.
Add support to install.sh and instdso.sh, too.
Replace for-loops in the Makefiles.

This reduces 'make install' time by approx. 50% because we save
lots of calls to the huge libtool shell script.

The AIX-specific magic in instdso.sh could use some testing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1237447 13f79535-47bb-0310-9956-ffa450edef68
2012-01-29 20:11:55 +00:00
Stefan Fritsch
bbf60bffa7 Add a validate-xml target
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234642 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 23:19:57 +00:00
Graham Leggett
2cb5dbf511 Distinguish properly between the bindir and sbindir directories when
installing binaries. Previously all binaries were silently installed to
sbindir, whether they were system administration commands or not.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1220846 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 17:00:49 +00:00
Stefan Fritsch
b3cde50489 Add APLOGNO() macro for unique tags for every log message.
Add some scripts to make adding these tags easier.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209743 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 22:26:54 +00:00
Rainer Jung
67b5ac9664 Fix installation of conf/extra/proxy-html.conf.
Otherwise httpd does no longer start, because
it is the only extra file required in the main
config at the moment.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200699 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 02:32:19 +00:00
Stefan Fritsch
9209ff117f Fix selection of loaded modules on AIX because its grep doesn't understand \< and \>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200064 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 00:41:20 +00:00
Rainer Jung
fc2ea4121c Load all modules in the generated default configuration
when using --enable-load-all-modules with configure.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199467 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 21:25:28 +00:00
Rainer Jung
573dd37ec6 Fix make variable reference.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199423 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 20:02:33 +00:00
Stefan Fritsch
4a36c5ba4c By default, only load those modules that are either required
or explicitly selected by a configure --enable-foo argument. The
LoadModule statements for modules enabled by --enable-mods-shared=most
and friends will be commented out.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199027 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 00:20:24 +00:00
Stefan Fritsch
b41c0b1170 Revert r1141203:
remove ap_ldap.h in make distclean



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150161 13f79535-47bb-0310-9956-ffa450edef68
2011-07-23 17:07:41 +00:00
Rainer Jung
c1197d4d83 Move PCRE_LIBS from HTTPD_LDFLAGS to
PROGRAM_LDADD.

Otherwise -lpcre comes before libmain which leads
to undefined recences during linking of httpd.

Followup to r1142739.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142893 13f79535-47bb-0310-9956-ffa450edef68
2011-07-05 05:48:24 +00:00
Stefan Fritsch
7a26dacc38 remove ap_ldap.h in make distclean
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1141203 13f79535-47bb-0310-9956-ffa450edef68
2011-06-29 19:16:36 +00:00
Jeff Trawick
44ad1574ba apache_probes.h is generated by configure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@892250 13f79535-47bb-0310-9956-ffa450edef68
2009-12-18 13:52:48 +00:00
William A. Rowe Jr
d0cbb2c54b Note style flaw, this is rather inappropriate on a global basis, no?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@808719 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 01:26:07 +00:00
William A. Rowe Jr
aed4311df4 catch missing .h for install
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@808680 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 23:31:46 +00:00
Brian Havard
60fbe11de1 Bring back OS/2 support.
Reverses r758929 with a little bit of conflict resolution.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@807930 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 08:56:13 +00:00
William A. Rowe Jr
bc8cdc7896 Here's the simpler solution to the two groups of mappers/ modules...
The mod_so and mod_watchdog are truly not mappers/ at all.  Very open
to better names than modules/core/ but these are clearly API's which
are to be consumed by the httpd core, or generically, any module.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@772848 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 05:46:28 +00:00
Jeff Trawick
f72c7532f1 install mod_serf.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759698 13f79535-47bb-0310-9956-ffa450edef68
2009-03-29 14:37:48 +00:00
Jeff Trawick
ee32468a33 remove OS/2 platform support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758929 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 23:47:52 +00:00
Jeff Trawick
d91f998069 MPM header files are private; don't install them
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758002 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 20:31:51 +00:00
Mladen Turk
24407caabc Add watchdog module header to dist include
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@745164 13f79535-47bb-0310-9956-ffa450edef68
2009-02-17 17:28:33 +00:00
Graham Leggett
457ebd6222 Export and install the mod_rewrite.h header to ensure the optional
rewrite_mapfunc_t and ap_register_rewrite_mapfunc functions are
available to third party modules.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@704726 13f79535-47bb-0310-9956-ffa450edef68
2008-10-14 22:39:32 +00:00
William A. Rowe Jr
864dc3f7d4 mod_core.h moved to include/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@664237 13f79535-47bb-0310-9956-ffa450edef68
2008-06-07 01:47:34 +00:00
William A. Rowe Jr
132636f829 mod_request.h / mod_auth.h moved to include/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@664170 13f79535-47bb-0310-9956-ffa450edef68
2008-06-06 22:35:30 +00:00
Graham Leggett
c239e59ea5 Move the public mod_request.h header out of the include directory and back to modules/filters.
The current build of exports.c assumes that everything in include is part of the core, and so
putting the header there creates link errors.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@648254 13f79535-47bb-0310-9956-ffa450edef68
2008-04-15 13:53:32 +00:00
Graham Leggett
e9e1438e14 Make sure the mod_session.h public header is exported correctly to the rest of the server.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645597 13f79535-47bb-0310-9956-ffa450edef68
2008-04-07 16:32:41 +00:00
Dirk-Willem van Gulik
0fdf9c187b Also install the so, rewrite and cache header files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@620135 13f79535-47bb-0310-9956-ffa450edef68
2008-02-09 15:12:52 +00:00
Guenter Knauf
4e0d66f3fb Enabled to configure the https port as we do with http port too.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606316 13f79535-47bb-0310-9956-ffa450edef68
2007-12-21 20:59:03 +00:00