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

Apr 28, 2002

Aaron Bannert authored Apr 28, 2002


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

ad1fb1e7

Some more threadpool MPM changes: · f9c42818

Aaron Bannert authored Apr 28, 2002

- Add a "state" variable to the worker_wakeup_info struct. This is
  used to make sure that we act on the correct signal, and to know when
  to shut down a worker thread.
- Fix the call when the worker thread waits for a connection to use
  the new state variable and use mutexes around the cond_wait() call.
- Change the interrupt_all() call to set the WORKER_TERMINATED state.
- Add two AP_DEBUG_ASSERT() to make sure that we aren't waking up
  a worker thread before it is idle.


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

f9c42818

Clarify an incorrect statement about why we're purposfully putting · d9bf770d

Aaron Bannert authored Apr 28, 2002

the signal inside of a mutex.


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

d9bf770d

Some threadpool fixes: · f00ec6fd

Aaron Bannert authored Apr 28, 2002

- We don't need the listener_blocked flag, just check if the element
  we're adding makes the stack non-empty.
- When we are terminated, return APR_EOF; catch this event in the
  worker thread and the listener thread.
- When shutting down, always signal a potential listener thread.
- Wait to signal the listener thread until after we add the worker
  element to the stack.


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

f00ec6fd

Detect APR_EINTR from ap_queue_pop() and avoid calling · 170e12e0

Aaron Bannert authored Apr 28, 2002

ap_queue_info_set_idle() more than once at a time per worker thread.
This fixes an assert coredump.

Submitted by:	Aaron Bannert
Reviewed by:	Brian Pane


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

170e12e0

When we signal a condition variable, we need to own the lock that · 719c46d2

Aaron Bannert authored Apr 28, 2002

is associated with that condition variable. This isn't necessary
for Solaris, but for Posix it is.

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

719c46d2

Fix a bug in the mod_status display caused by some uninitialized fields. · 47ed9e75

Bill Stoddard authored Apr 28, 2002

Prep for taking mpm_winnt to multi-process...


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

47ed9e75

Style cleanup (remove tabs, fix alignment). · e097d2a8

Aaron Bannert authored Apr 28, 2002

Submitted by:	Thom May <thom@planetarytramp.net>


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

e097d2a8

Typo fix. · aa3ab066

Joshua Slive authored Apr 28, 2002

Submitted by: Phil Forrest <forrest@physics.auburn.edu>


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

aa3ab066

kill a warning on Darwin for NONCE_LEN becoming a long int by math. · 78faf65b
Roy T. Fielding authored Apr 28, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94833 13f79535-47bb-0310-9956-ffa450edef68
```
78faf65b

If a subreq added a filter (say INCLUDES) and the subreq was promoted via · 07060a28

Justin Erenkrantz authored Apr 28, 2002

fast_redirect, the filter would still point at the subreq - rather than
the original r.  So, we must update any filters pointing at rr to be r.

This would cause lots of problems with mod_include with mod_dir requests
such as seen in PR 7966.  mod_include would be unsetting the headers_out
of rr instead of r.  But, we disassociate rr->headers_out and r->headers_out.
Therefore, the C-L header in r->headers_out would remain - even though it
bears no relation to what we will be outputting - causing problems.

This also now permits chunked-encoding of mod_dir/mod_include requests
which could never happen before and fixes the content-length problem
seen in PR 7966.

As hinted at in PR 7966, there is a race condition - if for some reason
the server stalls reading an included file (or even better, placing a
sleep in the cgi-bin script!), the invalid C-L may get propogated to the
client.

(Note that internal_internal_redirect has this same code fragment.)

PR: 7966


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

07060a28

Simplify this little chunk of code since r is set to f->r earlier. · ee78428c
Justin Erenkrantz authored Apr 28, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94831 13f79535-47bb-0310-9956-ffa450edef68
```
ee78428c

Moved the recycled pool list from the queue to the queue_info structure. · 592a679a

Brian Pane authored Apr 28, 2002

The advantage of doing this is that it enables us to guarantee that the
number of ptrans pools in existence at once is no greater than the
number of worker threads, and that we'll never have to delete ptrans
pools.

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

592a679a

Added a missing pool deletion case and simplified the conditionals · 7aa19296

Brian Pane authored Apr 28, 2002

for the error-case return (thanks to Justin for suggesting the
latter)


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

7aa19296

Move a potentially expensive pool cleanup operation outside · 789d28d6

Brian Pane authored Apr 28, 2002

the mutex-protected critical path of ap_queue_pop()


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

789d28d6

Preserve the original error, or if the unlock fails then use that · 4ae51770

Aaron Bannert authored Apr 28, 2002

error instead.

Obtained from:  Justin Erenkrantz
Submitted by:	Aaron Bannert


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

4ae51770

Removed creation of unused struct · 931df628

Brian Pane authored Apr 28, 2002


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

931df628

Modify the worker MPM to not accept() new connections until · 85a9154b

Aaron Bannert authored Apr 28, 2002

