Commits · 5bec619feec1dd89123086c70786a2c92d69d54d · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

01 Apr, 2006 30 commits

Kill the -dev tag, in preperation for tagging 2.2.1. · 5bec619f

Paul Querna authored Apr 01, 2006


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

5bec619f

Use consistent 'PR N' style. · fa9321b9

Paul Querna authored Apr 01, 2006


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

fa9321b9

Merge r384580, r390210 and r390619 from trunk, changing the flushing band-aid... · 919d2a5d

Paul Querna authored Apr 01, 2006

Merge r384580, r390210 and r390619 from trunk, changing the flushing band-aid in mod_proxy_ajp to be configurable.


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

919d2a5d

Merge r377738 and r377780 from trunk, fixing child-threads using 100% cpu in mod_proxy. · 3d8e6f04
Paul Querna authored Apr 01, 2006
```
PR: 38403


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

Merge r384731, r386790, and r386821 from trunk: · f9020c52

Paul Querna authored Apr 01, 2006

    * mod_isapi: Trivial compiler emit fixes for const'ness - noticed on OS/X
      Correct lvalue assignments (lvalue casts not allowed) - noticed on Sol.
      Resolve use of SetLastError with apr_set_os_error() and axe MAKEFILE
      for a literal value.  Permits mod_isapi to load and run on Unix.


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

f9020c52

Move up accepted patches. · d48418d6

Paul Querna authored Apr 01, 2006


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

d48418d6

Move my -0 to a +1 for this patch, after going back and reading more of the... · f355b599

Paul Querna authored Apr 01, 2006

Move my -0 to a +1 for this patch, after going back and reading more of the email about it.  It isn't pretty, but there just isn't a better way for now.


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

f355b599

Vote. · e04b6806

Paul Querna authored Apr 01, 2006


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

e04b6806

Vote, and move up. · 3bbeacab

Paul Querna authored Apr 01, 2006


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

3bbeacab

· b4f9680c

Jim Jagielski authored Apr 01, 2006

Better explain what this patch is about. It refers
to:

  *) Correctly initialize mod_proxy workers, which use a
     combination of local and shared datasets. Adjust logging
     to better trace usage. PR 38403.

The current impl is broken...


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

b4f9680c

vote · 1ee406c2

Jeff Trawick authored Apr 01, 2006


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

1ee406c2

* Add the patch that actually does the bump of the MODULE_MAGIC_NUMBER_MINOR - · e09edc3b

Ruediger Pluem authored Apr 01, 2006

  not just the comment.


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

e09edc3b

* Give an answer to pquerna question. · 14631385

Ruediger Pluem authored Apr 01, 2006


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

14631385

These patches were merged. · 4eb0514d

Paul Querna authored Apr 01, 2006


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

4eb0514d

Merge r377053, r377057 and r377525 from trunk, fixing several issues with... · 0f9181b9

Paul Querna authored Apr 01, 2006

Merge r377053, r377057 and r377525 from trunk, fixing several issues with mod_proxy_http and keep-alive headers.


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

0f9181b9

Merge r382147 from trunk: · 6040564c

Paul Querna authored Apr 01, 2006

APR_FILEPATH_NOTABOVEROOT was undefined with a left-hand NULL
or empty path. The SECUREROOTPATH and NOTABSOLUTE tests were
sufficient for this application. Adjusts for a bug in earlier
versions of APR with this undefined value.

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

6040564c

Vote on mod_include fix, move it up to accepted. · 3ad830e4

Paul Querna authored Apr 01, 2006


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

3ad830e4

Move up accepted patch · 4ef86fa9

Paul Querna authored Apr 01, 2006


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

4ef86fa9

Keep voting all night long. · c2d66274

Paul Querna authored Apr 01, 2006


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

c2d66274

The next apr-util release has fixed this show stopper issue. · 5a61ffde

Paul Querna authored Apr 01, 2006


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

5a61ffde

I am not comfortable with this solution for making the flushing band aid... · 73455f43

Paul Querna authored Apr 01, 2006

I am not comfortable with this solution for making the flushing band aid configurable. I do not oppose the concept, just the placement of the configuration information inside of the mod_proxy core, and not in mod_proxy_ajp.


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

73455f43

Merge r389697 and r390499 from trunk, making mod_disk_cache return better... · 91bfcd4b

Paul Querna authored Apr 01, 2006

Merge r389697 and r390499 from trunk, making mod_disk_cache return better error codes, instead of a silly APR_EGENERAL.


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

91bfcd4b

Merge r390573 from trunk: · 3ee53cd2

Paul Querna authored Apr 01, 2006

With all of the, uhm, interesting manners in which httpd
can be built and installed, let's ensure httpd -V gives the
reporter a chance to identify the APR flavor used to compile
and to run httpd when reporting bugs.

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

3ee53cd2

Move up accepted Patches. · 58ad615f

Paul Querna authored Apr 01, 2006


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

58ad615f

Merge r354630 from trunk: · 1644021d

Paul Querna authored Apr 01, 2006

If a connection aborts while waiting for a chunked line, flag the connection as
errored out and send errors upwards.

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

1644021d

Vote early, vote often · bcdcc849

Garrett Rooney authored Apr 01, 2006


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

bcdcc849

Vote on a good feature :) · 6a91dc54

Paul Querna authored Apr 01, 2006


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

6a91dc54

· fc6edc1e

William A. Rowe Jr authored Apr 01, 2006

  Low hanging fruit, so low you'll trip over it.


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

fc6edc1e

vote on the mod_disk_cache fix. · 09bc80f8

Paul Querna authored Apr 01, 2006


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

09bc80f8

Fix a race condition when creating the connection pool mutex and make sure... · ba02de0a

Bradley Nicholes authored Apr 01, 2006

Fix a race condition when creating the connection pool mutex and make sure that memory is being allocated from the correct pools when connections are being established. Enforce the GLOBAL_ONLY parameter for all of the directives.

Reviewed by: bnicholes, trawick, jim

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

ba02de0a

31 Mar, 2006 10 commits

* Fix report number · d83534db

Ruediger Pluem authored Mar 31, 2006


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

d83534db

* actually two patches are needed for this. Add missing patch and reset voting. · 5268b5b4
Ruediger Pluem authored Mar 31, 2006
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@390522 13f79535-47bb-0310-9956-ffa450edef68
```
5268b5b4

