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

11 Jul, 2000 5 commits

Remove all pthreads calls from the mpmt MPM prefork emulation. This makes · a10e2be9

Ryan Bloom authored Jul 11, 2000

the mpmt MPM look almost exactly like the original prefork MPM. Basically,
all that's left is re-naming the defined directives so they work with 1.3
config files. That will come later.

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

a10e2be9

Correct Win32 Expat build. · 05244b30

Keith Wannamaker authored Jul 11, 2000


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

05244b30

Fix a warning associated with the ap_send_fd change from earlier today. · 5843b526

Ryan Bloom authored Jul 11, 2000

This just changes a couple of long's to ap_size_t.


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

5843b526

shift the LimitXMLRequestBody directive to the core. use it from util_xml. · c96da44f
Greg Stein authored Jul 11, 2000
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85816 13f79535-47bb-0310-9956-ffa450edef68
```
c96da44f

make sure this is defined, so that mpm_common.c compiles with the right · 99772f16

Greg Stein authored Jul 11, 2000

values, functions, whatever. specifically, ap_reclaim_child_processes()
was not getting compiled into mpm_common.
this appears to keep mpmt_pthread running properly. dunno whether a similar
issue exists for prefork or dexter. (until all are torched)

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

99772f16

10 Jul, 2000 13 commits

eek. don't include carriage returns in the m4 macro. they get copied thru. · b91b337c
Greg Stein authored Jul 10, 2000
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85814 13f79535-47bb-0310-9956-ffa450edef68
```
b91b337c

· d9625103

William A. Rowe Jr authored Jul 10, 2000

  Advisory: This patch is still anywhere but complete.  However, it
  resolves most of the big bugs of the services to mpm relocation.
  I apologize that it's taken this long to get back on this.

  Brought across; Keep console open (needs a bit of cleanup and could
  be done better now for 2.0), service error event logging, and some
  other minor threading cleanup.

  Big issues remain: logged errors (even APLOG_STARTUP) drop into the
  logfile in spite of our interest in getting them to the user's console.

  Some threading sequences may yet be out of sorts, and those will be
  cleaned up by the end of the week.

PR:
Obtained from:
Submitted by:
Reviewed by:


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

d9625103

Make the spmt_os2 MPM use the new setup_listeners API. This should work, · 1b535c6d

Ryan Bloom authored Jul 10, 2000

but I make no garauntees.


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

1b535c6d

Move sock_disable_nagle to mpm_common.c. Rename it to ap_sock_disable_nagle. · 07732cfb

Ryan Bloom authored Jul 10, 2000

Again, I tried to modify all MPMs that are currently using this code.


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

07732cfb

Reimplement ap_send_fd. Eliminate ap_send_fd_length. If APR_HAS_SENDFILE is · d225bad1

Bill Stoddard authored Jul 10, 2000

defined but ap_sendfile fails with APR_ENOTIMPL, the BUFF implementation
of ap_send_fd will get a shot at serving the request. This fix is
required to get Apache working on 95/98 again and can also be useful on
Unix systems where sendfile is available via a servicepack/fixpack/PTF
on a particular level of the OS (e.g., AIX 4.3.2 base does not include
sendfile but is is available with a PTF).

This fix also reimplements the mod_file_cache sendfile_handler using
ap_send_fd and sets the connection aborted flag if the sendfile fails.

Future modification... Add code to ap_send_fd to hijack any data in the
client BUFF structure and send it along with the sendfile.

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

d225bad1

Move setup_listeners to listen.c. This renames it to ap_setup_listeners, · 9bdb713a

Ryan Bloom authored Jul 10, 2000

and removes the duplicated code from all effected MPMs. The only this
doesn't touch, is Windows. That MPM was using a different setup_listeners.
If one of the Windows guys would like to modify the WinNT MPM to use the
same setup_lsiteners, that would be VERY cool.

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

9bdb713a

Move process_child_status to mpm_common.c. This requires re-naming it · 541055a6

Ryan Bloom authored Jul 10, 2000

to ap_process_child_status and opening up ap_coredump_dir. I have
modified all of the MPMs that I saw using this function to work with this
patch. Sorry if I broke anybody.

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

541055a6

Stop doing the find for make clean. This was causing us to clean every · fd794dc7

Ryan Bloom authored Jul 10, 2000

directory twice. We should still clean those directories that weren't
configured in the current configuration, but this wasn't the right
solution.

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

fd794dc7

Beware the Jubjub bird · 234c0624

Greg Stein authored Jul 10, 2000


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

234c0624

complete the removal of the old dav_dyn crap. dav plugins are now · e3c99789

Greg Stein authored Jul 10, 2000

implemented entirely through standard Apache modules, hooks, and some
additional registration.

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

e3c99789

