www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-05 05:30:39 +03:00
Code Activity
22,500 Commits 62 Branches 304 Tags
c7f1896fa72eafc46943b51a07b72634fda93ca3
Commit Graph

360 Commits

Author SHA1 Message Date
Mladen Turk
1994180dc0 Add server_rec to initialize_worker_share so that it get's 
correctly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105345 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-29 19:05:44 +00:00
Mladen Turk
0d9c89ae6f Reformat code to no tab and no CR-LF 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105320 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-28 16:54:29 +00:00
Mladen Turk
258273c945 Make sure that we don't increase balancer worker count on 
gracefull restart. Thanks to Christian...again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105318 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-28 16:35:29 +00:00
Mladen Turk
8a2d25e4fa Remove proxy_runtime_worker and make the things simpler by 
sharing runtime status accross child processes. Also make sure
that shared data is initialized after the scoreboard is created.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105293 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-26 06:54:27 +00:00
Mladen Turk
b4442f1f73 Make worker retry algorithm much simpler removing incremental 
timeout increase.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105177 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-17 08:00:20 +00:00
Mladen Turk
ccd30cbfd2 Fix worker retries and limit default retry timeout to 10 minutes. 
Thanks to Christian von Roques for spotting that.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105136 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-15 12:20:19 +00:00
Mladen Turk
ff2207a250 Register output function so that core can retrieve it and set 
scoreboard accordingly


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105132 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-15 11:57:02 +00:00
Mladen Turk
2a234c6ec6 Fix typo -- uri is constructed when there is no proxy in chain. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105110 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-13 11:36:24 +00:00
Mladen Turk
925dcf456d No need to allocate hostname on each request for 
persistent connections.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105109 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-13 11:30:22 +00:00
Mladen Turk
5cc48386c4 Always use prive connection pool for allocation, and call 
apr_pool_clear when the connection is closed on recycle, so
that we don't leak on persistent connections.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105108 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-13 11:13:28 +00:00
Mladen Turk
5a5f85aad4 Use worker as a parameter for connection_constructor. 
When min connections is greater then zero connstructor is
called when the reslist is created.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105073 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-11 10:50:05 +00:00
Mladen Turk
dd00fb7d89 Do not add forward proxy to other proxies. Use new function to 
create the worker that isn't by default added to the list of other workers.
This enalbles mixing forward and reverse proxy functionality on the same box.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105070 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-11 09:31:10 +00:00
Mladen Turk
dca2aae9b3 Remove the unused close_connection function. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105069 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-11 09:12:26 +00:00
Mladen Turk
c1a9316651 Make sure that the connection pool cleanup is called before 
the reslist is destroyed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105068 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-11 09:08:00 +00:00
Mladen Turk
225dd230c4 Just like for balancers initialize the workers on post_config 
instead on first request to skip the race condition.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105064 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-10 18:29:16 +00:00
Mladen Turk
be924b521a Remove the proxy_conn_cleanup. The socket will be closed 
when the pool is cleared or destroyed by it's own cleanup routine.
Also skip clearing sockets if the workers pool is destroyed, cause
the pool might already be destroyed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105059 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-10 14:32:11 +00:00
Mladen Turk
916b02a98d Move the shared scoreboard data initization to the balancer module. 
The initialization is done like for the worker, on first request.
This is done because during config phase we don't have a scoreboard
to allocate from. Thanks to Chritian von Roques for spotting that.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105057 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-10 08:16:25 +00:00
Mladen Turk
333cd66de6 Remove unneeded variable. No functional change. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105056 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-09 19:57:29 +00:00
Mladen Turk
7e60923864 Make sure that the status is not overwritten. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105050 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-09 16:14:41 +00:00
Jeff Trawick
2f4e3c8872 spellcheck 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105049 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-09 15:54:50 +00:00
Mladen Turk
4f9be531d7 First try the reverse proxies. If there is no worker defined for 
requested uri use the forward worker, but only for PROXYREQ_PROXY
requests.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105048 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-09 13:51:08 +00:00
Mladen Turk
44d1474f1e Add PROXY_WORKER_IGNORE_ERRORS flags that 
disables puting the entire worker in retry mode, cause
for forward workers the remote is not fixed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105047 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-09 13:15:40 +00:00
Mladen Turk
bea1cc4147 Add sockaddr to proxy_conn_rec. Using the workers address 
is unsafe for forward proxy workers, cause unlike reverse
proxies the forward can have each connection with different
remote address.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105046 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-09 13:03:06 +00:00
Mladen Turk
4f7554d102 Use forward worker for all PROXYREQ_PROXY requests. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105045 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-09 10:26:29 +00:00
Graham Leggett
bf820c3251 Fix some compiler warnings in proxy 
PR:
Obtained from:
Submitted by:	Geoffrey Young <geoff@modperlcookbook.org>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104708 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-18 13:34:17 +00:00
Jeff Trawick
e882977b72 axe some unused variables and don't log an error code that 
hasn't been initialized


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104646 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-13 12:20:53 +00:00
William A. Rowe Jr
bf25755997 Fix setting of hostname for backend. 
The now reflects the real name withouth scheme:// prefix.

Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104628 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 23:30:54 +00:00
William A. Rowe Jr
9b549607fc Added dynamic worker limit. It ensures that the addng dynamic 
workers to the balancers never excedes that limit.

Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104625 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 23:10:35 +00:00
William A. Rowe Jr
855a0c323b Add some extra debugging to ease the bug chasing :) 
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104624 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 23:09:57 +00:00
William A. Rowe Jr
4d5f6895d1 Implement the worker retry functionality. 
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
 2004-08-11 23:05:59 +00:00
