]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
18 years agoAdd extra explanatory clause to VirtualHost docs
Nick Kew [Sun, 24 Sep 2006 22:29:59 +0000 (22:29 +0000)] 
Add extra explanatory clause to VirtualHost docs

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@449514 13f79535-47bb-0310-9956-ffa450edef68

18 years agoThis patch is required for 2.2.4...
Jim Jagielski [Sat, 16 Sep 2006 18:44:35 +0000 (18:44 +0000)] 
This patch is required for 2.2.4...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@446915 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Cast a vote
Ruediger Pluem [Fri, 15 Sep 2006 21:23:04 +0000 (21:23 +0000)] 
* Cast a vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@446740 13f79535-47bb-0310-9956-ffa450edef68

18 years agomerge from trunk (but preserve ap_get_server_version()):
Jeff Trawick [Fri, 15 Sep 2006 13:19:25 +0000 (13:19 +0000)] 
merge from trunk (but preserve ap_get_server_version()):

  *) The full server version information is now included in the error log at
     startup as well as server status reports, irrespective of the setting
     of the ServerTokens directive.  ap_get_server_version() is now
     deprecated, and is replaced by ap_get_server_banner() and
     ap_get_server_description().

Reviewed by: rpluem, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@446606 13f79535-47bb-0310-9956-ffa450edef68

18 years agoYep. I agree!
Jim Jagielski [Thu, 14 Sep 2006 23:16:19 +0000 (23:16 +0000)] 
Yep. I agree!

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@443515 13f79535-47bb-0310-9956-ffa450edef68

18 years agoBugfix backport
Jim Jagielski [Thu, 14 Sep 2006 23:15:14 +0000 (23:15 +0000)] 
Bugfix backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@443514 13f79535-47bb-0310-9956-ffa450edef68

18 years agoPropose backport for cool feature
Nick Kew [Wed, 13 Sep 2006 19:59:15 +0000 (19:59 +0000)] 
Propose backport for cool feature

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@443102 13f79535-47bb-0310-9956-ffa450edef68

18 years agoPropose backporting bugfix
Nick Kew [Wed, 13 Sep 2006 19:45:30 +0000 (19:45 +0000)] 
Propose backporting bugfix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@443095 13f79535-47bb-0310-9956-ffa450edef68

18 years agobackport build changes to link htcacheclean and httxt2dbm
Jeff Trawick [Sun, 10 Sep 2006 12:45:25 +0000 (12:45 +0000)] 
backport build changes to link htcacheclean and httxt2dbm
statically with apr[-util]??

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@441948 13f79535-47bb-0310-9956-ffa450edef68

18 years agoMerge r427172 from trunk:
Jim Jagielski [Wed, 6 Sep 2006 17:35:51 +0000 (17:35 +0000)] 
Merge r427172 from trunk:

Add in a very simple balancer "set" concept, which allows
for members to be assigned to a particular cluster set
such that members in lower-numbered sets are checked/used
before those in higher ones.

Also bundled in this are some HTML cleanups for the balancer
manager UI. Sorry for the mixins :)

Compiles/builds clean: passes test framework as well
as more normal usage tests ;)

Reviewed by: jim
Merge r427368, r428352, r428361, r432352 from trunk:

Reset standby flags for each loop through the cluster sets

Initialization change. Move to a different format
to force resets as well as a common technique, in case
_route is updated at some point.

Update docs for proxy:

  1. Put params in abc order
  2. Add hot-standby example
  3. Add in new features that hadn't been documented yet (lbset, ...)

Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@440800 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Move accepted patches up
Ruediger Pluem [Wed, 6 Sep 2006 17:19:33 +0000 (17:19 +0000)] 
* Move accepted patches up

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@440798 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Cast a vote
Ruediger Pluem [Wed, 6 Sep 2006 17:17:33 +0000 (17:17 +0000)] 
* Cast a vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@440797 13f79535-47bb-0310-9956-ffa450edef68

