git.ipfire.org Git - thirdparty/apache/httpd.git/log

]> git.ipfire.org Git - thirdparty/apache/httpd.git/log

projects / thirdparty / apache / httpd.git / log

Jim Jagielski [Tue, 1 May 2007 13:20:59 +0000 (13:20 +0000)]

Approved backport

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

commit | commitdiff | tree

Jim Jagielski [Tue, 1 May 2007 13:17:30 +0000 (13:17 +0000)]

Applied backport

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

commit | commitdiff | tree

Jim Jagielski [Tue, 1 May 2007 13:16:58 +0000 (13:16 +0000)]

Approved backport:

    * mod_ssl: Move thread locking upcall initialization before
      hardware library initialization, so hardware library can use
      these upcalls when run in a threaded MPM. Fixes PR 20951.

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

commit | commitdiff | tree

Jim Jagielski [Tue, 1 May 2007 13:13:34 +0000 (13:13 +0000)]

Update STATUS for applied patch

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

commit | commitdiff | tree

Jim Jagielski [Tue, 1 May 2007 13:12:59 +0000 (13:12 +0000)]

Backports:

Correct behavior of HTTP request headers sent by ab in presence of -H command-
line overrides.  Previously, ab would concatenate a supplied -H User-Agent:
header to the existing one, and send duplicate headers if either -H Host: or
-H Accept: were specified on the command line.

Now, the default headers are not sent if they are overridden using the -H
command-line flag.

Submitted by:  Arvind Srinivasan arvind.srinivasan  sun.com
Reviewed by: sctemme
PR: 31268, 26554

The apr_port_t type is unsigned, but ab was using a signed format code in
its reports. PR 42070. Submitted by Takashi Sato serai  lans-tv.com,
reviewed by sctemme.

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

commit | commitdiff | tree

Jim Jagielski [Tue, 1 May 2007 13:05:09 +0000 (13:05 +0000)]

... and promote...

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

commit | commitdiff | tree

Jim Jagielski [Tue, 1 May 2007 13:04:15 +0000 (13:04 +0000)]

Cast some votes...

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

commit | commitdiff | tree

Greg Stein [Tue, 1 May 2007 10:40:46 +0000 (10:40 +0000)]

port r532162 to the 2.2.x stable branch

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

commit | commitdiff | tree

Ruediger Pluem [Tue, 1 May 2007 08:39:18 +0000 (08:39 +0000)]

Merge r409442 from trunk:

* Fix documentation about the data types of attributes in the AJP protocol.

PR: 39658

Submitted by: rpluem

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

commit | commitdiff | tree

Ruediger Pluem [Tue, 1 May 2007 07:52:22 +0000 (07:52 +0000)]

* Add a backport proposal

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

commit | commitdiff | tree

Ruediger Pluem [Mon, 30 Apr 2007 22:32:11 +0000 (22:32 +0000)]

* Cast some votes

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

commit | commitdiff | tree

André Malo [Tue, 24 Apr 2007 16:18:39 +0000 (16:18 +0000)]

`build extraclean all`
`build convmap`

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

commit | commitdiff | tree

André Malo [Tue, 24 Apr 2007 13:32:55 +0000 (13:32 +0000)]

newlines

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

commit | commitdiff | tree

Martin Kraemer [Tue, 24 Apr 2007 11:08:01 +0000 (11:08 +0000)]

Add forgotten '|| true' to prevent 'make install-man' from returning an error (if rsync is not present on the platform)

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

commit | commitdiff | tree

Ruediger Pluem [Thu, 12 Apr 2007 20:00:54 +0000 (20:00 +0000)]

* Cast a vote

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

commit | commitdiff | tree

Jeff Trawick [Thu, 12 Apr 2007 15:16:33 +0000 (15:16 +0000)]

merge fix to 39245?

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

commit | commitdiff | tree

