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

11 Aug, 2004 40 commits

Add some extra debugging to ease the bug chasing :) · 3de783c1

William A. Rowe Jr authored Aug 11, 2004

Submitted by: mturk


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

3de783c1

Make sure that the things get logged using the same look-and-feal. · 8181ec74

William A. Rowe Jr authored Aug 11, 2004

Also fix the return code from DECLINED to service unavailable if the connection breaks.

Submitted by: mturk

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

8181ec74

Fix the url rewriting, and few minor developement bugs. · cec701bf

William A. Rowe Jr authored Aug 11, 2004

Submitted by: mturk


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

cec701bf

Fix the return codes. We can not return the APR error codes. · cf979426

William A. Rowe Jr authored Aug 11, 2004

Submitted by: mturk


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

cf979426

Make sure that if the pre_request was called that the post_request · 2c6bdb5f

William A. Rowe Jr authored Aug 11, 2004

gets called too, no mather what the error code is.

Submitted by: mturk


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

2c6bdb5f

Implement the worker retry functionality. · 53eb9be2

William A. Rowe Jr authored Aug 11, 2004

It uses either worker->retry option or default 60 second retry
that is on each revolution extended by another 60 seconds.

Submitted by: mturk

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

53eb9be2

Use the proxy_runtime_stat that either comes from scoreboard or · 9a266ceb

William A. Rowe Jr authored Aug 11, 2004

directly allocating memory if there is no scoreboard support or it is not
neaded, due to the fact that we have single child process.

Submitted by: mturk

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

9a266ceb

Shared memory support. The shared memory is inside · fa881d5e

William A. Rowe Jr authored Aug 11, 2004

apache scoreboard. If it ever gets back ported we could use it on 2.0

Submitted by: mturk

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

fa881d5e

Use the pool for add_worker call. · 3f0938f4

William A. Rowe Jr authored Aug 11, 2004

Submitted by: mturk


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

3f0938f4

Add pool to functions for setting worker and balancer parameters. · 24d22262

William A. Rowe Jr authored Aug 11, 2004

Still have no idea why that doesn't work without duping as JeanFrederic reported.

Submitted by: mturk

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

24d22262