18 years agoNote location of unified patch
Jim Jagielski [Wed, 6 Sep 2006 17:05:31 +0000 (17:05 +0000)] 
Note location of unified patch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@440796 13f79535-47bb-0310-9956-ffa450edef68

18 years agoCast quick vote.
Jim Jagielski [Wed, 6 Sep 2006 12:32:27 +0000 (12:32 +0000)] 
Cast quick vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@440701 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Cast a vote
Ruediger Pluem [Wed, 6 Sep 2006 11:59:35 +0000 (11:59 +0000)] 
* Cast a vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@440696 13f79535-47bb-0310-9956-ffa450edef68

18 years agopoint to new server version patch, with fixes for screw-ups
Jeff Trawick [Wed, 6 Sep 2006 11:43:53 +0000 (11:43 +0000)] 
point to new server version patch, with fixes for screw-ups
pointed out by Ruediger

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@440695 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Propose fix for PR40400 for backport
Ruediger Pluem [Wed, 6 Sep 2006 07:31:51 +0000 (07:31 +0000)] 
* Propose fix for PR40400 for backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@440643 13f79535-47bb-0310-9956-ffa450edef68

18 years agopropose a concrete patch for backporting ap_get_server_version()
Jeff Trawick [Wed, 6 Sep 2006 05:58:14 +0000 (05:58 +0000)] 
propose a concrete patch for backporting ap_get_server_version()
changes to 2.2.x without breaking existing modules

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@440624 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Cast a vote
Ruediger Pluem [Mon, 4 Sep 2006 19:59:34 +0000 (19:59 +0000)] 
* Cast a vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@440163 13f79535-47bb-0310-9956-ffa450edef68

18 years agopropose backport of simple mod_ext_filter fix
Jeff Trawick [Mon, 4 Sep 2006 11:12:57 +0000 (11:12 +0000)] 
propose backport of simple mod_ext_filter fix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@440029 13f79535-47bb-0310-9956-ffa450edef68

18 years ago Backport simplest change to silence VC 2005 'posix errors'.
William A. Rowe Jr [Sun, 3 Sep 2006 23:56:46 +0000 (23:56 +0000)] 
  Backport simplest change to silence VC 2005 'posix errors'.

Backports: 439639

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@439878 13f79535-47bb-0310-9956-ffa450edef68

18 years ago Add more ignores when building under VC 2005, we create these
William A. Rowe Jr [Sun, 3 Sep 2006 23:03:05 +0000 (23:03 +0000)] 
  Add more ignores when building under VC 2005, we create these
  binaries which have a corresponding .manifest to invoke them.

Backport: 439870

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@439871 13f79535-47bb-0310-9956-ffa450edef68

18 years agoremove backported patch
Jim Jagielski [Wed, 30 Aug 2006 17:52:53 +0000 (17:52 +0000)] 
remove backported patch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@438565 13f79535-47bb-0310-9956-ffa450edef68

18 years agoMerge r421287 from trunk:
Jim Jagielski [Wed, 30 Aug 2006 17:51:43 +0000 (17:51 +0000)] 
Merge r421287 from trunk:

The number of times elected as well as the i/o
of the workers is useful info to show in the
manager.

Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@438564 13f79535-47bb-0310-9956-ffa450edef68

18 years agoMerge r420936, r420954, r420986, r421283 from trunk:
Jim Jagielski [Wed, 30 Aug 2006 17:50:47 +0000 (17:50 +0000)] 
Merge r420936, r420954, r420986, r421283 from trunk:

Restructure the find_route_worker() function. Basically,
it should take care of knowing about usable and unusable
workers. By centralizing this logic, it will make it
easier and more streamlined to add in the forthcoming
hot-standby status workers.

Clean up some proxy macros. Avoid the use of magic
numbers, and instead use pre-defined defines. Also,
ensure that usable workers have been initialized :)

Allocate a bit for hot standbys. Adjust so that
normal "usable" workers don't count these.

