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

668 Commits

Author SHA1 Message Date
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
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
Jacob Champion
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
Jacob Champion
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
Gregg Lewis Smith
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
Graham Leggett
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
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
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
Rainer Jung
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
Rainer Jung
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
Rainer Jung
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
Rainer Jung
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
Rainer Jung
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
Gregg Lewis Smith
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
Christophe Jaillet
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
Jim Jagielski
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
Gregg Lewis Smith
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
Gregg Lewis Smith
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
Gregg Lewis Smith
455d46209c NetWare build bits for mod_h2
Submitted by normw gknw net


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697051 13f79535-47bb-0310-9956-ffa450edef68
2015-08-21 19:47:27 +00:00
Jan Kaluža
6ac752395e * mod_dav_fs: set default value of DavLockDB using installation layout
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674222 13f79535-47bb-0310-9956-ffa450edef68
2015-04-17 07:28:50 +00:00
Guenter Knauf
2f57f9208d NetWare build: fix problem with NLM version.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1652875 13f79535-47bb-0310-9956-ffa450edef68
2015-01-18 23:38:20 +00:00
Guenter Knauf
266da2feb2 Fix NetWare build: set NLM version with commandline option
instead of linker def file due to bug with mwldnlm linker
where patch version > 26 is ignored from def file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1621588 13f79535-47bb-0310-9956-ffa450edef68
2014-08-31 13:16:11 +00:00
Rainer Jung
92af05ae08 Note/update some requirements versions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1612938 13f79535-47bb-0310-9956-ffa450edef68
2014-07-23 20:02:14 +00:00
Gregg Lewis Smith
8b5e1ad57d Add mod_authnz_fcgi to traditional Win build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1588054 13f79535-47bb-0310-9956-ffa450edef68
2014-04-16 20:11:40 +00:00
Graham Leggett
1e41d4a8eb rpm spec file: Ensure that apr-util-ldap is installed when mod_authnz_ldap
is installed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553514 13f79535-47bb-0310-9956-ffa450edef68
2013-12-26 17:13:12 +00:00
Jim Jagielski
ae4d88bee9 Oops... revert
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1552783 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 18:57:45 +00:00
Jim Jagielski
d6e91afa0c For *bsd* systems, see if we are using BSD make and,
if so, then use that format for include/ifdef/else/endif


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1552779 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 18:48:14 +00:00
Jeff Trawick
b19837c7a5 Stringify ICON_FILE, like other values passed in via -Dxx=yy
With an out of tree build like cmake, certain paths to the source tree and icon
file can foil parsing of this line by the resource compiler unless the path is
quoted.

Submitted by: Bert Huijben
Reviewed by: trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1543282 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 01:03:49 +00:00
Stefan Fritsch
5c02313fb3 Explicitly list in which directories to look for config*.m4 files.
If some distributor patches a config*.m4 file with quilt, that will
place a copy of the original file in .pc/ . Doing a naive "find ."
will then cause both the original and the patched m4 file to be included,
causing havoc later on.

PR: 55787


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542615 13f79535-47bb-0310-9956-ffa450edef68
2013-11-16 23:49:04 +00:00
Joe Orton
db365dce9b * build/config_vars.sh.in: Trim more stuff from installed config_vars.mk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1528035 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 10:28:29 +00:00
Jeff Trawick
ee5444e12c works with (Strawberry) Perl 5.010 from 2009, so require that version; move to older File::Path interface
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1522747 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 00:01:21 +00:00
Jeff Trawick
86335b8bb8 BaseAddr.ref:
. Update sizes as necessary based on a 64-bit debug build with Visual Studio
  2012.
. Add missing modules mod_apreq, mod_authnz_fcgi, mod_dialup,
  mod_optional_fn_export, mod_optional_fn_import, mod_optional_hook_export,
  mod_optional_hook_import, and mod_policy.
  (The example mods aren't important, but adding them avoids having to
  treat those as exceptions in any sort of automatic update mechanism.
  Potential issues with the several modules that aren't currently buildable
  with the cmake-based solution have not been addressed.)

fixBaseAddrs.pl:
. New script to generate a new BaseAddr.ref based on Microsoft linker
  warnings about inadequate size or missing module.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1522544 13f79535-47bb-0310-9956-ffa450edef68
2013-09-12 12:15:02 +00:00
Jeff Trawick
1830b6b669 Generate and install .conf files
(with heavy lifting from tdonovan!).

Install sample docroot (if the top directory doesn't exist).

Change installation of error and icons directories to match
Unix -- only if the top directory doesn't exist.

Provide a simple Perl script to help with non-standard copy
semantics used by the install.

THIS ADDS PERL AS A BUILD PREREQ.  (The VisualStudio-specific
Windows build system required it too.)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1518376 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 20:38:14 +00:00
Jeff Trawick
8f3558bf2d Add util_fcgi.h and associated definitions and support
routines for FastCGI, based largely on mod_proxy_fcgi.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1513454 13f79535-47bb-0310-9956-ffa450edef68
2013-08-13 12:16:39 +00:00
Jeff Trawick
15a1d8ad21 s/seperate/separate/g
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1508416 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 12:33:12 +00:00
Eric Covener
1cc32d26f6 Use cp on AIX too. /usr/bin/install isn't compatible on recent systems
and it's a pain to install and force /opt/freeware/bin.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496230 13f79535-47bb-0310-9956-ffa450edef68
2013-06-24 21:48:50 +00:00
Gregg Lewis Smith
37ea78129f Add missing LoadModule line for mod_auth_form
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1488022 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 21:38:06 +00:00
Guenter Knauf
1cdf79507e NetWare build: dont make the svn revision file a dependency.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483867 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 15:33:45 +00:00
Guenter Knauf
4783ccc4bc NetWare build: make use of SVN revision optional.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482168 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 01:24:07 +00:00
Guenter Knauf
c3a459a2d3 Use SVN revision for NetWare dev builds version info.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482160 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 00:51:01 +00:00
Guenter Knauf
6d9b26c941 Fixed NetWare default versions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481060 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 15:40:25 +00:00
Guenter Knauf
1ef0978c78 Kill some NetWare build warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481040 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 14:58:20 +00:00
Graham Leggett
3a6bde00b2 RPM spec file: we depend on libuuid-devel to build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1457521 13f79535-47bb-0310-9956-ffa450edef68
2013-03-17 19:11:03 +00:00
Graham Leggett
15fb0efee9 Add mod_proxy_wstunnel to the RPM spec file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1454776 13f79535-47bb-0310-9956-ffa450edef68
2013-03-10 00:03:49 +00:00
Gregg Lewis Smith
e5d0f97ec8 Final rename per r1454386, we hope
Set eol style of mod_proxy_wstunnel.dsp to native
for easy editing on any OS



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1454659 13f79535-47bb-0310-9956-ffa450edef68
2013-03-09 05:51:48 +00:00
Gregg Lewis Smith
723bba5dff finish up mod_proxy_websocket/tunnel rename on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1453974 13f79535-47bb-0310-9956-ffa450edef68
2013-03-07 17:27:55 +00:00
Gregg Lewis Smith
60efc021bb Add mod_proxy_websocket to Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1453552 13f79535-47bb-0310-9956-ffa450edef68
2013-03-06 20:54:48 +00:00
Guenter Knauf
1b9fc3e72d Use define for serverroot with Windows conf files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1451830 13f79535-47bb-0310-9956-ffa450edef68
2013-03-02 03:43:39 +00:00
Guenter Knauf
d74807162d Some windows install.log output cosmetics.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1451828 13f79535-47bb-0310-9956-ffa450edef68
2013-03-02 03:36:47 +00:00