www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity
13,288 Commits 62 Branches 306 Tags
6ede0301133abc4e67bb2ae1f3dcef3d6b8404af
Commit Graph

13288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
André Malo
6ede030113 update transformation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104657 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-15 13:24:00 +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
Astrid Malo
fa75a62cec - name Apache with its full name 
- markup improvement


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104655 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-14 16:16:23 +00:00
Astrid Malo
ddc3dee9cf markup improvement 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104654 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-14 11:23:53 +00:00
Jeff Trawick
eec68b03fb WinNT MPM: Fix a broken log message at termination. 
PR: 28063
Submitted by: Eider Oliveira <eider bol.com.br>
Reviewed by: Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104652 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-14 10:57:13 +00:00
Jeff Trawick
0f0a226ad1 tweak error handling when reading the pid file 
previously strtol() would look at unitialized
storage, but now the string is terminated where
the data read ends

give user a hint about removing the file if we can't
read/parse it properly

(somehow I ended up with a truncated httpd.pid on my
own system, leading to these tweaks)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104651 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-14 10:49:43 +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
Joe Orton
3dcd1d7164 * configure.in: Ensure that apr and apr-util exported include 
directories are later than local source directories in INCLUDES.

PR: 18959


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104647 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-13 12:35:47 +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
Joe Orton
d32d0e376c * configure.in: Define AP_HAVE_DESIGNATED_INITIALIZER via ap_config.h 
so third-party modules don't have to pick up NOTEST_CPPFLAGS to avoid
gcc warnings from http_config.h.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104642 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-13 11:18:33 +00:00
Joe Orton
84b6512fc8 * configure.in, acinclude.m4: Substitute AP[RU]_CONFIG with location 
of installed ap[ru]-config scripts so third-party modules can use
`apxs -q APR_CONFIG`.

* support/apxs.in: Use new AP[RU]_CONFIG variables; use apr-config
--apr-libtool.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104641 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-13 09:38:11 +00:00
William A. Rowe Jr
ef0c43088f Fix signedness emit. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104639 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-12 17:48:35 +00:00
William A. Rowe Jr
3b3abbd89d Missing an entry for proxy_balancer in the win32 baseaddr's list 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104638 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-12 17:00:54 +00:00
Joshua Slive
a88c9085d0 Continue with addressing the FAQ: How to do url manipulation 
on the query string.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104636 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-12 15:50:57 +00:00
Stas Bekman
d60aa10075 correct struct fields comments 
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104633 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-12 05:22:59 +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
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