Add in hot-standby balancer member. If all other members
are disabled or not-usable, ONLY THEN will the hot
standby's be used.

Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@438563 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Vote and promote
Ruediger Pluem [Tue, 29 Aug 2006 20:29:09 +0000 (20:29 +0000)] 
* Vote and promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@438196 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Add comment
Ruediger Pluem [Tue, 29 Aug 2006 20:28:04 +0000 (20:28 +0000)] 
* Add comment

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@438194 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAdd in combined patch - dependent on one's patch being
Jim Jagielski [Tue, 29 Aug 2006 01:58:45 +0000 (01:58 +0000)] 
Add in combined patch - dependent on one's patch being
smart enough to create modules/proxy/ajp_utils.c

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437909 13f79535-47bb-0310-9956-ffa450edef68

18 years agoWorking on combined patch... just need to find out how to get 'svn diff'
Jim Jagielski [Tue, 29 Aug 2006 01:35:58 +0000 (01:35 +0000)] 
Working on combined patch... just need to find out how to get 'svn diff'
to "create" a new file...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437903 13f79535-47bb-0310-9956-ffa450edef68

18 years agoRefer to combined diff patch obtained via svn.merge and
Jim Jagielski [Tue, 29 Aug 2006 01:06:17 +0000 (01:06 +0000)] 
Refer to combined diff patch obtained via svn.merge and
that uses "working copy" instead of Arbeitskopie (more
up-to-date)

Remove rpluem's vote to allow him to revote with revised info.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437895 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAdd in the 2 pre-dependent commits and refer to full large diffset.
Jim Jagielski [Tue, 29 Aug 2006 00:44:18 +0000 (00:44 +0000)] 
Add in the 2 pre-dependent commits and refer to full large diffset.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437891 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Add comments to proposal
Ruediger Pluem [Mon, 28 Aug 2006 21:10:25 +0000 (21:10 +0000)] 
* Add comments to proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437839 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Vote and move
Ruediger Pluem [Mon, 28 Aug 2006 20:34:22 +0000 (20:34 +0000)] 
* Vote and move

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437818 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Add comment to proposal
Ruediger Pluem [Mon, 28 Aug 2006 20:22:14 +0000 (20:22 +0000)] 
* Add comment to proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437811 13f79535-47bb-0310-9956-ffa450edef68

18 years agoMerge r437768 from trunk:
Jim Jagielski [Mon, 28 Aug 2006 18:57:09 +0000 (18:57 +0000)] 
Merge r437768 from trunk:

Minor nit: why make the logic more complex than it needs to
be ? :)

Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437781 13f79535-47bb-0310-9956-ffa450edef68

18 years agoupdate transformation
AndrĂ© Malo [Mon, 28 Aug 2006 18:46:42 +0000 (18:46 +0000)] 
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437775 13f79535-47bb-0310-9956-ffa450edef68

18 years agoMerge r434483 from trunk:
Jim Jagielski [Mon, 28 Aug 2006 16:34:40 +0000 (16:34 +0000)] 
Merge r434483 from trunk:

* Close connection to backend if reading of request body fails.

PR: 40310
Submitted by: Ian Abel <ianabel mxtelecom.com>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437748 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAnd remove backported info
Jim Jagielski [Mon, 28 Aug 2006 16:32:41 +0000 (16:32 +0000)] 
And remove backported info

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437747 13f79535-47bb-0310-9956-ffa450edef68

18 years agoMerge r417443 from trunk:
Jim Jagielski [Mon, 28 Aug 2006 16:32:09 +0000 (16:32 +0000)] 
Merge r417443 from trunk:

* Retry worker chosen by client supplied route / redirect worker if it
  is in error state before sending "Service Temporarily Unavailable".

PR: 38962
Submitted by: Christian Boitel <cboitel lfdj.com>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437745 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAnd move up those with at least 3 +1s
Jim Jagielski [Mon, 28 Aug 2006 16:28:30 +0000 (16:28 +0000)] 
And move up those with at least 3 +1s

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437744 13f79535-47bb-0310-9956-ffa450edef68

18 years agoYeppers. Looks good on 2.2
Jim Jagielski [Mon, 28 Aug 2006 16:27:33 +0000 (16:27 +0000)] 
Yeppers. Looks good on 2.2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437743 13f79535-47bb-0310-9956-ffa450edef68