there is an available worker thread. This prevents queued
connections from starving for processing time while long-running
connections were hogging all the available threads.

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

85a9154b

Add a "queue_info" structure to the worker MPM. This is used to prevent · 74e62132

Aaron Bannert authored Apr 28, 2002

the listener thread from accept()ing more connections than there are
available workers. This prevents long-running requests from starving
connections that have been accepted but not yet processed.

The queue_info is a simple counter, mutex, and condition variable. Only
the listener thread blocks on the condition, and only when there are no
idle workers. In the fast path there is a mutex lock, integer decrement,
and and unlock (among a few conditionals). The worker threads each notify
the queue_info when they are about to block on the normal worker_queue
waiting for some connection to process, which wakes up any sleeping
listener thread to go perform another accept() in parallel.

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

74e62132

Fixed the creation of the worker threads' data structures · 01d7af03

Brian Pane authored Apr 28, 2002


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

01d7af03

Apr 27, 2002

my_generation is in the shared scoreboard now. · 97685c95

Bill Stoddard authored Apr 27, 2002


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

97685c95

Apr 26, 2002

Added a vote on MPMs · 72f318f4

Brian Pane authored Apr 26, 2002


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

72f318f4

· 2a7ce1a2

William A. Rowe Jr authored Apr 26, 2002

After review and testing against all of the PSDK examples (see
http://www.apache.org/~wrowe/ for commentary on building the
examples and making them work) ... this disable-optimization
should no longer be required.

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

2a7ce1a2

Added a check to make sure that h_aliases is not NULL before we try to · f7c451c3

Bradley Nicholes authored Apr 26, 2002

dereference it in the for(...) loop. Attempting to dereference a NULL pointer
was causing a fault if there were no aliases found.

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

f7c451c3

Apply a patch to compile cleanly again against changes to the shared memory · 49fe8228

Graham Leggett authored Apr 26, 2002

implementation in APR.
PR:
Obtained from:
Submitted by:	Eduardo Garcia Lopez <egarcia@stream18.com>
Reviewed by:


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

49fe8228

get closer to having apxs work from a binary distribution · 49b7978e

Jeff Trawick authored Apr 26, 2002

we need to copy libtool and instdso.sh verbatim, and we
need to edit config_vars.mk and apxs

still broken: "httpd -l" as invoked by apxs can fail since
support libraries (apr, aprutil, etc.) are probably not
findable


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

49b7978e

Update release info. · 311836d1

Justin Erenkrantz authored Apr 26, 2002


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

311836d1

Even though this is in APR, it is causing big problems in Apache. · 6b400de9
Aaron Bannert authored Apr 26, 2002
```
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94815 13f79535-47bb-0310-9956-ffa450edef68
```
6b400de9

The worker's fdqueue is now a queue again. · 1107d0c1

Aaron Bannert authored Apr 26, 2002


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

1107d0c1

Convert the worker MPM's fdqueue from a LIFO back into a FIFO. Since · 2f4e4bc5

Aaron Bannert authored Apr 26, 2002

elements in the queue represent accept()ed connections, we want them
to be processed in the order that they were received. (I erroneously
converted it to a LIFO quite awhile ago in the hopes that it would
improve cache efficiency.)

Remember to perform a make clean in the worker directory after this patch,
since this patch changes the size of the fd_queue_t object (which is
allocated in worker.c).

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

2f4e4bc5

fix a compile break on EBCDIC machines · dc96ceb6

Jeff Trawick authored Apr 26, 2002


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

dc96ceb6

get basic HTTP proxy working on EBCDIC machines · 2c9f05f0

Jeff Trawick authored Apr 26, 2002

(I would bet that there is more work to do throughout proxy, but at least
it can serve some pages now)


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

2c9f05f0

Switch back from atomic_cas to mutexes, based on all the current · 38357a11

Brian Pane authored Apr 26, 2002

portability challenges with atomics


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

38357a11

Some of these worker bugs may or may not be showstoppers, but I'll let · 9ee54ee4

Aaron Bannert authored Apr 26, 2002

Striker decide that. I hope to have the top two of these finished in
the next 24 hours, but the third I may need some help with.

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

9ee54ee4

Apr 25, 2002

get mod_proxy to build on EBCDIC machines · 3775cc2a

Jeff Trawick authored Apr 25, 2002


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

3775cc2a

remove a goto · 55f030ff

Greg Ames authored Apr 25, 2002


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

55f030ff

Typoed HTML tag. </ br> -> <br /> · 28f374f1

Richard Bowen authored Apr 25, 2002


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

28f374f1

Added example of the Redirect status syntax. · 950f0ee2

Richard Bowen authored Apr 25, 2002


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

950f0ee2

fix a compiler error with picky compilers that (correctly) don't let · 9381f3b5

Jeff Trawick authored Apr 25, 2002

you add to void *


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

9381f3b5

Correct SSI time format reference. · 3d31235d

Joshua Slive authored Apr 25, 2002

Submitted by: masao@ulis.ac.jp (Masao Takaku)
PR: 8449


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

3d31235d