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

17 Oct, 2001 12 commits

get rid of a reference to access.conf · c3aa1db3

Greg Ames authored Oct 17, 2001


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91532 13f79535-47bb-0310-9956-ffa450edef68

c3aa1db3

Fully convert worker's fdqueue to the new APR lock API: · fb1a1e31

Aaron Bannert authored Oct 17, 2001

- Mutexes and Condition Variables from APR are now used instead of
  direct (non-portable) calls to pthread.

Still need to fully APRize these routines, particularly the return
values. In many cases a failed lock or cond var call will simply return
FD_QUEUE_FAILURE. This should obviously instead return the appropriate
APR error code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91531 13f79535-47bb-0310-9956-ffa450edef68

fb1a1e31

I certainly see the advantage of having SSL split out into another file. · 1298b1bf

Joshua Slive authored Oct 17, 2001

And indeed, that is the way that I would do it for my own server. But
the default config file is really there for beginners, not for advanced
users. Having multiple config files is bad for beginners because it
makes it difficult to answer questions like "where do I put this config
directive?" It also makes it more difficult to move a specific configuration
from one server to another. Finally, it is just overall more intimidating
to be faced with a bunch of files to edit, rather than one file that
controls everything.

Having said that, it does look like the overall feeling is that at least
SSL should be split out, and I won't object (strongly).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91530 13f79535-47bb-0310-9956-ffa450edef68

1298b1bf

Win32: Deprecate ap_start_shutdown/ap_start_restart in favor of ap_signal_parent(enum). · 955609d1

Bill Stoddard authored Oct 17, 2001

This simplifies the code a bit for some more MPM cleanup work forthcoming.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91529 13f79535-47bb-0310-9956-ffa450edef68

955609d1

· 357d56cd

William A. Rowe Jr authored Oct 17, 2001

  Whoops ... invalid <Directory /> blocks for the new 'manual' tree location


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91528 13f79535-47bb-0310-9956-ffa450edef68

357d56cd

Not sure if the number of directives in a normal proxy setup would · 5d5ecca0

Jim Jagielski authored Oct 17, 2001

warrant needing a whole separate config file. I see such break outs
as pretty much dependent on the number of lines it adds to
httpd.conf... with SSL it makes sense. With proxy, well, I'm not
sure. To be honest, though, breaking out both won't trouble me
a bit, but this is my pref.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91527 13f79535-47bb-0310-9956-ffa450edef68

5d5ecca0

recognize filename subrequests without requiring a null URI. This fixes · 53d2b4e4

Greg Ames authored Oct 17, 2001

a problem with infinite recursion of dirent subrequests.

Submitted by: Bill Rowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91525 13f79535-47bb-0310-9956-ffa450edef68

53d2b4e4

· c89ba4c8

Ken Coar authored Oct 17, 2001

The argument that this is a reversion to the httpd/access/srm
multifile scenario is bogus, IMHO; the problem with those
was that their purposes were not clear, nor were the orders
of invocation. Putting massive (or tiny but uncommon) chunks
of easily self-contained special-function directives into
separate files simplifies the basic configuration and doesn't
revert to either of the trinity-file complaints, since these
would need to be explicitly invoked with an Include directive.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91524 13f79535-47bb-0310-9956-ffa450edef68

c89ba4c8

· 3ef528a2

William A. Rowe Jr authored Oct 17, 2001

  Some type correctness fixes for LARGEFILES platforms.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91521 13f79535-47bb-0310-9956-ffa450edef68

3ef528a2

First pass at converting worker MPM to APR's new lock API. This converts · 0fd131ac

Aaron Bannert authored Oct 17, 2001

the APR_INTRAPROCESS locks into lightweight, non-nested apr_thread_mutex_t
locks.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91518 13f79535-47bb-0310-9956-ffa450edef68

0fd131ac

