1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Commit Graph

13502 Commits

Author SHA1 Message Date
Astrid Malo
7e554318f5 update translation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105088 13f79535-47bb-0310-9956-ffa450edef68
2004-09-12 13:03:13 +00:00
André Malo
ed706e987d add Revision mark
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105083 13f79535-47bb-0310-9956-ffa450edef68
2004-09-11 21:35:11 +00:00
André Malo
0259cf593e build all
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105082 13f79535-47bb-0310-9956-ffa450edef68
2004-09-11 19:20:46 +00:00
Mladen Turk
c4971322e9 Something I've wish to change for years :).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105081 13f79535-47bb-0310-9956-ffa450edef68
2004-09-11 18:54:49 +00:00
Mladen Turk
a45247dd4d Add ajp and balancer
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105080 13f79535-47bb-0310-9956-ffa450edef68
2004-09-11 18:47:05 +00:00
Mladen Turk
5a73cff3db Initial balancer documentation. Just framework.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105079 13f79535-47bb-0310-9956-ffa450edef68
2004-09-11 18:46:33 +00:00
Mladen Turk
a5fbd0a7d4 Add ajp documentation.
Mostly copied from jakarta site and translate to apache doc format


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105078 13f79535-47bb-0310-9956-ffa450edef68
2004-09-11 18:45:31 +00:00
Mladen Turk
3e6833da34 Add more comments to the code -- No functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105077 13f79535-47bb-0310-9956-ffa450edef68
2004-09-11 17:14:49 +00:00
Yoshiki Hayashi
08e9b921d3 The functionality is in mod_authz_host module in 2.1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105076 13f79535-47bb-0310-9956-ffa450edef68
2004-09-11 16:43:26 +00:00
Mladen Turk
99af1492a3 Add more comments to the code -- No functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105075 13f79535-47bb-0310-9956-ffa450edef68
2004-09-11 16:39:38 +00:00
Nick Kew
aeaa702528 Tidying loose ends.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105074 13f79535-47bb-0310-9956-ffa450edef68
2004-09-11 11:00:32 +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
Nick Kew
7114158e9f Add #if APR_HAS_MMAP to fix for non-MMAPing platforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105072 13f79535-47bb-0310-9956-ffa450edef68
2004-09-11 10:45:06 +00:00
Joe Orton
e75696f56e Fix format string warnings in proxy_ajp on 64-bit platforms:
* modules/proxy/ajp_header.c (ajp_send_data_msg): Use
APR_SIZE_T_FMT.

* modules/proxy/ajp_link.c (ajp_ilink_receive): Don't pass
\n to ap_log_error; do use APR_SIZE_T_FMT.

* modules/proxy/ajp_msg.c (ajp_msg_dump, ajp_msg_check_header,
ajp_msg_copy): Use APR_SIZE_T_FMT.
(ajp_log_overflow): New function.
(ajp_msg_{append,peek,get}_*): Use it.

* modules/proxy/proxy_ajp.c (ap_proxy_ajp_request): Use
APR_SIZE_T_FMT.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105071 13f79535-47bb-0310-9956-ffa450edef68
2004-09-11 09:57:12 +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
André Malo
72e8398861 update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105066 13f79535-47bb-0310-9956-ffa450edef68
2004-09-10 18:55:23 +00:00
Mladen Turk
a64681b5cf Initialize the forward proxy worker too.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105065 13f79535-47bb-0310-9956-ffa450edef68
2004-09-10 18:47:55 +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
4877098bc4 Initialize the balancer on child_init instead on first request to skip
the race condition.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105063 13f79535-47bb-0310-9956-ffa450edef68
2004-09-10 18:25:54 +00:00
Nick Kew
aa868e2511 Entering mod_filter and documentation, as previously discussed on dev@httpd.
Please test-drive in time for 2.2.  Currently compatible with 2.0 and up.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105062 13f79535-47bb-0310-9956-ffa450edef68
2004-09-10 16:17:15 +00:00
Mladen Turk
e93d6400e3 Include unistd.h for getpid.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105061 13f79535-47bb-0310-9956-ffa450edef68
2004-09-10 14:49:38 +00:00
Mladen Turk
9e235eb876 Fix compile time warnings (logging pointer and unused var).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105060 13f79535-47bb-0310-9956-ffa450edef68
2004-09-10 14:48:20 +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
Joe Orton
faa3a85728 MaxSpareServers cannot be equal to MinSpareServers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105058 13f79535-47bb-0310-9956-ffa450edef68
2004-09-10 09:21:31 +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
ced8a94089 Add function protos so that -Wmissing-declarations doesn't complain.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105055 13f79535-47bb-0310-9956-ffa450edef68
2004-09-09 19:56:30 +00:00
Mladen Turk
db9425f495 Fix typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105054 13f79535-47bb-0310-9956-ffa450edef68
2004-09-09 19:55:24 +00:00
André Malo
1e4baaab6c update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105053 13f79535-47bb-0310-9956-ffa450edef68
2004-09-09 19:50:26 +00:00
Mladen Turk
e35d233809 If any of steps return status != OK close the connection
and call the proxy_http_cleanup.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105051 13f79535-47bb-0310-9956-ffa450edef68
2004-09-09 16:22:23 +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
Mladen Turk
c355a4dc78 Add 'default' foward proxy worker to the proxy_server_conf.
Forward worker is constructed on ProxyRequests directive
with sceme and host equals '*', meaning all.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105044 13f79535-47bb-0310-9956-ffa450edef68
2004-09-09 10:24:27 +00:00
Mladen Turk
5593ebbfb2 Add 'default' foward proxy worker to the proxy_server_conf.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105043 13f79535-47bb-0310-9956-ffa450edef68
2004-09-09 10:22:19 +00:00
Yoshiki Hayashi
92d0f47b35 Forward port typo fix from 2.0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105042 13f79535-47bb-0310-9956-ffa450edef68
2004-09-09 06:17:29 +00:00
Jeff Trawick
4f2a685fa7 document a problem with AIX native compiler and Apache 2+,
and describe how to avoid it

PR:   30487


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105038 13f79535-47bb-0310-9956-ffa450edef68
2004-09-08 14:50:31 +00:00
André Malo
c7308039ec update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105030 13f79535-47bb-0310-9956-ffa450edef68
2004-09-08 10:34:28 +00:00
Yoshiki Hayashi
199bc66637 The domain name example1.com actually exists and is NOT one of the
example domain names reserved in RFC2606.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105029 13f79535-47bb-0310-9956-ffa450edef68
2004-09-08 06:13:54 +00:00
André Malo
66286d5c01 update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105027 13f79535-47bb-0310-9956-ffa450edef68
2004-09-07 06:05:34 +00:00
Yoshiki Hayashi
35a4208295 Grammar police.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105020 13f79535-47bb-0310-9956-ffa450edef68
2004-09-07 02:28:16 +00:00
Yoshiki Hayashi
aa2e4b0b37 Grammar police.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105019 13f79535-47bb-0310-9956-ffa450edef68
2004-09-07 00:13:40 +00:00
André Malo
9e2ffd375f use language designtated maf base urls
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105016 13f79535-47bb-0310-9956-ffa450edef68
2004-09-05 17:17:40 +00:00
André Malo
c015d9b2ad clean up
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105012 13f79535-47bb-0310-9956-ffa450edef68
2004-09-05 16:04:29 +00:00
André Malo
1676f10a20 build bootstrap
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105010 13f79535-47bb-0310-9956-ffa450edef68
2004-09-05 16:01:20 +00:00