]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
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
Colm MacCarthaigh [Tue, 20 Sep 2005 11:57:56 +0000 (11:57 +0000)]
Backport all outstanding docs/manual changes from trunk to the 2.2.x
branch. Only the SetEnvIf documentation was left out.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290427
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Tue, 20 Sep 2005 10:54:21 +0000 (10:54 +0000)]
Backporting the caching user guide to the 2.2.x branch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290416
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 19 Sep 2005 17:01:24 +0000 (17:01 +0000)]
* update German translation
* update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290200
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 19 Sep 2005 16:55:52 +0000 (16:55 +0000)]
add background faq to the sitemap
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290199
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 19 Sep 2005 16:51:30 +0000 (16:51 +0000)]
* fix some eol-style properties
* add missing faq/background transformed files
* `build extraclean all`
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290198
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 19 Sep 2005 16:14:08 +0000 (16:14 +0000)]
add missing property
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290195
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 19 Sep 2005 16:04:34 +0000 (16:04 +0000)]
backport docs/manual/faq/background.xml from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290193
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 19 Sep 2005 16:00:40 +0000 (16:00 +0000)]
bring build properties up-to-date
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290190
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 19 Sep 2005 15:51:22 +0000 (15:51 +0000)]
Backport graceful-stop to the 2.2.x branch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290189
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 19 Sep 2005 14:57:07 +0000 (14:57 +0000)]
Backport r239710, r239711, r239732, r239740 and r241815 to the 2.2.x branch;
Fix PR 28167, which means we stop listening on ports when we do a
graceful-restart.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290179
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 19 Sep 2005 13:50:35 +0000 (13:50 +0000)]
Merge r265702, r290136, r264800 from trunk:
* 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.
* modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert_dn): Fix gcc
4.x different-pointer-signedness warning.
* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): Ensure that
renegotiation is performed for a transition from "SSLVerifyClient
optional" to "SSLVerifyClient require". (CVE CAN-2005-2700)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290159
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Sep 2005 13:19:08 +0000 (13:19 +0000)]
Document the lbmethod naming is now bytraffic|byrequests not simply
traffic|requests
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290149
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Sep 2005 13:02:35 +0000 (13:02 +0000)]
Document re-impl to providers for mod_proxy_balancer lbmethods
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290144
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Sep 2005 12:52:19 +0000 (12:52 +0000)]
Backport of the following patches from trunk:
r279973
r279752
r279579
r279319
r279305
------------------------------------------------------------------------
r279973 | jorton | 2005-09-10 05:10:27 -0400 (Sat, 10 Sep 2005) | 5 lines
* modules/proxy/mod_proxy_balancer.c (balancer_handler): Fix gcc
warning; no functional change.
* modules/proxy/mod_proxy.c (set_balancer_param): Likewise.
------------------------------------------------------------------------
r279752 | jim | 2005-09-09 08:28:02 -0400 (Fri, 09 Sep 2005) | 4 lines
Proxy balancer lbmethods are now registered as providers and not
via hooks. Move various find() functions back to mod_proxy_balancer
where they belong :)
------------------------------------------------------------------------
r279579 | bnicholes | 2005-09-08 12:37:00 -0400 (Thu, 08 Sep 2005) | 1 line
Remove proxy_hook_load_lbmethods from Netware export list
------------------------------------------------------------------------
r279319 | jim | 2005-09-07 09:14:16 -0400 (Wed, 07 Sep 2005) | 2 lines
Minor nit. Methods are server-wide, so simply use the base version table.
------------------------------------------------------------------------
r279305 | jim | 2005-09-07 08:04:15 -0400 (Wed, 07 Sep 2005) | 4 lines
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/branches/2.2.x@290141
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Sep 2005 12:38:51 +0000 (12:38 +0000)]
Backport r280013 from trunk:
gcc -Wall fix: depending on signedness of char.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290139
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Sep 2005 12:36:27 +0000 (12:36 +0000)]
Backport 280010 from trunk:
gcc -Wall cleanup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290138
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Sep 2005 12:34:32 +0000 (12:34 +0000)]
Backport 279750 from TRUNK.
New provider function to list all available provider names in a
specific group and version (ap_list_provider_names).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290137
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/branches/2.2.x@290133
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 19 Sep 2005 11:39:13 +0000 (11:39 +0000)]
Backport support for gigabytes in htcacheclean to the 2.2.x branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290118
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Mon, 19 Sep 2005 10:55:34 +0000 (10:55 +0000)]
Remove that odd strerror() call in the 2.2.x branch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@290108
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/branches/2.2.x@290107
13f79535 -47bb-0310-9956-
ffa450edef68
Colm MacCarthaigh [Sun, 18 Sep 2005 21:17:54 +0000 (21:17 +0000)]
Backport two small htcacheclean fixes from trunk to the 2.2.x branch;
1.) Open the cache files as binary types, so that htcacheclean can
work properly on Windows.
2.) Add an entry in support/README for htcacheclean
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@289977
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/branches/2.2.x@289972
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/branches/2.2.x@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/branches/2.2.x@289961
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 16 Sep 2005 16:07:01 +0000 (16:07 +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/branches/2.2.x@289593
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 11 Sep 2005 20:28:20 +0000 (20:28 +0000)]
Backport 280114
rewrite CR mitigation logic to wipe out any trailing
white space
Submitted by: trawick
Suggested and reviewed by: wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@280177
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 11 Sep 2005 19:54:59 +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/branches/2.2.x@280171
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 11 Sep 2005 17:34:59 +0000 (17:34 +0000)]
Backport 264623 from trunk
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.
[Pradeep Kumar S <pradeep.smani gmail.com>]
Sync some CHANGES, more to come.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@280158
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 31 Aug 2005 09:50:53 +0000 (09:50 +0000)]
Revert r220310 and r220312 to bring mod_setenvif docs in line with
code.
Reviewed by: colm, jorton, trawick, jerenkrantz
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@264993
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 31 Aug 2005 09:46:17 +0000 (09:46 +0000)]
Merge r239381, r240092, r240096, r240349 from trunk:
* support/htcacheclean.c: Update htcacheclean defines to match
mod_disk_cache.c.
* server/listen.c (IS_INADDR_ANY, IS_IN6ADDR_ANY): New macros.
(open_listeners): Simplify using the new macros; no functional change.
* 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.
* build/rpm/httpd.spec.in: Fix the RPM spec file: XML versions of the
doc files are no longer removed. Added httxt2dbm to the sbin
directory.
Submitted by: colm, jorton, minfrin
Reviewed by: colm, jorton, trawick, jerenkrantz
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@264990
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sat, 20 Aug 2005 19:09:37 +0000 (19:09 +0000)]
Roll on to 2.1.8-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@234115
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sat, 20 Aug 2005 19:07:42 +0000 (19:07 +0000)]
Prepare for 2.1.7 tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@234112
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sat, 20 Aug 2005 18:39:06 +0000 (18:39 +0000)]
Revert OID() changes to mod_setenvif, and sync() CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@234108
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sat, 20 Aug 2005 18:31:52 +0000 (18:31 +0000)]
Go backwards in version numbers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@234106
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sat, 20 Aug 2005 18:29:56 +0000 (18:29 +0000)]
Revert r233369 due to veto.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@234105
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Sat, 20 Aug 2005 18:21:45 +0000 (18:21 +0000)]
Recreate 2.2.x branch from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@234103
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
Wilfredo Sanchez [Fri, 12 Aug 2005 18:03:47 +0000 (18:03 +0000)]
Fix typo in manual [Ben Collins-Sussman]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@232342
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