]>
granicus.if.org Git - apache/log
Jim Jagielski [Mon, 19 Sep 2005 13:04:29 +0000 (13:04 +0000)]
Backported to the 2.1.8/2.2.x tree
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@290146
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 19 Sep 2005 13:03:37 +0000 (13:03 +0000)]
* include/ap_mmn.h (MODULE_MAGIC_NUMBER_MAJOR): Bump for mod_ssl API
change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@290145
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 19 Sep 2005 12:26:36 +0000 (12:26 +0000)]
* modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert_dn): Fix gcc
4.x different-pointer-signedness warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@290136
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 19 Sep 2005 12:10:34 +0000 (12:10 +0000)]
Backport r239420 and r239421 to the 2.2.x branch; Enhance
CacheEnable/CacheDisable to be of use to proxy servers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@290133
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 19 Sep 2005 11:54:52 +0000 (11:54 +0000)]
* server/mpm/prefork/prefork.c: Add volatile qualifier to die_now
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
Colm MacCarthaigh [Mon, 19 Sep 2005 10:45:03 +0000 (10:45 +0000)]
Backport r239407 to the 2.2.x branch; Improve mod_disk_cache hit/miss ratio
by canonicalising the url key.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@290107
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Sun, 18 Sep 2005 20:39:34 +0000 (20:39 +0000)]
Backport r265506, r240044 and r240049 to the 2.2.x branch; Appends .PID to the
ScriptSock filename.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@289972
13f79535 -47bb-0310-9956-
ffa450edef68
David Reid [Sun, 18 Sep 2005 20:06:27 +0000 (20:06 +0000)]
Catch up with the changes to mod_ssl and rename the
function pointer to reflect the change. With this change
this module now builds again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@289968
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Sun, 18 Sep 2005 20:01:10 +0000 (20:01 +0000)]
Backport r264759 and r264788 to the 2.2.x branch. Fixes the get_suexec_identity hook
for mod_cgid.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@289965
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Sun, 18 Sep 2005 19:39:02 +0000 (19:39 +0000)]
Backport r239430 to the 2.2.x branch. Lets make sure WINCH is kept free.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@289961
13f79535 -47bb-0310-9956-
ffa450edef68
Greg Ames [Sat, 17 Sep 2005 01:14:16 +0000 (01:14 +0000)]
get rid of an obsolete comment. the separate event thread disappeared when
the event MPM moved into svn.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@289681
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 16 Sep 2005 16:04:37 +0000 (16:04 +0000)]
I'd prefer, before 2.2-final, to have AP_NEED_SET_MUTEX_PERMS defined
across all architectures as 1|0. Comments?
This simply ensures we can use the value in #if tests.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@289592
13f79535 -47bb-0310-9956-
ffa450edef68
David Reid [Fri, 16 Sep 2005 09:03:49 +0000 (09:03 +0000)]
- remove ssl_ext_lookup and replace it with ssl_ext_list
- change ssl_expr_eval_oid to use ssl_ext_list
This change provides for a singfle function that provides an array of all
values from a certificate that match a given extension and removes the
duplictaed code that was present.
Reviewed by: Joe Orton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@289444
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 12 Sep 2005 19:27:53 +0000 (19:27 +0000)]
Remove a call to strerror(). Possibly a leftover from prior debugging code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@280401
13f79535 -47bb-0310-9956-
ffa450edef68
Stas Bekman [Mon, 12 Sep 2005 18:14:19 +0000 (18:14 +0000)]
Document the ReceiveBufferSize change done in r157583
Submitted by: Murray Nesbitt <murray@cpan.org>]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@280384
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 11 Sep 2005 19:54:26 +0000 (19:54 +0000)]
SYNC to 2.0.x/CHANGES; shift backported patches to the fixed-in-2.0.x
section, and ensure that common sections of CHANGES are 100% identical.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@280170
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 11 Sep 2005 12:35:56 +0000 (12:35 +0000)]
rewrite CR mitigation logic to wipe out any trailing
white space
Suggested by: wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@280114
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Sat, 10 Sep 2005 16:36:37 +0000 (16:36 +0000)]
Any failure in apr_stat on a symlink currently gives
"Symbolic link not allowed", which results in much head-scratching
if the actual problem is a broken link of some sort. The real
fix would be to propogate the correct apr_stat error into the
error log, but that would require more refactoring than I'm
prepared to do. This change simply expands the error message
to include both possibilities. It improves the situation for
PR28515 but does not solve it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@280018
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 10 Sep 2005 14:59:48 +0000 (14:59 +0000)]
gcc -Wall fix: depending on signedness of char.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@280013
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 10 Sep 2005 14:43:58 +0000 (14:43 +0000)]
gcc -Wall cleanup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@280010
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Sat, 10 Sep 2005 09:10:27 +0000 (09:10 +0000)]
* modules/proxy/mod_proxy_balancer.c (balancer_handler): Fix gcc
warning; no functional change.
* modules/proxy/mod_proxy.c (set_balancer_param): Likewise.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279973
13f79535 -47bb-0310-9956-
ffa450edef68
Ian Holsman [Sat, 10 Sep 2005 03:44:08 +0000 (03:44 +0000)]
Fix config file for mod_dbd
Submitted: Brian J. France <list firehawksystems.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279940
13f79535 -47bb-0310-9956-
ffa450edef68
David Reid [Fri, 9 Sep 2005 22:10:25 +0000 (22:10 +0000)]
Record the fact that we failed to set the username as requested.
This is useful to know as the most likely cause will be a misconfiguration
and so should be easily fixed, but to be fixed it's helpful if you're
aware it needs fixed!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279893
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Fri, 9 Sep 2005 15:24:43 +0000 (15:24 +0000)]
Move the timeout mutex up, to limit the time we are holding it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279794
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 9 Sep 2005 12:28:02 +0000 (12:28 +0000)]
Proxy balancer lbmethods are now registered as providers and not
via hooks. Move various find() functions back to mod_proxy_balancer
where they belong :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279752
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 9 Sep 2005 12:23:56 +0000 (12:23 +0000)]
New provider function, ap_list_provider_names(), which lists all
available registered providers for a specified group and version
number. Visible change so add CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279750
13f79535 -47bb-0310-9956-
ffa450edef68
Bradley Nicholes [Thu, 8 Sep 2005 16:37:00 +0000 (16:37 +0000)]
Remove proxy_hook_load_lbmethods from Netware export list
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279579
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 7 Sep 2005 16:14:29 +0000 (16:14 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279368
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 7 Sep 2005 13:14:16 +0000 (13:14 +0000)]
Minor nit. Methods are server-wide, so simply use the base version table.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279319
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 7 Sep 2005 12:42:56 +0000 (12:42 +0000)]
s/Redhat/Red Hat/ but use Fedora here anyway.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279314
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 7 Sep 2005 12:04:15 +0000 (12:04 +0000)]
Restruct of lbmethod find-best algo's, bypassing hook mechanism.
Looking into provider method, but until then... Prevent core dump
when balancer not in vhosts
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279305
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 6 Sep 2005 21:43:28 +0000 (21:43 +0000)]
Language, spelling and grammar fixes for ssl_intro.xml
Submitted by Noirin Plunkett <firebird nerdchic.net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279128
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 1 Sep 2005 14:49:12 +0000 (14:49 +0000)]
Introduce SSLProxyVerify better. Add a warning note on exactly
what verification is done by the proxy in the proxy-to-SSL-server
case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265741
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 1 Sep 2005 14:21:38 +0000 (14:21 +0000)]
httpd.exe/apachectl -V: display the DYNAMIC_MODULE_LIMIT setting
(1.3 has done that for a while)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265737
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 1 Sep 2005 11:58:58 +0000 (11:58 +0000)]
* modules/ssl/ssl_util_ssl.c (SSL_X509_STORE_create): Catch errors
returned by X509_LOOKUP_add_dir or X509_LOOKUP_load_file to detect
malformed or misconfigured CRLs. Clear error stack beforehand to
ensure reported errors are relevant.
PR: 36438
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265702
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 1 Sep 2005 11:55:31 +0000 (11:55 +0000)]
* server/listen.c (open_listeners): Avoid shadowing the 'next'
variable at function-scope.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265701
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Wed, 31 Aug 2005 16:10:55 +0000 (16:10 +0000)]
Initiliase all of the first_*_limit variables to zero, so that we can actually
raise limits beyond their defaults reliably.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265523
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Wed, 31 Aug 2005 16:04:25 +0000 (16:04 +0000)]
Revert one part. I should have tested seperately. This line isn't neccessary.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265519
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Wed, 31 Aug 2005 16:01:13 +0000 (16:01 +0000)]
Actually allow the admin to set thread_limit higher than the default.
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
Jim Jagielski [Wed, 31 Aug 2005 15:22:08 +0000 (15:22 +0000)]
Add ap_append_pid(); This is performed enough to warrant
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
Jim Jagielski [Wed, 31 Aug 2005 15:19:27 +0000 (15:19 +0000)]
Some simple debugging log entries
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265505
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 31 Aug 2005 15:18:54 +0000 (15:18 +0000)]
More getpid format fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265504
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 31 Aug 2005 14:23:33 +0000 (14:23 +0000)]
Consistantly use APR_PID_T_FMT for getpid value
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265049
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 31 Aug 2005 14:18:33 +0000 (14:18 +0000)]
Start of getpid()/%d confusion fix...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265047
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 31 Aug 2005 12:34:07 +0000 (12:34 +0000)]
mod_log_config: %{hextid}P will log the thread id in hex with APR
versions 1.2.0 or higher.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265033
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 30 Aug 2005 22:53:37 +0000 (22:53 +0000)]
* server/main.c (suck_in_APR): Remove weird gzeof reference which
broke all the -Werror builds.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264886
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 30 Aug 2005 22:33:30 +0000 (22:33 +0000)]
Make my PR references consistent with everyone elses.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264881
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Tue, 30 Aug 2005 21:21:18 +0000 (21:21 +0000)]
mod_cgid: Refuse to work on Solaris 10 due to OS bugs.
PR: 34264
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264866
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 30 Aug 2005 15:57:38 +0000 (15:57 +0000)]
Fix CVE CAN-2005-2700:
* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): Ensure that
renegotiation is performed for a transition from "SSLVerifyClient
optional" to "SSLVerifyClient require".
The boolean "verify_old & SSL_VERIFY_PEER_STRICT" is true if the old
context merely has optional verification configured, since the
definition of SSL_VERIFY_PEER_STRICT is
(SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_PEER).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264800
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 30 Aug 2005 14:28:48 +0000 (14:28 +0000)]
If uid_t and gid_t are unsigned on a platform (hurd, for example), using -1
may cause a compiler warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264788
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 30 Aug 2005 11:26:45 +0000 (11:26 +0000)]
Fix PR36410; Change how the get_suexec_identity hook is handled by CGID.
Instead of using mod_userdir and mod_suexec specific hacks, we now run the hook
on the httpd side of the handler.
If this is NULL, we pass on a magic empty_ugid constant, otherwise pass on the
real ugid.
On the cgid side of the equation, we add our own hook, with REALLY_FIRST, and
then order the hooks. This ensures that cgid's doer runs before any other
registered get_suexec_identity doers.
We use cgid's request config to store the ugid. If ugid == empty_ugid, we DON'T
call ap_os_create_privileged_process, because our doer would return the magic
empty_ugid constant. Having the doer return NULL is no good, because then
userdir and mod_suexec's doers would be called. Instead, we call plain old
apr_proc_create().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264759
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 30 Aug 2005 08:24:14 +0000 (08:24 +0000)]
Fix a grammar mistake; note what happens when the timeout is
reached.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264737
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 29 Aug 2005 20:12:43 +0000 (20:12 +0000)]
Correct mod_cgid's argv[0] so that the full path can be delved by the
invoked cgi application, to conform to the behavior of mod_cgi.
PR: 34542
Reviewed by: Andre, OtherBill
Submitted by: Pradeep Kumar S <pradeep.smani gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264623
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 29 Aug 2005 19:59:46 +0000 (19:59 +0000)]
Noticed in the development of fips-enabled mod_ssl, when we are
configured to support exactly one protocol, use that explicit server
and client mechansim to handshake with the client or proxied machine,
rather than the generic SSLv23_[client|server]_method().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264621
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 29 Aug 2005 10:20:25 +0000 (10:20 +0000)]
Implement graceful stop in the event MPM. Implementation is identical to
the worker MPM implementation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264105
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 29 Aug 2005 09:38:33 +0000 (09:38 +0000)]
*how* did I mis-spell that.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264104
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 29 Aug 2005 09:28:27 +0000 (09:28 +0000)]
Move the "GracefulShutdownTimeout" command definition into mpm_common
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264103
13f79535 -47bb-0310-9956-
ffa450edef68
Ian Holsman [Sun, 28 Aug 2005 23:03:59 +0000 (23:03 +0000)]
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
Colm MacCarthaigh [Sun, 28 Aug 2005 19:22:35 +0000 (19:22 +0000)]
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
Colm MacCarthaigh [Sun, 28 Aug 2005 18:44:28 +0000 (18:44 +0000)]
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
Colm MacCarthaigh [Sun, 28 Aug 2005 10:48:09 +0000 (10:48 +0000)]
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
Colm MacCarthaigh [Sun, 28 Aug 2005 10:26:45 +0000 (10:26 +0000)]
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
Colm MacCarthaigh [Sat, 27 Aug 2005 23:24:43 +0000 (23:24 +0000)]
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
Colm MacCarthaigh [Sat, 27 Aug 2005 23:22:50 +0000 (23:22 +0000)]
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
Colm MacCarthaigh [Sat, 27 Aug 2005 23:05:42 +0000 (23:05 +0000)]
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
Colm MacCarthaigh [Sat, 27 Aug 2005 23:04:17 +0000 (23:04 +0000)]
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
Colm MacCarthaigh [Sat, 27 Aug 2005 22:16:46 +0000 (22:16 +0000)]
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
Colm MacCarthaigh [Sat, 27 Aug 2005 22:12:08 +0000 (22:12 +0000)]
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
Jeff Trawick [Sat, 27 Aug 2005 15:02:49 +0000 (15:02 +0000)]
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
Graham Leggett [Fri, 26 Aug 2005 21:33:59 +0000 (21:33 +0000)]
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
Joshua Slive [Fri, 26 Aug 2005 18:18:14 +0000 (18:18 +0000)]
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
Joshua Slive [Fri, 26 Aug 2005 17:58:39 +0000 (17:58 +0000)]
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
Joshua Slive [Fri, 26 Aug 2005 17:54:49 +0000 (17:54 +0000)]
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
Colm MacCarthaigh [Fri, 26 Aug 2005 17:54:18 +0000 (17:54 +0000)]
Allow htcacheclean to deal in gigabytes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240297
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Fri, 26 Aug 2005 17:43:24 +0000 (17:43 +0000)]
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
André Malo [Fri, 26 Aug 2005 16:40:17 +0000 (16:40 +0000)]
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
Colm MacCarthaigh [Fri, 26 Aug 2005 16:14:46 +0000 (16:14 +0000)]
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
Colm MacCarthaigh [Fri, 26 Aug 2005 16:13:17 +0000 (16:13 +0000)]
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
Colm MacCarthaigh [Fri, 26 Aug 2005 16:12:28 +0000 (16:12 +0000)]
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
Colm MacCarthaigh [Fri, 26 Aug 2005 16:11:45 +0000 (16:11 +0000)]
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
Colm MacCarthaigh [Fri, 26 Aug 2005 16:09:54 +0000 (16:09 +0000)]
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
Colm MacCarthaigh [Fri, 26 Aug 2005 16:00:59 +0000 (16:00 +0000)]
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
Colm MacCarthaigh [Fri, 26 Aug 2005 15:08:06 +0000 (15:08 +0000)]
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
Jeff Trawick [Thu, 25 Aug 2005 16:54:50 +0000 (16:54 +0000)]
spell check
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240101
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 25 Aug 2005 15:56:43 +0000 (15:56 +0000)]
* 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
Joe Orton [Thu, 25 Aug 2005 15:37:39 +0000 (15:37 +0000)]
* 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
Colm MacCarthaigh [Thu, 25 Aug 2005 15:30:31 +0000 (15:30 +0000)]
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
Colm MacCarthaigh [Thu, 25 Aug 2005 12:12:15 +0000 (12:12 +0000)]
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
Colm MacCarthaigh [Thu, 25 Aug 2005 11:51:24 +0000 (11:51 +0000)]
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
Colm MacCarthaigh [Thu, 25 Aug 2005 10:56:12 +0000 (10:56 +0000)]
nit: Consistently CamelCase "ScriptSock".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240043
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Wed, 24 Aug 2005 19:37:46 +0000 (19:37 +0000)]
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
Colm MacCarthaigh [Wed, 24 Aug 2005 19:06:40 +0000 (19:06 +0000)]
Correct the function prototype/declaration
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239732
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Wed, 24 Aug 2005 16:58:11 +0000 (16:58 +0000)]
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
Colm MacCarthaigh [Wed, 24 Aug 2005 16:51:20 +0000 (16:51 +0000)]
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
André Malo [Wed, 24 Aug 2005 15:30:52 +0000 (15:30 +0000)]
fix revision references and update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239692
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 24 Aug 2005 15:14:03 +0000 (15:14 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239686
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 24 Aug 2005 15:13:41 +0000 (15:13 +0000)]
update German translation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239685
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 24 Aug 2005 15:09:31 +0000 (15:09 +0000)]
Document change in lbmethod= argument
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239684
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 24 Aug 2005 15:03:41 +0000 (15:03 +0000)]
add new documents to the sitemap
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239681
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 24 Aug 2005 15:00:23 +0000 (15:00 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239678
13f79535 -47bb-0310-9956-
ffa450edef68