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

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

11 Nov, 2001 17 commits

This patch changes the apr_table_elts macro so that it provides · d714b4c4

Ian Holsman authored Nov 11, 2001

access to the internals of an apr_table_t via a const pointer
instead of the current non-const pointer.


Submitted by:	Brian Pane <BPane@pacbell.net>
Reviewed by:	Ian Holsman


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

d714b4c4

This patch zero-fills just the integer and pointer fields in · 25e0f366

Ian Holsman authored Nov 11, 2001

the structure, plus the first byte of each of the string buffers.

This updated version of the patch doesn't allocate space for
the error_str and time_str buffers in the mod_include filter
context until/unless they're actually needed.

--Brian


Submitted by:	Brian Pane <bpane@pacbell.net>
Reviewed by:	Ian Holsman


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

25e0f366

I forgot about this vote (it started before I had a binding vote). · 856af9e7

Aaron Bannert authored Nov 11, 2001

Time to wrap this one up.


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

856af9e7

Note that we are on 2.0.29 now. · e61036fd

Justin Erenkrantz authored Nov 11, 2001


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

e61036fd

apr_file_gets returns an apr_status_t not a char* and it returns · 54e14c11

Justin Erenkrantz authored Nov 11, 2001

APR_SUCCESS when it reads something (which is 0).

Two of the cases were doing while apr_file_gets > 0 which would cause
it to loop when it returned APR_EOF.  So, the valid check here is to
loop while we are receiving APR_SUCCESS.

Fix all of the other apr_file_gets to check APR_SUCCESS explicitly so
that it is obvious that we are checking an apr_status_t.  Yes,
0 == APR_SUCCESS, but it obviously wasn't clear to someone what it
was returning.

Submitted by:	Dale Ghent <daleg@elemental.org>,
                Brian Pane <bpane@pacbell.net>
Reviewed by:	Justin Erenkrantz


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

54e14c11

Add Debian Layout · 81466d7b

Justin Erenkrantz authored Nov 11, 2001

Submitted by:	Daniel Stone <daniel@sfarc.net>
Reviewed by:	Justin Erenkrantz


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

81466d7b

minor tweaks to pass a parm of the right type to apr_poll() and · 075cb659

Jeff Trawick authored Nov 11, 2001

to use i for an iterator in both listensocks[] loops


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

075cb659

in prefork, listensocks[0] doesn't have a pod · 8c8f971b

Jeff Trawick authored Nov 11, 2001

also, fix an ap_log_error() call to use ret for the error code
instead of errno

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

8c8f971b

Add example for AllAltByType, AddAltByEncoding · acbed462

Richard Bowen authored Nov 11, 2001


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

acbed462

Added examples for AddAlt · e0a61322

Richard Bowen authored Nov 11, 2001


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

e0a61322

Added examples for Action directive. · cb5dd302

Richard Bowen authored Nov 11, 2001


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

cb5dd302

mod_ssl STATUS update. · 6703a0f9

Justin Erenkrantz authored Nov 11, 2001


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

6703a0f9

If shared modules are requested and mod_so is not available, produce a · e6f1e272

Justin Erenkrantz authored Nov 11, 2001

fatal config-time error.


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

e6f1e272

This should be the last complaint about the input filtering. · d553196e

Justin Erenkrantz authored Nov 11, 2001

Needs more eyes...


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

d553196e

I think it might be time to take action on this unless someone wants to -1. · ea0a5cd8

Justin Erenkrantz authored Nov 11, 2001

(Ian's vote is now binding...)


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

ea0a5cd8

Comment forthcoming to dev@httpd... · cd9391d5

Justin Erenkrantz authored Nov 11, 2001


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

cd9391d5

2.0.28 has been tagged. · c8d7ceeb

Justin Erenkrantz authored Nov 11, 2001

2.0.27 was rolled, but abandoned due to C-L bug.
2.0.26 needs grammatical nit.


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

c8d7ceeb

10 Nov, 2001 7 commits

Fix the Windows MPM. Windows doesn't always use the lingering close · 2d4f9d83

Ryan Bloom authored Nov 10, 2001

function. If it can re-use the socket, we are better off not calling
the function. To fix this, we re-expose the lingering_close function,
and we allow the MPM to remove the cleanup.

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

2d4f9d83

Improve http2env's performance by cutting the work it has to · 0e12ece9

Ryan Bloom authored Nov 10, 2001

do.

Submitted by:	Brian Pane <bpane@pacbell.net>


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

0e12ece9

Fix a missing tag. · 8954ed7d

Joshua Slive authored Nov 10, 2001


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

8954ed7d

Change note->environment variable and convert <pre> list to <table>. · ee0db365
Joshua Slive authored Nov 10, 2001
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91833 13f79535-47bb-0310-9956-ffa450edef68
```
ee0db365

Remove ap_lingering_close from all of the MPMs. This is now done as · a6ae39d0

Ryan Bloom authored Nov 10, 2001

a cleanup registered with the connection_pool. I have also turned
ap_lingering_close into a static function, because it is only used
in connection.c. This is the next step to consolidating all of the
socket function calls. ap_lingering_close will only be added if the
core is dealing with a standard socket.

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

a6ae39d0

display a warning message if someone attempts to load · aca05a92

Ian Holsman authored Nov 10, 2001

the same module twice

Submitted by:	Brian Pane <bpane@pacbell.net>
Reviewed by:	Ian Holsman


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

aca05a92

Move prefork to the same API as the rest of the MPMs for setting up · 51e0aa12

Ryan Bloom authored Nov 10, 2001

listeners.


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

51e0aa12