SSL config is large, complex & many users never need to see it at all. · c5603df1
Brian Havard authored Oct 17, 2001
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91517 13f79535-47bb-0310-9956-ffa450edef68
```
c5603df1

· f1477236

William A. Rowe Jr authored Oct 17, 2001

It is absolutely invalid practice to test 'prot' bits to determine if a
file is readable. The only acceptable means of testing readability is to
open it for reading, due to discrepancies between permissions, DACLs and
SACLS. Even Linux hackers are gonna need to learn that lesson if they
plan to do any DOD or Gov work once DACL-enhanced Linux is adopted.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91516 13f79535-47bb-0310-9956-ffa450edef68

f1477236

16 Oct, 2001 28 commits

· f73f0213

William A. Rowe Jr authored Oct 16, 2001

Already committed in similar form to Apache 1.3.22-dev, this patch allows
Win32/OS2/Netware paths to work with mod_vhost_alias.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91515 13f79535-47bb-0310-9956-ffa450edef68

f73f0213

First cut at the MPM for NetWare · 4a15e3fd

Bradley Nicholes authored Oct 16, 2001


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91514 13f79535-47bb-0310-9956-ffa450edef68

4a15e3fd

OS specific file for NetWare · 695ec5da

Bradley Nicholes authored Oct 16, 2001


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91513 13f79535-47bb-0310-9956-ffa450edef68

695ec5da

Remove the ldap config file. This is now part of the ldap sub-project. · 0c221041
Ryan Bloom authored Oct 16, 2001
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91511 13f79535-47bb-0310-9956-ffa450edef68
```
0c221041

· 57114e28

William A. Rowe Jr authored Oct 16, 2001

  A bit of declaration would help get this loading on Win32


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91510 13f79535-47bb-0310-9956-ffa450edef68

57114e28

Missed this one when I removed the other ldap files. · 76c589e5

Ryan Bloom authored Oct 16, 2001


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91509 13f79535-47bb-0310-9956-ffa450edef68

76c589e5

Remove all of the ldap modules. These have been moved to their own · a3040aca

Ryan Bloom authored Oct 16, 2001

repository, httpd-ldap, and they now form their own sub-project of the
httpd project.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91508 13f79535-47bb-0310-9956-ffa450edef68

a3040aca

Initial revision · b5df2148

Ryan Bloom authored Oct 16, 2001


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91504 13f79535-47bb-0310-9956-ffa450edef68

b5df2148

The SSL config is huge, and has a lot of comments. The proxy config is · 3c2a5ea0

Ryan Bloom authored Oct 16, 2001

tiny, and very self-contained.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91499 13f79535-47bb-0310-9956-ffa450edef68

3c2a5ea0

IMHO, ssl and proxy are advanced operations. Placing them into the default · c990254b

Aaron Bannert authored Oct 16, 2001

httpd.conf will just confuse people who just want a barebones webserver.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91498 13f79535-47bb-0310-9956-ffa450edef68

c990254b

· bc62690b

William A. Rowe Jr authored Oct 16, 2001

  One more party


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91497 13f79535-47bb-0310-9956-ffa450edef68

bc62690b

· 913c8225

William A. Rowe Jr authored Oct 16, 2001

LoadFile(s) required by modules before they loaded weren't executed until
server initialization. This patch assures all such loaded files occur as
they are parsed.

Submitted by: John Sterling <sterling@covalent.net>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91496 13f79535-47bb-0310-9956-ffa450edef68

913c8225

· 04fa819b

William A. Rowe Jr authored Oct 16, 2001

  The right place to choose this... hard to read some opinions


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91495 13f79535-47bb-0310-9956-ffa450edef68

04fa819b

Exit when we can't listen on any of the configured ports. This · 2424c7f0

Jeff Trawick authored Oct 16, 2001

is the same behavior as 1.3, and it avoids having the MPMs to
deal with bogus ap_listen_rec structures.

This also backs out some circumventions I and Greg Ames had added
to prefork; these are no longer necessary because of this change.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91494 13f79535-47bb-0310-9956-ffa450edef68

