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

14 Nov, 2001 1 commit

Move this to a HOOK_MIDDLE location. We need to add some logic to · 83cec24e

Ryan Bloom authored Nov 14, 2001

make sure that we have a socket that the core controls if we do this,
but it is more correct.

Submitted by:	Greg Stein


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

83cec24e

13 Nov, 2001 23 commits

Allow modules that add sockets to the ap_listeners list to · 0dc8f880

Ryan Bloom authored Nov 13, 2001

define the function that should be used to accept on that
socket.  Each MPM can define their own function to use for
the accept function with the MPM_ACCEPT_FUNC macro.  This
also abstracts out all of the Unix accept error handling
logic, which has become out of synch across Unix MPMs.

The code flow is much easier now for different transports:

1)  During pre-config, post-config or while parsing the config
    file, add a socket to the ap_listeners list, making sure to
    define an accept function at the same time.

2)  MPMs find the correct listener, and call the accept function
    that was defined in step 1.

3)  That accept function returns a void pointer, which is passed
    to the create_connection hook.

4)  create_connection adds the correct low-level filters.


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

0dc8f880

Updated NetWare project file. Now builds many of the external modules · 19145472
Bradley Nicholes authored Nov 13, 2001
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91915 13f79535-47bb-0310-9956-ffa450edef68
```
19145472

Add the server_rec argument back to the create_connection hook. · a1f43659

Ryan Bloom authored Nov 13, 2001

Submitted by:	Greg Stein


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

a1f43659

don't use a variable named stat, it can cause problems on some platforms. · a4eadbfc
Ryan Bloom authored Nov 13, 2001
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91912 13f79535-47bb-0310-9956-ffa450edef68
```
a4eadbfc

Remove ap_new_connection from the header. I missed this when I removed · 4ab969dd

Ryan Bloom authored Nov 13, 2001

the function.
Submitted by:   Brad Nicholes <BNICHOLES@novell.com>


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

4ab969dd

Misc. cleanups and performance enhancements · 01eda02d

Bradley Nicholes authored Nov 13, 2001


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

01eda02d

Back out my last patch. The logic to add sockets to pollsets is back in · b0d5f2db
Ryan Bloom authored Nov 13, 2001
```
the MPM


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91906 13f79535-47bb-0310-9956-ffa450edef68
```
b0d5f2db
Added the NetWare SSL module to the prebuilt module list · 2118a1cb
Bradley Nicholes authored Nov 13, 2001
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91905 13f79535-47bb-0310-9956-ffa450edef68
```
2118a1cb
Module that takes advantage of the built-in SSL functionality on the · da7805d4
Bradley Nicholes authored Nov 13, 2001
```
NetWare OS


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

Fixed the LoadModule statements to fit the 8.3 and NLM extension · d69727e3

Bradley Nicholes authored Nov 13, 2001

requirement for NetWare


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

d69727e3

Whoops, wrong variable. · 5b17f566

Ryan Bloom authored Nov 13, 2001


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

5b17f566

