summaryrefslogtreecommitdiff
path: root/include/mpm_common.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge r1546759, r1546760 from trunk:Jim Jagielski2014-04-151-0/+41
| | | | | | | | | | | | | | Add suspend_connection and resume_connection hooks to notify modules when the thread/connection relationship changes. (Currently implemented only for the Event MPM; should be implemented for all async MPMs.) follow-up to r1546759: remove an inadvertently committed testcase Submitted by: trawick Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1587695 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1423933 from trunk:Jim Jagielski2014-03-101-2/+2
| | | | | | | | | | On NetWare skip these unsupported function prototypes. Submitted by: fuankg Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1575914 13f79535-47bb-0310-9956-ffa450edef68
* Remove a 1 empty line difference between trunk and 2.4.x that could break ↵Christophe Jaillet2013-12-181-1/+0
| | | | | | backport of r1551714. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1551853 13f79535-47bb-0310-9956-ffa450edef68
* mpm_unix: Add ap_mpm_podx_* implementation to avoid code duplicationGraham Leggett2013-11-161-0/+44
| | | | | | | | | | | | | | and align w/ trunk. trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1409214 http://svn.apache.org/viewvc?view=revision&revision=1410004 2.4.x patch: http://people.apache.org/~jim/patches/httpd-2.4-podx-v2.patch Submitted by: jim Reviewed by: rjung, minfrin git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1542557 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1363035 from trunk:Jim Jagielski2012-07-231-2/+3
| | | | | | | | | | avoid decls for some Unix-specific functions on Win32 too Submitted by: trawick Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1364608 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1303201, r1303435, r1303827:Stefan Fritsch2012-03-311-34/+38
| | | | | | | | | | | | | | | | | | | * Revert r1294936 (Jeff's revert) and fix NetWare / Win32 build. Added the missing AP_DECLARE* decorations for the function implementations and variables. * Fix changes in parameter names in function definitions done in r1303201 * Partly revert r1303435 and rename pconf back to in_pconf to avoid shadowing the global variable with the same name and create a bogus assignment. Pointed out by: Eric Covener Committed by: fuankg, rpluem Reviewed by: fuankg, minfrin, trawick git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1307828 13f79535-47bb-0310-9956-ffa450edef68
* include/: Various doxy markup tweaks.Rainer Jung2012-01-311-0/+4
| | | | | | | Backport of r1211364 from trunk. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238409 13f79535-47bb-0310-9956-ffa450edef68
* end-generation hook: Fix false notification of end-of-generation forJeff Trawick2011-11-101-0/+5
| | | | | | | temporary intervals with no active MPM children. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200449 13f79535-47bb-0310-9956-ffa450edef68
* Add -D DUMP_RUN_CFG option to dump some configuration itemsStefan Fritsch2011-10-091-0/+1
| | | | | | | | | from the parsed (or default) config. This is useful for init scripts that need to setup temporary directories and permissions, for example if those temporary directories are located on a ram disk. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180681 13f79535-47bb-0310-9956-ffa450edef68
* re-add "extern" accidentally removed by r1179448Stefan Fritsch2011-10-061-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1179715 13f79535-47bb-0310-9956-ffa450edef68
* Export ap_max_mem_free, needed by r1178079, as pointed out by Gregg L. SmithStefan Fritsch2011-10-051-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1179448 13f79535-47bb-0310-9956-ffa450edef68
* Cleanup effort in prep for GA push:Jim Jagielski2011-09-231-8/+8
| | | | | | | | Trim trailing whitespace... no func change git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174748 13f79535-47bb-0310-9956-ffa450edef68
* Add child_status hook for tracking creation/termination of MPM childJeff Trawick2011-04-251-3/+11
| | | | | | | | | | | | | | processes. Add end_generation hook for notification when the last MPM child of a generation exits. end_generation is implemented completely by core using the child_status hook run by the MPM. simple and mpmt_os2 MPMs don't currently run the child_status hook, so neither hook is invoked with those MPMs. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1096609 13f79535-47bb-0310-9956-ffa450edef68
* Fix some MinGW build issues...Jeff Trawick2011-04-091-0/+4
| | | | | | | | | | | | | | | | | | | | mpm_winnt.c: MinGW doesn't currently define the Windows STACK_SIZE_PARAM_IS_A_RESERVATION symbol mpm_unix.c: Bypass all this code on Windows (too much trouble to keep it out of Makefile) mpm_common.h: Skip over definitions of functions not available on Windows to keep references out of exports.c. PR: 49535 Submitted by: John Vandenberg <jayvdb gmail.com> Minor tweaks by: trawick Other commits for this PR: r1089950, r1089951, r1089954 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090614 13f79535-47bb-0310-9956-ffa450edef68
* Simplify the interface to ap_reclaim_child_processes() andJeff Trawick2011-03-301-16/+10
| | | | | | | | | | | | | ap_relieve_child_processes(): instead of requiring the MPM to implement an otherwise-useless hook, just use a callback function. As I don't expect third-party MPM devs are following our day to day progress, the API changes are considered part of yesterday's MMN change. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1087085 13f79535-47bb-0310-9956-ffa450edef68
* the mpm-note-child-killed hook was just for use byJeff Trawick2011-03-301-3/+5
| | | | | | | | | ap_{reclaim,relieve}_child_processes; those functions can invoke the hook directly; the function ap_mpm_note_child_killed() is useless git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086953 13f79535-47bb-0310-9956-ffa450edef68
* mpm_common.c implements a handful of config directives; the Jeff Trawick2011-03-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | related state has to be re-initialized to the default values at pre-config time, but that was handled inconsistently by the MPMs, resulting in unexpected behavior when some of the directives were removed across restart move that necessary initialization from the MPMs to common code run from core's pre-config; MPMs that need to override defaults can do so by running after core's pre-config (the NetWare MPM now does that) the DEFAULT_MAX_REQUESTS_PER_CHILD compile setting wasn't useful enough to keep the simple MPM wasn't consistent in which of these directives were respected and which weren't, and that hasn't changed (see procmgr.max_requests_per_child vs. ap_max_requests_per_child) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086293 13f79535-47bb-0310-9956-ffa450edef68
* SCOREBOARD_MAINTENANCE_INTERVAL is gone, except for some localJeff Trawick2011-03-261-3/+2
| | | | | | | usage within the NetWare and OS/2 MPMs. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1085780 13f79535-47bb-0310-9956-ffa450edef68
* Added prototype for initgroups().Guenter Knauf2011-03-161-0/+13
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082250 13f79535-47bb-0310-9956-ffa450edef68
* core: Abort with sensible error message if no or more than one MPM isStefan Fritsch2010-08-211-0/+6
| | | | | | | loaded. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@987806 13f79535-47bb-0310-9956-ffa450edef68
* change the preprocessor define ap_accept_mutex_type to upper caseJeff Trawick2010-02-081-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@907723 13f79535-47bb-0310-9956-ffa450edef68
* Refactor mod_status out of the ExtendedStatus toggle picture, as otherWilliam A. Rowe Jr2010-01-261-6/+0
| | | | | | | | | | | | modules can and should be able to use this scoreboard information. Rename suggestions for such a directive are welcomed. Note that mod_status toggles the default, to present the ExtendedStatus for server operators, whenever it is loaded. Docs changes to follow. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@903020 13f79535-47bb-0310-9956-ffa450edef68
* Replace AcceptMutex, LockFile, RewriteLock, SSLMutex, SSLStaplingMutex,Jeff Trawick2009-11-231-14/+5
| | | | | | | | | | | | | and WatchdogMutexPath with a single Mutex directive. Add APIs to simplify setup and user customization of APR proc and global mutexes. (See util_mutex.h.) Build-time setting DEFAULT_LOCKFILE is no longer respected; set DEFAULT_REL_RUNTIMEDIR instead. Some existing modules, such as mod_ldap and mod_auth_digest gain configurability for their mutexes. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883540 13f79535-47bb-0310-9956-ffa450edef68
* Fix a lot of doxygen warnings. Thanks to Brad Hards for the patch.Daniel Earl Poirier2009-10-281-7/+17
| | | | | | | | | | | | I added a few more fixes, and there are still more that might need a doxygen expert. PR: 48061 Submitted by: Brad Hards Reviewed by: poirier git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@830527 13f79535-47bb-0310-9956-ffa450edef68
* Hmmm... forgot git commit/dcommit.Jim Jagielski2009-09-251-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@818828 13f79535-47bb-0310-9956-ffa450edef68
* Oops. forgot the declarationJim Jagielski2009-09-251-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@818827 13f79535-47bb-0310-9956-ffa450edef68
* Enhance ap_hook_monitor to pass along a server_rec (inJim Jagielski2009-09-251-1/+2
| | | | | | | | general the ap_server_conf) and tuck away some storage in there which may be useful as an opaque data pointer. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@818825 13f79535-47bb-0310-9956-ffa450edef68
* main() can use ap_run_mpm() directly, so axe the old ap_mpm_run() functionJeff Trawick2009-04-051-3/+0
| | | | | | | change the mpm hooks to return OK/DONE instead of 0/1 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@762127 13f79535-47bb-0310-9956-ffa450edef68
* mpm-query hook: distinguish between DECLINED and APR_ENOTIMPL so thatJeff Trawick2009-04-011-3/+6
| | | | | | | | | . ap_mpm_query() can return APR_EGENERAL if called too early (for debugging a module) . some hypothetical module which implements the mpm-query hook can bypass the MPM with APR_ENOTIMPL git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@760864 13f79535-47bb-0310-9956-ffa450edef68
* the mpm_get_child_pid hook is unnecessary, as was the per-MPM ↵Jeff Trawick2009-03-291-8/+2
| | | | | | | | | MPM_CHILD_PID() macro which it replaced axe this new hook, and use ap_get_scoreboard_process() instead git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759757 13f79535-47bb-0310-9956-ffa450edef68
* change commentary to note MPM API changes: MPM_ macros to mpm_ hooksJeff Trawick2009-03-271-6/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759172 13f79535-47bb-0310-9956-ffa450edef68
* axe unmaintained 1.3-era code to support AUX, SunOS, IRIX, Next, Tandem, MPE, Jeff Trawick2009-03-271-1/+1
| | | | | | | LynxOS, QNX, and UnixWare git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758944 13f79535-47bb-0310-9956-ffa450edef68
* remove TPF supportJeff Trawick2009-03-271-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758936 13f79535-47bb-0310-9956-ffa450edef68
* axe the unnecessary AP_MPM_HARD_LIMITS_FILEJeff Trawick2009-03-261-2/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758671 13f79535-47bb-0310-9956-ffa450edef68
* no longer conditional; although some are now in mpm_unix.cWilliam A. Rowe Jr2009-03-251-52/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758371 13f79535-47bb-0310-9956-ffa450edef68
* resurrect the old (pre-r757867) compiled-in MPM_NAME value, but via a hook ↵Jeff Trawick2009-03-251-0/+3
| | | | | | | | | for dynamically linked MPMs git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758312 13f79535-47bb-0310-9956-ffa450edef68
* dangling semis lead to warnings with Sun StudioJeff Trawick2009-03-251-5/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758229 13f79535-47bb-0310-9956-ffa450edef68
* fix inconsistent defs of ap_mpm_note_child_killed()Jeff Trawick2009-03-251-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758226 13f79535-47bb-0310-9956-ffa450edef68
* axe the remaining checks of AP_MPM_WANT_foo to see what code to generateJeff Trawick2009-03-241-8/+0
| | | | | | | | | | MPMs no longer provide those definitions (the signal server support is an interesting problem, since it has to be known before loading loading the MPM) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758014 13f79535-47bb-0310-9956-ffa450edef68
* Introduce a new set of APIs to allow MPMs to be proper modules insteadJeff Trawick2009-03-241-19/+50
| | | | | | | | | | | | | | of integral parts which share global variables, functions, and macros with the rest of httpd. Converted now: prefork, worker, event, simple, WinNT* *WinNT hasn't been built or tested, and relies on a hack to include the WinNT mpm.h to disable Unixy MPM support routines in mpm_common.c git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757853 13f79535-47bb-0310-9956-ffa450edef68
* API Cleanup in preperation for 2.4.x, make sure all exported functions or ↵Paul Querna2008-12-021-1/+1
| | | | | | variables contain an ap_ prefix. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722399 13f79535-47bb-0310-9956-ffa450edef68
* Wrap the global count of privileges handlers operating. Silence grumblers.Nick Kew2008-11-031-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@710037 13f79535-47bb-0310-9956-ffa450edef68
* Switch all unix MPMs to use drop_privileges hook (mod_unixd) for startupNick Kew2008-11-031-0/+4
| | | | | | | | and add a flag to prevent running without any module taking responsibility for managing system privileges! git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@709993 13f79535-47bb-0310-9956-ffa450edef68
* Use correct Doxygen keywords for functions and variables. TODO: figure out ↵Sander Temme2007-07-031-2/+2
| | | | | | whether those keywords are actually necessary. HTML-ify some documentation comments for benefit of Doxygen. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@553013 13f79535-47bb-0310-9956-ffa450edef68
* Add alternative fixes for CVE-2007-3304:Joe Orton2007-06-291-0/+13
| | | | | | | | | | | | | | | | | | | * configure.in: Check for getpgid. * include/mpm_common.h (ap_mpm_safe_kill): New prototype. * server/mpm_common.c (reclaim_one_pid): Ensure pid validity before calling apr_proc_wait(). (ap_mpm_safe_kill): New function. * server/mpm/prefork/prefork.c, server/mpm/worker/worker.c, server/mpm/experimental/event/event.c: Use ap_mpm_safe_kill() on pids from the scoreboard, throughout. * include/ap_mmn.h: Minor bump. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551843 13f79535-47bb-0310-9956-ffa450edef68
* Revert r547987 ("svn merge -c -547987 .")Joe Orton2007-06-291-8/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551835 13f79535-47bb-0310-9956-ffa450edef68
* PID table impl: parent process keeps a local table store ofJim Jagielski2007-06-161-0/+8
| | | | | | | | Apache child process PIDs and uses that to check validity of what's in the scoreboard. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@547987 13f79535-47bb-0310-9956-ffa450edef68
* Once SSLMutex allowed for the setting of both theJim Jagielski2006-10-241-1/+0
| | | | | | | | | | | | | | | | | | | | locking method and the lockfile location, I never liked how AcceptMutex was linked to LockFile. This seemed unnecessary. Much better to have AcceptMutex do both as well. Plus, now that we will likely see other modules require a "standard" way of setting mutexes, why not have Apache provide that as an API of sorts. Anyway, LockFile is now depreciated and AcceptMutex is now SSLMutex-like. We also provide a short function that "parses" out a mutex parameter and strips out the mechanism and lockfile location. AcceptMutex and SSLMutex is this capability. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@467326 13f79535-47bb-0310-9956-ffa450edef68
* update license header textRoy T. Fielding2006-07-111-6/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
* Update the copyright year in all .c, .h and .xml filesColm MacCarthaigh2006-04-191-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status