18 years agoPropose mpm_winnt fix for handling the return
Mladen Turk [Mon, 28 Aug 2006 16:20:14 +0000 (16:20 +0000)] 
Propose mpm_winnt fix for handling the return
values from wait_for_many_objects.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437740 13f79535-47bb-0310-9956-ffa450edef68

18 years agoSome votes.
Mladen Turk [Mon, 28 Aug 2006 16:14:48 +0000 (16:14 +0000)] 
Some votes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437737 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAdd in the cping/cpong backport... will vote in a bit, but didn't
Jim Jagielski [Mon, 28 Aug 2006 16:07:25 +0000 (16:07 +0000)] 
Add in the cping/cpong backport... will vote in a bit, but didn't
want to forget this.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437733 13f79535-47bb-0310-9956-ffa450edef68

18 years agoSome votes
Jim Jagielski [Mon, 28 Aug 2006 12:43:02 +0000 (12:43 +0000)] 
Some votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437690 13f79535-47bb-0310-9956-ffa450edef68

18 years agoPropose load balancer enhancements from trunk for backport.
Jim Jagielski [Mon, 28 Aug 2006 12:41:05 +0000 (12:41 +0000)] 
Propose load balancer enhancements from trunk for backport.
These are:

   o Hot Standby
   o Cluster set
   o balancer_manager additional info
   o docs updates for above

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437689 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Fix broken links in proposal
Ruediger Pluem [Mon, 28 Aug 2006 11:55:46 +0000 (11:55 +0000)] 
* Fix broken links in proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437679 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Propose rework of mod_deflate's inflate and deflate output filter for
Ruediger Pluem [Mon, 28 Aug 2006 11:52:06 +0000 (11:52 +0000)] 
* Propose rework of mod_deflate's inflate and deflate output filter for
  backport. This fixes PR 39854. Also remove previous backport proposal for
  fixing PR 39854 and restart voting. The patch for the previous backport
  proposal is contained inside this proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437674 13f79535-47bb-0310-9956-ffa450edef68

18 years agoBackport README change
Sander Temme [Sun, 27 Aug 2006 17:28:23 +0000 (17:28 +0000)] 
Backport README change

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437417 13f79535-47bb-0310-9956-ffa450edef68

18 years agoCast some votes
Sander Temme [Sun, 27 Aug 2006 16:48:27 +0000 (16:48 +0000)] 
Cast some votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@437407 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Add proposal to fix PR: 40310
Ruediger Pluem [Thu, 24 Aug 2006 20:00:39 +0000 (20:00 +0000)] 
* Add proposal to fix PR: 40310

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@434488 13f79535-47bb-0310-9956-ffa450edef68

18 years ago* Cast one vote and add a proposal
Ruediger Pluem [Wed, 23 Aug 2006 19:34:10 +0000 (19:34 +0000)] 
* Cast one vote and add a proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@434133 13f79535-47bb-0310-9956-ffa450edef68

18 years agoFix contributed by Bjarne D Mathiesen <macintosh@mathiesen.info>
Noirin Plunkett [Wed, 23 Aug 2006 16:29:44 +0000 (16:29 +0000)] 
Fix contributed by  Bjarne D Mathiesen <macintosh@mathiesen.info>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@434073 13f79535-47bb-0310-9956-ffa450edef68

18 years agoAdd a backport, approve another, vote and note on others...
Justin Erenkrantz [Wed, 23 Aug 2006 08:01:37 +0000 (08:01 +0000)] 
Add a backport, approve another, vote and note on others...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@433970 13f79535-47bb-0310-9956-ffa450edef68

18 years agoBackport:
Joshua Slive [Sun, 20 Aug 2006 19:46:55 +0000 (19:46 +0000)] 
Backport:
My last effort was a little too succinct and not quite precise
enough.  Try being more explicit.

