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

25 Commits

Author SHA1 Message Date
Graham Leggett
55c799dc0d mod_cache_socache: New cache implementation backed by mod_socache
that replaces mod_mem_cache removed from httpd v2.2.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1388660 13f79535-47bb-0310-9956-ffa450edef68
2012-09-21 20:10:16 +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
Stefan Fritsch
f21ee09d4a More configure time dependencies:
mod_cache_disk depends on mod_cache
mod_heartbeat depends on mod_watchdog


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234297 13f79535-47bb-0310-9956-ffa450edef68
2012-01-21 10:26:51 +00:00
Rainer Jung
9ed2afa2b9 Tolerate dependency checking failures in configure
for modules that have been enabled only implicitely.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142892 13f79535-47bb-0310-9956-ffa450edef68
2011-07-05 05:31:22 +00:00
Rainer Jung
1fa2322c04 1) Add --with-distcache to configure for choosing
the distcache installation directory.

2) Use correct build variable MOD_SOCACHE_DC_LDADD
instead of MOD_SOCACHE_LDADD in build macro.

Also made the macro a bit more consistent with the
SSL checking macro.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142648 13f79535-47bb-0310-9956-ffa450edef68
2011-07-04 13:03:01 +00:00
Graham Leggett
27637bfdd8 mod_disk_cache renamed to mod_cache_disk, to be consistent with the
naming of other modules.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1037229 13f79535-47bb-0310-9956-ffa450edef68
2010-11-20 14:58:34 +00:00
Daniel Earl Poirier
4c477008d4 Add to modules' help text (displayed by ./configure -h) more
information that will be useful in deciding whether to enable
them or not.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1029814 13f79535-47bb-0310-9956-ffa450edef68
2010-11-01 20:02:51 +00:00
Brian Havard
8a47421de6 OS/2: Fix building of more modules that depend on symbols from other modules.
Affected modules are: mod_heartbeat, mod_session_cookie, mod_session_crypto,
mod_session_dbd and mod_disk_cache.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@956857 13f79535-47bb-0310-9956-ffa450edef68
2010-06-22 11:57:51 +00:00
Stefan Fritsch
9b851ec65e - Add reallyall option to configure to build everything that can be built with
the available libs.
- Remove redundant --with-distcache option. Simply enable distcache if
  mod_socache_dc is selected.
- Enable serf support by default if serf is available in /usr.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@956221 13f79535-47bb-0310-9956-ffa450edef68
2010-06-19 12:36:57 +00:00
Ruediger Pluem
55b00a33b0 * mod_mem_cache is dead. So remove all hints on it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@711576 13f79535-47bb-0310-9956-ffa450edef68
2008-11-05 14:41:02 +00:00
William A. Rowe Jr
87c353a5c0 mod_mem_cache consumes mod_cache, linking this in
two modules is an error.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@664143 13f79535-47bb-0310-9956-ffa450edef68
2008-06-06 21:45:09 +00:00
William A. Rowe Jr
7158876aaf Revert prior commit; the flaw is not in exporting all
of these cache_* functions, but in declaring them 
exported in the first place.  _hash, _pqueue and cache_cache
are undecorated and were erroniously exported.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@664142 13f79535-47bb-0310-9956-ffa450edef68
2008-06-06 21:44:25 +00:00
William A. Rowe Jr
0f1189fc9b These are declared CACHE_DECLARE and should be consumed
from mod_cache by mod_mem_cache.  The duplicate cache_util
import is a dead giveaway that this was broken.

In order to backport, an MMN bump would be required because
these cache_pqueue, cache_cache and cache_hash exported
functions would be added to the "contract" of functions
which are available from mod_cache for third party cache
providers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@664136 13f79535-47bb-0310-9956-ffa450edef68
2008-06-06 21:23:05 +00:00
Chris Darroch
76e9c2b0ba Fix socache modules' APACHE_MODULE() definitions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@646945 13f79535-47bb-0310-9956-ffa450edef68
2008-04-10 20:24:42 +00:00
Joe Orton
3279936028 Session cache interface redesign, Part 8:
Abstract out the mod_ssl session caching interface into a separate set
of modules, mod_socache_*.

* modules/cache/ap_socache.h: New file.

* modules/cache/config.m4: Copy CHECK_DISTCACHE from ../ssl/config.m4; 
  add new socache modules.

