]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Nick Kew [Wed, 24 Jan 2007 21:59:20 +0000 (21:59 +0000)]
Merge rpluem's fix into my proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@499587
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 24 Jan 2007 21:22:43 +0000 (21:22 +0000)]
* Add a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@499572
13f79535 -47bb-0310-9956-
ffa450edef68
Bradley Nicholes [Wed, 24 Jan 2007 03:47:59 +0000 (03:47 +0000)]
Point out that if another authorization method is used
with mod_authnz_ldap, AuthzLDAPAuthoritative must be
set to off.
submitted by: Darren Spruell <phatbuckett gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@499242
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 23 Jan 2007 21:06:49 +0000 (21:06 +0000)]
* Cast a vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@499135
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 23 Jan 2007 13:01:41 +0000 (13:01 +0000)]
propose a proxy fix for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@499011
13f79535 -47bb-0310-9956-
ffa450edef68
Bradley Nicholes [Mon, 22 Jan 2007 16:07:39 +0000 (16:07 +0000)]
Set the SSLMutex to default on the NetWare platform and make sure that the file locations are being set properly.
Submitted by: Guenter Knauf <fuankg apache.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@498666
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 12 Jan 2007 10:53:31 +0000 (10:53 +0000)]
Make buildmark.c compilation consistent, especially for VC8
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@495546
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 11 Jan 2007 06:58:10 +0000 (06:58 +0000)]
Well that's done
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@495142
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 11 Jan 2007 05:53:09 +0000 (05:53 +0000)]
One more backported (Nick expressed his -1 wasn't ment to be a veto,
next time please state something other than -1. -.999 would be fine.)
Fix building PCRE with -DDEBUG on just about all the platforms under
my roof (FreeBSD, Darwin, Ubuntu Breezy)
Submitted by: sctemme
Backports: r381783
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@495134
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 11 Jan 2007 05:48:39 +0000 (05:48 +0000)]
Solved.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@495132
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 11 Jan 2007 05:44:54 +0000 (05:44 +0000)]
Add .manifest post-processing to the httpd build for users of VC 8
(Studio 2005, 'free' Express or full edition) command line builds.
Backports 495126, adjusted for debugging/debug path change between
trunk and 2.2 branch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@495130
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 11 Jan 2007 05:42:17 +0000 (05:42 +0000)]
Correct openssl-related version numbers and schema to include
openssl.cnf (required to invoke openssl.exe, even if the path
must be explicitly given.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@495129
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 10 Jan 2007 05:50:14 +0000 (05:50 +0000)]
This notice should have been propogated to 2.2 and 2.0 trees
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@494725
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 10 Jan 2007 05:28:54 +0000 (05:28 +0000)]
Site was reorganized.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@494717
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sat, 6 Jan 2007 17:57:18 +0000 (17:57 +0000)]
Add note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@493520
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 6 Jan 2007 06:32:08 +0000 (06:32 +0000)]
Bump after tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@493426
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 6 Jan 2007 06:29:51 +0000 (06:29 +0000)]
Prepare for tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@493424
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 6 Jan 2007 03:53:33 +0000 (03:53 +0000)]
Each review of this code, something else looks wrong
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@493292
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 6 Jan 2007 03:46:40 +0000 (03:46 +0000)]
Pull showstopper & braindead patch with no activity.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@493286
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 6 Jan 2007 03:10:28 +0000 (03:10 +0000)]
Correctly evaluate the HTTPS condition string, update CHANGES for attributions
and recent activity.
PR: 40573
Submitted by: Matt Eaton <asf divinehawk.com>
Backports: 429341
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@493281
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 6 Jan 2007 02:48:41 +0000 (02:48 +0000)]
Revert one aspect of the recent mod_isapi overhaul.
Where any response is sent, return OK from the handler. Where there
is no response (but a status code) return the code. This patch adds
a great number of debugging emits for failed ap_pass_brigade calls,
to help diagnose failure cases, and disambiguates OK from APR_SUCCESS.
PR: 40470
Submitted by: wrowe, Matt Eaton <asf divinehawk.com>
Backports: 492333
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@493275
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 3 Jan 2007 23:04:40 +0000 (23:04 +0000)]
Beg another (very trivial) review
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@492342
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 3 Jan 2007 22:57:48 +0000 (22:57 +0000)]
Beg for review
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@492338
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 25 Dec 2006 17:51:19 +0000 (17:51 +0000)]
Propose Backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@490157
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 25 Dec 2006 12:12:34 +0000 (12:12 +0000)]
Propose backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@490143
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 24 Dec 2006 14:40:19 +0000 (14:40 +0000)]
merge from trunk:
Allow htcacheclean, httxt2dbm, and fcgistarter to link apr/apr-util
statically like the older support programs.
Submitted by: Eric Covener <covener gmail.com>
Reviewed by: trawick, wrowe, jerenkrantz
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@490027
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 21 Dec 2006 21:05:51 +0000 (21:05 +0000)]
* Add a proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@489460
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 21 Dec 2006 17:35:50 +0000 (17:35 +0000)]
Concur with Roy on fourth inspection.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@489416
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 20 Dec 2006 02:04:39 +0000 (02:04 +0000)]
Merge r487901 from trunk:
PR#37680: fix socket block/nonblock on restart/graceful
Patch submitted by Darius Davis (darius-abz free-range.com.au)
Submitted by: niq
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@488883
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 19 Dec 2006 23:21:30 +0000 (23:21 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@488853
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 19 Dec 2006 22:36:08 +0000 (22:36 +0000)]
one more vote twords an actual patch - note this is tested in production
by several on the bug thread.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@488835
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 19 Dec 2006 21:56:16 +0000 (21:56 +0000)]
Merge r484978,r484787,r484792 from trunk:
* Isolate the unlock return vals
* Log when the lock fails.
* Failure to unlock is very nasty, so log it to help with troubleshooting.
Submitted by: jim
Reviewed by: jim, rpluem, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@488822
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 19 Dec 2006 21:48:16 +0000 (21:48 +0000)]
* This proposal has been backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@488818
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 19 Dec 2006 21:45:35 +0000 (21:45 +0000)]
Merge r422731, r422736, r422739, r423940, r424759, r424950, r425109, r426790,
r426791, r426793, r426795, r416165, r426799, r475403, r475406, r475915,
r475920, r475922, r476600, r437668 from trunk, which makes mod_deflate.c the
same as r483597 from trunk:
All comments to these changes for the sake of completeness:
* Fix wrong FLUSH bucket handling in deflate_out_filter: Actually the internal
structures of libz never got flushed as ctx->stream.avail_in is always zero
here. As the EOS and the FLUSH bucket case use the same code for flushing
libz's internal buffers move this code to the new function flush_zlib_buffer.
* Fix potential memory leaks in deflate_out_filter if bailing out due to an
error (either in the lower filter chain or during a libz operation). We need
to call deflateEnd as it is very likely that this filter is never called
again to ensures that libz's internal structures get cleaned properly.
* Remove ourselves from the filter chain if we failed to init libz, as we
pass data down the filter chain uncompressed afterwards.
* In preparation of the changes of the inflate out filter:
- rename flush_zlib_buffer to flush_libz_buffer (this name seems
better)
- add a parameter to tell flush_libz_buffer whether it should
deflate or inflate as this function should be also used for the
inflate out filter.
* This shortcut is too short. It is not up to the filters to decide
whether filters down the chain can do something useful with this empty
brigade.
* Initialize zRC to avoid a compiler warning.
* Rather use a pool cleanup function than calling deflateEnd before every
return from function to ensure that libz's internals get cleaned up.
* Add parameter crc to flush_libz_buffer in order to call the libz's crc32
function on the output buffer if needed. This is actually needed by the
later rework of the inflate out filter.
* Use a define for the number of validation bytes (CRC and length) after the
compressed data
* We can ignore Z_BUF_ERROR in flush_libz_buffer because:
When we call libz_func we can assume that
- avail_in is zero (due to the surrounding code that calls
flush_libz_buffer)
- avail_out is non zero due to the fact that we just emptied
the output buffer and stored it into a brigade
So the only reason for Z_BUF_ERROR is that the internal libz
buffers are now empty and thus we called libz_func one time
too often. This does not hurt. It simply says that we are done.
* some optimizations taken from the inflate out filter
* Remove bogus code that chokes on flush buckets
* Rework inflate out filter and give it a similar workflow as the deflate out
filter. This fixes the following bugs in the inflate out filter:
- Incorrect handling of flush buckets.
- Excessive memory usage for large compressed content (because we now
already sent parts down the chain and do not process the whole brigade
first before sending something down the chain).
- Handle the case correctly where the validation bytes at the end of
the compressed data stream are distributed across different buckets /
brigades.
- Fix a memory leak due to not cleaning up the internal structures of
libz in some error cases.
* Ensure that we do not try to inflate validation data or garbage data. None
of this is zlib's business.
* Ensure that we do not perform our final operations twice if a second EOS
falls down the chain by accident. Otherwise we are likely to run in a
SEGFAULT. So remove ourselves from the chain.
* Actually append new data to the validation buffer and do not overwrite old
data already there by setting the correct offset for the target buffer.
* Also log the presence of garbage data at the end of the stream if all
validation data is available in the first round.
* Housekeeping: keep track of size even in the edge-case where validation
bytes trickle in over multiple buckets.
PR: 39854
Reviewed by: rpluem, niq, jerenkrantz, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@488817
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 19 Dec 2006 19:38:48 +0000 (19:38 +0000)]
Votes and Notes; the first four I would like to see applied before
tagging 1.2.4; add a better patch for the winnt mpm wait patch
that makes this reviewable (sometimes -U3 just isn't enough context.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@488780
13f79535 -47bb-0310-9956-
ffa450edef68
Justin Erenkrantz [Tue, 19 Dec 2006 03:35:40 +0000 (03:35 +0000)]
Approve two backports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@488516
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 18 Dec 2006 20:53:37 +0000 (20:53 +0000)]
* Add a proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@488411
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 17 Dec 2006 10:16:21 +0000 (10:16 +0000)]
Propose backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@487955
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sat, 16 Dec 2006 22:01:53 +0000 (22:01 +0000)]
PR#40950: backport security note to htpasswd/htdigest docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@487905
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Fri, 15 Dec 2006 21:33:07 +0000 (21:33 +0000)]
PR#39420, make matching on resp=Content-Type case-insensitive.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@487676
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 14 Dec 2006 20:32:33 +0000 (20:32 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@487344
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 13 Dec 2006 14:10:41 +0000 (14:10 +0000)]
Merge r450070 from trunk:
Memory leak fix: Unconditionally free the buffer.
Submitted by: minfrin
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@486661
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 13 Dec 2006 14:09:05 +0000 (14:09 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@486660
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 13 Dec 2006 14:06:43 +0000 (14:06 +0000)]
Merge r484783 from trunk:
No need for each ind lb method to increment the elected
element. Do so from the main calling func.
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@486659
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 13 Dec 2006 14:04:27 +0000 (14:04 +0000)]
Merge r463291 from trunk:
So I'm sitting in Rich's talk and think to myself, it's kind
of stupid that DumpIO always logs at Debug, esp when
you consider that it's likely you'll be doing so
in conjunction with SSL... One Big Log is understating
it! :)
Add DumpIOLogLevel to allow one to change the level...
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@486656
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 13 Dec 2006 12:11:56 +0000 (12:11 +0000)]
merge from trunk:
rotatelogs: Improve error message for open failures.
PR: 39487
Submitted by: jorton
Reviewed by: trawick, jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@486612
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 13 Dec 2006 12:02:36 +0000 (12:02 +0000)]
vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@486609
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 13 Dec 2006 10:08:39 +0000 (10:08 +0000)]
Notes/votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@486580
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Wed, 13 Dec 2006 02:24:04 +0000 (02:24 +0000)]
Propose backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@486459
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 12 Dec 2006 14:17:17 +0000 (14:17 +0000)]
Merge r485311 from trunk:
Stop mod_dbd emitting bogus error messages when it's loaded
but not configured.
Submitted by: niq
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@486157
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 12 Dec 2006 14:16:28 +0000 (14:16 +0000)]
And promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@486156
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 12 Dec 2006 14:16:02 +0000 (14:16 +0000)]
Cast votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@486155
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 11 Dec 2006 20:49:49 +0000 (20:49 +0000)]
* Cast a vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@485870
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 11 Dec 2006 19:13:16 +0000 (19:13 +0000)]
add to proposed rotatelogs backport to address buffer size concern
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@485831
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 10 Dec 2006 23:44:48 +0000 (23:44 +0000)]
Propose backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@485314
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sat, 9 Dec 2006 20:34:00 +0000 (20:34 +0000)]
Fix CHANGES file; part of what I claimed on previous commit was
already in there!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@485056
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sat, 9 Dec 2006 19:56:07 +0000 (19:56 +0000)]
mod_dbd backports:
(1) Key connection pools to virtualhosts (niq, minfrin; reviewed us + wrowe)
(2) share per-request database handles across subrequests (chrisd; reviewed
niq + rpluem). Including fixing compiler warning (rpluem).
More to come on mod_dbd
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@485053
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 9 Dec 2006 17:45:04 +0000 (17:45 +0000)]
* Add a vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@485015
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 9 Dec 2006 17:30:26 +0000 (17:30 +0000)]
Respond to rpluem's ball busting :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@485013
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 9 Dec 2006 16:55:09 +0000 (16:55 +0000)]
* Vote and give comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@485011
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 9 Dec 2006 14:42:34 +0000 (14:42 +0000)]
Low hanging fruit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484986
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 9 Dec 2006 14:18:54 +0000 (14:18 +0000)]
format change. no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484984
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 9 Dec 2006 14:14:27 +0000 (14:14 +0000)]
Need to clarify the vote validity.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484982
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 9 Dec 2006 14:13:41 +0000 (14:13 +0000)]
Merge r472633 from trunk:
Better detection and clean up of ldap connection that have been
terminated by the ldap server. PR#40878
Submitted by: Rob Baily <rbaily servicebench com>
Reviewed by: bnicholes
Submitted by: bnicholes
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484981
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 8 Dec 2006 20:49:45 +0000 (20:49 +0000)]
* Another format error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484772
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 8 Dec 2006 20:48:39 +0000 (20:48 +0000)]
* Style police and format nitpicking
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484771
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 8 Dec 2006 20:28:17 +0000 (20:28 +0000)]
* Add a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484749
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 8 Dec 2006 15:31:59 +0000 (15:31 +0000)]
* mod_mem_cache: Convert mod_mem_cache to use APR memory pool functions
by creating a root pool for object persistence across requests. This
also eliminates the need for custom serialization code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484642
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 8 Dec 2006 15:30:45 +0000 (15:30 +0000)]
promote as accepted
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484639
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 8 Dec 2006 15:29:36 +0000 (15:29 +0000)]
Merge r463427 from trunk:
mod_authnz_ldap: Add an AuthLDAPRemoteUserAttribute directive. If
set, REMOTE_USER will be set to this attribute, rather than the
username supplied by the user. Useful for example when you want users
to log in using an email address, but need to supply a userid instead
to the backend.
Submitted by: minfrin
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484638
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 8 Dec 2006 15:28:47 +0000 (15:28 +0000)]
Cast vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484637
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 8 Dec 2006 15:23:04 +0000 (15:23 +0000)]
Add a short note about the AcceptMutex patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484634
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 8 Dec 2006 15:09:43 +0000 (15:09 +0000)]
Delete mistakenly added files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484631
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 8 Dec 2006 14:32:32 +0000 (14:32 +0000)]
Note 2.2.4 specific version of mod_mem_cache-apr-patch.txt...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484618
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 8 Dec 2006 13:28:54 +0000 (13:28 +0000)]
http://svn.apache.org/viewvc?view=rev&revision=450089 no
longer cleanly applies as is to 2.2 branch. Need a
2.2 specific patch now. Jim will try.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484590
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 8 Dec 2006 13:21:40 +0000 (13:21 +0000)]
format change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@484588
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 8 Dec 2006 13:07:14 +0000 (13:07 +0000)]
Merge r442758 from trunk:
PR 31759 (mutated) - reported by Jo Rhett
Don't return apr_status_t error value from input filter chain.
Submitted by: niq
Reviewed by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483980
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 8 Dec 2006 12:56:00 +0000 (12:56 +0000)]
merge from trunk:
*) mod_cache: Eliminate a bogus error in the log when a filter returns
AP_FILTER_ERROR. [Niklas Edmundsson <nikke acc.umu.se>]
Reviewed by: minfrin, wrowe, trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483974
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 8 Dec 2006 12:41:20 +0000 (12:41 +0000)]
merge from trunk:
*) Fix issue which could cause piped loggers to be orphaned and never
terminate after a graceful restart. PR 40651. [Joe Orton,
Ruediger Pluem]
Reviewed by: trawick, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483967
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 8 Dec 2006 12:23:33 +0000 (12:23 +0000)]
backport simple list manipulation fix:
*) Fix address-in-use startup failure caused by corruption of the list of
listen sockets in some configurations with multiple generic Listen
directives. [Jeff Trawick]
Reviewed by: jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483958
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 8 Dec 2006 11:49:04 +0000 (11:49 +0000)]
mindless housekeeping only -- highlight accepted patches by moving to
proper section (one patch with 3 +1s but an outstanding question left
alone)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483956
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Thu, 7 Dec 2006 23:23:40 +0000 (23:23 +0000)]
Backport R452330: header editing in mod_headers
+1 niq, chrisd, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483732
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Thu, 7 Dec 2006 22:58:21 +0000 (22:58 +0000)]
easy vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483718
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Thu, 7 Dec 2006 22:45:15 +0000 (22:45 +0000)]
propose mod_dbd fix to avoid excessive connections in single request
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483712
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 7 Dec 2006 19:19:04 +0000 (19:19 +0000)]
Revert a regression introduced in the recent overhauls of mod_isapi.
PR 40470 points out that we no longer handle ate == headlen, where
there is a headers-only response from the isapi app to the server.
This patch restores the previous behavior of pending those headers
until some amount of body response is ready to be sent to the client.
Backports: 483613
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483614
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 7 Dec 2006 18:38:04 +0000 (18:38 +0000)]
* Add a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483599
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 7 Dec 2006 17:49:18 +0000 (17:49 +0000)]
Mirror r483553 for the GUI environment on win32. Duplication is to assist users
in debugging the installed Apache server.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483568
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 7 Dec 2006 17:09:37 +0000 (17:09 +0000)]
Fix two flaws that make parallel testing of Apache2 (.0, .2, .x) very difficult,
change the default dir for command-line make to \Apache22 on Windows, and change
the service name to Apache2.2 by default (this *matches* the windows installer.)
Resolves recent bug reports and confusion.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483553
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 7 Dec 2006 17:01:50 +0000 (17:01 +0000)]
Mostly acks, a couple naks and a Q or two
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483547
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 4 Dec 2006 14:22:40 +0000 (14:22 +0000)]
logging-related patches
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@482184
13f79535 -47bb-0310-9956-
ffa450edef68
Chris Pepper [Tue, 28 Nov 2006 04:37:04 +0000 (04:37 +0000)]
Reword Order section to make 3-pass design clearer.
Add table showing results of match combinations.
Fix some tenses.
Fix case of CENTER & IP Address.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@479896
13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Mon, 27 Nov 2006 15:14:07 +0000 (15:14 +0000)]
Backport explicit flushing feature.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@479655
13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Mon, 27 Nov 2006 15:00:56 +0000 (15:00 +0000)]
Backport support for ping/pong.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@479647
13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Mon, 27 Nov 2006 14:30:28 +0000 (14:30 +0000)]
Add my +1.
BTW: Autoflush (even in trunk) does not work (See PR 19954).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@479636
13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Mon, 27 Nov 2006 14:10:46 +0000 (14:10 +0000)]
Fix typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@479623
13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Sun, 26 Nov 2006 07:41:17 +0000 (07:41 +0000)]
Trow an vote on the modified proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@479305
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 25 Nov 2006 22:14:08 +0000 (22:14 +0000)]
* Cast a vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@479212
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 25 Nov 2006 21:27:35 +0000 (21:27 +0000)]
cast a vote and reboot another.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@479201
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 25 Nov 2006 20:43:48 +0000 (20:43 +0000)]
* Cast a vote and add a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@479191
13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Sat, 25 Nov 2006 14:59:43 +0000 (14:59 +0000)]
Vote on the variable interpolation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@479130
13f79535 -47bb-0310-9956-
ffa450edef68