I accidentally removed these lines. Thank to Greg for catching this. · 99da6c24
Ryan Bloom authored Nov 13, 2001
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91901 13f79535-47bb-0310-9956-ffa450edef68
```
99da6c24

Fix a bug which would cause the response headers to be omitted · 90585875

Cliff Woolley authored Nov 13, 2001

when sending a negotiated ErrorDocument because the required
filters were attached to the wrong request_rec.

Submitted by: John Sterling <sterling@covalent.net>
Reviewed by: Justin Erenkrantz, Cliff Woolley

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

90585875

This allows modules to add socket descriptors to the pollset. I have · 29096788

Ryan Bloom authored Nov 13, 2001

only added this to the perfork MPM, and the others work without it.
Tomorrow I will add it to the other MPMs.

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

29096788

I was originally just going to s/commans/commas/, and then I got · 2d15ef99

Cliff Woolley authored Nov 13, 2001

carried away and rewrote half the paragraph.  <sigh>


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

2d15ef99

This section of tabs in the middle of space-only bugs me. · 126c4b85

Justin Erenkrantz authored Nov 13, 2001

Reformat this section.


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

126c4b85

Remove commas from the end of the macros that define · a11cb714

Ryan Bloom authored Nov 13, 2001

directives that are used by MPMs.  Previous to this patch,
you would use these macros without commans, which was unlike
any other directives. Now, after the macro, you must have
a comma.  This makes the macros look more like the rest of the
directives.

I know this is cosmetic, and I was going to leave it alone, but when
I found out that it bothered Cliff too, I decided to fix it after all.

Submitted by:	Ryan Bloom and Cliff Woolley


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

a11cb714

Document the new 'redirect-carefully' option. · d8968563

Justin Erenkrantz authored Nov 13, 2001


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

d8968563

Resolve the mod_dir overaggressive redirection problem seen with non-GET · cf366e88

Justin Erenkrantz authored Nov 13, 2001

requests for WebFolders.
Reviewed by:	Greg Stein


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

cf366e88

- 2.0.28 has been rolled. · 92c557a7

Justin Erenkrantz authored Nov 13, 2001

- Downgrade style changes to non-release showstopper.


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

92c557a7

Add docs for the newest hook. · e33d3efe

Ryan Bloom authored Nov 13, 2001


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

e33d3efe

Cleanup some code that was created during the abstration. This basically · 7a0b2a36

Ryan Bloom authored Nov 13, 2001

takes the old ap_new_connection, and puts into the new core_create_conn
function. There is no good reason to have two functions to do this.

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

7a0b2a36

Remove more network logic from the MPMs. Essentially, each MPM can define · 552bcb80

Ryan Bloom authored Nov 13, 2001

AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK, which tells Apache to disable_nagle
on the accepted socket.

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

552bcb80

12 Nov, 2001 16 commits

Begin to abstract out the underlying transport layer. · 4bcc975b

Ryan Bloom authored Nov 12, 2001

The first step is to remove the socket from the conn_rec,
the server now lives in a context that is passed to the
core's input and output filters. This forces us to be very
careful when adding calls that use the socket directly,
because the socket isn't available in most locations.

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

4bcc975b

fix segv triggered by recent ap_lingering_close change · 8c3ce8f6

Doug MacEachern authored Nov 12, 2001

need to set SSLFilterRec.pssl = NULL when ssl_hook_CloseConnection is called
otherwise, ap_lingering_close -> ap_flush_conn will call ssl_io_filter_Output
which thinks it can still use the SSLFilterRec.pssl
PR:
Obtained from:
Submitted by:
Reviewed by:


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

8c3ce8f6

· 601b80aa

William A. Rowe Jr authored Nov 12, 2001

Drop the wide net observed by Ken Coar, since one .rc file does exist
in cvs (and should reside there.)

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

601b80aa

add a note about libtoo 1.4.2 for Mac OS X · 2c841bd4

Greg Ames authored Nov 12, 2001


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

2c841bd4

Fix some indenting. Change an error message to a warning. · bb05bf5d

Bill Stoddard authored Nov 12, 2001


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

bb05bf5d

threaded: Fix the resetting of MaxClients when it isn't a multiple · ed686a4e

Jeff Trawick authored Nov 12, 2001

of the number of threads per process.


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

ed686a4e

Really reset the MaxClients value in worker when the · 5e2afa30

Jeff Trawick authored Nov 12, 2001

configured value is not a multiple of the number of threads
per child. We said we did previously but we forgot to.

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

5e2afa30

restore post-2_0_28 changes following tag bump · 5ab14be5

Greg Ames authored Nov 12, 2001


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

5ab14be5

account for the mod_cgid fix being bumped into 2_0_28. The other changes · b922b4a1

Greg Ames authored Nov 12, 2001

will be restored soon.


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

b922b4a1

Performance: Move the is_included strcmp to after the check to see if the · 68f3c95e

Bill Stoddard authored Nov 12, 2001

request is to be served by the cgi handler.


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

68f3c95e

Remove a broken link. · 4c598c54

Joshua Slive authored Nov 12, 2001

PR: 8743


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

4c598c54

It's -> its (where appropriate) · 06abb0d9

Martin Kraemer authored Nov 12, 2001


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

06abb0d9

Keep track of this so I don't forget. Not entirely sure how to go about · 0faf05ba

Aaron Bannert authored Nov 12, 2001

doing this properly, but I'll figure it out unless someone else beats
me to it.

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

0faf05ba

Port Justin's mod_cgid change to mod_cgi. · 997263b7

Cliff Woolley authored Nov 12, 2001

mod_cgi wasn't actually broken in the way that mod_cgid was, but
it's still good do have these checks be against APR_SUCCESS rather
than 0 for clarity.

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

997263b7

Remove the returned-length "w" parameter from apr_bucket_heap_create() · 5f2b4718

Cliff Woolley authored Nov 12, 2001

and apr_bucket_heap_make(). It was useless, since the length is invariant
from the length passed in and from the resulting bucket's b->length. This
takes care of a long-standing issue first brought up in February and
discussed on the dev@apr list. (Issue #2 from the "Bucket API Cleanup
Issues" thread.)

See http://marc.theaimsgroup.com/?l=apr-dev&m=98324983126666&w=2

Reviewed by: Ryan Bloom (concept)

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

5f2b4718

clean up some warnings on AIX · 6b81ab87

Jeff Trawick authored Nov 12, 2001

since apr_size_t isn't always int, we should use
APR_SIZE_T_FMT instead of %d


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

6b81ab87