]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Stefan Fritsch [Fri, 19 Feb 2010 18:15:08 +0000 (18:15 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@911888
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 16 Feb 2010 23:35:42 +0000 (23:35 +0000)]
Update proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@910769
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 16 Feb 2010 22:28:00 +0000 (22:28 +0000)]
Update the proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@910737
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 16 Feb 2010 21:49:20 +0000 (21:49 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@910708
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 16 Feb 2010 09:59:40 +0000 (09:59 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@910449
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 15 Feb 2010 19:54:41 +0000 (19:54 +0000)]
mod_proxy, mod_proxy_http: Support remote https proxies
by using HTTP CONNECT.
PR 19188. [Philippe Dutrueux <lilas evidian.com>, Rainer Jung]
Backport of r909323, r910079, r910081, r910124
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@910322
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 15 Feb 2010 19:52:00 +0000 (19:52 +0000)]
*) worker: Don't report server has reached MaxClients until it has.
Add message when server gets within MinSpareThreads of MaxClients.
PR 46996. [Dan Poirier]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@910320
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 15 Feb 2010 19:50:59 +0000 (19:50 +0000)]
* mod_ssl: Improve environment variable extraction to be more
efficient and to correctly handle DNs with duplicate tags.
PR 45875.
Trunk Patch: http://svn.apache.org/viewvc?view=rev&revision=724717
http://svn.apache.org/viewvc?view=rev&revision=813165
http://svn.apache.org/viewvc?view=rev&revision=820401
2.2.x Patch: http://people.apache.org/~minfrin/ssl-env2.diff
+1: minfrin, fuankg, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@910319
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 15 Feb 2010 16:48:39 +0000 (16:48 +0000)]
upgrade
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@910259
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 15 Feb 2010 16:47:50 +0000 (16:47 +0000)]
cast votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@910258
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 15 Feb 2010 00:20:25 +0000 (00:20 +0000)]
Update backport proposal: add later bg fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@910138
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 14 Feb 2010 19:24:26 +0000 (19:24 +0000)]
AuthLDAPBindAuthoritative backport developed conflicts, resolve and supply patches
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@910063
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 13 Feb 2010 20:27:26 +0000 (20:27 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@909901
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 13 Feb 2010 20:18:09 +0000 (20:18 +0000)]
Comment, vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@909892
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 13 Feb 2010 19:51:07 +0000 (19:51 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@909879
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 12 Feb 2010 12:04:38 +0000 (12:04 +0000)]
Add proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@909377
13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Earl Poirier [Thu, 4 Feb 2010 16:55:54 +0000 (16:55 +0000)]
Propose backport: fix Maxclients warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@906563
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 1 Feb 2010 21:44:21 +0000 (21:44 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@905421
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 1 Feb 2010 21:11:45 +0000 (21:11 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@905414
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 27 Jan 2010 19:05:49 +0000 (19:05 +0000)]
Provide pointer to discussion thread
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@903785
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Wed, 27 Jan 2010 00:53:29 +0000 (00:53 +0000)]
Backport r902641: change log level of ldap authn failure message.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@903518
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Wed, 27 Jan 2010 00:45:57 +0000 (00:45 +0000)]
Backport (trivial) r897570
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@903517
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Wed, 27 Jan 2010 00:42:50 +0000 (00:42 +0000)]
Veto, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@903514
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 27 Jan 2010 00:33:45 +0000 (00:33 +0000)]
Now that we have a resolution working on www.a.o, time to backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@903513
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 25 Jan 2010 22:12:19 +0000 (22:12 +0000)]
Update backport proposal to current trunk version
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@902997
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 24 Jan 2010 22:37:56 +0000 (22:37 +0000)]
Query backport proposal; looks like a conditional +1
Oops, clashed with fuankg vote. This is not an objection, just a query.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@902669
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sun, 24 Jan 2010 22:34:42 +0000 (22:34 +0000)]
vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@902668
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 24 Jan 2010 21:33:55 +0000 (21:33 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@902647
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 24 Jan 2010 21:06:48 +0000 (21:06 +0000)]
propose an LDAP one-liner to reduce log severity
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@902645
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 24 Jan 2010 20:58:41 +0000 (20:58 +0000)]
fix my r896956 which made LDAP_OPT_NETWORK_TIMEOUT seem more powerful due to
my misunderstanding.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@902643
13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Fri, 15 Jan 2010 23:29:30 +0000 (23:29 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@899841
13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Fri, 15 Jan 2010 23:26:30 +0000 (23:26 +0000)]
update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@899840
13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Earl Poirier [Thu, 14 Jan 2010 15:52:52 +0000 (15:52 +0000)]
Clarify references to arguments in the Header directive documentation.
(The first argument is optional, so referring to any argument by
absolute position is ambiguous).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@899257
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 10 Jan 2010 07:12:33 +0000 (07:12 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@897593
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sat, 9 Jan 2010 22:54:15 +0000 (22:54 +0000)]
Propose backport - cleanup of duplication
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@897574
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sat, 9 Jan 2010 22:32:48 +0000 (22:32 +0000)]
Backport r807015
PR 35999 - preserve port over internal redirection
Patch by Jonas Ringh
Reviewed niq, covener, sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@897568
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 9 Jan 2010 21:16:18 +0000 (21:16 +0000)]
vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@897549
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 9 Jan 2010 19:52:47 +0000 (19:52 +0000)]
Propose mod_reqtimeout for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@897527
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 7 Jan 2010 18:47:11 +0000 (18:47 +0000)]
Merge r896897 from trunk:
clarify LDAPConnectionTimeout behavior/availability which is really just
passed along to the SDK when applicable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@896956
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 7 Jan 2010 15:11:53 +0000 (15:11 +0000)]
Merge r891282 from trunk:
Further mitigation for the TLS renegotation attack, CVE-2009-3555:
* modules/ssl/ssl_engine_kernel.c (has_buffered_data): New function.
(ssl_hook_Access): Forcibly disable keepalive for the connection if
there is any buffered data readable from the input filter stack.
* modules/ssl/ssl_engine_io.c (ssl_io_filter_input): Ensure that the
BIO uses blocking operations when invoked outside direct control of
the httpd filter stack.
Thanks to Hartmut Keil <Hartmut.Keil adnovum.ch> for proposing this
technique.
Submitted by: jorton
Reviewed by: rpluem, jim, trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@896900
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 6 Jan 2010 22:02:18 +0000 (22:02 +0000)]
vote+promote mod_ssl legacy renegotiation improvement
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@896689
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 6 Jan 2010 01:35:09 +0000 (01:35 +0000)]
Merge r896299 from trunk:
clarify that FileETag is for static files only, and explicitly mention
that ETags aren't generated for files parsed by mod_include.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@896300
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Tue, 5 Jan 2010 23:40:54 +0000 (23:40 +0000)]
Merge from trunk r896223: Update for IANA and comment-out unused types.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@896274
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Tue, 5 Jan 2010 15:01:24 +0000 (15:01 +0000)]
backport r896073 from trunk:
Similar to r893874, fix the ProxyPass example accoding to the trailing slash rule.
PR: 48459
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@896075
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 4 Jan 2010 01:53:16 +0000 (01:53 +0000)]
whitespace only: normalize indentation of recent CHANGES entries
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@895528
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 4 Jan 2010 01:51:33 +0000 (01:51 +0000)]
vote, add doc revision for AuthLDAPBindAuthoritative
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@895527
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 27 Dec 2009 01:16:53 +0000 (01:16 +0000)]
Fix administrivia in CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@894040
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Sat, 26 Dec 2009 00:42:46 +0000 (00:42 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@893913
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Fri, 25 Dec 2009 16:55:23 +0000 (16:55 +0000)]
backport r893874 from trunk
Fix the ProxyPass example according to the trailing slash rule.
Submitted by: inoue <inoue ariel-networks.com>
PR: 48444
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@893875
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Tue, 22 Dec 2009 17:27:41 +0000 (17:27 +0000)]
Fix a mistranslation.
Submitted by: HANAWA Yoshio <hanawa dino.co.jp>
Reviewed by: takashi
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@893241
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 21 Dec 2009 23:54:10 +0000 (23:54 +0000)]
Propose backport (embarrassingly long-standing buglet)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@893036
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Sun, 20 Dec 2009 08:07:48 +0000 (08:07 +0000)]
Improve the wording.
Submitted by: OZAWA Sakuro <ozawa feedforce.jp>
Reviewed by: takashi
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@892569
13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Earl Poirier [Fri, 18 Dec 2009 15:48:18 +0000 (15:48 +0000)]
Document the ability to use shell environment variables in
the configuration file.
PR: 46333
Patch submitted by: Nathan Stratton Treadway
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@892282
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Dec 2009 14:15:27 +0000 (14:15 +0000)]
* mod_filter: dispatch correctly where dispatch string doesn't exist
PR 48054
Trunk patch: n/a (trunk upgraded to use ap_expr for condition testing)
2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=24418
+1: niq, rpluem, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@892261
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Dec 2009 14:13:05 +0000 (14:13 +0000)]
* mod_disk_cache, mod_mem_cache: don't cache incomplete responses,
per RFC 2616, 13.8.
PR 15866
Trunk Patch: http://svn.apache.org/viewvc?rev=818492&view=rev
http://svn.apache.org/viewvc?rev=821763&view=rev
2.2.x Patch: http://people.apache.org/~poirier/PR15866-22x.patch
+1: poirier, rpluem, rjung, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@892260
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Dec 2009 14:12:02 +0000 (14:12 +0000)]
Merge r880794 from trunk:
Build: fix --with-module to work as documented
PR 43881
Submitted: Gez Saunders
Reviewed: Nick Kew
Submitted by: niq
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@892259
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Dec 2009 14:10:56 +0000 (14:10 +0000)]
Merge r821298 from trunk:
Make RemoveType override the info from TypesConfig
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@892258
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Dec 2009 14:09:40 +0000 (14:09 +0000)]
Merge r822458 from trunk:
Work around broken cache management in mod_ldap: If LDAPSharedCacheSize is too
small, try to free some memory by purging the cache and log a warning.
Also increase the default LDAPSharedCacheSize to 500000. This is a more
realistic size suitable for the default values of 1024 for LdapCacheEntries and
LdapOpCacheEntries.
PR: 46749
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@892257
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Dec 2009 14:08:15 +0000 (14:08 +0000)]
bump up
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@892256
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 18 Dec 2009 14:07:48 +0000 (14:07 +0000)]
some votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@892255
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 17 Dec 2009 11:39:15 +0000 (11:39 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@891656
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 17 Dec 2009 11:21:12 +0000 (11:21 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@891642
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 17 Dec 2009 09:44:12 +0000 (09:44 +0000)]
* Vote and comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@891604
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 17 Dec 2009 08:55:46 +0000 (08:55 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@891588
13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Wed, 16 Dec 2009 02:59:23 +0000 (02:59 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@891105
13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Earl Poirier [Mon, 14 Dec 2009 19:03:49 +0000 (19:03 +0000)]
Update transforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@890441
13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Earl Poirier [Mon, 14 Dec 2009 19:02:20 +0000 (19:02 +0000)]
Expand mod_alias documentation.
Add link from glossary entry for regular expressions to the wikipedia entry,
which seems to be a good reference for PCRE's flavor of regular expression syntax.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@890440
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 14 Dec 2009 15:39:22 +0000 (15:39 +0000)]
Patch from Mark Watts. Mention ProxyErrorOverride.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@890372
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 12 Dec 2009 20:17:25 +0000 (20:17 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@889971
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 7 Dec 2009 16:27:24 +0000 (16:27 +0000)]
Insert missing line-break
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@887984
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 3 Dec 2009 17:34:24 +0000 (17:34 +0000)]
Correct the default location of sysconfdir, which is conf, not etc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@886859
13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Earl Poirier [Thu, 3 Dec 2009 14:58:33 +0000 (14:58 +0000)]
Propose backport for PR 15866 related to cache correctness
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@886801
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 30 Nov 2009 22:57:41 +0000 (22:57 +0000)]
Rpm package: pass the HTTPD_LANG variable to the httpd process in line
with Fedora. Remove the use of the apachectl script, as a script calling
another script makes no sense. Test for the pidfile specifically, so
that Redhat's scripts don't fall back to using pidof and returning the
status of other httpd processes running on the same box.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@885608
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 29 Nov 2009 23:39:05 +0000 (23:39 +0000)]
fix svn:keywords
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@885298
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sun, 29 Nov 2009 22:07:48 +0000 (22:07 +0000)]
cleaned up NetWare makefile includes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@885280
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 21 Nov 2009 21:43:12 +0000 (21:43 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@883003
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Fri, 20 Nov 2009 10:17:02 +0000 (10:17 +0000)]
fixed NetWare objects output directory naming.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@882483
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 19 Nov 2009 14:07:46 +0000 (14:07 +0000)]
Merge r806920 from trunk:
Return consistent error status for proxy unable to connect
PR 46971
Submitted by: niq
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@882153
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 19 Nov 2009 14:05:59 +0000 (14:05 +0000)]
approved
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@882152
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 19 Nov 2009 14:05:32 +0000 (14:05 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@882150
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 19 Nov 2009 14:05:02 +0000 (14:05 +0000)]
whitespace
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@882149
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 18 Nov 2009 16:18:06 +0000 (16:18 +0000)]
Backport r829657 from trunk:
mod_charsert_lite: Start honoring the 'NoImplicitAdd' CharsetOption.
Unsettable since 2.2.9, before that a no-op.
Reviewed By: covener, trawick, poirier
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@881824
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 18 Nov 2009 16:05:57 +0000 (16:05 +0000)]
vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@881818
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 18 Nov 2009 16:04:19 +0000 (16:04 +0000)]
update revision in niq's proposal to match PR and abstract, old revision was
Apache Jackrabbit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@881816
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 18 Nov 2009 15:54:33 +0000 (15:54 +0000)]
propose AuthLDAPBindAuthoritative
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@881810
13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Earl Poirier [Tue, 17 Nov 2009 12:36:25 +0000 (12:36 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@881251
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 16 Nov 2009 15:56:06 +0000 (15:56 +0000)]
Backport proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@880817
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 8 Nov 2009 13:56:56 +0000 (13:56 +0000)]
Little typos.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@833879
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Sat, 7 Nov 2009 00:56:23 +0000 (00:56 +0000)]
Merge r833582, r833593 from trunk:
SECURITY: Partial fix for CVE-2009-3555:
Reject client-initiated renegotiations; this is sufficient to prevent
the attack for any configuration which does not require renegotiation
due to per-directory/per-location access control configuration.
Configuration with per-directory/per-location access control
requirements (such as "SSLVerifyClient require") are still vulnerable
to CVE-2009-3555 with this patch applied (if using OpenSSL <= 0.9.8k).
* modules/ssl/ssl_private.h (SSLConnRec): Add reneg_state field.
(ssl_callback_Info): Renamed from ssl_callback_LogTracingState.
* modules/ssl/ssl_engine_init.c (ssl_init_ctx_callbacks): Install
the (renamed) info callback unconditionally.
* modules/ssl/ssl_engine_io.c (ssl_filter_ctx_t): Add config pointer
to SSLConnRec.
(bio_filter_out_write, bio_filter_in_read): Fail with
APR_ECONNABORTED if the reneg state is set to RENEG_ABORT.
* modules/ssl/ssl_engine_kernel.c (log_tracing_state): Factored out
of ssl_callback_LogTracingState.
(ssl_callback_Info): New function.
Submitted by: jorton, rpluem
Reviewed by: jorton, rpluem, dirkx
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@833622
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 5 Nov 2009 18:39:44 +0000 (18:39 +0000)]
wrowe said it would be fine to remove his -1 vote on this. His concerns
are addressed. Anybody else in favor?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@833118
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 5 Nov 2009 17:39:14 +0000 (17:39 +0000)]
Little typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@833097
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 4 Nov 2009 23:23:07 +0000 (23:23 +0000)]
Merge r832759 from trunk:
ServerAlias and Listen accumulate, not supercede. The latter of course is n/a to vhosts!
Additional rewording of vhost details.
PR48125
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@832902
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 2 Nov 2009 22:30:38 +0000 (22:30 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@832164
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 2 Nov 2009 22:04:34 +0000 (22:04 +0000)]
add PR ref
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@832129
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 2 Nov 2009 21:59:04 +0000 (21:59 +0000)]
Merge r822004 from trunk:
mod_rewrite: Make sure that a hostname:port isn't fully qualified if
the request is a CONNECT request.
Submitted by: Bill Zajac <billz consultla.com>
Reviewed by: sf, minfrin, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@832124
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 1 Nov 2009 16:26:07 +0000 (16:26 +0000)]
document SetEnv "late" processing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@831696
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sun, 1 Nov 2009 06:34:44 +0000 (06:34 +0000)]
tab and trailing space police.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@831645
13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Earl Poirier [Thu, 29 Oct 2009 17:06:15 +0000 (17:06 +0000)]
Merge r823536, r823563 from trunk:
mod_cache: add Cache-control: s-maxage to cacheability decisions per RFC 2616.
Update doc to match change to mod_cache to include s-maxage in
some cacheability decisions.
Reviewed by: sf, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@831031
13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Earl Poirier [Tue, 27 Oct 2009 19:33:27 +0000 (19:33 +0000)]
Add SNI to glossary
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@830310
13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Earl Poirier [Tue, 27 Oct 2009 19:20:12 +0000 (19:20 +0000)]
Update transforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@830302
13f79535 -47bb-0310-9956-
ffa450edef68
projects / thirdparty / apache / httpd.git / log
