]>
granicus.if.org Git - apache/log
Rich Bowen [Fri, 27 Nov 2009 18:10:47 +0000 (18:10 +0000)]
Other minor cosmetic changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@884934
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 27 Nov 2009 17:53:33 +0000 (17:53 +0000)]
It appears that the mass vhosts document need a lot more love than I
initially thought. No wonder people are confused about this topic.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@884925
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 27 Nov 2009 17:45:19 +0000 (17:45 +0000)]
Adds links to the other new documents.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@884921
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 27 Nov 2009 17:35:47 +0000 (17:35 +0000)]
Clarifying some of the phrasing, and removing some of the chattiness
from the example itself. Will eventually remove duplication between this
doc and the rewrite/vhosts.xml doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@884917
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Wed, 25 Nov 2009 22:35:45 +0000 (22:35 +0000)]
sync to CHANGES to 2.3.4/2.3.5
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@884313
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Wed, 25 Nov 2009 22:21:45 +0000 (22:21 +0000)]
roll on to 2.3.5-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@884301
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Wed, 25 Nov 2009 22:20:30 +0000 (22:20 +0000)]
prepare for 2.3.4 tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@884299
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Nov 2009 21:24:27 +0000 (21:24 +0000)]
update generate docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883883
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Nov 2009 21:22:15 +0000 (21:22 +0000)]
remove SSLMutex documentation
update the session cache description to indicate that the ssl cache mutex is used
to serialize access, and that the mutex can be configured using the Mutex directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883880
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Nov 2009 21:10:49 +0000 (21:10 +0000)]
generated doc updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883879
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Nov 2009 21:08:37 +0000 (21:08 +0000)]
move a couple of special warnings for SysV sems and Posix sems out of the
performance tuning guide and into the common Mutex documentation; remove the
other (duplicate) information from that guide and instead point to the Mutex
directive
mpm_common: axe docs for old accept mutex directives
worker and prefork: axe links to old accept mutex directives, mention the use
of the accept mutex and how it can be configured
event: axe links to old mutex directives where were already N/A
mod_rewrite: axe old RewriteLock directive, mention use of the rewrite map
mutex for RewriteMap programs and how it can be configured
fix other miscellaneous LockFile or AcceptMutex references
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883878
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Nov 2009 20:32:42 +0000 (20:32 +0000)]
non-static directive parsers should be AP_DECLARE_NONSTD()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883860
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Nov 2009 20:30:00 +0000 (20:30 +0000)]
fix the "fix" in r883816
internal function ap_set_mutex() should be AP_DECLARE_NONSTD()
like our other directive parsers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883859
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Nov 2009 19:28:34 +0000 (19:28 +0000)]
fix Win32 compile failure in r883540, reported by Gregg Smith
DEFAULT_REL_RUNTIMEDIR defined only in mpm_default.h for
NetWare and dsp-based Win32 builds
mpm_default.h not in normal include path on Unix
thus, hardcode "logs" directory when DEFAULT_REL_RUNTIMEDIR
isn't defined
(file-based mutexes aren't configurable for those platforms anyway)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883828
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Nov 2009 19:06:16 +0000 (19:06 +0000)]
fix Win32 compile failure in r883540, reported by Gregg Smith
(on Win32, external APIs use one calling convention while directive
parsers use a different one)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883816
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Nov 2009 17:55:37 +0000 (17:55 +0000)]
fix Win32 compile failure in r883540, reported by Gregg Smith
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883802
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Nov 2009 14:54:03 +0000 (14:54 +0000)]
document the new Mutex directive, pulling in any existing special considerations described in the
documentation of the old LockFile, AcceptMutex, RewriteLock, and SSLMutex directives
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883712
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Nov 2009 14:47:55 +0000 (14:47 +0000)]
tweaks to r883540:
watchdog: use better mutex type name
ldap/digest: use same FOO_mutex_type variable name as other modules
for easier searching
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883708
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Nov 2009 01:52:13 +0000 (01:52 +0000)]
fix recognition of the Mutex directive (problem in r883540)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883572
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 23 Nov 2009 23:17:51 +0000 (23:17 +0000)]
Replace AcceptMutex, LockFile, RewriteLock, SSLMutex, SSLStaplingMutex,
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
Takashi Sato [Sun, 22 Nov 2009 14:30:50 +0000 (14:30 +0000)]
KeepAlive no longer accepts other than On|Off.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883082
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 22 Nov 2009 12:52:25 +0000 (12:52 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883071
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 22 Nov 2009 01:38:59 +0000 (01:38 +0000)]
continue clarification of RewriteBase, lots of users who install little
PHP apps with an Alias a) leave off RewriteBase then b) add the filesystem
path instead of the URL-path then c) spend hours trying to debug
the RewriteRules themselves.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883030
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 21 Nov 2009 21:32:13 +0000 (21:32 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882998
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 21 Nov 2009 21:27:08 +0000 (21:27 +0000)]
fix config context tokens
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882997
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 21 Nov 2009 21:16:25 +0000 (21:16 +0000)]
fix validity problems
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882994
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 21 Nov 2009 21:04:08 +0000 (21:04 +0000)]
svn:eol-style = native
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882992
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 21 Nov 2009 21:00:44 +0000 (21:00 +0000)]
automatically replace LastChangedRevision
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882991
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 21 Nov 2009 17:33:31 +0000 (17:33 +0000)]
Correct error. Patch from Lucien Gentis.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882945
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 21 Nov 2009 17:25:17 +0000 (17:25 +0000)]
fix typo in AcceptFilter-related comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882944
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 21 Nov 2009 17:18:39 +0000 (17:18 +0000)]
remove dead code related to the accept mutex
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882943
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 21 Nov 2009 16:38:59 +0000 (16:38 +0000)]
axe some vestiges of Event's accept mutex
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882939
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 21 Nov 2009 00:27:17 +0000 (00:27 +0000)]
Starts on the vhosts document. Need to eliminate duplication with the
main /docs/vhosts/mass.html doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882806
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 21 Nov 2009 00:24:21 +0000 (00:24 +0000)]
Adds vhosts and proxy docs, and updates the seealso sections in
everything. proxy only has one rule in it, and vhosts is empty. Will fix
that soon.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882805
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 21 Nov 2009 00:07:26 +0000 (00:07 +0000)]
Adds a 'rewrite everything' or 'fallback resource' rule.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882797
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Fri, 20 Nov 2009 10:10:28 +0000 (10:10 +0000)]
fixed NetWare objects output directory naming take 2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882480
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Fri, 20 Nov 2009 10:06:05 +0000 (10:06 +0000)]
fixed NetWare objects output directory naming.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882477
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 19 Nov 2009 20:17:59 +0000 (20:17 +0000)]
actually modify the MMN for the dav_error change, as expected with r882274
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882280
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 19 Nov 2009 20:09:27 +0000 (20:09 +0000)]
Remove errno from dav_error interface. Calls to dav_new_error()
and dav_new_error_tag() must be adjusted to add an apr_status_t parameter.
Reviewed by: jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882274
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 19 Nov 2009 20:00:12 +0000 (20:00 +0000)]
fix or complain about some invalid errno references
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882269
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 19 Nov 2009 15:10:07 +0000 (15:10 +0000)]
Flags patch from Igor Galić. Corrects error in noting what status codes
can be specified.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@882171
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 18 Nov 2009 15:55:29 +0000 (15:55 +0000)]
doc for AuthLDAPBindAuthoritative
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@881812
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 18 Nov 2009 15:49:48 +0000 (15:49 +0000)]
Add AuthLDAPBindAuthoritative to allow other authentication providers a chance
to run when mod_authnz_ldap finds a user but can't verify their password.
Submitted By: Justin Erenkrantz, Joe Schaefer, Tony Stevenson
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@881808
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 17 Nov 2009 09:54:56 +0000 (09:54 +0000)]
* modules/ssl/ssl_engine_kernel.c (ssl_callback_Info): Cast away the
constness of SSL * before calling SSL_get_state, to fix warning with
older OpenSSLs.
Reported by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@881222
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 17 Nov 2009 02:55:19 +0000 (02:55 +0000)]
Remove more refences to rewrite_guide.html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@881116
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 17 Nov 2009 02:52:53 +0000 (02:52 +0000)]
Remove references to the now-gone rewrite-guide.html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@881113
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 17 Nov 2009 02:44:19 +0000 (02:44 +0000)]
Moves the last of the rules from the monolithic rewrite_guide into
topic-specific sub-pages. Still a lot of cleanup and improvement can be
done, but this is a good first step.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@881110
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 17 Nov 2009 01:56:34 +0000 (01:56 +0000)]
Moving yet another recipe. Almost done with this exercise.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@881091
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 16 Nov 2009 21:51:01 +0000 (21:51 +0000)]
tweak r823613/PR 47951 change to avoid /usr/sbin/install on
Solaris
(not compatible with BSD install)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@880981
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 16 Nov 2009 15:46:18 +0000 (15:46 +0000)]
This isn't Apache 2.0 any more.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@880811
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 16 Nov 2009 15:37:12 +0000 (15:37 +0000)]
Logging in to bugzilla gives me the bug reporter's details
to record correctly in CHANGES.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@880801
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 16 Nov 2009 15:24:34 +0000 (15:24 +0000)]
Build: fix --with-module to work as documented
PR 43881
Submitted: Gez Saunders
Reviewed: Nick Kew
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@880794
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 16 Nov 2009 14:36:45 +0000 (14:36 +0000)]
fix VPATH builds, broken by the support for --enable-mpms-shared
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@880775
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 16 Nov 2009 11:17:54 +0000 (11:17 +0000)]
Not sure this is actually a useful recipe, but it belongs in the access
file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@880707
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 15 Nov 2009 14:12:40 +0000 (14:12 +0000)]
support --enable-mpms-shared (without argument) and --disable-mpms-shared
the former builds just the default MPM (or --with-mpm argument)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@836365
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 15 Nov 2009 13:49:23 +0000 (13:49 +0000)]
fix bad doc for an argument to APACHE_MPM_MODULE()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@836358
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 Nov 2009 15:45:21 +0000 (15:45 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@836194
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 14 Nov 2009 13:01:43 +0000 (13:01 +0000)]
Improve hack to "determine" if APR supports thread-safe pollsets by hiding the
presence of kqueue() on Leopard, matching APR's configuration.
Event and Simple no longer report that they are supported on Leopard, resolving
a broken default config file with --enable-mpms-shared=all on that platform.
(Event was loaded by default in httpd.conf, and it failed at startup when it
failed to obtain a thread-safe pollset.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@836165
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 13 Nov 2009 12:40:58 +0000 (12:40 +0000)]
Removes another bogus example. Use <Proxy> blocks instead, and standard
access control methods. Also, the note about loading mod_rewrite before
mod_proxy isn't actually relevant any more.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@835827
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 13 Nov 2009 12:38:55 +0000 (12:38 +0000)]
This is a really cool example, and I don't want to lose it. However, I'm
reasonably sure that there's easier ways to do this, and I'm not yet
sure that the example given actually works. Need to revisit this soon.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@835826
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 13 Nov 2009 12:36:04 +0000 (12:36 +0000)]
Removes an inscrutable recipe - I don't know what problem it's trying to
solve, and the solution appears to be a completely useless use of
RewriteMap to solve a trivial problem that could be better done with
Alias. Am I missing something?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@835824
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 12 Nov 2009 23:43:05 +0000 (23:43 +0000)]
update generated html and metadata
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@835645
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 12 Nov 2009 23:27:41 +0000 (23:27 +0000)]
update MPM doc to cover new MPM defaults and MPMs as DSO modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@835638
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 12 Nov 2009 21:56:11 +0000 (21:56 +0000)]
Adds a couple of seealso's.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@835573
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 12 Nov 2009 12:35:04 +0000 (12:35 +0000)]
Corrects the page title.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@835365
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 12 Nov 2009 12:30:05 +0000 (12:30 +0000)]
Removes a lengthy and unnecessary discussion of the various methods of
load balancing. Removes a RewriteMap prg load balancing script, and
replaces it with a RewriteMap rnd example of the same, as well as an
admonition to use mod_proxy_balancer instead.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@835364
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 12 Nov 2009 12:10:26 +0000 (12:10 +0000)]
Corrects links to the reference documentation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@835360
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 12 Nov 2009 12:00:32 +0000 (12:00 +0000)]
Move the 'vhost per user' rule, and add commentary.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@835356
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 11 Nov 2009 22:07:16 +0000 (22:07 +0000)]
fix CHANGES entries: mod_dav_fs -> mod_dav
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@835095
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 11 Nov 2009 20:27:10 +0000 (20:27 +0000)]
* Use correct #ifndef's to compile again on openssl 0.9.8 and fix compiler
warnings.
Noted by: sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@835046
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Wed, 11 Nov 2009 19:34:46 +0000 (19:34 +0000)]
roll on to 2.3.4-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@835031
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Wed, 11 Nov 2009 19:32:36 +0000 (19:32 +0000)]
Prepare for 2.3.3 release tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@835029
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 10 Nov 2009 22:13:50 +0000 (22:13 +0000)]
When moving a file over device boundaries and unlinking the source file fails
because it does not exist anymore, don't unlink the destination file.
While it is unclear to me how/when this can happen, at least one user
encountered the problem:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=273476
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834697
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 10 Nov 2009 18:05:12 +0000 (18:05 +0000)]
s/cange/change/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834568
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 10 Nov 2009 16:32:57 +0000 (16:32 +0000)]
Revert removal of the key_type byte in the lock key. There is no need to break
the format on systems without inodes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834533
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 10 Nov 2009 15:29:04 +0000 (15:29 +0000)]
fix off by one error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834500
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 10 Nov 2009 15:27:02 +0000 (15:27 +0000)]
Fix broken config check for *max timeouts
Fix floating point exception for *minrate == 0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834499
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 10 Nov 2009 11:50:28 +0000 (11:50 +0000)]
fix e-mail address format
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834440
13f79535 -47bb-0310-9956-
ffa450edef68
Sander Temme [Tue, 10 Nov 2009 07:55:13 +0000 (07:55 +0000)]
enable support for ECC keys and ECDH ciphers. Tested against
OpenSSL 1.0.0b3. [Vipul Gupta vipul.gupta sun.com, Sander Temme]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834378
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 9 Nov 2009 21:32:10 +0000 (21:32 +0000)]
mod_dav_fs: Include uri when logging a PUT error due to connection abort.
PR: 38149
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834245
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 9 Nov 2009 21:04:28 +0000 (21:04 +0000)]
Return 409 instead of 500 for a LOCK request if the parent resource does not
exist or is not a collection.
PR: 43465
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834230
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 9 Nov 2009 15:28:59 +0000 (15:28 +0000)]
There is a bug report for r834073, therefore add a CHANGES entry.
Fix litmus warning: According to RFC2518, COPY to non-existant collection
should give 409 CONFLICT.
PR: 39299
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834107
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 9 Nov 2009 14:27:45 +0000 (14:27 +0000)]
Fix compiler warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834079
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 9 Nov 2009 14:10:31 +0000 (14:10 +0000)]
Fix litmus warning: According to RFC2518, COPY to non-existant collection
should give 409 CONFLICT.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834073
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 9 Nov 2009 13:50:21 +0000 (13:50 +0000)]
Don't delete the whole file if a PUT with content-range failed.
PR: 42896
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834062
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 9 Nov 2009 13:14:07 +0000 (13:14 +0000)]
Make PUT with DAV_MODE_WRITE_TRUNC create a temporary file first and, when the
transfer has been completed successfully, move it over the old file.
Since this would break inode keyed locking, switch to filename keyed locking
exclusively.
PR: 39815
Submitted by: Paul Querna, Stefan Fritsch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834049
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 9 Nov 2009 11:17:01 +0000 (11:17 +0000)]
Instead of checking device ids, try rename first and in case of EXDEV,
fallback to copy.
From rename(2) on Linux: Linux permits a file system to be mounted at multiple
points, but rename() does not work across different mount points, even
if the same file system is mounted on both.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834019
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 9 Nov 2009 10:43:16 +0000 (10:43 +0000)]
Also remove trailing whitespace in the value
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834013
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 9 Nov 2009 09:59:53 +0000 (09:59 +0000)]
Simplify code by using apr_strtok
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@834006
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 8 Nov 2009 22:20:37 +0000 (22:20 +0000)]
Rebuild html from xml typo fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@833936
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 8 Nov 2009 13:56:00 +0000 (13:56 +0000)]
Little typos.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@833878
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 7 Nov 2009 19:19:10 +0000 (19:19 +0000)]
mod_log_config: Make ${cookie}C correctly match whole cookie names
instead of substrings.
PR: 28037
Submitted by: Dan Franklin <dan dan-franklin.com>, Stefan Fritsch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@833738
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Nov 2009 17:45:55 +0000 (17:45 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@833722
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sat, 7 Nov 2009 17:40:28 +0000 (17:40 +0000)]
Typo correction. Thanks Lucien.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@833721
13f79535 -47bb-0310-9956-
ffa450edef68
Sander Temme [Fri, 6 Nov 2009 23:18:33 +0000 (23:18 +0000)]
Some additional new feature goodness to be part of 2.4. Please review
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@833596
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 6 Nov 2009 22:51:42 +0000 (22:51 +0000)]
* modules/ssl/ssl_engine_kernel.c (ssl_callback_Info): Add parentheses
around bitwise-and.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@833593
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 6 Nov 2009 22:33:37 +0000 (22:33 +0000)]
update pollset to reflect changed connection state before closing the socket;
otherwise the pollset-remove can crash (at least with select-based poll, since
fd is now -1)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@833583
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 6 Nov 2009 22:33:19 +0000 (22:33 +0000)]
SECURITY: Partial fix for CVE-2009-3555:
Reject client-initiated renegotiations; this is sufficient to prevent
the attack for any configuration which does not require renegotiation
due to per-directory/per-location access control configuration.
Configuration with per-directory/per-location access control
requirements (such as "SSLVerifyClient require") are still vulnerable
to CVE-2009-3555 with this patch applied (if using OpenSSL <= 0.9.8k).
* modules/ssl/ssl_private.h (SSLConnRec): Add reneg_state field.
(ssl_callback_Info): Renamed from ssl_callback_LogTracingState.
* modules/ssl/ssl_engine_init.c (ssl_init_ctx_callbacks): Install
the (renamed) info callback unconditionally.
* modules/ssl/ssl_engine_io.c (ssl_filter_ctx_t): Add config pointer
to SSLConnRec.
(bio_filter_out_write, bio_filter_in_read): Fail with
APR_ECONNABORTED if the reneg state is set to RENEG_ABORT.
* modules/ssl/ssl_engine_kernel.c (log_tracing_state): Factored out
of ssl_callback_LogTracingState.
(ssl_callback_Info): New function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@833582
13f79535 -47bb-0310-9956-
ffa450edef68
Sander Temme [Fri, 6 Nov 2009 17:20:24 +0000 (17:20 +0000)]
Remove mod_unique_id from the default build.
Reviewed by: sctemme, niq, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@833477
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 6 Nov 2009 13:42:16 +0000 (13:42 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@833393
13f79535 -47bb-0310-9956-
ffa450edef68