]>
granicus.if.org Git - apache/log
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
André Malo [Wed, 24 Aug 2005 14:57:16 +0000 (14:57 +0000)]
update German translation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239677
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 24 Aug 2005 12:36:57 +0000 (12:36 +0000)]
`build all`
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239633
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 24 Aug 2005 12:23:46 +0000 (12:23 +0000)]
`build all`
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239629
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 24 Aug 2005 12:04:25 +0000 (12:04 +0000)]
activate LastChangedRevision expansion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239618
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Wed, 24 Aug 2005 12:02:34 +0000 (12:02 +0000)]
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
André Malo [Wed, 24 Aug 2005 12:01:38 +0000 (12:01 +0000)]
fix line endings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239616
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Wed, 24 Aug 2005 08:18:45 +0000 (08:18 +0000)]
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
Colm MacCarthaigh [Tue, 23 Aug 2005 20:29:51 +0000 (20:29 +0000)]
Update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239460
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 23 Aug 2005 20:19:42 +0000 (20:19 +0000)]
A first take at a User-Guide for caching. Covers mod_cache and mod_file_cache,
and tries to place the caching modules in context.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239459
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 23 Aug 2005 17:03:01 +0000 (17:03 +0000)]
Add APR_FOPEN_BINARY to the options passed to apr for opening the
cache header files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239436
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 23 Aug 2005 16:41:17 +0000 (16:41 +0000)]
Remove support for the threaded-mpm's on Linux 2.0, and de-autoconf the
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
Andreas Steinmetz [Tue, 23 Aug 2005 16:06:24 +0000 (16:06 +0000)]
fix 64bit build warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239423
13f79535 -47bb-0310-9956-
ffa450edef68
Andreas Steinmetz [Tue, 23 Aug 2005 15:45:00 +0000 (15:45 +0000)]
fix 64bit build warnings in modules/dav
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239422
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 23 Aug 2005 15:43:23 +0000 (15:43 +0000)]
Enhance CacheEnable/CacheDisable to control caching on a per-protocol, per-host
and per-path basis. Makes Cache(En|Dis)able useful for forward proxy servers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239421
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 23 Aug 2005 15:25:08 +0000 (15:25 +0000)]
remove some unused variables and re-name cache_select_url() to simply
cache_select()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239420
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 23 Aug 2005 13:50:47 +0000 (13:50 +0000)]
Improve the cache hit/miss ratio by canonicalising the url key. hostname's
are matched case-insensitively, port-based vhosts are catered for and the
scheme included for future multi-scheme caching compatibility.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239407
13f79535 -47bb-0310-9956-
ffa450edef68
Andreas Steinmetz [Tue, 23 Aug 2005 13:35:00 +0000 (13:35 +0000)]
Split mod_disk_cache.c into mod_disk_cache.c and mod_disk_cache.h
to allow inclusion of mod_disk_cache.h in htcacheclean.c.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239406
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 23 Aug 2005 09:29:23 +0000 (09:29 +0000)]
add htcacheclean to support/README
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239382
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 23 Aug 2005 09:25:31 +0000 (09:25 +0000)]
Update htcacheclean defines to match mod_disk_cache.c, Andreas is working on
mod_disk_cache.h, an all-round better solution, but for now just fix the
bug.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239381
13f79535 -47bb-0310-9956-
ffa450edef68
Astrid Malo [Mon, 22 Aug 2005 21:46:13 +0000 (21:46 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239256
13f79535 -47bb-0310-9956-
ffa450edef68
Astrid Malo [Mon, 22 Aug 2005 21:40:16 +0000 (21:40 +0000)]
some language changes and fixes
committed by Noirin Plunkett
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239255
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 22 Aug 2005 18:17:15 +0000 (18:17 +0000)]
`build extraclean all` (extraclean just to make sure I got them all :-)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239209
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 22 Aug 2005 18:15:04 +0000 (18:15 +0000)]
add description of background faqs, shown on the all in one page
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239206
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 22 Aug 2005 17:59:17 +0000 (17:59 +0000)]
fix properties, line endings and copyright year
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@235763
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 22 Aug 2005 17:52:12 +0000 (17:52 +0000)]
fix xml validation errors
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@235762
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sat, 20 Aug 2005 18:39:46 +0000 (18:39 +0000)]
OID Support has been dropped from 2.2.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@234109
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sat, 20 Aug 2005 18:22:56 +0000 (18:22 +0000)]
Resync CHANGES with 2.2.x branch point.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@234104
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sat, 20 Aug 2005 10:36:50 +0000 (10:36 +0000)]
mod_dbd:
(1) Export new ap_dbd_prepare function
(2) Put all dbd_open() stuff in one place
(3) Remove the servertoken
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@234017
13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Fri, 19 Aug 2005 17:23:00 +0000 (17:23 +0000)]
Arghhh.... missed the version. Sorry for the noise.
Revert the hack for setting the lbmethod.
The problem is deeper inside caused by the
new hook to the balancer module that is never
called on WIN32.
Although the hack fixed core dump, the proxy is
still unusable because the configuration is failing
due to the empty lbmethod names array.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@233516
13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Fri, 19 Aug 2005 17:19:54 +0000 (17:19 +0000)]
Revert the hack for setting the lbmethod.
The problem is deeper inside caused by the
new hook to the balancer module that is never
called on WIN32.
Although the hack fixed core dump, the proxy is
still unusable because the configuration is failing
due to the empty lbmethod names array.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@233514
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 19 Aug 2005 15:56:36 +0000 (15:56 +0000)]
Backport patch from pcre 6.2 to fix integer overflows in quantifier
parsing:
* srclib/pcre/pcre.c (read_repeat_counts): Check for integer overflow.
Obtained from: pcre 6.2 upstream
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@233493
13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Fri, 19 Aug 2005 11:58:36 +0000 (11:58 +0000)]
Temporary make balancer working.
What is needed is a setup for the finder function
introduced, but never implemented.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@233468
13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Fri, 19 Aug 2005 10:45:34 +0000 (10:45 +0000)]
Add ssl dir to include path.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@233464
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 19 Aug 2005 10:18:10 +0000 (10:18 +0000)]
* support/httxt2dbm.c: Fix some style nits, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@233462
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Thu, 18 Aug 2005 20:10:26 +0000 (20:10 +0000)]
Do not check the value of r->handler.
This allows the use of SetHandler for an entire directory, and since we already check via the stat structure if this is a directory, there is no reason for this extra check, which causes a regression since 1.3.
PR: 25435
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@233369
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Wed, 17 Aug 2005 03:10:03 +0000 (03:10 +0000)]
Start adding more FAQs. Some copied from the 1.3 FAQ.
I hope to add a few new ones every couple days.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@233112
13f79535 -47bb-0310-9956-
ffa450edef68
Bradley Nicholes [Mon, 15 Aug 2005 13:19:10 +0000 (13:19 +0000)]
Add proxy_hook_load_lbmethods to the export and imports lists for the Netware build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232808
13f79535 -47bb-0310-9956-
ffa450edef68
Wilfredo Sanchez [Fri, 12 Aug 2005 18:04:08 +0000 (18:04 +0000)]
Fix typo in manual [Ben Collins-Sussman]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232343
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Fri, 12 Aug 2005 16:57:13 +0000 (16:57 +0000)]
Move the debuging log message about the removal of a url from
cache_remove_url_filter to cache_remove_url.
Submitted by: Rudiger Plum <ruediger.pluem vodafone.com>
Reviewed by: Justin Erenkrantz
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232335
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Fri, 12 Aug 2005 16:52:28 +0000 (16:52 +0000)]
mod_disk_cache: Remove the directory path of the cached file as far as possible
(up to the cache root) to get rid of unused empty directories.
* cache/mod_disk_cache.c
(remove_url): Try to delete directories; also change two APR_ENOENT to
APR_STATUS_IS_ENOENT.
(Justin tweaked some comments.)
Submitted by: Rudiger Plum <ruediger.pluem vodafone.com>
Reviewed by: Justin Erenkrantz
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232334
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 12 Aug 2005 15:31:03 +0000 (15:31 +0000)]
When using the LB Balancer manager, if you disabled
a member, then clicked on another member and/or
itself again, the member would be re-enabled. This
was due to the form being "submitted" and
'dw' being null (observed with Safari). Anyway,
moving to a radio makes it explicit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232314
13f79535 -47bb-0310-9956-
ffa450edef68
Martin Kraemer [Fri, 12 Aug 2005 15:22:19 +0000 (15:22 +0000)]
Get rid of some warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232311
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 12 Aug 2005 12:47:04 +0000 (12:47 +0000)]
simple, functional interface to add additional balancer lb selection methods
without requiring code changes to mod_proxy/mod_proxy_balancer;
these can be implemented via sub-modules now.
Let the games begin...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232282
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 12 Aug 2005 11:32:55 +0000 (11:32 +0000)]
* modules/cache/cache_storage.c (cache_remove_url): Remove unused
variables.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232272
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Fri, 12 Aug 2005 09:38:09 +0000 (09:38 +0000)]
Fix mess left by incompleteness of previous ProxyPassReverse fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232247
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 12 Aug 2005 06:38:01 +0000 (06:38 +0000)]
* support/htcacheclean.c (directory_empty): Remove unused function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232218
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Thu, 11 Aug 2005 18:52:16 +0000 (18:52 +0000)]
Fix build error from cut&paste
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231501
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Thu, 11 Aug 2005 17:38:18 +0000 (17:38 +0000)]
Fix incorrectly served 304 responses when expired cache entity
is valid, but cache is unwritable and headers cannot be updated.
Submitted by: Colm MacCarthaigh <colm stdlib.net>
Reviewed by: Justin Erenkrantz
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231488
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Thu, 11 Aug 2005 17:35:48 +0000 (17:35 +0000)]
mod_cache: Implement remove URL via a filter.
Remove entities from the cache when re-validation receives a 404 or other
content-no-longer-present error.
Suggested by: Paul Querna, Justin Erenkrantz
Submitted by: Rudiger Plum <ruediger.pluem vodafone.com>
Reviewed by: Justin Erenkrantz
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231487
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Thu, 11 Aug 2005 17:31:10 +0000 (17:31 +0000)]
Implement mod_disk_cache's remove_url.
(Minor tweaks and comment fixes by Justin.)
Suggested by: Paul Querna, Justin Erenkrantz
Submitted by: Rudiger Plum <ruediger.pluem vodafone.com>
Reviewed by: Justin Erenkrantz
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231486
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Thu, 11 Aug 2005 14:12:13 +0000 (14:12 +0000)]
Add const-ness to apr_dbd_driver_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231464
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Wed, 10 Aug 2005 23:36:39 +0000 (23:36 +0000)]
Fix ProxyPassReverse & family to work correctly in <Location>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231355
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Wed, 10 Aug 2005 23:19:39 +0000 (23:19 +0000)]
Note two changes (r231349 and r231351) that are paired together.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231352
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Wed, 10 Aug 2005 23:14:57 +0000 (23:14 +0000)]
Add -t option to htcacheclean to clean out empty directories.
* support/htcacheclean.c: Implement -t option.
* docs/man/htcacheclean.8, docs/manual/programs/htcacheclean.html.en,
docs/manual/programs/htcacheclean.xml: Document -t option.
Justin did some minor tweaks as he agrees with Andreas and Rudiger that
apr_dir_remove should return an error if the directory isn't empty; hence,
remove the apr_dir_read calls.
Submitted by: Colm MacCarthaigh
Reviewed by: Justin Erenkrantz, Andreas Steinmetz, Rudiger Pluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231351
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Wed, 10 Aug 2005 23:03:38 +0000 (23:03 +0000)]
mod_disk_cache: Retry file rename up to three times to ameliorate race
condition with htcacheclean removing the directories underneath us.
(Includes tweaks by Justin.)
Suggested by: Graham Leggett
Submitted by: Andreas Steinmetz <ast@domdv.de>
Reviewed by: Justin Erenkrantz
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231349
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Wed, 10 Aug 2005 16:05:17 +0000 (16:05 +0000)]
Update mod_dbd to API that hides apr_dbd_driver_t struct.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231275
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Wed, 10 Aug 2005 04:32:13 +0000 (04:32 +0000)]
Fix bug where non-200 CGI responses will not send anything down filter chain.
This is most notable when mod_cache is used. This has been used in production
on wiki.apache.org for a while now.
* modules/generators/mod_cgi.c
(cgi_handler): When a non-zero value is returned by scan_script, set the
status field and ensure that we have an EOS to send down the filer stack.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231167
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 9 Aug 2005 21:15:40 +0000 (21:15 +0000)]
* modules/proxy/mod_proxy_http.c (stream_reqbody_cl): Fix gcc warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231114
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 9 Aug 2005 14:54:46 +0000 (14:54 +0000)]
Hopefully, address the last edge case where status may
be uninitialized. Asserts in non-debug builds are bad things,
anyways, so this is probably more correct. This should fix
-Werror compile warning observed by Joe Orton.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231046
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 9 Aug 2005 14:46:55 +0000 (14:46 +0000)]
Remove the base href tag from mod_proxy_ftp, as it breaks relative
links for clients not using an Authorization header.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231044
13f79535 -47bb-0310-9956-
ffa450edef68