Add rewrite url function and calcute lbstatuses when session worker is elected. · d8807a05
William A. Rowe Jr authored Aug 11, 2004
```
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104614 13f79535-47bb-0310-9956-ffa450edef68
```
d8807a05
The lbstatus needs to be updated for every worker, not just the candidate. · 48c1914d
William A. Rowe Jr authored Aug 11, 2004
```
Submitted by: mturk


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

Add finding of a most suitable worker. · a4704062

William A. Rowe Jr authored Aug 11, 2004

Submitted by: mturk


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

a4704062

Add route and redirect to worker so they can be set trough configuration. · d3fafc6d

William A. Rowe Jr authored Aug 11, 2004

Add worker status flag definitions.

Submitted by: mturk


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

d3fafc6d

Set initial lbstatus to calculated lbfactor. · b0d2c77a

William A. Rowe Jr authored Aug 11, 2004

Submitted by: mturk


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

b0d2c77a

Fix structure element typo. · 0306d4ae

William A. Rowe Jr authored Aug 11, 2004

Submitted by: mturk


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

0306d4ae

Add proxy_balancer to proxy module, including config and capturing · c32e11d1

William A. Rowe Jr authored Aug 11, 2004

-I ../generators for the mod_status.h

Submitted by: mturk


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

c32e11d1

Remove setting module config. · ef3bf169

William A. Rowe Jr authored Aug 11, 2004

Submitted by: mturk


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

ef3bf169

Fix some config checking params. · 0416cf3a

William A. Rowe Jr authored Aug 11, 2004

Added route and route redirect to the runtime worker.

Submitted by: mturk


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

0416cf3a

Bounding to client connection is not needed(?). · 365c73db

William A. Rowe Jr authored Aug 11, 2004

Since AJP can serve multiple request trough the same
backend connection, no need to create separate conn_rec.
For now comment out all the set/get module config.

Submitted by: mturk


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

365c73db

Use the new connection pool for AJP. · 19e7c774

William A. Rowe Jr authored Aug 11, 2004

Submitted by: mturk


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

19e7c774

Always use the cleanup. Do not close the socket directly. · 6a3321b1

William A. Rowe Jr authored Aug 11, 2004

Submitted by: mturk


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

6a3321b1

Fix the assertion bug for reslist caused by returning the · c4268db7

William A. Rowe Jr authored Aug 11, 2004

same connection back to the pool twice.

Submitted by: mturk


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

c4268db7

We have a proxy-http using connection pool ;) · 73ffcd0f

William A. Rowe Jr authored Aug 11, 2004

Need some thorough testing.

Submitted by: mturk


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

73ffcd0f

Change the scheme handler hook to include worker. · ee3ddd90

William A. Rowe Jr authored Aug 11, 2004

We will probably need the balancer too, but that can wait for now.
Other undocumented changes (shame,shame) in proxy_util.c

Submitted by: mturk

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

ee3ddd90

Added close_on_recycle flags for creatin connections. · ce4e4192

William A. Rowe Jr authored Aug 11, 2004

This flag enables to distinguish between connection types.
Also added a pool cleanup bound to connection pool that recycles
the connection when client disconnects from server.

Submitted by: mturk


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

ce4e4192

Added acquire and release connection functions. · ceaf988d

William A. Rowe Jr authored Aug 11, 2004

The acquire pulls the connection from the pool.
The release returns the connection to the pool.

Submitted by: mturk


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

ceaf988d

Added ap_proxy_connection_create function that makes · 19a7fffe

William A. Rowe Jr authored Aug 11, 2004

conn_rec for opened connection. It is used bt http(s) and ftp for
bounding the backend connection to client connection with the same id's.

Submitted by: mturk

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

19a7fffe

Added KeepAlive worker option. · 19bd5ee8

William A. Rowe Jr authored Aug 11, 2004

The scheme handler will override this setting if required, depending on the
protocol itself and keepalive_set flag.

Submitted by: mturk


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

19bd5ee8

Add ap_proxy_connect_backend that will replace · 08660c6a

William A. Rowe Jr authored Aug 11, 2004

ap_proxy_connect_to_backend. It uses worker params for setting socket
options and checks for conection's connect status.
It works both on empty and acquired connections.

Submitted by: mturk


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

08660c6a

Added iobuffersize and receivebuffersize to be worker specific. · 92e4dac5

William A. Rowe Jr authored Aug 11, 2004

As for timeout their default value is from proxy_conf.

Submitted by: mturk


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

92e4dac5

Change the way the prefork connection is created. · ad5c2de6

William A. Rowe Jr authored Aug 11, 2004

Use the same constructor as for theaded mpm's.
Added API's for destroying and closing connections

Submitted by: mturk


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

ad5c2de6

Added timeout_set for worker. Each worker can have a different timeout · e1c801a2

William A. Rowe Jr authored Aug 11, 2004

the ProxyTimout sets. Also changed proxy_conf's timeout_set to int.

Use timeout_set for worker inherited from ProxyTimeout but overridable
using timout=xxx

Submitted by: mturk


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

e1c801a2

Added acquire timeout for obtaining resources from reslist. · d37e1066

William A. Rowe Jr authored Aug 11, 2004

The timeout is in milliseconds to enable quick return in case the
reslist is exceded the maximum number of connections.

Submitted by: mturk


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

d37e1066

Remove proxy_mdule_conf. · a6f738a1

William A. Rowe Jr authored Aug 11, 2004

We will change the scheme hook api to include the worker.

Submitted by: mturk


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

a6f738a1

Remove proxy_conn struct and add it's params to proxy_conn_rec. · 56bffb7c

William A. Rowe Jr authored Aug 11, 2004

Use named structure type declarations.

Submitted by: mturk


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

56bffb7c

Add worker timeout inherited from ProxyTimeout. · bdd37775

William A. Rowe Jr authored Aug 11, 2004

Submitted by: mturk


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

bdd37775

Use the worker pool for creating proxy_conn_poll to suppress it's · 3f0af6f7

William A. Rowe Jr authored Aug 11, 2004

destruction when cleaning worker.

Submitted by: mturk


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

3f0af6f7

Arrange the handling of apr_array_header_t arrays. · a603bc9f

William A. Rowe Jr authored Aug 11, 2004

Submitted by: jfclere


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

a603bc9f

Make proxy_conn always accesible for preforked MPM and · 498e2a6c

William A. Rowe Jr authored Aug 11, 2004

APR_HAS_THREADS enabled.

Add init_conn_worker for creating apr_reslist that maintains connection
pool. For prefork mpm's use the single connection container.

Submitted by: mturk


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

498e2a6c