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

14 Feb, 2001 10 commits

This commit was manufactured by cvs2svn to create tag · 3cf2473b

No Author authored Feb 14, 2001

'APACHE_2_0_11'.

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

2.0.11

3cf2473b

Move the call to set the socket timeout outside the loop. · 42ef5307

Bill Stoddard authored Feb 14, 2001

ve :


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

42ef5307

Fix lingering close (and make it more efficient). We were blocking on · aaf63dad

Bill Stoddard authored Feb 14, 2001

apr_read() for 30 seconds for each lingering close. What we want to
do is block for 2 seconds. If we do not read any bytes from the client
in that time, close the connection. If we do read bytes, then wait 2
more seconds to see if more arrive, etc. Repeat for MAX_SECS_TO_LINGER
if needed.

This should clear the way to get 2.0 running on apache.org!

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

aaf63dad

· 6db84508

William A. Rowe Jr authored Feb 14, 2001

  Sorry, cleaning up the naughty bits that should not have been committed.


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

6db84508

· 60400e5f

William A. Rowe Jr authored Feb 14, 2001

Massive commit to clean up os/win32 and label some files with the
appropriate license blocks and #ifdef WIN32 wrappers.

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

60400e5f

Beos R5 and below don't have the sin_len member in sockaddr_in so don't · b87df787

David Reid authored Feb 14, 2001

try and use it.


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

b87df787

As a debugging aid, report which version of the beos code we're using and · dae3e1f4
David Reid authored Feb 14, 2001
```
fix a typo.


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

Remove some deprecated comments. · b4c3c7d7

Bill Stoddard authored Feb 14, 2001


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

b4c3c7d7

· 7bce13e1

Bill Stoddard authored Feb 14, 2001

PR:
Obtained from:
Submitted by:
Get req/sec and bytes/sec status reporting working. Still lots of type
warnings but this is a bit better than before.


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

7bce13e1

Start getting extended status working again. · 8315778e

Bill Stoddard authored Feb 14, 2001


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

8315778e

13 Feb, 2001 16 commits

doh. need a spellchekker for these rename scripts. s/apr_lock_aquire/apr_lock_acquire/g; · c2bdbf10
Doug MacEachern authored Feb 13, 2001
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88150 13f79535-47bb-0310-9956-ffa450edef68
```
c2bdbf10

Windows MPM: Handle ap_new_connection() failure. · a271b8ba

Bill Stoddard authored Feb 13, 2001


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

a271b8ba

Fix some spelling mistakes and remove the mpmt_beos MPM from the config.m4 · d4e7fb15

Ryan Bloom authored Feb 13, 2001

file.
Submitted by:	Cliff Woolley <cliffwoolley@yahoo.com>


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

d4e7fb15

This is a huge change that gets beos building again. Essentially it · d8ef729a

David Reid authored Feb 13, 2001

- tidies up some of the formatting
- gets us working with mod_status
- uses the newer naming I've used in the headers to try and be more obvious
- uses a UDP socket for telling the server when to stop/restart.  This isn't
  perfect but as pre-BONE we don't have the ability to select on a pipe this
  seemed like the next best option.  This seems to work well for stopping,
  but so far restarts don't.  This will need some more security adding to it
  I think.

If I ever wanted a lesson in not keeping something on my HDD too long before
committing this update has been it.  Really should try and keep up a bit more :)


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

d8ef729a

More changes to the way that we use mod_status on beos. · ff082896

David Reid authored Feb 13, 2001


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

ff082896

Remove the dexter MPM. This has been replaced with the Perchild MPM. · 3c8a7b7b

Ryan Bloom authored Feb 13, 2001

The two MPMs are basically identical, except that Perchild also allows
each child process to have a unique uid/gid combination.

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

3c8a7b7b

backout name change: · e8d65448

Doug MacEachern authored Feb 13, 2001

apr_bucket_notimpl_setaside -> apr_bucket_setaside_notimpl
apr_bucket_notimpl_split    -> apr_bucket_split_notimpl
apr_bucket_notimpl_copy     -> apr_bucket_copy_notimpl
apr_bucket_notimpl_destroy  -> apr_bucket_destroy_notimpl
PR:
Obtained from:
Submitted by:
Reviewed by:


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

e8d65448

rename: · f03d203d

Doug MacEachern authored Feb 13, 2001

ap_bucket_create_error -> ap_bucket_error_create
ap_bucket_make_error   -> ap_bucket_error_make
PR:
Obtained from:
Submitted by:
Reviewed by:


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

f03d203d

s/apr_bucket_pipe_creat/apr_bucket_pipe_create/ typo · d19b4ffd

