summaryrefslogtreecommitdiffstats
path: root/include/mpm_common.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* On the trunk:Stefan Eissing2017-09-211-1/+1
| | | | | | | | mpm_common.h: guarding AP_ENABLE_EXCEPTION_HOOK against use when undefined so that -Wundef does not triggger. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809135 13f79535-47bb-0310-9956-ffa450edef68
* ap_reclaim_child_processes(): Implement terminate immediatelyStefan Fritsch2016-11-211-2/+1
| | | | | | | | | | The behavior for terminate == 1 was documented but not implemented. Do that now. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1770750 13f79535-47bb-0310-9956-ffa450edef68
* ap_reclaim_child_processes() ignores its first argumentStefan Fritsch2016-08-211-1/+2
| | | | | | | note this in the docs, add comment git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1757061 13f79535-47bb-0310-9956-ffa450edef68
* reverting the reverting of r1735174, r1735176 was the culpritStefan Eissing2016-03-161-10/+11
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735227 13f79535-47bb-0310-9956-ffa450edef68
* reverting r1735174 as http/1.1 just terminated before responseStefan Eissing2016-03-161-11/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735216 13f79535-47bb-0310-9956-ffa450edef68
* mpm: Generalise the ap_mpm_register_socket functions to accept pipes or sockets.Graham Leggett2016-03-151-10/+11
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735174 13f79535-47bb-0310-9956-ffa450edef68
* core: Extend support for setting aside data from the network input filterGraham Leggett2016-03-121-1/+9
| | | | | | | to any connection or request input filter. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734656 13f79535-47bb-0310-9956-ffa450edef68
* mpm: Add a complete_connection hook that confirms whether an MPM is allowedGraham Leggett2016-02-191-0/+10
| | | | | | | to leave the WRITE_COMPLETION phase. Move filter code out of the MPMs. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1731253 13f79535-47bb-0310-9956-ffa450edef68
* Revert r1601943, r1602058, r1605307 (socket callback returning pollfds)Takashi Sato2014-06-271-2/+2
| | | | | | | | | | Revert r1605369 (wstunnel refactoring) per discassion on dev@httpd.a.o thread Message-ID: <CALK=YjN9HfThP_k_rF9iJPcUhcQk9sNOaDPxZNG+HcJNWS4ZAQ@mail.gmail.com> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1605946 13f79535-47bb-0310-9956-ffa450edef68
* Socket event callback now takes pollfd.Takashi Sato2014-06-111-2/+2
| | | | | | | | User (e.g. mod_proxy_wstunnel) can know which socket is ready. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1601943 13f79535-47bb-0310-9956-ffa450edef68
* PR56333: Add an API to resume a connection that a handler has previously ↵Eric Covener2014-05-111-0/+5
| | | | | | | | | | suspended. Submitted by: Artem <artemciy gmail.com>, Edward Lu <Chaosed0 gmail.com> Committed by: covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1593860 13f79535-47bb-0310-9956-ffa450edef68
* Extend the socket callbacks in event to allow a timeout on the I/O callback. Eric Covener2014-05-111-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | When a socket callback has a timeout, an associated timer event is used to remove the sockets from the pollset and call a timeout function. * This includes a noteworthy change to the main event loop. Previously, we would call epoll, then process the timer events, then iterate through the poll results. After this patch, the timer events are processed before the poll() a _non-queued_ action can change the pollset conents (a users timed callback function conversely could easily sit in a queue while the main thread continues down into epoll) * timer events can now have sockets associated with them, those sockets are removed from the pollset when the timer event fires w/o a queue to the worker. * timer events now have a canceled flag that can be toggled without locking the timer list. * Drop the severity of some wstunnel messages from DEBUG to TRACE1 * Lift the restriction on using asynchronous websockets connections but having an idle timeout git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1593857 13f79535-47bb-0310-9956-ffa450edef68
* tiny doc/Doxygen improvementsJeff Trawick2014-04-171-5/+31
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1588217 13f79535-47bb-0310-9956-ffa450edef68
* Remove useless \t and blank line that were not backported into 2.4.x in r1542557Christophe Jaillet2013-12-181-3/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551854 13f79535-47bb-0310-9956-ffa450edef68
* Add suspend_connection and resume_connection hooks to notify modulesJeff Trawick2013-11-301-0/+41
| | | | | | | | when the thread/connection relationship changes. (Currently implemented only for the Event MPM; should be implemented for all async MPMs.) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1546759 13f79535-47bb-0310-9956-ffa450edef68
* fix Doxygen warnings/commentsJeff Trawick2013-08-131-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1513461 13f79535-47bb-0310-9956-ffa450edef68
* Fold in Eric Covener's socket callbackJim Jagielski2013-06-171-0/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1493741 13f79535-47bb-0310-9956-ffa450edef68
* On NetWare skip these unsupported function prototypes.Guenter Knauf2012-12-191-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1423933 13f79535-47bb-0310-9956-ffa450edef68
* Pull out the "extended" pod functions used by event and workerJim Jagielski2012-11-141-0/+44
| | | | | | | | to core, since it will be used by Simple and Lean and likely other MPMs. Avoid duplication. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1409214 13f79535-47bb-0310-9956-ffa450edef68
* avoid decls for some Unix-specific functions on Win32 tooJeff Trawick2012-07-181-2/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1363035 13f79535-47bb-0310-9956-ffa450edef68
* * Partly revert r1303435 and rename pconf back to in_pconf to avoid shadowingRuediger Pluem2012-03-221-1/+1
| | | | | | | | | the global variable with the same name and create a bogus assignment. Pointed out by: Eric Covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1303827 13f79535-47bb-0310-9956-ffa450edef68
* Revert r1294936 (Jeff's revert) and fix NetWare / Win32 build.Guenter Knauf2012-03-211-34/+38
| | | | | | | | Added the missing AP_DECLARE* decorations for the function implementations and variables. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1303201 13f79535-47bb-0310-9956-ffa450edef68
* revert r1294936, which fixed MPM DSO load failures on AIXJeff Trawick2012-03-161-21/+19
| | | | | | | | | it breaks the Netware build and was also missing the AP_DECLARE* decorations for the function implementations and variables git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1301277 13f79535-47bb-0310-9956-ffa450edef68
* Fix MPM DSO load failure on AIX.Jeff Trawick2012-02-291-19/+21
| | | | | | | | | Without the proper AP_DECLARE*, these functions used by MPMs were not exported from httpd on AIX, resulting in symbol resolution errors. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1294936 13f79535-47bb-0310-9956-ffa450edef68
* * include/: Various doxy markup tweaks.Joe Orton2011-12-071-0/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1211364 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-241-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