Jim Jagielski [Tue, 10 Apr 2007 12:38:08 +0000 (12:38 +0000)]

Merge r484789 from trunk:

We are doing nothing here... but keep the stubs
in case we ever do.

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

commit | commitdiff | tree

Jim Jagielski [Tue, 10 Apr 2007 12:35:00 +0000 (12:35 +0000)]

Apply approved backport

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

commit | commitdiff | tree

Jeff Trawick [Mon, 9 Apr 2007 20:56:01 +0000 (20:56 +0000)]

merge from trunk:

core: Correct a regression since 2.0.x in the handling of AllowOverride
Options.

PR: 41829

Submitted by: Torsten Förtsch <torsten.foertsch gmx.net>
Reviewed by: niq, rpluem, trawick

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

commit | commitdiff | tree

Jeff Trawick [Mon, 9 Apr 2007 20:02:03 +0000 (20:02 +0000)]

proposals++

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

commit | commitdiff | tree

Sander Temme [Mon, 9 Apr 2007 19:17:31 +0000 (19:17 +0000)]

Propose backport of two minor ab.c fixes

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

commit | commitdiff | tree

Sander Temme [Thu, 5 Apr 2007 06:00:16 +0000 (06:00 +0000)]

Propose backport of hardware SSL fix

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

commit | commitdiff | tree

Joshua Slive [Tue, 27 Mar 2007 15:12:45 +0000 (15:12 +0000)]

Backport Order fix.

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

commit | commitdiff | tree

Jean-Frederic Clere [Tue, 27 Mar 2007 09:50:46 +0000 (09:50 +0000)]

Additional Fix for 40310.

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

commit | commitdiff | tree

Ruediger Pluem [Sat, 24 Mar 2007 20:07:47 +0000 (20:07 +0000)]

* Vote and promote

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

commit | commitdiff | tree

Nick Kew [Sat, 24 Mar 2007 13:03:41 +0000 (13:03 +0000)]

Propose backport

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

commit | commitdiff | tree

Mladen Turk [Wed, 21 Mar 2007 12:53:37 +0000 (12:53 +0000)]

Update status with comment and votes

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

commit | commitdiff | tree

Jim Jagielski [Tue, 13 Mar 2007 20:52:34 +0000 (20:52 +0000)]

Cast votes for 2 backports...

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

commit | commitdiff | tree

Jim Jagielski [Tue, 13 Mar 2007 20:47:01 +0000 (20:47 +0000)]

Sure. Why not :)

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

commit | commitdiff | tree

Ruediger Pluem [Tue, 13 Mar 2007 20:33:26 +0000 (20:33 +0000)]

* Cast a vote

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

commit | commitdiff | tree

Bradley Nicholes [Tue, 13 Mar 2007 18:12:30 +0000 (18:12 +0000)]

mod_ldap backport proposal

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

commit | commitdiff | tree

Bradley Nicholes [Tue, 13 Mar 2007 00:08:52 +0000 (00:08 +0000)]

Add the case_flt experimental modules to the NetWare build

Submitted by: Guenter Knauf <fuankg apache.org>

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

commit | commitdiff | tree

Sander Temme [Wed, 7 Mar 2007 07:33:58 +0000 (07:33 +0000)]

Backport of r515403, quote filesystem paths that might have spaces in them when expanded.

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

commit | commitdiff | tree

Sander Temme [Sat, 24 Feb 2007 16:17:27 +0000 (16:17 +0000)]

Generated HTML from previous XML changes and some housekeeping changes by build system

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

commit | commitdiff | tree

Sander Temme [Sat, 24 Feb 2007 16:07:29 +0000 (16:07 +0000)]

Hardware crypto support is less experimental in 2.2

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

commit | commitdiff | tree

Jeff Trawick [Wed, 21 Feb 2007 03:09:34 +0000 (03:09 +0000)]

unpropose a backport (sorry, Brad)

I'll back out the trunk commit if a reasonable solution
doesn't present itself very soon

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