* modules/cache/mod_socache_dbm.c: Copied from ../ssl/ssl_scache_dbm.c.
  s/ssl_scache_/socache_/; add module structure and register_hooks.

* modules/cache/mod_socache_shmcb.c: Copied from ../ssl/ssl_scache_shmcb.c.
  s/ssl_scache_/socache_/; add module structure and register_hooks.
  Add SHMCB_MAX_SIZE definition, replacing APR_SHM_MAXSIZE.

* modules/cache/mod_socache_memcache.c: Copied from
  ../ssl/ssl_scache_memcache.c.
  s/ssl_scache_/socache_/; add module structure and register_hooks.
  Enable for APR-Util 1.3.x at compile-time, omitting configure-time
  checks.

* modules/cache/mod_socache_dc.c: Copied from ../ssl/ssl_scache_dc.c.
  s/ssl_scache_/socache_/; add module structure and register_hooks.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645844 13f79535-47bb-0310-9956-ffa450edef68
2008-04-08 10:47:04 +00:00
Dirk-Willem van Gulik
813b31560b Turn the cache module into first class citizens (well the disk_cache
and file cache that is).

This makes the delta between 'all' and 'most'

mod_cern_meta.c
mod_log_forensic.c
mod_mime_magic.c
mod_unique_id.c
mod_usertrack.c
mod_version.c
mod_mem_cache.c

And keeps disabled in all and most the modules for:
	
authnz_ldap
bucketeer
echo
example_hooks
case_filter
case_filter_in
example_ipc
charset_lite
cgid
ldap
optional_hook_export
optional_hook_import
optional_fn_import
optional_fn_export

As well as mod_ssl which is intentionally not part of MOST and All.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@620530 13f79535-47bb-0310-9956-ffa450edef68
2008-02-11 17:21:05 +00:00
Justin Erenkrantz
63dd4623e1 At long last, promote mod_cache and friends out of experimental/.
Also, take quick pass through docs files to remove experimental label for them.

Reviewed by: Paul Querna, Bill Stoddard, Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106737 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 19:06:48 +00:00
Joe Orton
c4aa600023 Use -export-dynamic only when linking an httpd which includes mod_so,
not when linking modules or support programs.

* modules/aaa/config.m4, modules/arch/win32/config.m4,
modules/cache/config.m4, modules/echo/config.m4,
modules/filters/config.m4, modules/generators/config5.m4,
modules/metadata/config.m4: Don't add -export-dynamic to LT_LDFLAGS.

* modules/mappers/config9.m4: Add -export-dynamic to HTTPD_LDFLAGS
when mod_so is enabled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102235 13f79535-47bb-0310-9956-ffa450edef68
2004-01-08 20:47:29 +00:00
Roy T. Fielding
8ea5039bdb Fix httpd's definition of LTFLAGS to be consistent with that of apr
and apr-util, allow it to be overridden by the configure command-line
(default="--silent") and introduce LT_LDFLAGS to replace what we were
formally abusing as LTFLAGS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89094 13f79535-47bb-0310-9956-ffa450edef68
2001-05-12 03:48:31 +00:00
Roy T. Fielding
f1f5f01fdb Completely revamp configure so that it preserves the standard make
variables CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS and LIBS by moving
the configure additions to EXTRA_* variables.  Also, allow the user
to specify NOTEST_* values for all of the above, which eliminates the
need for THREAD_CPPFLAGS, THREAD_CFLAGS, and OPTIM.  Fix the setting
of INCLUDES and EXTRA_INCLUDES.  Check flags as they are added to
avoid pointless duplications.  Fix the order in which flags are given
on the compile and link lines.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88960 13f79535-47bb-0310-9956-ffa450edef68
2001-04-29 05:24:11 +00:00
Greg Stein
9787943f19 *) remove STANDARD_LIBS line; it is unused/unneeded
*) simplify by removing the extra AC_DEFUN() in each file


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87247 13f79535-47bb-0310-9956-ffa450edef68
2000-12-07 10:40:01 +00:00
Ryan Bloom
d412995055 Get the modules configuration stuff working correctly. This just deals
with STANDARD modules and Protocol, not MPMs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87186 13f79535-47bb-0310-9956-ffa450edef68
2000-12-04 21:38:51 +00:00
Ryan Bloom
a87a761b37 Start to add back the config.m4 and Makefile.in's that were separated out
during the repository move.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87184 13f79535-47bb-0310-9956-ffa450edef68
2000-12-04 20:34:48 +00:00