]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Jim Jagielski [Mon, 12 Jul 2010 18:45:22 +0000 (18:45 +0000)]
cast some votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@963424
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 12 Jul 2010 12:20:53 +0000 (12:20 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@963260
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 12 Jul 2010 09:57:51 +0000 (09:57 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@963233
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 12 Jul 2010 09:26:29 +0000 (09:26 +0000)]
Merge r785457 from trunk:
Fix bug in r785425 (dereference null pointer when not configured)
and add a couple of comments.
Submitted by: niq
Reviewed by: rpluem, niq, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@963220
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 12 Jul 2010 09:24:23 +0000 (09:24 +0000)]
* Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@963219
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 12 Jul 2010 08:08:05 +0000 (08:08 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@963205
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 12 Jul 2010 07:51:25 +0000 (07:51 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@963200
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 12 Jul 2010 07:04:07 +0000 (07:04 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@963196
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 12 Jul 2010 06:57:41 +0000 (06:57 +0000)]
Merge r955966 from trunk:
* Ensure that we only return a non fatal error if the request is idempotent
and if we did not sent any request body so far.
Submitted by: rpluem
Reviewed by: rpluem, trawick, niq
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@963195
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 12 Jul 2010 06:42:23 +0000 (06:42 +0000)]
* Remove stray '"' that was introduced in r962991 by accident and caused
the compiler to fail.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@963194
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 11 Jul 2010 14:52:10 +0000 (14:52 +0000)]
backport r951235 and r951237 from trunk:
*) mod_ldap: LDAP caching was suppressed (and ldap-status handler returns
title page only) when any mod_ldap directives were used in VirtualHost
context. [Eric Covener]
Reviewed By: covener, wrowe, trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@963086
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 11 Jul 2010 06:21:06 +0000 (06:21 +0000)]
mod_proxy: Tone down a warning message that appears when the same backend
website is reverse proxied two or more times into the frontend URL space.
PR: 48947
minfrin's patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@962992
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 11 Jul 2010 06:08:34 +0000 (06:08 +0000)]
Improve misleading error message.
PR 38322
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@962991
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 11 Jul 2010 05:58:13 +0000 (05:58 +0000)]
Backport FallbackResource directive.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@962989
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 11 Jul 2010 05:40:27 +0000 (05:40 +0000)]
vote, comment, query
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@962985
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 10 Jul 2010 22:29:16 +0000 (22:29 +0000)]
vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@962930
13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Wed, 7 Jul 2010 22:21:30 +0000 (22:21 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@961523
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 5 Jul 2010 19:59:13 +0000 (19:59 +0000)]
Undo accidental commit of code in r960674
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@960677
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 5 Jul 2010 19:51:56 +0000 (19:51 +0000)]
Yet another backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@960674
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 5 Jul 2010 19:08:50 +0000 (19:08 +0000)]
Backport proposal for enhancement PR 48377
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@960662
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Mon, 5 Jul 2010 03:09:03 +0000 (03:09 +0000)]
Propose trivial fix (sometimes CTR would be good ...)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@960426
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 3 Jul 2010 17:31:18 +0000 (17:31 +0000)]
Add backport proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@960242
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 30 Jun 2010 00:21:47 +0000 (00:21 +0000)]
This is claimed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@959151
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 27 Jun 2010 12:57:38 +0000 (12:57 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@958382
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 15 Jun 2010 17:40:03 +0000 (17:40 +0000)]
add more info to the entry for r527105 from the analogous entry
in trunk's CHANGES
(mod_ldap: Remove the hardcoded size limit parameter for ldap_search_ext
...)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@954978
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 11 Jun 2010 21:04:46 +0000 (21:04 +0000)]
This should wrap up our documentation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@953867
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 11 Jun 2010 09:10:29 +0000 (09:10 +0000)]
Merge r953377,r953385,r953418 from trunk:
mod_proxy_http, mod_proxy_ajp, mod_reqtimeout:
Use APR_STATUS_IS_TIMEUP instead of direct compare
to APR_TIMEUP to be more safe on different platforms.
Note: This commit has an additional, platform-independent change to
mod_proxy_http.c to mark the back-end connection for closing
("backend->close = 1;"). That code is not required to resolve
CVE-2010-2068 on any platform.
PR: 49417
Addresses CVE-2010-2068 (changes to mod_proxy_http.c)
Submitted by: rjung, rpluem
Reviewed by: rjung, rpluem, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@953616
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 11 Jun 2010 08:39:38 +0000 (08:39 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@953608
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 11 Jun 2010 05:32:22 +0000 (05:32 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@953559
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 10 Jun 2010 20:40:22 +0000 (20:40 +0000)]
Some votes and comments; mod_cache review is this weekend's project
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@953448
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 10 Jun 2010 19:34:38 +0000 (19:34 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@953426
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 8 Jun 2010 23:26:42 +0000 (23:26 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@952864
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 6 Jun 2010 19:33:02 +0000 (19:33 +0000)]
Fix typo.
PR: 49357
Submitted by: Matt Selsky <selsky columbia edu>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@951934
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 4 Jun 2010 15:36:57 +0000 (15:36 +0000)]
propose mod_ldap cache bug
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@951448
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 4 Jun 2010 00:28:46 +0000 (00:28 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@951225
13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Earl Poirier [Wed, 26 May 2010 11:28:42 +0000 (11:28 +0000)]
Fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@948398
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 24 May 2010 17:46:47 +0000 (17:46 +0000)]
hold up on prefork change that works around reslist issue
(and may hide other issues)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@947729
13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Thu, 20 May 2010 19:15:13 +0000 (19:15 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@946765
13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Thu, 20 May 2010 19:14:22 +0000 (19:14 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@946764
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 20 May 2010 18:55:40 +0000 (18:55 +0000)]
backport 946616 and 946617 from trunk:
PR49308: Header directive doesn't see CGI-issued headers because they live in err_headers.
emphasize request/response in the timing description, easy to miss the significance
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@946756
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 20 May 2010 14:50:38 +0000 (14:50 +0000)]
Daniel Ruggeri asked that we consider inclusion of the PR 48939
fix in 2.2.x, and he did so in the form of a patch to 2.2.x/STATUS.
Submitted by: Daniel Ruggeri <DRuggeri primary.net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@946652
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 19 May 2010 21:15:05 +0000 (21:15 +0000)]
Reviewed & backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@946402
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 19 May 2010 21:14:35 +0000 (21:14 +0000)]
Merge r417988 from trunk:
* modules/ssl/ssl_engine_init.c (ssl_init_ctx_cleanup_proxy): Unset
pkp->certs pointer after freeing the array; fixes segfault at startup
if the certs are shared across >1 server_rec.
PR: 39915
Submitted by: jorton
Reviewed by: minfrin, rjung, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@946401
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Thu, 13 May 2010 16:09:29 +0000 (16:09 +0000)]
fix broken patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@943926
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 13 May 2010 14:25:42 +0000 (14:25 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@943898
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 13 May 2010 14:24:54 +0000 (14:24 +0000)]
Vote, comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@943896
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 12 May 2010 20:19:59 +0000 (20:19 +0000)]
fix trunk revision to point to proper prefork MPM run-cleanups fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@943669
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 11 May 2010 11:09:35 +0000 (11:09 +0000)]
vote/promote htcacheclean enhancement
need to look at sf's entries more
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@943082
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 11 May 2010 10:41:09 +0000 (10:41 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@943077
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 10 May 2010 20:54:05 +0000 (20:54 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@942899
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 10 May 2010 20:22:44 +0000 (20:22 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@942891
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 10 May 2010 20:02:56 +0000 (20:02 +0000)]
Merge r932791 from trunk:
Update apxs for perl 5.12: Remove useless use of $[, which is now deprecated.
Submitted by: Roderich Schupp <roderich schupp googlemail com>
Reviewed by: sf, trawick, pgollucci
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@942882
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 10 May 2010 19:56:30 +0000 (19:56 +0000)]
Merge r921347, r921583 from trunk:
mod_proxy_http: log backend port in various places
PR: 48812
Submitted by: igalic
Reviewed by: sf, pgollucci, trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@942878
13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Fri, 7 May 2010 21:05:29 +0000 (21:05 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@942224
13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Fri, 7 May 2010 21:05:02 +0000 (21:05 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@942223
13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Fri, 7 May 2010 20:41:38 +0000 (20:41 +0000)]
- Backports r942209
ix the following:
$> grep -e autoindex_ -e cgi_ httpd.conf
LoadModule autoindex_module libexec/apache22/mod_autoindex.so
LoadModule cgi_module libexec/apache22/mod_cgi.so
fire up the following commands
$> apxs -e -a -n autoindex mod_autoindex.so
[activating module `autoindex' in /usr/local/etc/apache22/httpd.conf]
$> apxs -e -a -n cgi mod_cgi.so
[activating module `cgi' in /usr/local/etc/apache22/httpd.conf]
This will result into the following httpd.conf
$> grep -e autoindex_ -e cgi_ httpd.conf
LoadModule autoindex_module libexec/apache22/mod_autoindex.so
LoadModule cgi_module libexec/apache22/mod_cgi.so
LoadModule autoindex_module libexec/apache22/mod_autoindex.so
LoadModule cgi_module libexec/apache22/mod_cgi.so
As you notice the modules are now loaded twice
Now try to deactivate for the loaded ssl module
$> grep ssl_ httpd.conf
LoadModule ssl_module libexec/apache22/mod_ssl.so
$> apxs -e -A -n ssl mod_ssl.so
[preparing module `ssl' in /usr/local/etc/apache22/httpd.conf]
$> grep ssl_ httpd.conf
LoadModule ssl_module libexec/apache22/mod_ssl.so
#LoadModule ssl_module libexec/apache22/mod_ssl.so
As reported in FreeBSD ports PR: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/133704
Previously discussed with: wrowe@
This b/c '$lmd' expects the amount of space to be a fixed amount. Use \s+ to make
any valid httpd.conf syntax work (i.e. at least 1 space)
As previously discussed with wrowe, treast this the same way roy treats
mime.types.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@942210
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 6 May 2010 12:44:46 +0000 (12:44 +0000)]
vote+promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@941702
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 1 May 2010 11:03:28 +0000 (11:03 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@939974
13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Tue, 27 Apr 2010 05:38:58 +0000 (05:38 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@938328
13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Tue, 27 Apr 2010 05:38:21 +0000 (05:38 +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@938327
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 4 Apr 2010 20:16:42 +0000 (20:16 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@930745
13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Thu, 1 Apr 2010 20:35:30 +0000 (20:35 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@930082
13f79535 -47bb-0310-9956-
ffa450edef68
Stephen Henson [Thu, 1 Apr 2010 18:56:21 +0000 (18:56 +0000)]
vote on SSLFIPS and comment on PKCS#7.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@930064
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 29 Mar 2010 23:47:45 +0000 (23:47 +0000)]
Uploaded revised patch, and update the STATUS to reflect rpluem's patches.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@928942
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 29 Mar 2010 22:40:53 +0000 (22:40 +0000)]
Track this dialog under 'stalled'.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@928929
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 29 Mar 2010 22:38:41 +0000 (22:38 +0000)]
Revert vetoed backport r925858 and related docs commits.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@928928
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 29 Mar 2010 22:37:58 +0000 (22:37 +0000)]
Revert vetoed backport r925858 and related docs commits.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@928927
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Mar 2010 16:46:28 +0000 (16:46 +0000)]
Comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@928226
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 22 Mar 2010 09:00:49 +0000 (09:00 +0000)]
Reflect changes for UNSET/BOOL logic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@926005
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 22 Mar 2010 06:57:34 +0000 (06:57 +0000)]
Revert premature commit, sorry. It's time to stop using -m :/
Of course r925983 is one more way to review this patch,
if you like.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@925984
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 22 Mar 2010 06:55:15 +0000 (06:55 +0000)]
pick a number, 1 to 1m
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@925983
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 22 Mar 2010 06:54:08 +0000 (06:54 +0000)]
Propose SSLFIPS for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@925981
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 21 Mar 2010 19:42:19 +0000 (19:42 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@925873
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 21 Mar 2010 18:41:20 +0000 (18:41 +0000)]
Update tranformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@925859
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 21 Mar 2010 18:36:59 +0000 (18:36 +0000)]
core: Support wildcards in both the directory and file components of
the path specified by the Include directive.
Submitted by: minfrin, poirier
Reviewed by: minfrin, jim, poirier
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@925858
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 21 Mar 2010 18:27:12 +0000 (18:27 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@925855
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 21 Mar 2010 18:20:03 +0000 (18:20 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@925851
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 20 Mar 2010 00:50:40 +0000 (00:50 +0000)]
Propose a backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@925507
13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Earl Poirier [Fri, 19 Mar 2010 13:45:41 +0000 (13:45 +0000)]
Vote to backport fix for wildcards in Include directives
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@925215
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 16 Mar 2010 20:21:13 +0000 (20:21 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@923964
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 16 Mar 2010 13:38:12 +0000 (13:38 +0000)]
update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@923739
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 16 Mar 2010 13:37:48 +0000 (13:37 +0000)]
merge r923735 from trunk:
note that CacheLock is available in 2.2.15 or later
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@923738
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 15 Mar 2010 16:02:10 +0000 (16:02 +0000)]
Correct referenced OpenSSL version.
Backport of r923313.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@923314
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 13 Mar 2010 14:10:52 +0000 (14:10 +0000)]
fix apr_pstrcat() call in config-time error path
Reviewed by: jim, sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@922574
13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 13 Mar 2010 08:45:30 +0000 (08:45 +0000)]
vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@922505
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 11 Mar 2010 14:44:35 +0000 (14:44 +0000)]
looks and tests good ;)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@921875
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 8 Mar 2010 17:14:13 +0000 (17:14 +0000)]
add defaults to synopsis for AuthLDAPGroupAttribute
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@920409
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 7 Mar 2010 12:36:30 +0000 (12:36 +0000)]
backport updated T= per-directory caveat for PR 36590
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@919978
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 6 Mar 2010 20:07:50 +0000 (20:07 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@919837
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sat, 6 Mar 2010 20:04:47 +0000 (20:04 +0000)]
bump version
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@919836
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 6 Mar 2010 01:59:07 +0000 (01:59 +0000)]
Drop a BOM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@919689
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 6 Mar 2010 01:45:37 +0000 (01:45 +0000)]
A quiet peanut gallery today, clarify what changed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@919686
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 5 Mar 2010 22:19:35 +0000 (22:19 +0000)]
%k available in 2.2.11 and later
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@919647
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Wed, 3 Mar 2010 18:55:46 +0000 (18:55 +0000)]
Added missing bits for NetWare from mod_reqtimeout backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@918626
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 3 Mar 2010 13:51:15 +0000 (13:51 +0000)]
Formatting, spelling, and name fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@918471
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 3 Mar 2010 11:48:24 +0000 (11:48 +0000)]
reflect assignment of CVE-2010-0434
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@918427
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 2 Mar 2010 12:01:12 +0000 (12:01 +0000)]
gcc told me about this old bug while compiling 2.2.15 slightly differently
than my usual method
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@917985
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 2 Mar 2010 04:59:31 +0000 (04:59 +0000)]
And we are at 2.2.16-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@917881
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 2 Mar 2010 04:55:45 +0000 (04:55 +0000)]
Done with 2.2.15, prepared to tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@917879
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 2 Mar 2010 04:47:28 +0000 (04:47 +0000)]
SECURITY: CVE-2010-0408 (cve.mitre.org)
mod_proxy_ajp: Respond with HTTP_BAD_REQUEST when the body is not sent after
request headers indicate a request body is incoming; this is not a case of
HTTP_INTERNAL_SERVER_ERROR.
Submitted by: Niku Toivola <niku.toivola sulake.com>
Reviewed by: rpluem, jim, wrowe
Backports: r917875
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@917876
13f79535 -47bb-0310-9956-
ffa450edef68
projects / thirdparty / apache / httpd.git / log
