]>
granicus.if.org Git - apache/log
André Malo [Sun, 15 Aug 2004 13:27:16 +0000 (13:27 +0000)]
fix & update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104658
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 15 Aug 2004 13:24:00 +0000 (13:24 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104657
13f79535 -47bb-0310-9956-
ffa450edef68
Bradley Nicholes [Sat, 14 Aug 2004 17:36:06 +0000 (17:36 +0000)]
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
Astrid Malo [Sat, 14 Aug 2004 16:16:23 +0000 (16:16 +0000)]
- 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
Astrid Malo [Sat, 14 Aug 2004 11:23:53 +0000 (11:23 +0000)]
markup improvement
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104654
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 14 Aug 2004 10:57:13 +0000 (10:57 +0000)]
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
Jeff Trawick [Sat, 14 Aug 2004 10:49:43 +0000 (10:49 +0000)]
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
Bradley Nicholes [Fri, 13 Aug 2004 23:16:50 +0000 (23:16 +0000)]
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
Bradley Nicholes [Fri, 13 Aug 2004 23:13:46 +0000 (23:13 +0000)]
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
Joe Orton [Fri, 13 Aug 2004 12:35:47 +0000 (12:35 +0000)]
* 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
Jeff Trawick [Fri, 13 Aug 2004 12:20:53 +0000 (12:20 +0000)]
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
Jeff Trawick [Fri, 13 Aug 2004 12:15:46 +0000 (12:15 +0000)]
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
Jeff Trawick [Fri, 13 Aug 2004 12:11:50 +0000 (12:11 +0000)]
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
Jeff Trawick [Fri, 13 Aug 2004 12:09:13 +0000 (12:09 +0000)]
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
Joe Orton [Fri, 13 Aug 2004 11:18:33 +0000 (11:18 +0000)]
* 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
Joe Orton [Fri, 13 Aug 2004 09:38:11 +0000 (09:38 +0000)]
* 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
William A. Rowe Jr [Thu, 12 Aug 2004 17:48:35 +0000 (17:48 +0000)]
Fix signedness emit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104639
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 12 Aug 2004 17:00:54 +0000 (17:00 +0000)]
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
Joshua Slive [Thu, 12 Aug 2004 15:50:57 +0000 (15:50 +0000)]
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
Stas Bekman [Thu, 12 Aug 2004 05:22:59 +0000 (05:22 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 23:31:40 +0000 (23:31 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 23:30:54 +0000 (23:30 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 23:30:17 +0000 (23:30 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 23:28:58 +0000 (23:28 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 23:10:35 +0000 (23:10 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 23:09:57 +0000 (23:09 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 23:09:17 +0000 (23:09 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 23:08:34 +0000 (23:08 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 23:08:04 +0000 (23:08 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 23:07:16 +0000 (23:07 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 23:05:59 +0000 (23:05 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 23:03:43 +0000 (23:03 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 23:02:53 +0000 (23:02 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 23:01:39 +0000 (23:01 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 23:00:07 +0000 (23:00 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:58:51 +0000 (22:58 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:58:30 +0000 (22:58 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:58:03 +0000 (22:58 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:56:51 +0000 (22:56 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:55:28 +0000 (22:55 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:55:00 +0000 (22:55 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:52:46 +0000 (22:52 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:51:34 +0000 (22:51 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:48:13 +0000 (22:48 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:46:31 +0000 (22:46 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:45:51 +0000 (22:45 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:45:08 +0000 (22:45 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:44:38 +0000 (22:44 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:43:44 +0000 (22:43 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:41:02 +0000 (22:41 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:39:02 +0000 (22:39 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:37:08 +0000 (22:37 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:36:28 +0000 (22:36 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:35:19 +0000 (22:35 +0000)]
Added KeepAlive worker option.
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:34:26 +0000 (22:34 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:33:07 +0000 (22:33 +0000)]
Added iobuffersize and receivebuffersize to be worker specific.
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:32:22 +0000 (22:32 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:31:46 +0000 (22:31 +0000)]
Added timeout_set for worker. Each worker can have a different timeout
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:30:06 +0000 (22:30 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:28:59 +0000 (22:28 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:27:34 +0000 (22:27 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:16:27 +0000 (22:16 +0000)]
Add worker timeout inherited from ProxyTimeout.
Submitted by: mturk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104588
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 22:15:23 +0000 (22:15 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:14:49 +0000 (22:14 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:13:50 +0000 (22:13 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:12:02 +0000 (22:12 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 22:10:23 +0000 (22:10 +0000)]
Remove unusable code. The constructor and destructor will
be in proxy_util. Add a trace.
Submitted by: mturk, jfclere
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104583
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 22:05:20 +0000 (22:05 +0000)]
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
André Malo [Wed, 11 Aug 2004 22:02:15 +0000 (22:02 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104581
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 11 Aug 2004 22:02:15 +0000 (22:02 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104580
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 22:01:55 +0000 (22:01 +0000)]
Use pre_pequest function and set proxy_module_conf bound to client
connection so it cen be obtained inside scheme handlers.
Submitted by: mturk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104579
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 22:00:47 +0000 (22:00 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 21:59:48 +0000 (21:59 +0000)]
dup real and fake
Submitted by: jfclere
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104577
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 21:56:38 +0000 (21:56 +0000)]
Add pre_request and post_request proxy hooks.
They will be mainly used for loadbalancers for finding and maintaining workers.
Submitted by: mturk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104576
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 21:49:40 +0000 (21:49 +0000)]
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
William A. Rowe Jr [Wed, 11 Aug 2004 21:46:54 +0000 (21:46 +0000)]
Remove all worker/balancer API's to proxy_util.
Submitted by: mturk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104574
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 21:45:53 +0000 (21:45 +0000)]
Missed a 2.0-HEAD proxy back-compat patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104573
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 21:44:23 +0000 (21:44 +0000)]
Added API for creating balancers.
Added property setter for balancers.
Submitted by: mturk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104572
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 21:30:57 +0000 (21:30 +0000)]
Use RAW_ARGS instead ITERATE.
Add options for connection pool when using ProxyPass
Submitted by: mturk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104571
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 21:29:57 +0000 (21:29 +0000)]
Move worker params parsing to a separate function.
The same will be used for creating ProxyPass connection pools.
Added ttl param to worker for maintaining reslist.
Submitted by: mturk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104570
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 21:27:57 +0000 (21:27 +0000)]
Move min,smax and hmax params to worker, so they can be set
before the connection pool is created
Added init_conn_pool to worker.
Connection pool will either use reslist (if thread number > 1) or single connection.
Submitted by: mturk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104569
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 21:26:03 +0000 (21:26 +0000)]
Obtain balancer using API.
Submitted by: mturk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104568
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 21:25:15 +0000 (21:25 +0000)]
Use API instead directly obtaining worker and balancer.
Add BalancerStickySession and BalanceMember directives.
Add workers and balancers to create and merge config.
Submitted by: mturk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104567
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 21:20:07 +0000 (21:20 +0000)]
Add initial structures for connection pool and load balancer.
Submitted by: mturk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104566
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 21:14:49 +0000 (21:14 +0000)]
Enable backwards compatibility with 2.0-HEAD, define ajp module base,
and note CHANGES so far to proxy
Submitted by: mturk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104565
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 20:48:40 +0000 (20:48 +0000)]
Well, we still need that casting :)
Submitted by: mturk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104564
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 20:48:15 +0000 (20:48 +0000)]
Use ajp scheme when doing canonicalise.
Submitted by: mturk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104563
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 20:46:29 +0000 (20:46 +0000)]
Rename parse_headers to parse_header.
Some renaming and style cleanup.
Submitted by: mturk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104562
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 20:44:40 +0000 (20:44 +0000)]
Close only when needed.
Submitted by: jfclere
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104561
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 20:44:08 +0000 (20:44 +0000)]
Use protocol handler defines instead fixed numbers.
Makes more sense what's happening.
Submitted by: mturk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104560
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 20:43:05 +0000 (20:43 +0000)]
Added include "ajp.h", and made some casting
Submitted by: mturk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104559
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 20:42:00 +0000 (20:42 +0000)]
Add the logic to read the body.
Submitted by: jfclere
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104558
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 20:41:23 +0000 (20:41 +0000)]
Clean useless code.
Submitted by: jfclere
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104557
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 11 Aug 2004 20:29:46 +0000 (20:29 +0000)]
Introduce proxy_ajp.c : use --enable-proxy-ajp with configuring Apache.
To load it:
+++
LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
+++
And to use it something like:
+++
<Location /examples/>
ProxyPass ajp://backend.example.net:8009/examples/
</Location>
+++
proxy_ajp will not be enabled by default due to ./ajp dependencies
Build magic improvements: mturk, wrowe
Submitted by: jfclere
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104556
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Wed, 11 Aug 2004 20:03:55 +0000 (20:03 +0000)]
Refer people to mod_rewrite if they need to manipulate the query
string. (This is a FAQ.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104554
13f79535 -47bb-0310-9956-
ffa450edef68
Joshua Slive [Wed, 11 Aug 2004 16:59:41 +0000 (16:59 +0000)]
Note that mod_expires also sends Cache-Control: max-age.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104550
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 11 Aug 2004 14:25:30 +0000 (14:25 +0000)]
* modules/ssl/ssl_engine_kernel.c (ssl_callback_SSLVerify_CRL),
* server/log.c (ap_log_pid),
* server/mpm/prefork/prefork.c (accept_mutex_on, accept_mutex_off),
* support/htdbm.c (htdbm_list):
Fix some non-literal format strings (warnings from gcc -Wformat-security).
PR: 30585
Submitted by: Ulf Harnhammar (SITIC), Joe Orton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104548
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 11 Aug 2004 13:19:24 +0000 (13:19 +0000)]
* modules/ssl/ssl_engine_io.c (ssl_io_input_read): Fix potential
infinite loop in ssl_io_input_getline if connection is aborted without
inctx->rc being set.
PR: 29964
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104547
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 10 Aug 2004 10:21:07 +0000 (10:21 +0000)]
Ignore config.* scripts copied from APR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104543
13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Jacques Clar [Mon, 9 Aug 2004 17:41:37 +0000 (17:41 +0000)]
Updated list of exported API for NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104539
13f79535 -47bb-0310-9956-
ffa450edef68