commit | commitdiff | tree

Jim Jagielski [Tue, 20 Feb 2007 17:12:55 +0000 (17:12 +0000)]

Merge r486320 from trunk:

* Handle request bodies larger than 2 GB by converting the Content-Length
header string of the request correctly to apr_off_t.

PR: 40883

Submitted by: rpluem
Reviewed by: jim

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

commit | commitdiff | tree

Jim Jagielski [Tue, 20 Feb 2007 17:10:42 +0000 (17:10 +0000)]

Move up

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

commit | commitdiff | tree

Jim Jagielski [Tue, 20 Feb 2007 17:10:11 +0000 (17:10 +0000)]

Cast a vote

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

commit | commitdiff | tree

Jim Jagielski [Tue, 20 Feb 2007 17:06:00 +0000 (17:06 +0000)]

Merge r507516 from trunk:

Patch for PR#11540 (submitted by Stuart Children)

Submitted by: niq
Reviewed by: jim

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

commit | commitdiff | tree

Bradley Nicholes [Tue, 20 Feb 2007 16:23:19 +0000 (16:23 +0000)]

vote

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

commit | commitdiff | tree

Jeff Trawick [Mon, 19 Feb 2007 16:26:31 +0000 (16:26 +0000)]

simple LDAP API usage fix

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

commit | commitdiff | tree

Graham Leggett [Fri, 16 Feb 2007 21:15:18 +0000 (21:15 +0000)]

Vote...

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

commit | commitdiff | tree

Jeff Trawick [Thu, 15 Feb 2007 15:19:22 +0000 (15:19 +0000)]

votes++

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

commit | commitdiff | tree

Jim Jagielski [Thu, 15 Feb 2007 15:14:25 +0000 (15:14 +0000)]

Actually, I think this should be a show-stopper, since the
current behavior is broke broke broke.

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

commit | commitdiff | tree

Jim Jagielski [Thu, 15 Feb 2007 15:04:01 +0000 (15:04 +0000)]

Backport proposal:
http://svn.apache.org/viewvc?view=rev&revision=507516
PR: 11540

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

commit | commitdiff | tree

Bradley Nicholes [Fri, 9 Feb 2007 23:59:15 +0000 (23:59 +0000)]

Implement a BASEDIR build environment variable to allow the NetWare build to relocate the install files

Submitted by: Guenter Knauf <fuankg apache org>

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

commit | commitdiff | tree

Jim Jagielski [Thu, 8 Feb 2007 13:56:07 +0000 (13:56 +0000)]

Why bother?

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

commit | commitdiff | tree

Jim Jagielski [Fri, 2 Feb 2007 23:46:57 +0000 (23:46 +0000)]

bomb the BOM

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

commit | commitdiff | tree

Jeff Trawick [Mon, 29 Jan 2007 17:54:10 +0000 (17:54 +0000)]

Merge from trunk:
Unix MPMs: Catch SIGFPE so that exception hooks and CoreDumpDirectory
can work after that terminating signal.

Submitted by: Eric Covener <covener gmail.com>
Reviewed by: trawick, rpluem, jorton

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

commit | commitdiff | tree

Joe Orton [Mon, 29 Jan 2007 15:21:40 +0000 (15:21 +0000)]

Votes.

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

commit | commitdiff | tree

Jeff Trawick [Mon, 29 Jan 2007 01:53:32 +0000 (01:53 +0000)]

add commentary fix from rpluem to backport

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

commit | commitdiff | tree

Ruediger Pluem [Sun, 28 Jan 2007 22:04:00 +0000 (22:04 +0000)]

* Add comment

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

commit | commitdiff | tree

Jeff Trawick [Sun, 28 Jan 2007 21:16:56 +0000 (21:16 +0000)]

propose backporting the code to catch SIGFPE

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Mirror of https://github.com/apache/httpd.git

RSS Atom