8c1e315d3f
Doxygen fixup / cleanup
...
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
2005-08-28 23:03:59 +00:00
3e168404bc
Add graceful-stop to the list of new features.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@263906 13f79535-47bb-0310-9956-ffa450edef68
2005-08-28 19:22:35 +00:00
d075344158
Update transformations to reflect the graceful-stop XML documentation.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@263901 13f79535-47bb-0310-9956-ffa450edef68
2005-08-28 18:44:28 +00:00
c31aede2e1
Add a note on the possible pit-falls that lie ahead when running multiple
...
instances of httpd at the same time.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@263857 13f79535-47bb-0310-9956-ffa450edef68
2005-08-28 10:48:09 +00:00
f73a68d910
If it makes it in to 2.2, leave it. Otherwise bump it later.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@263854 13f79535-47bb-0310-9956-ffa450edef68
2005-08-28 10:26:45 +00:00
52428b719e
Update CHANGES to reflect that worker now supports graceful-stop, that Bill
...
wrote some of the graceful-stop code I stole from Ken, and to get rid of
exraneous `'`'s.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@241820 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 23:24:43 +00:00
fec621ccba
Implement a graceful-stop for the worker MPM. We close our listeners, and then
...
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
2005-08-27 23:22:50 +00:00
de0b459ab0
CGId keeps a copy of the listening sockets open, which interferes with a
...
graceful shutdown/start. Close the listening sockets on cgid start.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@241815 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 23:05:42 +00:00
b4b88ed365
Re-add a simple, obvious, speed-up.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@241814 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 23:04:17 +00:00
04558bec28
Remove as many ghastly scoreboard loops from the graceful-shutdown code, and
...
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
2005-08-27 22:16:46 +00:00
a500939eb8
Add ap_relieve_child_processess(), a non-infanticidal copy of
...
ap_reclaim_child_processes(). Allows us to waitpid() each process in the
scoreboard and each "extra" process with a single call.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240465 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 22:12:08 +00:00
0dc658a595
suppress-error-charset now in 2.0.55-dev
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240426 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 15:02:49 +00:00
b40eaaf3e1
Fix the RPM spec file: XML versions of the doc files are no
...
longer removed. Added httxt2dbm to the sbin directory.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240349 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 21:33:59 +00:00
8b3205dde7
Sync the all_in_one index page with the regular index page and
...
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240306 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 18:18:14 +00:00
16dcf5959f
Clean up some problems in the recently committed background faqs;
...
Make the reference to the 1.3 FAQ a little more up-to-date; and
add a FAQ on SELinux.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240301 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 17:58:39 +00:00
8a1e45e947
Make the arguments to the redirect directive clearer.
...
PR: 36166
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240299 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 17:54:49 +00:00
42377545e2
Allow htcacheclean to deal in gigabytes.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240297 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 17:54:18 +00:00
d7c04b158c
Move the "GracefulShutdownTimeout" directive into mpm_common, for re-use
...
with other MPM's.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240296 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 17:43:24 +00:00
d25bf1132c
hmm. for some reason some transformed files are missing in the last commit ;)
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240281 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 16:40:17 +00:00
ae0455044b
Update the transformations to reflect the new graceful-stop argument.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240275 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 16:14:46 +00:00
bbb8aeee02
Silly me, I forgot to commit this; the definitions for the GRACEFUL_STOP
...
signal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240274 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 16:13:17 +00:00
51daa83cd7
Allow apachectl to support "graceful-stop" argument
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240273 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 16:12:28 +00:00
ab0d82ccf2
Documentation changes relevant to new graceful-stop command line argument
...
for httpd and apachectl, and the the "GracefulShutdownTimeout" directive.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240271 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 16:11:45 +00:00
c6fb6c57d0
Implement a "graceful-stop" for the prefork MPM (might aswell do the hard one
...
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
2005-08-26 16:09:54 +00:00
432af0071e
Make the neccessary changes to mpm_common and main to support a graceful-stop
...
command line argument.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240269 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 16:00:59 +00:00
42ff4f977c
Remove the note about WINCH on certain platforms. As of r239430, this is no
...
longer the case and USR1 will be used on all platforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240258 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 15:08:06 +00:00
859b92789f
spell check
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240101 13f79535-47bb-0310-9956-ffa450edef68
2005-08-25 16:54:50 +00:00
67e8ce3fc8
* server/listen.c (open_listeners): If 0.0.0.0 is found before [::]
...
for the same port, switch them so that the bind to [::] is attempted
first.
Submitted by: colm, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240096 13f79535-47bb-0310-9956-ffa450edef68
2005-08-25 15:56:43 +00:00
4f75bd3508
* server/listen.c (IS_INADDR_ANY, IS_IN6ADDR_ANY): New macros.
...
(open_listeners): Simplify using the new macros; no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240092 13f79535-47bb-0310-9956-ffa450edef68
2005-08-25 15:37:39 +00:00
56101b205e
A very minor, but particularly annoying whitespace fix. It took me 15 minutes
...
to try and parse what was going on :-)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240089 13f79535-47bb-0310-9956-ffa450edef68
2005-08-25 15:30:31 +00:00
803cdc87cd
Update the documentation for the ScriptSock directive to match the
...
.PID extension.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240049 13f79535-47bb-0310-9956-ffa450edef68
2005-08-25 12:12:15 +00:00
b379e699a4
Append the .PID to the ScriptSock filename. This change ensures that multiple
...
running instances of httpd will not clobber each others script sockets.
Because a different socket will be created for each instance, this change also
unlinks the script-socket on exit, to prevent pollution.
unlink() happens from within the parent process, since the change in userid's
means the cgid process likely won't have the correct permissions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240044 13f79535-47bb-0310-9956-ffa450edef68
2005-08-25 11:51:24 +00:00
e3d4e1fe50
nit: Consistently CamelCase "ScriptSock".
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240043 13f79535-47bb-0310-9956-ffa450edef68
2005-08-25 10:56:12 +00:00
cdb2935300
Implement "de-listening" in the worker MPM. Fixes PR28167. Comments in CHANGES
...
file also cover r239710-1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239740 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 19:37:46 +00:00
ea08df890e
Correct the function prototype/declaration
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239732 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 19:06:40 +00:00
aacf3609d2
Implement "de-listening" for graceful restarts with the prefork MPM. With this
...
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
2005-08-24 16:58:11 +00:00
d6f8c966b0
Provide a function for closing all of the listeners.
...
* This is useful for properly implementing a graceful stop and restart
where we want child processess to be able to carry on serving a request
but "de-listen" from a port. So that another instance entirely can be
started in our place, or to unbind from a "Listen" directive an admin
has removed from the configuration.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239710 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 16:51:20 +00:00
11a5397d1f
fix revision references and update transformation
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239692 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 15:30:52 +00:00
11e80bd7c3
update transformation
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239686 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 15:14:03 +00:00
a3932cdea2
update German translation
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239685 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 15:13:41 +00:00
e4e8151603
Document change in lbmethod= argument
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239684 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 15:09:31 +00:00
f065e18de9
add new documents to the sitemap
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239681 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 15:03:41 +00:00
d6ed6d03d9
update transformation
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239678 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 15:00:23 +00:00
2c1bdc5bbd
update German translation
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239677 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 14:57:16 +00:00
b6a51f1d6f
build all
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239633 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 12:36:57 +00:00
5ea66d99f4
build all
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239629 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 12:23:46 +00:00
eeff385e44
activate LastChangedRevision expansion
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239618 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 12:04:25 +00:00
b9ecf2dcd7
Update docs to document ap_dbd_prepare function.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239617 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 12:02:34 +00:00
42bcc6868d
fix line endings
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239616 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 12:01:38 +00:00
60a8931fa6
Remove over-zealous and invalid use of <indent></indent> in the Caching
...
User-guide.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239563 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 08:18:45 +00:00
