Commit Graph

699 Commits

Author SHA1 Message Date
587d170151 *) core: provide ap_ssl_* functions in new http_ssl.h header file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1888083 13f79535-47bb-0310-9956-ffa450edef68
2021-03-26 11:27:34 +00:00
e47241a976 * build/config_vars.sh.in: Improve comment language, no functional change.
[skip ci]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1887480 13f79535-47bb-0310-9956-ffa450edef68
2021-03-11 13:48:18 +00:00
482089e7e1 Windows bits for mod_log_json.dsp
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1877688 13f79535-47bb-0310-9956-ffa450edef68
2020-05-13 10:43:05 +00:00
e63927f462 Never checkin generated files applied to build/apr_common.m4.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1869500 13f79535-47bb-0310-9956-ffa450edef68
2019-11-07 12:09:29 +00:00
1c2523d7fc Use latest/compatible apr_common.m4.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1869499 13f79535-47bb-0310-9956-ffa450edef68
2019-11-07 11:01:48 +00:00
77c96847ce *) mod_md: Adding the several new features.
The module offers an implementation of OCSP Stapling that can replace fully or
     for a limited set of domains the existing one from mod_ssl. OCSP handling
     is part of mod_md's monitoring and message notifications. If can be used
     for sites that do not have ACME certificates.
     The url for a CTLog Monitor can be configured. It is used in the server-status
     to link to the external status page of a certicate.
     The MDMessageCmd is called with argument "installed" when a new certificate
     has been activated on server restart/reload. This allows for processing of
     the new certificate, for example to applications that require it in different
     locations or formats.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1868506 13f79535-47bb-0310-9956-ffa450edef68
2019-10-16 12:31:43 +00:00
5d2583a0f4 mod_md: copy recent fixes, adding new sources to mod_md.dsp
Adding module to CMakeLists, needs testing.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1862041 13f79535-47bb-0310-9956-ffa450edef68
2019-06-25 08:56:57 +00:00
a9f939b019 * build/config_vars.sh.in: Remove test-suite (builddir-specific) vars
from installed config_vars.mk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1861767 13f79535-47bb-0310-9956-ffa450edef68
2019-06-21 09:33:22 +00:00
50bbfb3de5 Add an --enable-reduced-exports configure option to link libmain.a
using ld's --whole-archive mode and avoid building exports.c entirely.
This reduces the size of a minimal httpd binary by 18% on Linux/x86_64
(687K to 560K) with no difference to the set of symbols available to
modules.

This option is only appropriate to use if using a shared libapr*
build, hence is non-default.

* configure.in: Add --enable-reduced-exports; disable httpdunit build
  if used.  Define AP_FORCE_EXPORTS if not enabled (default) in place
  of AP_USING_AUTOCONF.

* server/main.c (ap_suck_in_APR): Only build if AP_FORCE_EXPORTS is
  defined.

* Makefile.in: Link libmain.la using LIBMAIN_LIB.