2424c7f0

In one target we weren't always creating the $libexecdir · b4bb9c9b

Aaron Bannert authored Oct 16, 2001

($prefix/modules) directory, and in another we were assuming that the
directory existed. Now we always create it in the first target, and we
check that it exists in the second.

This fixes a bug where httpd.exp would be installed as a _file_ called
$prefix/modules.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91492 13f79535-47bb-0310-9956-ffa450edef68

b4bb9c9b

· 589f7215

William A. Rowe Jr authored Oct 16, 2001

Ok... for now ssl-std.conf and proxy-std.conf stand, so here's the patch
for the win32 build.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91491 13f79535-47bb-0310-9956-ffa450edef68

589f7215

· b11e8390

William A. Rowe Jr authored Oct 16, 2001

  Just feels wrong... but need to continue building


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91490 13f79535-47bb-0310-9956-ffa450edef68

b11e8390

· 2bd0d0d0

William A. Rowe Jr authored Oct 16, 2001

  Hmmm... mismatched namespaces :-?


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91489 13f79535-47bb-0310-9956-ffa450edef68

2bd0d0d0

don't lose the retcode in core_create_proxy_req() · 247987b6

Jeff Trawick authored Oct 16, 2001


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91488 13f79535-47bb-0310-9956-ffa450edef68

247987b6

Cleanup the proxy code that creates a request to the origin · b377be1d

Ryan Bloom authored Oct 16, 2001

server. This change adds an optional hook, which allows modules
to gain control while the request is created if the proxy module
is loaded. The purpose of this hook is to allow modules to add
input and/or output filters to the request to the origin. While
I was at it, I made the core use this hook, so that proxy request
creation uses some of the code from the core. This can still be
greatly improved, but this is a good start.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91486 13f79535-47bb-0310-9956-ffa450edef68

b377be1d

Bump after the 2.0.26 tag. · 5476075e

Ryan Bloom authored Oct 16, 2001


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91485 13f79535-47bb-0310-9956-ffa450edef68

5476075e

Bump the versions for the 2.0.26 tag. · 47ccc2f1

Ryan Bloom authored Oct 16, 2001


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91484 13f79535-47bb-0310-9956-ffa450edef68

47ccc2f1

Port the MaxClients changes from the worker MPM to the threaded · d69edd38

Ryan Bloom authored Oct 16, 2001

MPM.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91483 13f79535-47bb-0310-9956-ffa450edef68

d69edd38

· f011fcd4

William A. Rowe Jr authored Oct 16, 2001

  Fix the little bits o' breakage I introduced with the last two
  'theoretical' corrections.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91482 13f79535-47bb-0310-9956-ffa450edef68

f011fcd4

· 88521ec7

William A. Rowe Jr authored Oct 16, 2001

directory_walk trounced existing path_info declarations. I suspect _this_
was Greg Ames bug...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91481 13f79535-47bb-0310-9956-ffa450edef68

88521ec7

· 851373ea

William A. Rowe Jr authored Oct 16, 2001

Streamline this function, and append the trailing slash for any directories
that are resolved. Needs to be more tightly coupled to the dir_walk
optimized cache.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91480 13f79535-47bb-0310-9956-ffa450edef68

851373ea

· d32834f3

William A. Rowe Jr authored Oct 16, 2001

This will probably fix recent breakage to mod_negotation and httpd.test,
as well as the /manual/ returning docroot/index. Need to look for another
solution. I'm suspecting path_info is possibly broken.

Reverts 1.68, as suggested by Brian Havard.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91479 13f79535-47bb-0310-9956-ffa450edef68

d32834f3

Cautiously avoiding the scoping issue that was discussed on the list, · e903ef6e

Aaron Bannert authored Oct 16, 2001

I thought these other changes needed to go in; Namely that we don't
need to check if the brigade is empty twice in the loop, just once.
Added a comment for good measure.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91478 13f79535-47bb-0310-9956-ffa450edef68

e903ef6e