summaryrefslogtreecommitdiff
path: root/server/mpm
Commit message (Collapse)AuthorAgeFilesLines
* Removed the destruction of the bucket allocator prior toBrian Pane2005-12-311-1/+0
| | | | | | | | | | | clearing the transaction pool. The bucket allocator will now get destroyed when apr_pool_clear() invokes its cleanup callback. With the old logic, memory corruption was possible if the pool contained any brigades that referenced any buckets allocated from the bucket allocator. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@360257 13f79535-47bb-0310-9956-ffa450edef68
* When computing the timeouts for keepalives and write completion,Brian Pane2005-11-271-5/+3
| | | | | | | | | get the current time _after_ processing the event that led to the timeout, rather than before. [forward-port of commit 349189 from the async-read-dev branch] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@349190 13f79535-47bb-0310-9956-ffa450edef68
* remove an obsolete commentBrian Pane2005-11-201-4/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345726 13f79535-47bb-0310-9956-ffa450edef68
* No functional change: remove "internal" tab spacing/formatting.Jim Jagielski2005-11-166-40/+40
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345053 13f79535-47bb-0310-9956-ffa450edef68
* Minor refactoring: move the creation of the pollset and associatedBrian Pane2005-11-131-35/+48
| | | | | | | | | | data structures outside of the listener thread function. The point of this is to facilitate future experiments with different concurrency models like Leader/Followers as potential alternatives to the current Reactor design. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332879 13f79535-47bb-0310-9956-ffa450edef68
* No functional change: more indenting/formatting changes due toJim Jagielski2005-11-103-22/+22
| | | | | | | tabbing git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332316 13f79535-47bb-0310-9956-ffa450edef68
* No functional Change: Removing trailing whitespace. This alsoJim Jagielski2005-11-1019-1176/+1176
| | | | | | | | means that "blank" lines consisting of just spaces or tabs are now really blank lines git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
* No functional change: simple detabbing of indented code.Jim Jagielski2005-11-1012-143/+143
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332305 13f79535-47bb-0310-9956-ffa450edef68
* Async write completion for Event MPMBrian Pane2005-10-241-14/+83
| | | | | | | (backported from async-dev branch to 2.3 trunk) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327945 13f79535-47bb-0310-9956-ffa450edef68
* remove the recycled_pool variable to keep it more in sync with worker.Greg Ames2005-10-081-6/+2
| | | | | | | | event already had logic in the listener thread error legs to prevent leaking ptrans, so this is mostly cosmetic. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@307250 13f79535-47bb-0310-9956-ffa450edef68
* remove obsolete constantGreg Ames2005-10-081-11/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@307239 13f79535-47bb-0310-9956-ffa450edef68
* use Greg's cleaner fix for CAN-2005-2970Jeff Trawick2005-10-081-13/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@307221 13f79535-47bb-0310-9956-ffa450edef68
* Remove some trailing spaces. Syncs with 2.2.x.Colm MacCarthaigh2005-10-031-4/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@293307 13f79535-47bb-0310-9956-ffa450edef68
* SECURITY: CAN-2005-2970 (cve.mitre.org)Jeff Trawick2005-09-301-0/+5
| | | | | | | | worker MPM: Fix a memory leak which can occur after an aborted connection in some limited circumstances. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@292809 13f79535-47bb-0310-9956-ffa450edef68
* * server/mpm/prefork/prefork.c: Add volatile qualifier to die_nowJoe Orton2005-09-191-1/+1
| | | | | | | since it is changed by a signal handler. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@290124 13f79535-47bb-0310-9956-ffa450edef68
* get rid of an obsolete comment. the separate event thread disappeared whenGreg Ames2005-09-171-3/+2
| | | | | | | the event MPM moved into svn. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@289681 13f79535-47bb-0310-9956-ffa450edef68
* Move the timeout mutex up, to limit the time we are holding it.Paul Querna2005-09-091-2/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279794 13f79535-47bb-0310-9956-ffa450edef68
* Initiliase all of the first_*_limit variables to zero, so that we can actuallyColm MacCarthaigh2005-08-314-7/+7
| | | | | | | | raise limits beyond their defaults reliably. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265523 13f79535-47bb-0310-9956-ffa450edef68
* Revert one part. I should have tested seperately. This line isn't neccessary.Colm MacCarthaigh2005-08-311-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265519 13f79535-47bb-0310-9956-ffa450edef68
* Actually allow the admin to set thread_limit higher than the default. Colm MacCarthaigh2005-08-311-3/+3
| | | | | | | | | Also, initialise the first_ variables, since they are tested in the set_ functions. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265518 13f79535-47bb-0310-9956-ffa450edef68
* Add ap_append_pid(); This is performed enough to warrantJim Jagielski2005-08-311-6/+3
| | | | | | | | | a function I think, especially with the fact that the mapping of getpid() to APR_PID_T_FMT isn't consistant in some areas. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265506 13f79535-47bb-0310-9956-ffa450edef68
* More getpid format fixesJim Jagielski2005-08-311-4/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265504 13f79535-47bb-0310-9956-ffa450edef68
* Implement graceful stop in the event MPM. Implementation is identical toColm MacCarthaigh2005-08-292-7/+74
| | | | | | | | the worker MPM implementation. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264105 13f79535-47bb-0310-9956-ffa450edef68
* *how* did I mis-spell that.Colm MacCarthaigh2005-08-291-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264104 13f79535-47bb-0310-9956-ffa450edef68
* Move the "GracefulShutdownTimeout" command definition into mpm_commonColm MacCarthaigh2005-08-292-6/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264103 13f79535-47bb-0310-9956-ffa450edef68
* Doxygen fixup / cleanupIan Holsman2005-08-2828-4/+262
| | | | | | | | | submited by: Neale Ranns neale ranns.org reviewed by: Ian Holsman git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@263931 13f79535-47bb-0310-9956-ffa450edef68
* Implement a graceful-stop for the worker MPM. We close our listeners, and thenColm MacCarthaigh2005-08-272-6/+74
| | | | | | | | | | | | | ask each child process to do the same. We then monitor until all children have exited. The change to ap_start_shutdown(void) to ap_start_shutdown(int) may look like an external API change, but the function is defined static, and used only in one place. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@241819 13f79535-47bb-0310-9956-ffa450edef68
* Re-add a simple, obvious, speed-up.Colm MacCarthaigh2005-08-271-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@241814 13f79535-47bb-0310-9956-ffa450edef68
* Remove as many ghastly scoreboard loops from the graceful-shutdown code, andColm MacCarthaigh2005-08-271-33/+12
| | | | | | | | | | replace with the new ap_relieve_child_processes() call. Add a sleep() call now, as we lost the timeout inherent in ap_wait_or_timeout(). 1 second seems a sane choice. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240466 13f79535-47bb-0310-9956-ffa450edef68
* Move the "GracefulShutdownTimeout" directive into mpm_common, for re-useColm MacCarthaigh2005-08-262-19/+8
| | | | | | | | with other MPM's. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240296 13f79535-47bb-0310-9956-ffa450edef68
* Implement a "graceful-stop" for the prefork MPM (might aswell do the hard oneColm MacCarthaigh2005-08-262-2/+126
| | | | | | | | | | | | | | | | | first). General approach is to send SIGUSR1 to all children (which will de-listen, and exit when finished), and to gather all children as they exit. We don't use a sleep(timeout) for the timeout implementation, because this would lead to a rut of defunct children until the timeout had expired. set_graceful_shutdown stolen from Ken Coar. See <3E84B1EC.3050007@Golux.Com> (28 Mar 2003). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240270 13f79535-47bb-0310-9956-ffa450edef68
* Implement "de-listening" in the worker MPM. Fixes PR28167. Comments in CHANGESColm MacCarthaigh2005-08-241-0/+1
| | | | | | | | file also cover r239710-1. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239740 13f79535-47bb-0310-9956-ffa450edef68
* Implement "de-listening" for graceful restarts with the prefork MPM. With thisColm MacCarthaigh2005-08-241-3/+17
| | | | | | | | | | | | | | | | | | change; 1.) httpd -k graceful sends SIGUSR1 to the parent pid, which in turn sends SIGUSR1 to all of the active children, 2.) Active children each close their copy of listener fd's. This means that the listening sockets are freed for re-use. In the ordinary case, this makes no difference. However if for example admin changes "Listen 80" to "Listen 81" in the config, this rev makes port 80 immediately available (no waiting for the graceful children to die). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239711 13f79535-47bb-0310-9956-ffa450edef68
* Remove support for the threaded-mpm's on Linux 2.0, and de-autoconf theColm MacCarthaigh2005-08-231-0/+16
| | | | | | | | | graceful restart signal. Frees up SIGWINCH for implementing graceful stop. See <20050727114058.GA3390@stdlib.net> and subsequent thread on httpd-dev. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239430 13f79535-47bb-0310-9956-ffa450edef68
* * event.c: Create ptrans pool as a child of pconf, to fix APR pool Paul Querna2005-06-011-1/+1
| | | | | | | | | lifetime checks in apr_tables.c. Based on r170896 changes to the Worker MPM. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179355 13f79535-47bb-0310-9956-ffa450edef68
* downgrade the log level of a proc_mutex_unlock error messageJeff Trawick2005-05-311-1/+7
| | | | | | | | | | when it occurs during restart; it isn't at all uncommon then when SysV semaphores are used for the accept mutex same logic already in place for two other mutex calls git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179317 13f79535-47bb-0310-9956-ffa450edef68
* * server/mpm/worker/worker.c (listener_thread): Create ptrans pool asJoe Orton2005-05-191-1/+1
| | | | | | | | | a child of pconf, to fix APR pool lifetime checks in apr_tables.c. Submitted by: Joe Schaefer git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170896 13f79535-47bb-0310-9956-ffa450edef68
* missed a couple. Greg Ames2005-05-062-10/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168649 13f79535-47bb-0310-9956-ffa450edef68
* Remove this old email from the source tree.Paul Querna2005-05-061-94/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168496 13f79535-47bb-0310-9956-ffa450edef68
* worker and event mpms: transient thread creation errors shouldn't take downGreg Ames2005-05-042-41/+87
| | | | | | | the whole server. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168182 13f79535-47bb-0310-9956-ffa450edef68
* Allow httpd on NetWare to build using either the standard socket libraries ↵Bradley Nicholes2005-04-141-3/+11
| | | | | | or the Winsock libraries. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161368 13f79535-47bb-0310-9956-ffa450edef68
* the style police have been sleepingGreg Ames2005-04-051-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160211 13f79535-47bb-0310-9956-ffa450edef68
* Win32: Eliminate useless debug error messageBill Stoddard2005-04-051-4/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160209 13f79535-47bb-0310-9956-ffa450edef68
* Fix Windows CompContext buff size miscalculationAllan K. Edwards2005-03-221-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@158685 13f79535-47bb-0310-9956-ffa450edef68
* sync with mod_status hacks in the worker mpm.Paul Querna2005-03-161-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@157810 13f79535-47bb-0310-9956-ffa450edef68
* Add ap_mpm_is_experimental and ap_mpm_is_threaded. Use these instead of ↵Paul Querna2005-03-081-2/+20
| | | | | | checking for specific MPMs. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156574 13f79535-47bb-0310-9956-ffa450edef68
* Make sure that the secure listen sockets that are created and injected into ↵Bradley Nicholes2005-03-081-1/+3
| | | | | | the ap_listeners lists by mod_nw_ssl are handled correctly so that they remain open and reused across restarts. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156556 13f79535-47bb-0310-9956-ffa450edef68
* worker MPM/mod_status: Support per-worker tracking of pid andJeff Trawick2005-03-051-0/+2
| | | | | | | | | | | | | | generation in the scoreboard so that mod_status can accurately represent workers in processes which are gracefully terminating. New child processes with worker MPM can take over slots of individual threads within gracefully terminating processes. Sometimes this is a problem (too many of these gracefully terminating processes), so it is helpful to have mod_status provide the information required to recognize these processes. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156274 13f79535-47bb-0310-9956-ffa450edef68
* Win32: Init the args to mpm_service_install(). Prevents nasty things like ↵Bill Stoddard2005-03-011-22/+26
| | | | | | segfaults git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@155833 13f79535-47bb-0310-9956-ffa450edef68
* Win32: output some useful debug messages when installing the serviceBill Stoddard2005-02-181-0/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154322 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status