This does leave the danger that people will clip the <Location>
example as the proper way to do things, when they should be
reading on to the <Directory> example.  The <Location> example
is only correct when used in conjunction with Alias.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@433022 13f79535-47bb-0310-9956-ffa450edef68

18 years agoBackport case sensitivity note for windows.
Joshua Slive [Sun, 20 Aug 2006 18:49:30 +0000 (18:49 +0000)] 
Backport case sensitivity note for windows.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@433007 13f79535-47bb-0310-9956-ffa450edef68

18 years agoBackport:
Joshua Slive [Sun, 20 Aug 2006 18:11:40 +0000 (18:11 +0000)] 
Backport:
Make it clear that url-path is always case-sensitive.
Provide an example of using a regex to make it case-insensitive.
Make it clear that ScriptAlias is only used when you want
BOTH mapping and script-designation.

Partially in response to the disputed vulnerability:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-4110

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@432998 13f79535-47bb-0310-9956-ffa450edef68

18 years agoupdate convmap
AndrĂ© Malo [Fri, 18 Aug 2006 22:10:56 +0000 (22:10 +0000)] 
update convmap

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@432745 13f79535-47bb-0310-9956-ffa450edef68

18 years agofix messed up paths. How did that happen?
AndrĂ© Malo [Thu, 17 Aug 2006 19:38:58 +0000 (19:38 +0000)] 
fix messed up paths. How did that happen?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@432357 13f79535-47bb-0310-9956-ffa450edef68

18 years agoUpdate manual transformations
Jim Jagielski [Thu, 17 Aug 2006 19:27:30 +0000 (19:27 +0000)] 
Update manual transformations

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@432354 13f79535-47bb-0310-9956-ffa450edef68

18 years agoUpdate the proxy module docs to reflect current reality.
Jim Jagielski [Thu, 17 Aug 2006 19:19:22 +0000 (19:19 +0000)] 
Update the proxy module docs to reflect current reality.
Add in the flush settings, which are part of 2.2.x and
reorder params to be in abc order (to make 'em easier
to find)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@432350 13f79535-47bb-0310-9956-ffa450edef68

19 years ago Sync to httpd/trunk where we've reverted the /d "LONG_NAME=foo bar" syntax,
William A. Rowe Jr [Sat, 5 Aug 2006 20:19:08 +0000 (20:19 +0000)] 
  Sync to httpd/trunk where we've reverted the /d "LONG_NAME=foo bar" syntax,
  which confuses the ability of MS VS 6 to export makefiles.

  Also syncs the fix to some debug/release targets observed by hunter.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@429039 13f79535-47bb-0310-9956-ffa450edef68

19 years agoVote on the PCRE backport; While it is 3rd party software, we must take responsibilit...
Paul Querna [Fri, 4 Aug 2006 05:49:38 +0000 (05:49 +0000)] 
Vote on the PCRE backport; While it is 3rd party software, we must take responsibility for it when we are distributing it. The choice to not include it should be discussed on dev@httpd, or voted on separately.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@428633 13f79535-47bb-0310-9956-ffa450edef68

19 years ago2.2.3 was released.
Paul Querna [Fri, 4 Aug 2006 05:44:10 +0000 (05:44 +0000)] 
2.2.3 was released.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@428632 13f79535-47bb-0310-9956-ffa450edef68

19 years agoAdd PKCS#7 backport.
Ben Laurie [Mon, 31 Jul 2006 17:33:12 +0000 (17:33 +0000)] 
Add PKCS#7 backport.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@427179 13f79535-47bb-0310-9956-ffa450edef68

19 years ago Bump after tag 2.2.3
William A. Rowe Jr [Thu, 27 Jul 2006 17:21:39 +0000 (17:21 +0000)] 
  Bump after tag 2.2.3

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@426152 13f79535-47bb-0310-9956-ffa450edef68

19 years ago Prepare to tag
William A. Rowe Jr [Thu, 27 Jul 2006 17:16:46 +0000 (17:16 +0000)] 
  Prepare to tag

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@426150 13f79535-47bb-0310-9956-ffa450edef68