Doug MacEachern authored Feb 13, 2001


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

d19b4ffd

Windows doesn't have ap_config_auto. Perhaps we need a HAVE_CONFIG_AUTO · 19bc4e44
Bill Stoddard authored Feb 13, 2001
```
macro?


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

· 99aa6ccf

Greg Ames authored Feb 13, 2001

The "src/" directory no longer exists. Clean up the HARD_SERVER_LIMITS
warning msg to reflect the current directory structure.

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

99aa6ccf

OK, this is the start of getting things running on BeOS again :) · bdd33cb5
David Reid authored Feb 13, 2001
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88135 13f79535-47bb-0310-9956-ffa450edef68
```
bdd33cb5

Use apr_want.h to get the declarations for ntohs et al instead of · 8e70b444

Jeff Trawick authored Feb 13, 2001

including the appropriate system header files directly.

This gets rid of a warning for props.c on FreeBSD 3.4 which cropped
up when I included the right header file to get OS/390 to build :)

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

8e70b444

mod_status references ap_my_generation; declare it for now · 73011591

Jeff Trawick authored Feb 13, 2001

so perchild+mod_status builds; we can add logic to fill in
ap_my_generation later

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

73011591

Make perchild build again · 154413cc

Ryan Bloom authored Feb 13, 2001


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

154413cc

Add the perchild MPM to MPM.NAMING · ffb5701b

Ryan Bloom authored Feb 13, 2001


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

ffb5701b

12 Feb, 2001 14 commits

Don't disable threads just because we are using the prefork MPM. · fd281b2f

Ryan Bloom authored Feb 12, 2001

If somebody wants to compile without threads, they must now add
--disable-threads to the configure command line.  [Ryan Bloom]


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

fd281b2f

This is the wrong place to mark the server ready. Servers need to be marked ready · d417b2be

Bill Stoddard authored Feb 12, 2001

in the MPM -after- lingering close processing. This could be playing havoc with
perform_idle_server_maintenance.

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

d417b2be

include <arpa/inet.h> for the declarations for htons() et al; OS/390 has · ab0114e3

Jeff Trawick authored Feb 12, 2001

macros in arpa/inet.h which turn such "calls" into nothing and does not
have functions to link against in libc

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

ab0114e3

trailing commas in enum declarations aren't portable · 2d481505

Jeff Trawick authored Feb 12, 2001


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

2d481505

ignore generated file modules.mk · a0e00787

Jeff Trawick authored Feb 12, 2001


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

a0e00787

Begin to move the code that updates the child status out of the MPMs and · 1e3ff044

Ryan Bloom authored Feb 12, 2001

into the main-line code. This ensures that all MPMs can easily forget
about updating their status.

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

1e3ff044

Remove some OS/2 code from the prefork MPM. Since OS/2 has it's own · d3802b3d

Ryan Bloom authored Feb 12, 2001

MPM, this is needed here.


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

d3802b3d

Allow mod_tls to compile on Unix boxes where openssl has already been · 11575f83

Ryan Bloom authored Feb 12, 2001

installed.
Submitted by:	Gomez Henri <new-httpd@slib.fr>
Reviewed by:	Ryan Bloom


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

11575f83

string.h needs to be included before monkeying around with strchr et al, · 1f71772a

Jeff Trawick authored Feb 12, 2001

since some system header files do their own monkeying around with those
functions in ways that don't get along with us unless we include their
definitions first

examples: gcc 2.8.1 on Solaris
          gcc 2.95.2 on AIX


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

1f71772a

Fix for moved macros · c1b845b8

Chuck Murcko authored Feb 12, 2001

PR:
Obtained from:
Submitted by:
Reviewed by:


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

c1b845b8

sneaky for loop... make it more obvious what it is doing · 1a75d07c

Greg Stein authored Feb 12, 2001


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

1a75d07c

*) rename apr_memdup() to apr_pmemdup() · fc898f1f

Greg Stein authored Feb 12, 2001

*) optimize the allocation size in apr_pstrndup()


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

fc898f1f

*) remove some obsolete/unused defines from httpd.h. · 9174184e

Greg Stein authored Feb 12, 2001

*) remove DEFAULT_XFERLOG from main.c; it is never set/used
*) move ap_get_max_daemons() to ap_mpm.h
*) move DEFAULT_LISTENBACKLOG to mpm_common.h


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

9174184e

*) include the strings stuff the right way (some platforms use string.h; · afc4d9f7

Greg Stein authored Feb 12, 2001

   apr_want figures all that out for us)
*) include ap_mpm.h to pick up a moved func declaration


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

afc4d9f7