Vote on the mod_disk_cache change · 5b1f2a51

Colm MacCarthaigh authored Mar 31, 2006


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

5b1f2a51

Add a fix for mod_disk_cache to the voting. · 2c1d0ae8

Paul Querna authored Mar 31, 2006


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

2c1d0ae8

* Small formating change · d5fb6423

Ruediger Pluem authored Mar 31, 2006


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

d5fb6423

Merge r370172, r371132 from trunk: · 0693f8c0

Ruediger Pluem authored Mar 31, 2006

* Insert the HTTP_IN filter uncondionally before we call
  ap_send_error_response or ap_die. This ensures that
  ap_discard_request_body called by ap_die and by ap_send_error_response works
  correctly on status codes that do not cause the connection to be dropped and
  in situations where the connection should be kept alive.

PR: 38123
Reviewed by: rpluem, niq, jerenkrantz


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

0693f8c0

* Move security fixes at the beginning of the changelog · e2687ac4

Ruediger Pluem authored Mar 31, 2006


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

e2687ac4

*) Fix mis-shifted 32 bit scope, masked to 64 bits as a method. · 3b771481

Jim Jagielski authored Mar 31, 2006

     [Will Rowe, Joe Orton]



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

3b771481

Committed · 1f01d11b

Jim Jagielski authored Mar 31, 2006


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

1f01d11b

Merge r378032 from trunk: · 8a453c67

Jim Jagielski authored Mar 31, 2006

  *) mod_proxy: Fix KeepAlives not being allowed and set to
     backend servers. PR38602. [Ruediger Pluem, Jim Jagielski]

Also, document previous patch:
  *) Correctly initialize mod_proxy workers, which use a
     combination of local and shared datasets. Adjust logging
     to better trace usage. PR38403. [Jim Jagielski]


Reviewed by: jim


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

8a453c67