19 years ago Last quick observation
William A. Rowe Jr [Thu, 27 Jul 2006 17:11:39 +0000 (17:11 +0000)] 
  Last quick observation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@426147 13f79535-47bb-0310-9956-ffa450edef68

19 years ago Wrong project name
William A. Rowe Jr [Thu, 27 Jul 2006 17:06:27 +0000 (17:06 +0000)] 
  Wrong project name

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@426143 13f79535-47bb-0310-9956-ffa450edef68

19 years agoSECURITY: CVE-2006-3747 (cve.mitre.org)
Mark J. Cox [Thu, 27 Jul 2006 17:05:41 +0000 (17:05 +0000)] 
SECURITY: CVE-2006-3747 (cve.mitre.org)
mod_rewrite: Fix an off-by-one security problem in the ldap scheme
handling.  For some RewriteRules this could lead to a pointer being
written out of bounds.  Reported by Mark Dowd of McAfee.

Ack: trawick, lars, jorton, wrowe, benl

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@426141 13f79535-47bb-0310-9956-ffa450edef68

19 years ago Changes from trunk noted by Mladen, fix %~na typo and activate our
William A. Rowe Jr [Thu, 27 Jul 2006 16:49:09 +0000 (16:49 +0000)] 
  Changes from trunk noted by Mladen, fix %~na typo and activate our
  config rewriting; and copy a NOTICE

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@426133 13f79535-47bb-0310-9956-ffa450edef68

19 years ago Jeff's dead on - a diff is needed
William A. Rowe Jr [Wed, 26 Jul 2006 22:54:56 +0000 (22:54 +0000)] 
  Jeff's dead on - a diff is needed

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@425897 13f79535-47bb-0310-9956-ffa450edef68

19 years agoMerge r425210 from trunk:
Ruediger Pluem [Wed, 26 Jul 2006 14:20:48 +0000 (14:20 +0000)] 
Merge r425210 from trunk:

* Add a check to make sure that the base provider and the alias names are
  different and also that the alias has not been registered before.

PR: 40051
Submitted by: bnicholes
Reviewed by: bnicholes, rpluem, fielding

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@425740 13f79535-47bb-0310-9956-ffa450edef68

19 years agoMerge r411306 from trunk:
Ruediger Pluem [Wed, 26 Jul 2006 13:31:38 +0000 (13:31 +0000)] 
Merge r411306 from trunk:

* Fix a problem with invalid auth error detection for LDAP client SDKs that don't
  support the LDAP_SECURITY_ERROR macro.

PR: 39529
Submitted by: Ray Price <dohrayme yahoo.com>, Josh Fenlason <jfenlason ptc.com>
Reviewed by: bnicholes, wrowe, fielding

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@425731 13f79535-47bb-0310-9956-ffa450edef68

19 years agoMerge r410370 from trunk:
Ruediger Pluem [Wed, 26 Jul 2006 13:04:27 +0000 (13:04 +0000)] 
Merge r410370 from trunk:

* Keep the Content-Type for successfully revalidated
  cached objects, by unsetting possible Content-Type headers in
  r->headers_out and r->err_headers_out as they may be different to what
  we have received from the cache.
  Actually they are not needed as r->content_type set by
  ap_set_content_type a few lines above will be used in the store_headers
  functions of the storage providers as a fallback and the HTTP_HEADER filter
  does overwrite the Content-Type header with r->content_type anyway.

PR: 39647
Submitted by: rpluem
Reviewed by: rpluem, pquerna, fielding

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@425725 13f79535-47bb-0310-9956-ffa450edef68

19 years agoCast a baleful eye over proposal to ship hacked third-party package
Nick Kew [Wed, 26 Jul 2006 08:40:24 +0000 (08:40 +0000)] 
Cast a baleful eye over proposal to ship hacked third-party package

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@425677 13f79535-47bb-0310-9956-ffa450edef68

19 years agoBackport mod_speling enhancement
Nick Kew [Wed, 26 Jul 2006 08:18:53 +0000 (08:18 +0000)] 
Backport mod_speling enhancement

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@425670 13f79535-47bb-0310-9956-ffa450edef68