William A. Rowe Jr
906f2c3d2d Shared memory support. The shared memory is inside 
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
 2004-08-11 23:02:53 +00:00
William A. Rowe Jr
b8a176667f Add route and redirect to worker so they can be set trough configuration. 
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
 2004-08-11 22:56:51 +00:00
William A. Rowe Jr
4c69458867 Set initial lbstatus to calculated lbfactor. 
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104610 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 22:55:28 +00:00
William A. Rowe Jr
674cfed554 Fix the assertion bug for reslist caused by returning the 
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
 2004-08-11 22:44:38 +00:00
William A. Rowe Jr
f99f785c89 Change the scheme handler hook to include worker. 
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
 2004-08-11 22:41:02 +00:00
William A. Rowe Jr
ae18ec32a1 Added close_on_recycle flags for creatin connections. 
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
 2004-08-11 22:39:02 +00:00
William A. Rowe Jr
6cc26c2656 Added acquire and release connection functions. 
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
 2004-08-11 22:37:08 +00:00
William A. Rowe Jr
62ccd6ca6a Added ap_proxy_connection_create function that makes 
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
 2004-08-11 22:36:28 +00:00
William A. Rowe Jr
5ead791f0e Add ap_proxy_connect_backend that will replace 
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
 2004-08-11 22:34:26 +00:00
William A. Rowe Jr
ae33d99379 Change the way the prefork connection is created. 
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
 2004-08-11 22:32:22 +00:00
William A. Rowe Jr
c25b89a720 Added acquire timeout for obtaining resources from reslist. 
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
 2004-08-11 22:30:06 +00:00
William A. Rowe Jr
66239a82ef Remove proxy_mdule_conf. 
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
 2004-08-11 22:28:59 +00:00
William A. Rowe Jr
3cc146e42b Remove proxy_conn struct and add it's params to proxy_conn_rec. 
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
 2004-08-11 22:27:34 +00:00
William A. Rowe Jr
385f71e758 Use the worker pool for creating proxy_conn_poll to suppress it's 
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
 2004-08-11 22:15:23 +00:00
William A. Rowe Jr
504d6da5ab Arrange the handling of apr_array_header_t arrays. 
Submitted by: jfclere


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104586 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 22:14:49 +00:00
William A. Rowe Jr
c460a77e84 Make proxy_conn always accesible for preforked MPM and 
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
 2004-08-11 22:13:50 +00:00
William A. Rowe Jr
5b93a5f53c Add some source comments about worker DNS lookup. 
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104584 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 22:12:02 +00:00
William A. Rowe Jr
9e6393182e Added ap_proxy_determine_connection. 
It will be used both for http and ajp handlers.
Started writing apr_reslist connection pool.

Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104582 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 22:05:20 +00:00
William A. Rowe Jr
f9596ca564 Add ap_proxy_pre_request API function. 
It calls the actual module pre_request hook if present

Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104578 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 22:00:47 +00:00
William A. Rowe Jr
4c283844ab Make sure that APR_MAJOR_VERSION is defined. 
Submitted by: jfclere


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104575 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 21:49:40 +00:00