liveprop namespace indexes are 1-based. make room in the marks array. · ba893657
Greg Stein authored Jul 10, 2000
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85802 13f79535-47bb-0310-9956-ffa450edef68
```
ba893657

torch just about all of the old dav_dyn stuff. temporarily hard-wire the · 6c19630c

Greg Stein authored Jul 10, 2000

    liveprop provider setup. this will go away momentarily (another pass).


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

6c19630c

new liveprop namespace registration and lookup. modules register each · b33512b1

Greg Stein authored Jul 10, 2000

namespace they will use, which then receives a process-wide index.
get rid of old dav_liveprop_uris global (and minor cleaning in dav_dyn);
encapsulate liveprop handling in liveprop.c.
do not build/use an ns_map; use dav_get_liveprop_ns_index().

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

b33512b1

09 Jul, 2000 5 commits

Fix mpm_common for use with the real prefork MPM. This was broken when · 1dd1a724

Ryan Bloom authored Jul 09, 2000

mpmt was added. This change can be removed when the MPM stuff calms down
a bit and either mpmt or three separate MPMs are chosen.

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

1dd1a724

Fix building the mpmt MPM. The problem was that IfModule uses the name of · eae60414

Ryan Bloom authored Jul 09, 2000

the C file to determine if a module is present. mpmt emulates three
different MPMs though. If the default config file we have sane defaults
for each of the three MPMs that mpmt emulates.

To fix this, the build process creates a soft link to the original MPM name
during the configure process, and the build process actually compiles that
file, instead of the original mpmt.c. This allow the mpmt MPM to work
just as well as mpmt_pthread.

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

eae60414

Days off are a good thing. :-) · 5d03125a

Ryan Bloom authored Jul 09, 2000


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

5d03125a

sunny. of course. · b27bc9f9

Greg Stein authored Jul 09, 2000


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

b27bc9f9

Change variable name to avoid conflict with typedef. Yes, it's anal. · 2d857343
Roy T. Fielding authored Jul 09, 2000
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85795 13f79535-47bb-0310-9956-ffa450edef68
```
2d857343

08 Jul, 2000 5 commits

Can you believe VC++ 6.0 was not catching this! Not even a warning. · 929a098a
Bill Stoddard authored Jul 08, 2000
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85794 13f79535-47bb-0310-9956-ffa450edef68
```
929a098a

Ack. is the variable · 9b2df93f

Jim Jagielski authored Jul 08, 2000

that's set, so we better check that one :)


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

9b2df93f

We already depend on these autoconf functions · fadef0cb

Jim Jagielski authored Jul 08, 2000

in other places. Avoid possible portability concerns by using them
here as well

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

fadef0cb

get rid of more of the old module/provider mechanisms -- use ap_hooks to · 185311fd

Greg Stein authored Jul 08, 2000

look up the plugins' function hook tables.


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

185311fd

the new "mpmt" MPM is busted. the config system didn't listen to me when I · 135bff59

Greg Stein authored Jul 08, 2000

said that I really wanted --with-mpm=mpmt_pthread. I made it listen :-)

the new behavior: if you explicitly state an MPM, then it is used. if it
guesses one, then it is free to replace that guess with mpmt.

[ yes, this will probably change again when mpmt works ]


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

135bff59

07 Jul, 2000 10 commits

Initial version of the mpmt MPM. This MPM can emulate dexter, mpmt_pthread, · 5b5818f1

Ryan Bloom authored Jul 07, 2000

and prefork. This basically just combines a lot of common code. This
builds and serves pages in all three modes, but I don't think killing
the server works in any of them. The configuration system hasn't changed
at all, so using --with-mpm=(prefork|dexter|mpmt_pthread) all work.

My goal is to remove the three separate MPMs in a few days, and then work
on merging one of the BeOS and the OS/2 MPMs into this as well. :-)

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

5b5818f1

Drastically increase the listen backlog for mod_cgid's unix socket. It · 444c559b

Jeff Trawick authored Jul 07, 2000

was pretty easy to hit ECONNREFUSED errors when the backlog was 5.

The backlog can be customized at build time if required.

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

444c559b

do the "get resource" via a hook rather than through the repository hook · 30f0e5cd

Greg Stein authored Jul 07, 2000

structure. once the resource is retrieved, then we have the relevant
repository hooks and can dispatch through those.
some additional tweaks to use lockdb->hooks rather than fetching them

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

30f0e5cd

do the config/build for module stuff "right" · 0791607c

Greg Stein authored Jul 07, 2000


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

0791607c

add a bit of framework so that experimental modules can be built a bit more · 9b97a7b3
Greg Stein authored Jul 07, 2000
```
easily.


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

turn dav/fs/ into a real module · 5aad857d

Greg Stein authored Jul 07, 2000

move the DAVLockDB directive to the dav_fs module


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

5aad857d

I bunged up Joe's patch. Use the right size in the pcalloc(). · 57165bf0
Greg Stein authored Jul 07, 2000
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85782 13f79535-47bb-0310-9956-ffa450edef68
```
57165bf0

This patch fixes several problems with mod_file_cache · ef9bc035

Bill Stoddard authored Jul 07, 2000

- Pool usage problem
- SIGSEGVs when both MMapFile and CacheFile directives are present.  The fix combines
the cleanup routines and only cleans up resources when appropriate.
- Log sendfile errors.

Submitted by:	Greg Ames
Reviewed by:	Bill Stoddard


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

ef9bc035

use ap_size_t rather than plain size_t · 979b63df

Greg Stein authored Jul 07, 2000


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

979b63df

APR-ize repos.c and lock.c. trim back repos.h. Original patch by Joe Orton · dd5d7a60

Greg Stein authored Jul 07, 2000

with some additional APR-izing from Greg (lock.c and ap_rename_file).

Submitted by: Joe Orton

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

dd5d7a60

06 Jul, 2000 2 commits

Fix the way that ap_rwrite() checks for an error from ap_bwrite(). · e161a914

Jeff Trawick authored Jul 06, 2000

A dropped connection could cause a loop in ap_send_mmap() (and probably
a few other places) because of this problem.

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

e161a914

Temporarily disable lingerling close until I can get the sendfile path right. · 1393c3a5

Bill Stoddard authored Jul 06, 2000

This avoids a seg fault when we try to shutdown then close a socket that has
been reset by the client.

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

1393c3a5