summaryrefslogtreecommitdiff
path: root/build
Commit message (Collapse)AuthorAgeFilesLines
* Win32 Legacy buildGregg Lewis Smith2017-11-301-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mod_md@1816751 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1729235, r1730079, r1801665 from trunk:Jim Jagielski2017-09-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude MPM modules from automatic LoadModule enabling when configure was called with -enable-load-all-modules. The default MPM should still get enabled automatically. 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. Makefile.in: fix MPM_MODULES typo Submitted by: rjung, jchampion Reviewed by: jchampion, icing, ylavic git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808854 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1780441, r1780470, r1795928 from trunk:Yann Ylavic2017-09-084-0/+1533
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. buildconf: add --help for the new behavior buildconf's behavior is a little complicated (and was made more so with apr-config mode), so add some self-documentation. 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. Submitted by: jchampion Reviewed by: jchampion, jim, ylavic git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807761 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1800788 from trunk:Jim Jagielski2017-07-051-0/+1
| | | | | | | | | | | Add mod_proxy_hcheck to generated httpd.spec file. PR 60506. Submitted by: ylavic Reviewed by: ylavic, rpluem, jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1800862 13f79535-47bb-0310-9956-ffa450edef68
* Add mod_brotli to Windows legacy buildGregg Lewis Smith2017-04-261-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1792753 13f79535-47bb-0310-9956-ffa450edef68
* Add mod_proxy_hcheck to WindowsGregg Lewis Smith2016-11-301-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1772126 13f79535-47bb-0310-9956-ffa450edef68
* add mod_proxy_http2 to traditional windows buildGregg Lewis Smith2016-06-141-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1748429 13f79535-47bb-0310-9956-ffa450edef68
* merge r1707591Gregg Lewis Smith2015-10-081-1/+0
| | | | | | | remove conf/extra/http-h2.conf.in from install filelist git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1707592 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1705749 from trunk:Jim Jagielski2015-09-281-1/+1
| | | | | | | | | bye bye mod_h2, hello mod_http2 Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705751 13f79535-47bb-0310-9956-ffa450edef68
* merge of protocols + http2 relevant changesStefan Eissing2015-09-072-0/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1701655 13f79535-47bb-0310-9956-ffa450edef68
* Fix NetWare build: set NLM version with commandline optionGuenter Knauf2014-08-311-1/+2
| | | | | | | | 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/branches/2.4.x@1621588 13f79535-47bb-0310-9956-ffa450edef68
* Merged ↵Jeff Trawick2014-04-161-0/+1
| | | | | | | | | | | | | | | | /httpd/httpd/trunk:r1515403,1515411,1515420,1517175,1521909,1526647,1541181,1578762,1585054,1585072,1588054 mod_authnz_fcgi: New module to enable FastCGI authorizer applications to authenticate and/or authorize clients. Submitted by: trawick, jailletc36, gsmith Approved by: trawick, jim, gsmith (Thanks gsmith for the Windows build bits!) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1588064 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1542615 from trunk:Eric Covener2014-01-061-1/+1
| | | | | | | | | | | | | | | | | 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 Submitted by: sf Reviewed by: trawick, covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1555792 13f79535-47bb-0310-9956-ffa450edef68
* Backport 1553514:Graham Leggett2013-12-261-1/+1
| | | | | | | | 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/branches/2.4.x@1553516 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1543282 from trunk:Jeff Trawick2013-11-191-1/+1
| | | | | | | | | | | | | | 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/branches/2.4.x@1543283 13f79535-47bb-0310-9956-ffa450edef68
* Grab r1517919 and countless follow-ups (up through r1529452) from trunk:Jeff Trawick2013-11-141-0/+71
| | | | | | | | | | | | | | Add experimental cmake-based build system for Windows. (Support for both trunk and 2.4.x has been removed for this first commit to the 2.4.x branch.) Thanks tdonovan for sharing your earlier version! A lot of good stuff is from Tom; a lot of bad stuff is from me. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1541921 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1513492 from trunk:Jim Jagielski2013-09-261-0/+1
| | | | | | | | | | | | | | | | | follow up to r1513454: fill in missing log number Submitted by: trawick Reviewed/backported by: jim * util_fcgi API to 2.4.x (allows mod_proxy_fcgi to be kept in sync, along with other less important reasons) trunk: http://svn.apache.org/r1513454 and http://svn.apache.org/r1513492 2.4.x: copy server/util_fcgi.c and include/util_fcgi.h, then apply http://people.apache.org/~trawick/patch-after-copying-util_fcgi-splat.txt +1: trawick, jim, chrisd git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1526598 13f79535-47bb-0310-9956-ffa450edef68
* Fix typo in comment (r1508416 in trunk)Christophe Jaillet2013-08-251-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1517232 13f79535-47bb-0310-9956-ffa450edef68
* Add in mod_proxy_wstunnelJim Jagielski2013-07-231-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1506142 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1452911, r1452949, r1452954, r1453022, r1453574, r1453875, r1453876, ↵Jim Jagielski2013-06-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r1453963, r1454386, r1454414, r1454415, r1458285, r1458447 from trunk: Rough start for simple, tunneling websocket proxy support. Compiles at this stage and that's all I know :) force correct scheme info We need to ensure a conn_rec Work around blocking issues... And now pass the initial request to the backend... I dislike this duplication of code from mod_proxy_http() but maybe it's inevitable. I may create ap_proxy_create_headerb() to create a header brigade that both modules can use. Pull out duplicated code to proxy_util... rename extension module... tunnel is more accurate log nums "final" rename :) don't strip these, ensure that they exist. streamline bypass reqtimeout for websockets Keep mod_req clear. Simply scan thru input filters and remove it within the ws submodule. Nasty, but it keeps mod_req untouched (for now ;) ) Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1492699 13f79535-47bb-0310-9956-ffa450edef68
* Backport r1488022Gregg Lewis Smith2013-05-301-0/+1
| | | | | | | Add missing LoadModule line for mod_auth_form git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1488023 13f79535-47bb-0310-9956-ffa450edef68
* NetWare build: dont make the svn revision file a dependency.Guenter Knauf2013-05-171-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1483943 13f79535-47bb-0310-9956-ffa450edef68
* NetWare build: make use of SVN revision optional.Guenter Knauf2013-05-141-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1482168 13f79535-47bb-0310-9956-ffa450edef68
* Use SVN revision for NetWare dev builds version info.Guenter Knauf2013-05-142-2/+19
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1482160 13f79535-47bb-0310-9956-ffa450edef68
* Fixed NetWare default versions.Guenter Knauf2013-05-101-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1481060 13f79535-47bb-0310-9956-ffa450edef68
* Kill some NetWare build warnings (backport r1481040).Guenter Knauf2013-05-102-2/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1481054 13f79535-47bb-0310-9956-ffa450edef68
* rpm spec file: Add mod_macro and mod_cache_socache to the RPM build.Graham Leggett2013-04-301-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477815 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1305167, r1330964, r1388660, r1388899, r1391396, r1391398, r1392214, ↵Jim Jagielski2013-04-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r1406760, r1418648 from trunk: Update transformations. syntax for mod_b*.xml and mod_c*.xml mod_cache_socache: New cache implementation backed by mod_socache that replaces mod_mem_cache removed from httpd v2.2. Windows build for mod_cache_socache added in r1388660 Fix the return values on mod_cache_socache's store_headers() implementation to return APR errors codes and not DECLINED. We are committed to using this implementation by this point, and any error should force us to stand down. Submitted by: trawick Reviewed by: minfrin Apply proper APLOGNO codes for mod_cache_socache. Added mod_cache_socache to NetWare build. * Ensure that nkey is initialized. mod_cache_socache: Don't clean up too soon. If we do, revalidated requests lose their bodies. Submitted by: minfrin, humbedooh, minfrin, gsmith, minfrin, minfrin, fuankg, rpluem, minfrin Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1477652 13f79535-47bb-0310-9956-ffa450edef68
* Add mod_macro to Windows Build. merge/backport r1436058Gregg Lewis Smith2013-03-271-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1461781 13f79535-47bb-0310-9956-ffa450edef68
* Backport r1457521.Graham Leggett2013-03-171-1/+1
| | | | | | | RPM spec file: we depend on libuuid-devel to build. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1457526 13f79535-47bb-0310-9956-ffa450edef68
* Use define for serverroot with NetWare conf files.Guenter Knauf2013-03-021-3/+6
| | | | | | | (Backport r1451155) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1451928 13f79535-47bb-0310-9956-ffa450edef68
* Some windows install.log output cosmetics.Guenter Knauf2013-03-021-5/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1451828 13f79535-47bb-0310-9956-ffa450edef68
* Backport r1439114:Graham Leggett2013-01-271-1/+2
| | | | | | | | 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/branches/2.4.x@1439117 13f79535-47bb-0310-9956-ffa450edef68
* Backport r1429610.Graham Leggett2013-01-061-1/+2
| | | | | | | rpm spec: Ensure we are prioritised above mod_ssl on Redhat derivatives. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1429611 13f79535-47bb-0310-9956-ffa450edef68
* Widen strip pattern in config_vars.sh to alsoRainer Jung2012-12-311-1/+1
| | | | | | | | | | | | | | match MOD_XML2ENC_LDADD. This was the first module with digits in its name. Submitted by: rjung Backported by: rjung Reviewed by: rjung, covener, fuankg Backport of r1426975 from trunk. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1427067 13f79535-47bb-0310-9956-ffa450edef68
* Backport r1418703.Graham Leggett2012-12-081-7/+7
| | | | | | | rpm: Remove stray references to the epoch variable. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1418720 13f79535-47bb-0310-9956-ffa450edef68
* backport r1385216, r1387610 from trunk:Jim Jagielski2012-09-261-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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/branches/2.4.x@1390518 13f79535-47bb-0310-9956-ffa450edef68
* installwinconf.awk: install.log output tweaks; reduced path convertionJim Jagielski2012-09-261-6/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1390511 13f79535-47bb-0310-9956-ffa450edef68
* Removed tabs and traling spaces.Guenter Knauf2012-08-201-138/+139
| | | | | | | Backport of r1375034 - no functional change. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1375035 13f79535-47bb-0310-9956-ffa450edef68
* NetWare build tweaks.Guenter Knauf2012-08-091-2/+8
| | | | | | | | | | | | mwccnlm: search directory of referencing file first for #includes. (backport r1370592, 1370615) 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. (backport 1370616) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1371164 13f79535-47bb-0310-9956-ffa450edef68
* Backport 1363853:Graham Leggett2012-07-211-0/+1
| | | | | | | RPM packaging: add the fcgistarter man pages to the RPM. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364089 13f79535-47bb-0310-9956-ffa450edef68
* Backport 1363837:Graham Leggett2012-07-211-1/+0
| | | | | | | RPM packaging: remove the epoch to be consistent with APR and APR-util. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364088 13f79535-47bb-0310-9956-ffa450edef68
* Backport 1363836:Graham Leggett2012-07-211-1/+1
| | | | | | | RPM packaging: The PID file goes in /var/run in the RPM layout. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364087 13f79535-47bb-0310-9956-ffa450edef68
* Backport 1363832:Graham Leggett2012-07-211-1/+0
| | | | | | | | RPM packaging: Remove the BuildArch from the manual package, this forces the target to "noarch" for all packages and breaks the build on CentOS5. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364086 13f79535-47bb-0310-9956-ffa450edef68
* Backport 1363829:Graham Leggett2012-07-211-2/+2
| | | | | | | RPM packaging: The PID file goes in /var/run in the RPM layout. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364084 13f79535-47bb-0310-9956-ffa450edef68
* NetWare build system: fixed var names.Guenter Knauf2012-05-012-10/+10
| | | | | | | | Renamed wrong and misleading var names in makefiles. No functional change. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1332842 13f79535-47bb-0310-9956-ffa450edef68
* fix various property issuesAndré Malo2012-04-042-45/+43
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1309579 13f79535-47bb-0310-9956-ffa450edef68
* Fixed broken *_DECLARE_DATA section.Guenter Knauf2012-03-261-2/+2
| | | | | | | | | Seems our preprocessor is some crazy and inserts a blank after replacing a define which made the awk script fail. Patch submitted by: normw gknw net (Backport r1301281). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1305192 13f79535-47bb-0310-9956-ffa450edef68
* Backport:Graham Leggett2012-02-273-16/+267
| | | | | | | | AIX: Add missing build scripts. Submitted by: Michael Felt <mamfelt gmail com> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1294373 13f79535-47bb-0310-9956-ffa450edef68
* Backport:Graham Leggett2012-02-271-25/+99
| | | | | | | | AIX: Update the build to support AIX packages. Submitted by: Michael Felt <mamfelt gmail com> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1294368 13f79535-47bb-0310-9956-ffa450edef68