* server/Makefile.in: Conditionally build exports.c into libmain.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1861685 13f79535-47bb-0310-9956-ffa450edef68
2019-06-20 13:00:37 +00:00
d5767ac605 *) mod_http2: internal code cleanups and simplifications. Common output code for
h2 and h2c protocols, using nested mutex locks for simplified calls. [Stefan Eissing]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1859724 13f79535-47bb-0310-9956-ffa450edef68
2019-05-22 13:41:36 +00:00
c051a01aed Well, our build with latest APR trunk seems to insist on updating apr_common.m4
So be it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1856846 13f79535-47bb-0310-9956-ffa450edef68
2019-04-02 21:37:27 +00:00
e0b2f5d780 Revert r1856560: was not the latest apr_common.m4 version anyway...
How does that change came in my local workspace in the first place??


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1856561 13f79535-47bb-0310-9956-ffa450edef68
2019-03-29 17:37:38 +00:00
b480020595 Update apr_common.m4 to latest (trunk).
Note: why is that file in the httpd repo??


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1856560 13f79535-47bb-0310-9956-ffa450edef68
2019-03-29 17:33:23 +00:00
c714186607 add loadmodule line to sochache_redis to httpd.conf in Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1856322 13f79535-47bb-0310-9956-ffa450edef68
2019-03-26 15:52:28 +00:00
2ed2702a49 Synch with 2.4.x.
Change position of #loadModule mod_proxy_http2 to keep alphabetical order.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1834252 13f79535-47bb-0310-9956-ffa450edef68
2018-06-24 15:47:12 +00:00
5777ff9a22 Rpm: fix the location of the PID file so as to avoid timeout
delays on systemd.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1832383 13f79535-47bb-0310-9956-ffa450edef68
2018-05-28 12:03:21 +00:00
72eb879561 * build/config_vars.sh.in: Clean more variables from installed
config_vars.mk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1830754 13f79535-47bb-0310-9956-ffa450edef68
2018-05-02 13:15:50 +00:00
e62e749619 Flush garbage stderr output
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1826698 13f79535-47bb-0310-9956-ffa450edef68
2018-03-14 06:35:57 +00:00
2d80cdeb7b add apreq in Win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1825396 13f79535-47bb-0310-9956-ffa450edef68
2018-02-26 18:36:15 +00:00
feedb2c7d1 rpm: Add the ctlogconfig.8 man page to the build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1825380 13f79535-47bb-0310-9956-ffa450edef68
2018-02-26 14:32:02 +00:00
3db50dc551 rpm: Add mod_mpm_motorz to the build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1825379 13f79535-47bb-0310-9956-ffa450edef68
2018-02-26 14:30:09 +00:00
10bea6c1ea rpm: Add mod_syslog to the build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1825377 13f79535-47bb-0310-9956-ffa450edef68
2018-02-26 14:27:38 +00:00
3d171c7bb0 rpm: Add mod_socache_redis to the build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1825375 13f79535-47bb-0310-9956-ffa450edef68
2018-02-26 14:23:23 +00:00
af467dfbdf rpm: Add build for mod_ssl_ct.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1825374 13f79535-47bb-0310-9956-ffa450edef68
2018-02-26 14:20:29 +00:00
2501bd25ea rpm: Add mod_proxy_uwsgi to the RPM package.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1825370 13f79535-47bb-0310-9956-ffa450edef68
2018-02-26 13:35:52 +00:00
80f1c58d1a rpm: Remove rpm build for mod_socache_dc, the dependency distcache has long since
stopped being available in RPM distros.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1825368 13f79535-47bb-0310-9956-ffa450edef68
2018-02-26 13:25:03 +00:00
7ac49b7933 add mod_proxy_uwsgi.so to windows build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1824736 13f79535-47bb-0310-9956-ffa450edef68
2018-02-19 11:12:41 +00:00
2ce4d05fc5 follow up to r1821582
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1821606 13f79535-47bb-0310-9956-ffa450edef68
2018-01-19 09:34:17 +00:00
49e3722d31 * build/config_vars.sh.in: Trim more variables from installed config_vars.mk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1816532 13f79535-47bb-0310-9956-ffa450edef68
2017-11-28 09:25:58 +00:00
0e295e2e15 Win32 legacy bits for mod_md
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1815264 13f79535-47bb-0310-9956-ffa450edef68
2017-11-14 21:01:37 +00:00
b8e6337119 Add mod_proxy_hcheck to generated httpd.spec file. PR 60506.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800788 13f79535-47bb-0310-9956-ffa450edef68
2017-07-04 14:00:29 +00:00
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
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
d8d6987036 rules.mk: output directly to target for LT_COMPILE
For source files that exist in another directory, libtool will by
default put the output file in the current working directory instead of
next to the source file. Our build logic would then `touch` an empty
output file in the place where the actual output should have gone.

Replace the touch logic with an explicit -o option to libtool.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpdunit@1796200 13f79535-47bb-0310-9956-ffa450edef68
2017-05-25 21:18:28 +00:00
d7e1ad9390 buildconf: check in APR[-util] m4 macros
Suggestion by wrowe. These files haven't changed in years; since we need
them anyway, check them in directly. buildconf will still copy over the
latest versions during setup, and SVN will tell us if there are any
changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-buildconf-noapr@1795928 13f79535-47bb-0310-9956-ffa450edef68
2017-05-23 16:19:33 +00:00
b77f2ba33b buildconf: allow configuration without APR sources
Previously we required copying the APR (and APR-util) source code into
srclib or some other location on disk in order to build httpd directly
from source. This is annoying if you're on a distribution that already
has the required files in its APR dev packages.

