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

15 Nov, 2001 8 commits

Fix the SSL filter logic. The SSL filter is not a network filter, because · 43def6bf

Ryan Bloom authored Nov 15, 2001

it does not actually do the reading and writing to the network. By
moving that filter to in between CONNECTION and NETWORK filters, we ensure
that SSL is always called before the core.

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

43def6bf

Pull lingering close out of the pool cleanup phase. This was causing too · 0f70923a

Ryan Bloom authored Nov 15, 2001

many bugs. Instead, it is called where it used to be called. I have
abstracted some of the logic out of the lingering close so that it gets
the socket from the connection using the core's conn_config vector. This
is in anticipation of a change to use a hook for the lingering close,
which I hope to do soon.

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

0f70923a

Style updates before I convert to the new lock type. · 09c1d5c7

Aaron Bannert authored Nov 15, 2001


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

09c1d5c7

mention an old problem (mod_cgid being left around after · 2b89f6a8

Jeff Trawick authored Nov 15, 2001

an aborted initialization) in slightly more general terms


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

2b89f6a8

Fix a file descriptor leak in mod_include. When we include a · 32c1e8d5

Ryan Bloom authored Nov 15, 2001

file, we use a sub-request, but we didn't destroy the sub-request
immediately, instead we waited until the original request was
done.  This patch closes the sub-request as soon as the data is
done being generated.

This passes all tests in the test suite.

Submitted by:	Brian Pane <bpane@pacbell.net>
Reviewed by:	Ryan Bloom and Cliff Woolley


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

32c1e8d5

FTYPE_CONTENT - 1 isn't enough for OLD_WRITE. OLD_WRITE is a special · 3551f5ed

Ryan Bloom authored Nov 15, 2001

filter, and it MUST run absolutely first. To allow other filters a little
space to manuver, I am moving this to FTYPE_CONTENT - 10.

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

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

3551f5ed

Ignore *.slo files. · 2c96bf68

Aaron Bannert authored Nov 15, 2001


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

2c96bf68

Get rid of the listensocks array. It was just duplicating the ap_listeners · eaf84954

Ryan Bloom authored Nov 15, 2001

list.  No reason to have the same information stored twice.


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

eaf84954

14 Nov, 2001 15 commits

Added links to NetWare documentation · 8983cbcc

Bradley Nicholes authored Nov 14, 2001


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

8983cbcc

mpm_netware directive documentation · 28adf610

Bradley Nicholes authored Nov 14, 2001


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

28adf610

Apache for NetWare configuration and build documentation · d453eaf7
Bradley Nicholes authored Nov 14, 2001
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91956 13f79535-47bb-0310-9956-ffa450edef68
```
d453eaf7

Port the worker MPM to the new accept model. This has passed every · f4a5dce3

Ryan Bloom authored Nov 14, 2001

test in the test suite (except Limit tests). We waste a bit of space
with the listensocks array, which is the exact same as the ap_listeners
list, but we have done that for a while. I'll fix that soon.

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

f4a5dce3

Quiet a compiler warning. · de21ea13

Ryan Bloom authored Nov 14, 2001


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

de21ea13

Get the proxy module compiling again. This is a hack to get past the · 2150a933

Ryan Bloom authored Nov 14, 2001

current compiler errors. Basically, the core now puts the socket
in the conn_rec->conn_config vector. The proxy grabs that socket and
uses it where it used to use the client_socket field from the conn_rec.
Long-term, all of the direct socket communication needs to be removed,
and this should go through a filter stack. Short-term, this gets the
proxy working again.

I have tested http and connect, but I haven't looked at the FTP proxy,
although it does compile now.

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

2150a933

Turns out this is causing problems on my linux box (libtool 1.3.5), so · 6a2d75df

Aaron Bannert authored Nov 14, 2001

I'm going to remove it until I or someone else can come up with a better
way to check for and link against libssl and libcrypto for mod_ssl.so.

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

6a2d75df

Missing a header · 3a2ae5c9

Bradley Nicholes authored Nov 14, 2001


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

3a2ae5c9

Fixed ap_listeners so that it will be included in the AWK generated export lists · cf1665cb
Bradley Nicholes authored Nov 14, 2001
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91948 13f79535-47bb-0310-9956-ffa450edef68
```
cf1665cb

In my book this is a GA showstopper, but I'm volunteering here and I · 718fab16

Aaron Bannert authored Nov 14, 2001

expect to have it done by the time we want to do a GA.


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

718fab16

Convert mod_rewrite's INTRAPROCESS lock to the newly supported · 6ebaa3f8

Aaron Bannert authored Nov 14, 2001

apr_thread_mutex_t type lock. Passes all rewrite.t tests.


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

6ebaa3f8

Convert tabs to spaces, and a couple other style changes. No functional · 2bb3c90e

Aaron Bannert authored Nov 14, 2001

changes. I checked with the rewrite.t perl-framework test to make sure
it still passes.

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

2bb3c90e

Fix location of KEYS file in docs. · 8306a9f0

Roy T. Fielding authored Nov 14, 2001


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

8306a9f0

KEYS do not belong here. The only valid location for a KEYS file · 23df117a

Roy T. Fielding authored Nov 14, 2001

is on our site in a directory controlled by CVS: www.apache.org/dist/httpd/


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

23df117a

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 17 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