19 years agoPromote patches with 3 votes (hey, should've done that before backport:-)
Nick Kew [Wed, 26 Jul 2006 08:10:01 +0000 (08:10 +0000)] 
Promote patches with 3 votes (hey, should've done that before backport:-)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@425664 13f79535-47bb-0310-9956-ffa450edef68

19 years agoBackport DBD fixes
Nick Kew [Wed, 26 Jul 2006 08:00:23 +0000 (08:00 +0000)] 
Backport DBD fixes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@425659 13f79535-47bb-0310-9956-ffa450edef68

19 years agonot a very good vacation
Roy T. Fielding [Wed, 26 Jul 2006 00:00:15 +0000 (00:00 +0000)] 
not a very good vacation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@425561 13f79535-47bb-0310-9956-ffa450edef68

19 years ago* Cast some votes.
Ruediger Pluem [Tue, 25 Jul 2006 06:26:44 +0000 (06:26 +0000)] 
* Cast some votes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@425304 13f79535-47bb-0310-9956-ffa450edef68

19 years agopropose a backport
Bradley Nicholes [Mon, 24 Jul 2006 22:43:46 +0000 (22:43 +0000)] 
propose a backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@425211 13f79535-47bb-0310-9956-ffa450edef68

19 years agoScriptSock has been global-only for a couple of years
Jeff Trawick [Mon, 24 Jul 2006 17:36:17 +0000 (17:36 +0000)] 
ScriptSock has been global-only for a couple of years
now; fix the docs

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@425131 13f79535-47bb-0310-9956-ffa450edef68

19 years agoPropose a small backport.
Sander Temme [Mon, 24 Jul 2006 15:18:05 +0000 (15:18 +0000)] 
Propose a small backport.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@425086 13f79535-47bb-0310-9956-ffa450edef68

19 years agoMerge r399947, r406697 from trunk:
Ruediger Pluem [Mon, 24 Jul 2006 13:34:19 +0000 (13:34 +0000)] 
Merge r399947, r406697 from trunk:

* Add optional 'scheme://' prefix to ServerName directive.  For
  'https', mod_http returns "https" for the ap_hook_http_scheme and
  DEFAULT_HTTPS_PORT for ap_hook_default_port.  This fixes Redirect
  responses to requests for directories without a trailing slash
  when httpd runs behind a proxy or offload device that processes
  SSL.  It also enables support for Subversion in that
  configuration.  This change is completely backwards compatible
  and passes the perl-framework.  Minor mmn bump because I add a
  field to server_rec.

* Document r399947, addition of optional scheme:// to ServerName directive

PR: 33398
Submitted by: sctemme
Reviewed by: sctemme, rpluem, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@425051 13f79535-47bb-0310-9956-ffa450edef68

19 years agoMerge r407357, r408154, r408729 from trunk:
Ruediger Pluem [Mon, 24 Jul 2006 13:05:19 +0000 (13:05 +0000)] 
Merge r407357, r408154, r408729 from trunk:

* Handle the cases "no proxy request" and "reverse proxy request" in the same
  manner, when setting scheme and port_str. This is needed because if a cached
  entry is looked up by mod_cache's quick handler r->proxyreq
  is still unset in the reverse proxy case as it only gets set in the
  translate name hook (either by ProxyPass or mod_rewrite) which is run
  after the quick handler hook. This is different to the forward proxy
  case where it gets set before the quick handler is run (in the
  post_read_request hook).
  If a cache entry is created by the CACHE_SAVE filter we always have
  r->proxyreq set correctly.
  Also set scheme to ap_http_scheme(r) instead of "http" to handle SSL
  correctly.

* Fix const compiler warning introduced by r407357.
Noticed by: Joe Orton

* Cleanup the code by replacing some inline code to lower-case a string with
  ap_str_tolower.
Proposed by: Joe Orton

PR: 39593
Submitted by: rpluem
Reviewed by: rpluem, jim, pquerna

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@425035 13f79535-47bb-0310-9956-ffa450edef68

19 years agoPropose backport for DBD configuration segfault fix.
Nick Kew [Mon, 24 Jul 2006 09:58:06 +0000 (09:58 +0000)] 
Propose backport for DBD configuration segfault fix.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@424987 13f79535-47bb-0310-9956-ffa450edef68

19 years agomerge from trunk:
Jeff Trawick [Mon, 24 Jul 2006 01:43:24 +0000 (01:43 +0000)] 
merge from trunk:

  Worker MPM: On graceless shutdown or restart, send signals to
  each worker thread to wake them up if they're polling on a
  Keep-Alive connection.  PR 38737.  [Chris Darroch]

PR: 38737
Reviewed by: chrisd, trawick, niq

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@424876 13f79535-47bb-0310-9956-ffa450edef68

19 years agomerge from trunk:
Jeff Trawick [Mon, 24 Jul 2006 01:34:58 +0000 (01:34 +0000)] 
merge from trunk:

  worker and event MPMs: fix excessive forking if fork() or child_init
  take a long time.

PR: 39275
Reviewed by: trawick, gregames, pquerna

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@424874 13f79535-47bb-0310-9956-ffa450edef68

19 years agoVote.
Paul Querna [Sun, 23 Jul 2006 21:01:18 +0000 (21:01 +0000)] 
Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@424818 13f79535-47bb-0310-9956-ffa450edef68

19 years agoReverse PKCS#7 patch.
Ben Laurie [Sun, 23 Jul 2006 11:11:58 +0000 (11:11 +0000)] 
Reverse PKCS#7 patch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@424711 13f79535-47bb-0310-9956-ffa450edef68

19 years agoBackported.
Joe Orton [Sun, 23 Jul 2006 09:11:50 +0000 (09:11 +0000)] 
Backported.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@424694 13f79535-47bb-0310-9956-ffa450edef68

19 years agoMerge r395211, r410828 from trunk:
Joe Orton [Sun, 23 Jul 2006 09:11:29 +0000 (09:11 +0000)] 
Merge r395211, r410828 from trunk:

* configure.in: Add --with-included-apr flag to force use of the
bundled copies of APR and APR-util.

* configure.in: Use common variables for the required APR/APR-util
version.

Reviewed by: jorton, rpluem, pquerna

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@424693 13f79535-47bb-0310-9956-ffa450edef68

19 years agoAdd PKCS#7 support.
Ben Laurie [Sat, 22 Jul 2006 14:27:43 +0000 (14:27 +0000)] 
Add PKCS#7 support.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@424584 13f79535-47bb-0310-9956-ffa450edef68

19 years agovote for a backport
Greg Ames [Fri, 21 Jul 2006 15:18:18 +0000 (15:18 +0000)] 
vote for a backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@424357 13f79535-47bb-0310-9956-ffa450edef68

19 years agono more forkamatic?
Jeff Trawick [Fri, 21 Jul 2006 12:03:33 +0000 (12:03 +0000)] 
no more forkamatic?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@424277 13f79535-47bb-0310-9956-ffa450edef68

19 years agoupdate revision references
AndrĂ© Malo [Wed, 12 Jul 2006 05:54:25 +0000 (05:54 +0000)] 
update revision references

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@421144 13f79535-47bb-0310-9956-ffa450edef68

19 years agoupdate according to board resolution
Roy T. Fielding [Wed, 12 Jul 2006 05:12:56 +0000 (05:12 +0000)] 
update according to board resolution

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@421126 13f79535-47bb-0310-9956-ffa450edef68

19 years agoupdate collective copyright notice in manual
Roy T. Fielding [Wed, 12 Jul 2006 03:55:27 +0000 (03:55 +0000)] 
update collective copyright notice in manual

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@421105 13f79535-47bb-0310-9956-ffa450edef68

19 years agoupdate license header text
Roy T. Fielding [Wed, 12 Jul 2006 03:38:44 +0000 (03:38 +0000)] 
update license header text

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@421103 13f79535-47bb-0310-9956-ffa450edef68