]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Colm MacCarthaigh [Mon, 24 Oct 2005 10:53:30 +0000 (10:53 +0000)]
Update transformations; to reflect the fe80 -> 2001:db8 changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@328029
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 24 Oct 2005 10:17:38 +0000 (10:17 +0000)]
Merge r327999 from trunk:
fe80::/16 is for link-scope link-local addresses in IPv6, they are not
for goign in Listen directives, VirtualHost blocks, or anything like
that, and won't work.
Perform a mass search and replace: 2001:db8 for fe80. 2001:db8 is the
IPv6 documentation prefix. See RFC3849 for more details.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@328025
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 24 Oct 2005 01:22:31 +0000 (01:22 +0000)]
Revert a backport from trunk, as it actually has a veto outstanding.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@327903
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 24 Oct 2005 01:14:49 +0000 (01:14 +0000)]
Merge r233369 from trunk:
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
Submitted by: pquerna
Reviewed by: colm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@327900
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 24 Oct 2005 01:08:25 +0000 (01:08 +0000)]
Merge r292111 from trunk:
Clean up c2x code-path by not double-setting the prefix variable.
* server/util.c
(c2x): Take a new prefix parameter instead of hard-coding '%' and then
conditionally setting 'x' for half of the cases.
Submitted by: jerenkrantz
Reviewed by: nd, colm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@327898
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 24 Oct 2005 01:01:45 +0000 (01:01 +0000)]
Merge r327892 from trunk:
These days in most cases, "all bound IP addresses" means :: and 0.0.0.0
or even just ::. Rather than confuse users by trying to explain this in
the configuration, simply remove the now-erroneous reference to 0.0.0.0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@327896
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 23 Oct 2005 14:14:45 +0000 (14:14 +0000)]
Merge r327179 from trunk:
* Fix PR31226 (AddOutputFilterByType deflate not active with mod_proxy), by
allowing ap_add_output_filters_by_type to handle proxied requests.
Basic tests by jorton and me show that this works, nobody can actually
remember why this limitation was introduced at all (r94028) and the mailing
list archives also gave no hint.
Submitted by: Joe Orton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@327793
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 21 Oct 2005 21:54:27 +0000 (21:54 +0000)]
Merge r327590 from trunk:
* Fix PR37145 (data loss with httpd-2.0.55 reverse proxy method=post) by
exchanging APR_BRIGADE_CONCAT with ap_save_brigade to ensure that
transient buckets get setaside correctly between various iterations of
ap_get_brigade calls.
Reviewed by: Joe Orton, William Rowe, Jim Jagielski, Jeff Trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@327592
13f79535 -47bb-0310-9956-
ffa450edef68
Mark J. Cox [Wed, 19 Oct 2005 08:16:37 +0000 (08:16 +0000)]
Today a one-time change happens to all CAN- names as they are
renamed to CVE-. Make this change to our changelog
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@326456
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Tue, 18 Oct 2005 21:45:00 +0000 (21:45 +0000)]
Remove CGI block on OPTIONS method so that scripts can
respond to OPTIONS directly rather than via server default.
PR: 15242
Reviewed-by: Paul Querna, Andre Malo, William A. Rowe, Jr.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@326260
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Tue, 18 Oct 2005 16:23:16 +0000 (16:23 +0000)]
Merge r326143 from trunk:
Document Roy's recent discovery that plain Alias/Redirect only
match complete path segments. I haven't tested the examples,
but they seem to be right according to the code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@326144
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 18 Oct 2005 16:19:41 +0000 (16:19 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@326142
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 18 Oct 2005 16:11:48 +0000 (16:11 +0000)]
adjust availability information fo mod_version
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@326137
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Tue, 18 Oct 2005 15:59:01 +0000 (15:59 +0000)]
Merge r326130 from trunk:
Proxy docs changes:
- Move ftp-related questions to mod_proxy_ftp.
- Document the proxy-sendcl and proxy-sendchunked env variables.
- Improve the docs on the other proxy env variables.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@326131
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 17 Oct 2005 17:17:21 +0000 (17:17 +0000)]
get properties right
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@325935
13f79535 -47bb-0310-9956-
ffa450edef68
Bradley Nicholes [Mon, 17 Oct 2005 15:47:32 +0000 (15:47 +0000)]
Fix up the NetWare make files after some of the module moved out of experimental
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@325916
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 17 Oct 2005 15:30:05 +0000 (15:30 +0000)]
Merge r325879 from trunk:
* Style fixes: Add line breaks for lines that are too long. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@325914
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Sun, 16 Oct 2005 18:10:42 +0000 (18:10 +0000)]
Update STATUS to reflect the current state of 2.1, including the backwards
non-ISO date format.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@322498
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 16 Oct 2005 11:13:50 +0000 (11:13 +0000)]
Merge r322464, r322467 from trunk:
* Cleanup: Remove dead code. No functional change.
* Style fixes: Spaces, comments, typos. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@322468
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 15 Oct 2005 21:57:08 +0000 (21:57 +0000)]
ignore generated stuff
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@321505
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 15 Oct 2005 21:56:25 +0000 (21:56 +0000)]
* modules/http/http_request.c
(ap_allow_methods): add missing va_end call
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@321504
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 13 Oct 2005 18:49:44 +0000 (18:49 +0000)]
Merge r315051 from trunk:
* Added further directives that are controlled via AllowOverride FileInfo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@320870
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 13 Oct 2005 16:56:29 +0000 (16:56 +0000)]
Merge r314844, r320796 from trunk:
* support/ab.c (test): Increment count of started requests when a
non-blocking connect completes; avoids case where more requests are
made than intended.
* modules/ssl/ssl_engine_init.c (ssl_init_CheckServers): Fix IP/port
key generation which passed a bogus pointer for a %pA conversion,
hence could give false warnings for name-based-vhost use.
PR: 36966, 37051
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@320804
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 12 Oct 2005 13:06:24 +0000 (13:06 +0000)]
Merge r314881 from trunk:
Performance Tune: Do the cheap and fast length check before
we bother doing a char-by-char comparison.
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@314883
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 12 Oct 2005 13:02:14 +0000 (13:02 +0000)]
Merge r314875 from trunk:
Fix -Wall warning... Thanks to Joe for the head's up!
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@314876
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 11 Oct 2005 21:43:32 +0000 (21:43 +0000)]
Merge r312963 from trunk:
mod_proxy_balancer: BalancerManager and proxies correctly handle
member workers with paths. PR36816. [Ruediger Pluem, Jim Jagielski]
Reviewed by: jim, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@312964
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 11 Oct 2005 16:25:16 +0000 (16:25 +0000)]
Merge r265033 from trunk.
Author: trawick
Reviewed by: colm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@312911
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 11 Oct 2005 16:11:16 +0000 (16:11 +0000)]
merge r265737 from trunk.
Author: trawick
Reviewed by: colm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@312906
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 11 Oct 2005 16:05:15 +0000 (16:05 +0000)]
Backport the APACHE_CHECK_VOID_PTR_LEN and APACHE_CHECK_APxVER autoconf macros
from the trunk branch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@312904
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 9 Oct 2005 14:46:24 +0000 (14:46 +0000)]
Backport new_features documentation updates to 2.2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@307442
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 9 Oct 2005 14:31:40 +0000 (14:31 +0000)]
Sync module moves (dbd, filter, charset_lite) and dbd updates with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@307440
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 9 Oct 2005 11:02:20 +0000 (11:02 +0000)]
Merge r307389 from trunk:
* Fix a declaration problem introduced in r195013 that is C99 but not ANSI C
compatible. Thus move declaration of *worker to the top of find_session_route
to make it ANSI C compatible again.
Submitted by: NormW <normw bocnet.com.au>
Reviewed by: Ruediger Pluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@307393
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 8 Oct 2005 00:11:36 +0000 (00:11 +0000)]
use Greg's cleaner fix for CAN-2005-2970
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@307222
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 7 Oct 2005 21:09:59 +0000 (21:09 +0000)]
Merge r307195 from trunk:
* Fix PR36883 (mod_proxy_ajp and tomcat issues).
Submitted by: William Barker <william.barker wilshire.com>
Reviewed by: Ruediger Pluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@307196
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 7 Oct 2005 06:41:23 +0000 (06:41 +0000)]
Backport Revision: 306495
NET_TIME, as a standalone feature, was a horrid idea, so eliminate it.
The core filter will NOT operate correctly across platforms
(even between Linux/Solaris) without setting up the conn->timeout,
so always apply the timeout when establishing the core filter.
The keep-alive-timeout is entirely an HTTP-ism, and needs to
move to the http protocol handler. This isn't triggered in the
event mpm, but the event mpm introspects s->keep_alive_timeout
directly adding it to the pollset, so this is a non-sequitor.
Finally, once the headers are read, the named virtual host may
have a different (more/less permissive) timeout for the remainder
of the request body. This http-centric patch picks up that subtle
detail and can switch to a named-vhost timeout.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@307031
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 6 Oct 2005 21:30:58 +0000 (21:30 +0000)]
Merge r293123, r293293 from trunk:
* run the request_status hook in proxy_handler if HTTP_SERVICE_UNAVAILABLE
is returned by ap_proxy_pre_request.
Suggested by: Brian Akins <brian.akins turner.com>, Mladen Turk
Reviewed by: Jim Jagielski
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306900
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 6 Oct 2005 21:04:25 +0000 (21:04 +0000)]
merge from trunk:
mod_proxy_connect: Fix high CPU loop on systems like UnixWare which
trigger POLL_ERR or POLL_HUP on a terminated connection.
PR 36951.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306889
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 6 Oct 2005 20:59:48 +0000 (20:59 +0000)]
Merge r295013 from trunk:
* Fix PR36507 (mod_proxy_balancer does not handle sticky sessions with
tomcat correctly).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306884
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Thu, 6 Oct 2005 18:42:11 +0000 (18:42 +0000)]
Get latex build working again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306832
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 6 Oct 2005 18:19:51 +0000 (18:19 +0000)]
docs/build/ should not exist (docs/manual/build/ already in svn:ignore).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306826
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 6 Oct 2005 17:42:46 +0000 (17:42 +0000)]
httpd-docs procedures call for checking out build underneath
the docs/ tree, so add this subdirectory as an svn ignore
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306816
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Thu, 6 Oct 2005 16:26:08 +0000 (16:26 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306802
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Thu, 6 Oct 2005 16:12:15 +0000 (16:12 +0000)]
bump version
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306798
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Thu, 6 Oct 2005 16:02:42 +0000 (16:02 +0000)]
swap directive and module
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306787
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 6 Oct 2005 15:55:58 +0000 (15:55 +0000)]
Backport: 300198
Spare us a wasted variable, csd is initialized null, acting
as the 'csd_set' indicator.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306784
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 6 Oct 2005 15:53:58 +0000 (15:53 +0000)]
Backport 295141
Pay close attention to core_create_req() ... and note
that not one other member of the r->vars is initialized
herein. Move this initialization elsewhere.
(If this is the 'default' - it really aught to be the
zero value, for that matter).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306782
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Wed, 5 Oct 2005 20:32:12 +0000 (20:32 +0000)]
Merge r295104 from trunk:
Refresh the SSL FAQ to bring it a little closer to reality.
Submitted by: Noirin Plunkett <firebird nerdchic.net>
Reviewed by: Joe Orton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@295105
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 3 Oct 2005 15:15:36 +0000 (15:15 +0000)]
Merge r293364 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293365
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 3 Oct 2005 11:50:47 +0000 (11:50 +0000)]
Sync with trunk; minor comment and camelcase consistency changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293318
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 3 Oct 2005 11:30:06 +0000 (11:30 +0000)]
Sync with trunk; remove a now unused variable, and fix a comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293310
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 3 Oct 2005 11:06:04 +0000 (11:06 +0000)]
Merge r239422 and r239423 from trunk; these are (long) casts to fix 64-bit
build warnings by asteinmetz. Tested on IA64, x64 and x86.
Originally by: asteinmetz
Reviewed by: colm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293305
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 3 Oct 2005 10:58:45 +0000 (10:58 +0000)]
* Backport of r293301 style fixes to ease diff with trunk.
No Functional changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293302
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 3 Oct 2005 10:34:43 +0000 (10:34 +0000)]
Whitespace and comment changes; inconsequential - but synchronises
with trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293292
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Sun, 2 Oct 2005 21:32:29 +0000 (21:32 +0000)]
Sync with trunk: remove an unneccessary over-lapping variable (jorton)
and fix a style nit (colm).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293170
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Sun, 2 Oct 2005 21:21:59 +0000 (21:21 +0000)]
Merge r265047 and r265049 from trunk. Use the correct PID formatting.
Originally by: Jim
Reviewed by: Colm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293169
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Sun, 2 Oct 2005 20:56:56 +0000 (20:56 +0000)]
Merge r265518-9 from trunk; explicit assignment of some global variables
to zero. These should not be neccessary, but help us get around a gcc
(on ia64 at least) optimisation bug. They are harmless anyway.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293164
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Sun, 2 Oct 2005 20:39:15 +0000 (20:39 +0000)]
Merge r290162 from trunk. No policy changes, just update to pointing at
subversion.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293162
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Sat, 1 Oct 2005 12:11:45 +0000 (12:11 +0000)]
Merge r264886 from trunk:
* 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/branches/2.2.x@292965
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 1 Oct 2005 11:02:10 +0000 (11:02 +0000)]
merge from trunk:
*) SECURITY: CAN-2005-2970 (cve.mitre.org)
worker MPM: Fix a memory leak which can occur after an aborted
connection in some limited circumstances. [Greg Ames, Jeff Trawick]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292949
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Fri, 30 Sep 2005 15:31:40 +0000 (15:31 +0000)]
Backport recent fixes from trunk (hitherto lost in branch confusion)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292771
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Thu, 29 Sep 2005 22:09:30 +0000 (22:09 +0000)]
re-add the brackets on Neale's email
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292565
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Thu, 29 Sep 2005 21:30:30 +0000 (21:30 +0000)]
Merge r239406 with the 2.2.x branch. Again, no functional changes; this rev
moves some structures and define's shared by mod_disk_cache and htcacheclean
into a single mod_disk_cache.h.
Original Author: asteinmetz
Review by: colm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292557
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Thu, 29 Sep 2005 20:44:53 +0000 (20:44 +0000)]
Backport the Doxygen changes to the 2.2.x branch. No functional changes,
however backporting these doxygen fixes makes it significantly easier to diff
trunk and the 2.2.x branch, to sort out what's what. And we might as well
release with nicer doxygen markup.
Submitted by: Neale Ranns <neale ranns.org>
Reviewed by: Ian Holsman
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292540
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 29 Sep 2005 14:01:09 +0000 (14:01 +0000)]
Merge r292434 from trunk:
de-ref bug - balancer is always not null since it's &balancer
from the caller.
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292435
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Thu, 29 Sep 2005 13:50:22 +0000 (13:50 +0000)]
Add a changes entry for the mod_dir/mod_cache stuff.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292432
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Thu, 29 Sep 2005 12:20:54 +0000 (12:20 +0000)]
Merge r291588, r291672 and r291914 from trunk; make mod_dir and mod_cache
play nice together.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292423
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Mon, 26 Sep 2005 04:45:40 +0000 (04:45 +0000)]
Merge r291558 from trunk:
As recommended by nd, build docs for all languages.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291559
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 25 Sep 2005 23:15:15 +0000 (23:15 +0000)]
Roll on to 2.1.9-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291488
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 25 Sep 2005 23:13:33 +0000 (23:13 +0000)]
Remove -dev, to prepare for 2.1.8 tagging.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291486
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sun, 25 Sep 2005 23:07:27 +0000 (23:07 +0000)]
Merge r291480 from trunk:
* Makefile.in
(docs): If the "docs-build" project is available, trigger its build system
to turn the XML sources into HTML. Otherwise, display a URL to the
instructions on how to use the docs build.
* build/rules.mk.in:
(.PHONEY): docs is a fake target.
Submitted By: Daniel Rall <dlr apache.org>
Reviewed by: pquerna
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291485
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Sun, 25 Sep 2005 20:16:00 +0000 (20:16 +0000)]
Merge r291452, r291454 from trunk:
* server/connection.c (ap_lingering_close): Fix lingering close to
really match the 1.3 behaviour: read from the client for up to ~30
seconds in total. Current behaviour will attempt only 15 read() calls
then give up.
* server/connection.c (ap_lingering_close): Cleanup; no functional change.
PR: 35292
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291469
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Sun, 25 Sep 2005 15:22:57 +0000 (15:22 +0000)]
Merge r290965 from trunk:
Implement a (bounded) buffer of request body data to provide a limited
but safe fix for the mod_ssl renegotiation-vs-requests-with-bodies
bug:
* modules/ssl/ssl_private.h (ssl_io_buffer_fill): Add prototype.
* modules/ssl/ssl_engine_io.c (ssl_io_buffer_fill,
ssl_io_filter_buffer): New functions.
* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): If a
renegotiation is needed, and the request has a non-zero
content-length, or a t-e header (and 100-continue was not requested),
call ssl_io_buffer_fill to set aside the request body data if
possible, then proceed with the negotiation.
PR: 12355
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291425
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 24 Sep 2005 10:06:06 +0000 (10:06 +0000)]
fix eol-style property
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291271
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 23 Sep 2005 14:34:15 +0000 (14:34 +0000)]
Fix entry format and remove a docs change which is not really
significant enough to warrant its own CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291128
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 23 Sep 2005 14:25:19 +0000 (14:25 +0000)]
Merge r291120 from trunk:
* server/request.c (core_opts_merge): When AllowOverride is specified
for the directory, ignore the inherited override_opts field.
PR: 35330
Submitted by: kabe <kabe sra-tohoku.co.jp>
Reviewed by: jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291125
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Thu, 22 Sep 2005 15:45:54 +0000 (15:45 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290970
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Thu, 22 Sep 2005 15:45:36 +0000 (15:45 +0000)]
update German translation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290969
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Wed, 21 Sep 2005 20:13:57 +0000 (20:13 +0000)]
Merge r290816 from trunk:
Add <glossary> tag for mime-type where appropriate.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290817
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Wed, 21 Sep 2005 19:47:52 +0000 (19:47 +0000)]
Merge r290801, r290803 from trunk:
Add APR to the glossary and link it in where appropriate.
Missed an end tag in the glossary.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290805
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Wed, 21 Sep 2005 17:54:16 +0000 (17:54 +0000)]
Merge r290760 from trunk:
Fix dtd to match <glossary> change in xsl.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290761
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 21 Sep 2005 17:38:09 +0000 (17:38 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290756
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 21 Sep 2005 17:35:03 +0000 (17:35 +0000)]
update German translation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290754
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 21 Sep 2005 17:17:09 +0000 (17:17 +0000)]
fix <glossay> validity
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290748
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 21 Sep 2005 15:56:33 +0000 (15:56 +0000)]
Add TraceEnable compatibility tag, and ./build.sh all causing
lots and lots of noise this time.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290730
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Wed, 21 Sep 2005 15:37:21 +0000 (15:37 +0000)]
Merge r280018 from trunk:
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/branches/2.2.x@290727
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Wed, 21 Sep 2005 15:33:52 +0000 (15:33 +0000)]
Merge r290712, r290720, r290723 from trunk:
The arrow indicator for a glossary link was cute, but I found it way too
disturbing to the flow of text. Here I replace it with a dashed-unline.
Also, allow the omission of the ref attribute where the glossary term is
exactly equal to the link contents.
Omit reference to pre-2.0.48 versions.
Add some <glossary> markup for regular expression and regex.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290725
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Wed, 21 Sep 2005 15:14:35 +0000 (15:14 +0000)]
Merge win32 htcacheclean addition into the 2.2.x branch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290721
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Wed, 21 Sep 2005 09:16:45 +0000 (09:16 +0000)]
Merge r290659 with the 2.2.x branch; add htcacheclean to the win32 build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290663
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 20 Sep 2005 19:42:37 +0000 (19:42 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290547
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 20 Sep 2005 19:36:12 +0000 (19:36 +0000)]
fix TraceEnable docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290543
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 20 Sep 2005 18:44:41 +0000 (18:44 +0000)]
`build all`
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290521
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 20 Sep 2005 18:37:35 +0000 (18:37 +0000)]
Sync to 2.0.x/CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290518
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 20 Sep 2005 18:01:27 +0000 (18:01 +0000)]
Backport TraceEnable docs to the 2.2-dev branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290496
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 20 Sep 2005 15:29:16 +0000 (15:29 +0000)]
update German translation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290472
13f79535 -47bb-0310-9956-
ffa450edef68
Martin Kraemer [Tue, 20 Sep 2005 15:13:31 +0000 (15:13 +0000)]
Merge r290465 from trunk:
Fix Bug#: 25659 (Memory leak in ssl_util_algotypeof())
Reported by David Blake in 2003, including patch.
Reviewed by: martin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290466
13f79535 -47bb-0310-9956-
ffa450edef68
Martin Kraemer [Tue, 20 Sep 2005 15:02:23 +0000 (15:02 +0000)]
Merge r290459 from trunk:
Fix Bug#: 25659 (Memory leak in ssl_util_algotypeof())
Reported by David Blake in 2003, including patch.
Reviewed by: martin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290463
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 20 Sep 2005 14:54:17 +0000 (14:54 +0000)]
`build all`
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290461
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 20 Sep 2005 13:16:01 +0000 (13:16 +0000)]
As of the 2.2.x docs re-sync, this change is now in the 2.2.x branch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290442
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 20 Sep 2005 12:06:33 +0000 (12:06 +0000)]
Add the caching image to the 2.2.x branch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290429
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 20 Sep 2005 12:00:48 +0000 (12:00 +0000)]
Massive whopper of a translations update, to get the 2.2.x branch back in-sync.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290428
13f79535 -47bb-0310-9956-
ffa450edef68