1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Commit Graph

644 Commits

Author SHA1 Message Date
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
Guenter Knauf
1a39234831 Use define for serverroot with NetWare conf files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1451155 13f79535-47bb-0310-9956-ffa450edef68
2013-02-28 09:26:48 +00:00
Graham Leggett
fddcc9c8a1 rpm: Bump the epoch on mod_proxy_html so that older separately packaged
versions of mod_proxy_html don't take precedence over us.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1439114 13f79535-47bb-0310-9956-ffa450edef68
2013-01-27 16:32:20 +00:00
Graham Leggett
813931f717 Add mod_macro to the RPM spec file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1439110 13f79535-47bb-0310-9956-ffa450edef68
2013-01-27 16:13:28 +00:00
Gregg Lewis Smith
45de01a458 install httpd-macro.conf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1438714 13f79535-47bb-0310-9956-ffa450edef68
2013-01-25 21:16:48 +00:00
Gregg Lewis Smith
8e0c2d91e0 Add mod_macro to Windows build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1436058 13f79535-47bb-0310-9956-ffa450edef68
2013-01-21 01:20:33 +00:00
Graham Leggett
1a572ff3b1 rpm spec: Ensure we are prioritised above mod_ssl on Redhat derivatives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1429610 13f79535-47bb-0310-9956-ffa450edef68
2013-01-06 23:17:33 +00:00
Rainer Jung
c94c4a0224 Widen strip pattern to also match MOD_XML2ENC_LDADD.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1426975 13f79535-47bb-0310-9956-ffa450edef68
2012-12-30 19:00:44 +00:00
Stefan Fritsch
4e7607091a GNU make somtimes has problems determining that $(builddir)/test_char.h
and test_char.h are actually the same files. Fix 'make depends' to only
generate the latter.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1425447 13f79535-47bb-0310-9956-ffa450edef68
2012-12-23 09:10:20 +00:00
Guenter Knauf
c99f8c46a7 Removed now obsolete function skip from NetWare
export list generating script.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1425338 13f79535-47bb-0310-9956-ffa450edef68
2012-12-22 19:57:40 +00:00
Gregg Lewis Smith
5ed48d6240 mod_allowmethods is not required for Apache to run,
do not load it in default minimal config


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1419085 13f79535-47bb-0310-9956-ffa450edef68
2012-12-09 18:46:22 +00:00
Gregg Lewis Smith
3e8254fb4c Add mod_allowhandlers to Windows build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1418867 13f79535-47bb-0310-9956-ffa450edef68
2012-12-09 09:46:47 +00:00
Graham Leggett
a7eecbcdf2 rpm: Add the mod_allowhandlers and mod_mpm_eventopt modules to the spec
file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1418714 13f79535-47bb-0310-9956-ffa450edef68
2012-12-08 17:27:21 +00:00
Graham Leggett
4ff409cafb rpm: Remove stray references to the epoch variable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1418703 13f79535-47bb-0310-9956-ffa450edef68
2012-12-08 16:41:23 +00:00
Graham Leggett
dd0f4c27ff RPM: Add mod_cache_socache to the RPM spec file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1391404 13f79535-47bb-0310-9956-ffa450edef68
2012-09-28 11:40:26 +00:00
Gregg Lewis Smith
f696d241c7 Windows build for mod_cache_socache added in r1388660
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1388899 13f79535-47bb-0310-9956-ffa450edef68
2012-09-22 21:14:00 +00:00
Kaspar Brand
089f0eb0ac Spin off module-specific build options into separate build vars.
[second try, supersedes r1385214]

Add MOD_CFLAGS, MOD_LDFLAGS variables etc. to the build commands,
which are available to modules for customization on a per-subdir
basis (by adding definitions to modules.mk). Reduces the risk
of side-effects when a module needs to add CFLAGS, LDFLAGS etc.
and these would be added to the global settings (ALL_CFLAGS etc.).

Adapt build settings for mod_ssl, mod_socache_dc, mod_deflate,
mod_xml2enc, mod_proxy_html, and mod_lua to use the new MOD_xxx
build variables.

Change PICFLAGS, SHLTCFLAGS and LTCFLAGS into config vars, instead
of AC_SUBSTing them in build/rules.mk.in. For support/ab, introduce
ab_CFLAGS and ab_LDFLAGS, and define explicit make targets where
they appear at the proper position in the build commands.

Consistently use "--with-xxx=PATH" in configure help strings which
are used to specify a path to the installation directory of an
auxiliary package.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1385216 13f79535-47bb-0310-9956-ffa450edef68
2012-09-16 06:19:13 +00:00
Kaspar Brand
5eb4537e2a revert r1385214, as I inadvertently left out acinclude.m4.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1385215 13f79535-47bb-0310-9956-ffa450edef68
2012-09-16 06:16:35 +00:00
Kaspar Brand
3aaa0378b6 Spin off module-specific build options into separate build vars.
Add MOD_CFLAGS, MOD_LDFLAGS variables etc. to the build commands,
which are available to modules for customization on a per-subdir
basis (by adding definitions to modules.mk). Reduces the risk
of side-effects when a module needs to add CFLAGS, LDFLAGS etc.
and these would be added to the global settings (ALL_CFLAGS etc.).

Adapt build settings for mod_ssl, mod_socache_dc, mod_deflate,
mod_xml2enc, mod_proxy_html, and mod_lua to use the new MOD_xxx
build variables.

Change PICFLAGS, SHLTCFLAGS and LTCFLAGS into config vars, instead
of AC_SUBSTing them in build/rules.mk.in. For support/ab, introduce
ab_CFLAGS and ab_LDFLAGS, and define explicit make targets where
they appear at the proper position in the build commands.

Consistently use "--with-xxx=PATH" in configure help strings which
are used to specify a path to the installation directory of an
auxiliary package.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1385214 13f79535-47bb-0310-9956-ffa450edef68
2012-09-16 05:55:02 +00:00
Guenter Knauf
7feb929d5d Only substitute slashes if needed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1375099 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 16:45:01 +00:00
Guenter Knauf
92f440b4fc Avoid error message from del since we print already an own.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1375097 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 16:40:03 +00:00
Jeff Trawick
d982f9f8ad minor tweaks: fix server version banner, forget about old SSLMutex directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1375071 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 15:43:15 +00:00
Guenter Knauf
292f9e26c0 Fixed install.log output for SSL port.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1375041 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 14:41:57 +00:00
Guenter Knauf
1c374cd74d Removed tabs and traling spaces.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1375034 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 14:20:03 +00:00
Guenter Knauf
ae201ce6e6 More NetWare build tweaks.
Make use of CFLAGS from environment.
Added default maxerrors value 1 so that the compiler breaks
after 1st error; can be overwritten with CC_MAX_ERRORS var.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1370616 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 00:41:43 +00:00