www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Code Activity
13,520 Commits 62 Branches 304 Tags
7584e8b211f2bdf085e0697f5cb15fcbed536adb
Commit Graph

583 Commits

Author SHA1 Message Date
Mladen Turk
4a351595b3 Change the links to ajp files. They are no longer in the ajp subdir. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104781 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-24 07:56:20 +00:00
Jean-Frederic Clere
72e9dc7a50 Process request and response in ap_proxy_ajp_request() that the only 
way to process GET_BODY_CHUNCK after SEND_HEADER and SEND_BODY_CHUNK.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104764 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-21 19:27:24 +00:00
Bradley Nicholes
64e770c767 Build using the ajp code in the proxy directory. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104750 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-20 17:10:18 +00:00
Jean-Frederic Clere
6442f7203e Arrange the logic sending to body data to Tomcat. 
Now it works for both chunked and not-chunked.
But it is not yet working when the Tomcat starts to send data before having
read all the body and then reads again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104717 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-18 17:04:45 +00:00
Jean-Frederic Clere
244f2d8f39 Sorry there were 2 typos 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104716 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-18 16:53:50 +00:00
Jean-Frederic Clere
0b2a0d6e35 Typo. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104715 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-18 16:49:46 +00:00
Jean-Frederic Clere
ba8ab9bed4 Prevent / beeing accepted wrongly by the proxy when having for example: 
<Location /examples/>
   ProxyPass ajp://localhost:8009/examples/
</Location>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104714 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-18 16:46:12 +00:00
Jean-Frederic Clere
af2ceefe62 The ajp subdirectory does not exist so we don't need it in the includes. 
The mod_proxy_ajp.dsp also refers to source files in .\ajp but that looks to
be a generate file; someone with the right have to arrange it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104713 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-18 16:32:27 +00:00
Jean-Frederic Clere
5e63bc4a90 jakarta-tomcat-connectors AJP files. 
The original location of the files in jakarta is:
jakarta-tomcat-connectors/ajp/ajplib/test
(That was not a good idea)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104711 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-18 16:09:27 +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
Bradley Nicholes
e9977c0b90 Clean up the makefile 
Submitted by: Guenter Knauf <fuankg@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104684 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-16 21:55:26 +00:00
Jeff Trawick
3900951885 fix an infinite loop in proxy CONNECT 
(problem was only in 2.1-dev)

Submitted by:	jean-frederic clere <jfrederic.clere fujitsu-siemens.com>
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104683 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-16 16:09:48 +00:00
Bradley Nicholes
535b2c4ae2 Relax the pointer checking for the proxy_ajp module to avoid a pointer mismatch error when compiling 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104682 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-16 14:58:18 +00:00
Bradley Nicholes
209ddfbb12 Conditionally build the proxy_ajp module of the ajplib file are available 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104656 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-14 17:36:06 +00:00
Bradley Nicholes
7f47aa1ba8 Fix the parameter list for the scheme_handler ap_proxy_connect_handler() so that it matches the prototype declared for the scheme_handler hook. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104650 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-13 23:16:50 +00:00
Bradley Nicholes
9a86040ed4 Add the new proxy protocol modules to the NetWare build 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104649 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-13 23:13:46 +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
Jeff Trawick
ac4dcde20a apr_tolower() doesn't process the entire string 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104645 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-13 12:15:46 +00:00
Jeff Trawick
64119fafdd fix some const issues with string searching 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104644 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-13 12:11:50 +00:00
Jeff Trawick
26f21a9cbf fix format string mismatch (int vs. apr_time_t) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104643 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-13 12:09:13 +00:00
William A. Rowe Jr
84fd685bce Small status displaying fix. 
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104629 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 23:31:40 +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
c42bcbc7ba Added proxy status for conf, and elected member to runtime worker 
Added mod_status extension for displaying runtime
status informations for load balancer.

Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104627 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 23:30:17 +00:00
William A. Rowe Jr
787adb7c05 Start porting connection pool to ftp. 
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104626 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 23:28:58 +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
dcbceac99f Make sure that the things get logged using the same look-and-feal. 
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
 2004-08-11 23:09:17 +00:00
William A. Rowe Jr
6590e33ec9 Fix the url rewriting, and few minor developement bugs. 
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104622 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 23:08:34 +00:00
William A. Rowe Jr
0c15126a6c Fix the return codes. We can not return the APR error codes. 
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104621 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 23:08:04 +00:00
William A. Rowe Jr
c84854f270 Make sure that if the pre_request was called that the post_request 
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
 2004-08-11 23:07:16 +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
ec90a6826c Use the proxy_runtime_stat that either comes from scoreboard or 
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
 2004-08-11 23:03:43 +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
08e97ab50f Use the pool for add_worker call. 
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104616 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 23:01:39 +00:00
William A. Rowe Jr
8ca5c23d99 Add pool to functions for setting worker and balancer parameters. 
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
 2004-08-11 23:00:07 +00:00
William A. Rowe Jr
e1c9bf4b2a Add rewrite url function and calcute lbstatuses when session worker is elected. 
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104614 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 22:58:51 +00:00
William A. Rowe Jr
9bdff3874d The lbstatus needs to be updated for every worker, not just the candidate. 
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104613 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 22:58:30 +00:00
William A. Rowe Jr
392b0fc5fc Add finding of a most suitable worker. 
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104612 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 22:58:03 +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
3698b4588c Fix structure element typo. 
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104609 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 22:55:00 +00:00
William A. Rowe Jr
3c5a741b55 Add proxy_balancer to proxy module, including config and capturing 
-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
 2004-08-11 22:52:46 +00:00
William A. Rowe Jr
392a44c544 Remove setting module config. 
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104607 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 22:51:34 +00:00
William A. Rowe Jr
7d605dabeb Fix some config checking params. 
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
 2004-08-11 22:48:13 +00:00
William A. Rowe Jr
2b663aafd6 Bounding to client connection is not needed(?). 
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
 2004-08-11 22:46:31 +00:00
William A. Rowe Jr
abfd8529a3 Use the new connection pool for AJP. 
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104604 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 22:45:51 +00:00
William A. Rowe Jr
d65c9af1d8 Always use the cleanup. Do not close the socket directly. 
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104603 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 22:45:08 +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
99259de783 We have a proxy-http using connection pool ;) 
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
 2004-08-11 22:43:44 +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