]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
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
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
Joe Orton [Tue, 9 Aug 2005 13:16:46 +0000 (13:16 +0000)]
* modules/http/byterange_filter.c (ap_byterange_filter): Update some
comments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231030
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 9 Aug 2005 08:21:39 +0000 (08:21 +0000)]
* modules/ldap/util_ldap.c (util_ldap_parse_cert_type): Fix gcc 4
warning "type qualifiers ignored on function return type".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231014
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 8 Aug 2005 21:23:22 +0000 (21:23 +0000)]
Ensure that req->dn is valid for the util_ldap_cache_compare() call.
Esp make sure not null.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@230895
13f79535 -47bb-0310-9956-
ffa450edef68
Paul Querna [Mon, 8 Aug 2005 14:37:14 +0000 (14:37 +0000)]
Add a User-Agent to the dummy connection code to ease admin debugging.
Submitted By: Colm MacCarthaigh <colm stdlib.net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@230808
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 8 Aug 2005 03:34:57 +0000 (03:34 +0000)]
Two blank lines for clarity; whitespace only change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@230745
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 8 Aug 2005 03:12:24 +0000 (03:12 +0000)]
We already accept 80 bytes less than the client body's anticipated
size, so we don't need to also prefetch an extra 1024 bytes; this
was redundant.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@230739
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 8 Aug 2005 02:57:55 +0000 (02:57 +0000)]
Drop an impossible case; the while() loop already protected us
from this situation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@230735
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 8 Aug 2005 02:51:32 +0000 (02:51 +0000)]
Fix a double-termination case in svn trunk/; we terminated the
headers up-front knowing the resulting headers were already
correctly composed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@230733
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 8 Aug 2005 00:57:52 +0000 (00:57 +0000)]
An impossible-to-hit edge case today; we described the request
as chunked - and if chunked always send the body termination "0"
chunk header.
Roy's requested change that we always send a body we could read
in full as a C-L request ensures this code wasn't triggered; some
change in the future could again reveal this edge case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@230718
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 5 Aug 2005 13:49:07 +0000 (13:49 +0000)]
* server/vhost.c (get_addresses): Fix double negative and make errors
consistent; thanks Joshua.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@230469
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 5 Aug 2005 12:27:57 +0000 (12:27 +0000)]
* server/vhost.c (get_addresses): Fail with an error message rather
than an assert() for errors which plague users on Solaris boxes which
don't have a properly configured resolver.
PR: 27525
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@230453
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 3 Aug 2005 14:44:29 +0000 (14:44 +0000)]
* modules/ldap/util_ldap.c (util_ldap_post_config): Pass NULL to
apr_global_mutex_create if no cache file name is specified, rather
than inventing an inappropriate name with tmpnam().
PR: 30385
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@227230
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 3 Aug 2005 09:45:57 +0000 (09:45 +0000)]
* server/util_pcre.c (ap_regexec): Fix --with-pcre build with older
versions of pcre.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@227189
13f79535 -47bb-0310-9956-
ffa450edef68
Martin Kraemer [Tue, 2 Aug 2005 18:01:24 +0000 (18:01 +0000)]
Patch contributed by: Daniel Rall <dlr@apache.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@227052
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 2 Aug 2005 14:15:35 +0000 (14:15 +0000)]
* modules/ldap/util_ldap_cache.c (util_ldap_cache_init): Only remove
the shm segment by name if a name is configured.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@227012
13f79535 -47bb-0310-9956-
ffa450edef68
Martin Kraemer [Tue, 2 Aug 2005 13:17:20 +0000 (13:17 +0000)]
For generated files, strip off an absolute path
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@226993
13f79535 -47bb-0310-9956-
ffa450edef68
Martin Kraemer [Tue, 2 Aug 2005 12:48:36 +0000 (12:48 +0000)]
Commit (forgotten) generated files for changed in ssl_expr_parse.y and ssl_expr_scan.l
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@226990
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 2 Aug 2005 09:26:51 +0000 (09:26 +0000)]
* modules/ldap/util_ldap.c (util_ldap_post_config): Fail if
util_ldap_cache_init fails; let ap_log_error call strerror.
Downgrade informational messages to APLOG_INFO from APLOG_NOTICE.
(util_ldap_child_init): Remove some noisy but fairly pointless
debugging output.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@226974
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 1 Aug 2005 15:46:46 +0000 (15:46 +0000)]
* modules/ldap/util_ldap_cache.c (util_ldap_url_node_display,
util_ldap_search_node_display, util_ldap_compare_node_display,
util_ldap_dn_compare_node_display): Use ap_rprintf. Terminate table
rows with "</tr>" not "<tr>".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@226825
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 1 Aug 2005 15:32:28 +0000 (15:32 +0000)]
* modules/ldap/util_ldap_cache.c: Remove various casts-from-void *,
fix various minor style nits. No functional changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@226820
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 1 Aug 2005 14:57:35 +0000 (14:57 +0000)]
* modules/ldap/util_ldap_cache.c (MODLDAP_SHMEM_CACHE): Remove unused
macro.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@226811
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 1 Aug 2005 14:50:21 +0000 (14:50 +0000)]
* modules/ldap/util_ldap.c (util_ldap_post_config): Don't attempt to
remove the shm segment here.
* modules/ldap/util_ldap_cache.c (util_ldap_cache_init): Properly
remove the shm segment here before creating a new one; don't attach to
any existing shm segment if apr_shm_create() fails.
(util_ldap_cache_module_kill): Don't attempt to remove the shm segment
here; apr_shm_destroy() does that anyway.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@226809
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 1 Aug 2005 12:11:30 +0000 (12:11 +0000)]
* modules/ssl/mod_ssl.c (ssl_hook_pre_config): Initialize all
algorithms in OpenSSL; enables PKCS#8 keyfile support.
PR: 35469
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@226777
13f79535 -47bb-0310-9956-
ffa450edef68
Jason S. Lingohr [Mon, 1 Aug 2005 04:18:18 +0000 (04:18 +0000)]
Nitpick; changed for consistency.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@226737
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 28 Jul 2005 15:13:51 +0000 (15:13 +0000)]
* modules/ldap/util_ldap_cache_mgr.c (util_ald_cache_display): Replace
ap_rputs(apr_psprintf(...)) with simpler ap_rprintf(...).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225797
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 28 Jul 2005 15:00:46 +0000 (15:00 +0000)]
* modules/ldap/util_ldap.c, modules/aaa/mod_authnz_ldap.c: Stop using
APLOG_NOERRNO throughout.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225794
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 28 Jul 2005 12:02:44 +0000 (12:02 +0000)]
* modules/ldap/util_ldap_cache.c (util_ldap_cache_module_kill): Make
private function static. (util_ldap_cache_child_kill): Remove
prototype for function which doesn't exist.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225756
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 28 Jul 2005 11:53:25 +0000 (11:53 +0000)]
* modules/ldap/util_ldap_cache.c (util_ldap_cache_init): Use the
actual available size of the shm segment not the requested size.
Ensure the requested size is aligned. Check errors from apr_rmm_init.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225753
13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Thu, 28 Jul 2005 11:16:34 +0000 (11:16 +0000)]
Add status param option so that current worker
status can be changed via editing httpd.conf instead
just using web page. Seems the ApacheCon is paying of.
Thanks to Sander for pointing that out.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225751
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 28 Jul 2005 10:52:52 +0000 (10:52 +0000)]
* modules/ldap/util_ldap_cache_mgr.c (util_ald_cache_insert,
util_ald_cache_remove, util_ald_cache_fetch): Always use "unsigned
long" for hash values, for consistency.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225749
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 28 Jul 2005 10:45:59 +0000 (10:45 +0000)]
* modules/ldap/util_ldap_cache_mgr.c (util_ald_cache_insert): Fix a
cache corruption case: ensure that there is room in the cache for a
copy of the payload before inserting the node.
PR: 34209
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225746
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 28 Jul 2005 09:50:16 +0000 (09:50 +0000)]
* modules/ldap/util_ldap.c: Remove DOCTYPE_* macros duplicated from
httpd.h. Remove redundant prototypes of static functions which aren't
used before they are declared.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225734
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 28 Jul 2005 09:43:01 +0000 (09:43 +0000)]
* modules/ldap/util_ldap.c (util_ldap_cmds): Make static const.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225733
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 28 Jul 2005 09:40:08 +0000 (09:40 +0000)]
* modules/ldap/util_ldap.c (LDAP_CACHE_LOCK, LDAP_CACHE_UNLOCK):
Wrap in do/while for safety.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225732
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 28 Jul 2005 08:59:52 +0000 (08:59 +0000)]
Ignore httxt2dbm.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225730
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 28 Jul 2005 08:00:43 +0000 (08:00 +0000)]
* modules/experimental/mod_filter.c (filter_trace): Fix gcc
-Wformat-security warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225725
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 27 Jul 2005 19:36:07 +0000 (19:36 +0000)]
* modules/aaa/mod_authnz_ldap.c (authz_ldap_check_user_access): Remove
unused variable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225587
13f79535 -47bb-0310-9956-
ffa450edef68