Practically speaking, if you're not building an official distribution
tarball, you only need the following files:

1) config.guess
2) config.sub
3) find_apr.m4
4) find_apu.m4
5) PrintPath

1 and 2 come from automake. 3 and 4 are included in some distributions'
(e.g. Debian's) development packages for APR/-util. That leaves
PrintPath, which has not changed meaningfully in over a decade and is
checked in completely here.

Passing an apr-config executable to buildconf's --with-apr option will
now enable a mode in which the above files (minus PrintPath) are copied
from their respective homes, removing the need for APR sources on disk.
Otherwise, if a source tree is passed, the current behavior is retained
and all of the above files are copied from APR directly.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-buildconf-noapr@1780441 13f79535-47bb-0310-9956-ffa450edef68
2017-01-26 19:24:58 +00:00
280008d94d add mod_proxy_hcheck to legacy build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1771839 13f79535-47bb-0310-9956-ffa450edef68
2016-11-29 03:27:37 +00:00
45b089f7ac mod_crypto: Add the all purpose crypto filters with support for HLS.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1752099 13f79535-47bb-0310-9956-ffa450edef68
2016-07-10 17:27:03 +00:00
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
3244dd3254 More mod_proxy_http2 build support:
- include in Windows and Netware LoadModule lists
- add to cmake build file
Untested.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730075 13f79535-47bb-0310-9956-ffa450edef68
2016-02-12 17:20:22 +00:00
3f78bf6908 Add proxy_module to the list of symbols
detected by Netware export/import awk
script.

We do not export proxy_module by putting it
into modules/proxy/NWGNUproxy explicitely,
because all accompanying proxy modules need
this symbol to access their config. So let
the awk script add proxy_module to the imp
file and then export it from mod_proxy and
import it to all other mod_proxy_xxx modules
via the imp file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728780 13f79535-47bb-0310-9956-ffa450edef68
2016-02-06 00:35:22 +00:00
b4c9ef848f Remove recent new marker macroPROXY_HOOK_NON_LINKED
and instead use PROXY_DECLARE_OPTIONAL_HOOK which
is defined to be equal to APR_DECLARE_EXTERNAL_HOOK.

Correct explanation for the use of
PROXY_DECLARE_OPTIONAL_HOOK.

Use PROXY_DECLARE_OPTIONAL_HOOK for the correct
hooks.

Adjust build/make_nw_export.awk to match the new
PROXY_DECLARE_OPTIONAL_HOOK.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728663 13f79535-47bb-0310-9956-ffa450edef68
2016-02-05 13:27:56 +00:00
ba1ab80876 Allow Netware awk script which handles proxy
symbol import/export to differentiate between
hooks which call APR_HOOK_LINK() in the C
files and those who don't by marking them
in the header file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728656 13f79535-47bb-0310-9956-ffa450edef68
2016-02-05 12:31:33 +00:00
617e068f50 Build symbol import and export files for
proxy on Netware using the same awk script
which is already used for mod_cache.

Adjust other Netware makefiles to use this
new imp file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728574 13f79535-47bb-0310-9956-ffa450edef68
2016-02-05 00:20:07 +00:00
10c4dfa4ee Add support for the proxy modules to
the awk script used to generate Netware
symbol import and export files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728573 13f79535-47bb-0310-9956-ffa450edef68
2016-02-05 00:18:26 +00:00
6cc7ef888a remove conf/extra/http-h2.conf from install filelist
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1707591 13f79535-47bb-0310-9956-ffa450edef68
2015-10-08 17:54:05 +00:00
767eeeba2a mod_mpm_eventopt is no more, so remove reference to it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705965 13f79535-47bb-0310-9956-ffa450edef68
2015-09-30 05:41:01 +00:00
df0a03587e bye bye mod_h2, hello mod_http2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705749 13f79535-47bb-0310-9956-ffa450edef68
2015-09-28 19:26:32 +00:00
d581155eb9 missed in r1698023
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700925 13f79535-47bb-0310-9956-ffa450edef68
2015-09-03 02:29:05 +00:00
98077e4911 Windows traditional build files for mod_h2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698023 13f79535-47bb-0310-9956-ffa450edef68
2015-08-26 22:14:16 +00:00