]>
granicus.if.org Git - apache/log
Graham Leggett [Wed, 18 Aug 2004 13:34:17 +0000 (13:34 +0000)]
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
Graham Leggett [Wed, 18 Aug 2004 13:22:05 +0000 (13:22 +0000)]
Make sure mod_authnz_ldap is included in the unix builds.
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104707
13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 18 Aug 2004 13:15:47 +0000 (13:15 +0000)]
Clarify an error message to tell the user what to do if apr-util lacks
LDAP support.
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104706
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 18 Aug 2004 11:54:49 +0000 (11:54 +0000)]
suexec: Pass the SERVER_SIGNATURE envvar through to CGIs.
Submitted by: Zvi Har'El <rl math.technion.ac.il>
Reviewed by: Jeff Trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104703
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 18 Aug 2004 11:21:33 +0000 (11:21 +0000)]
apachectl: Fix a problem finding envvars if sbindir != bindir.
PR: 30723
Submitted by: Friedrich Haubensak <hsk imb-jena.de>
Reviewed by: Jeff Trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104701
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 18 Aug 2004 11:05:22 +0000 (11:05 +0000)]
* modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert_remain): New
function. (ssl_var_lookup_ssl_cert): Support _V_REMAIN suffix for
SSL_{SERVER,CLIENT} as number of days until certificate expires.
* modules/ssl_engine_kernel.c: Export SSL_CLIENT_V_REMAIN if
+StdEnvVars is configured.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104700
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 18 Aug 2004 08:21:55 +0000 (08:21 +0000)]
* modules/mappers/mod_userdir.c (register_hooks): Move suexec_identity
hook to APR_HOOK_FIRST to ensure it runs before the mod_suexec hook.
PR: 18156
Submitted by: Joshua Slive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104699
13f79535 -47bb-0310-9956-
ffa450edef68
Bradley Nicholes [Tue, 17 Aug 2004 23:33:07 +0000 (23:33 +0000)]
Re-structure the auth_ldap module to fit the new authentication model. The authnz_ldap module provides an ldap authentication provider and an authorization handler. It implements the authorization "require" values ldap-user, ldap-dn and ldap-group. This restructure also moves auth_ldap out of the experimental directory.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104696
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 17 Aug 2004 19:59:38 +0000 (19:59 +0000)]
sync
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104695
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 17 Aug 2004 16:39:04 +0000 (16:39 +0000)]
Require zlib to be pre-compiled, and rely upon the srclib/zlib/
tree to contain zlib.lib and our .h files.
This presumes that zlib is compiled to be compatible with Apache
(msvcrt build, either statics or as zlib1.dll). It's true of
all 1.2.1 zlibs and later.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104690
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 17 Aug 2004 16:35:26 +0000 (16:35 +0000)]
A few more modules who need their bases owned.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104689
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 17 Aug 2004 16:34:51 +0000 (16:34 +0000)]
Eliminate several unused variables, observe a file size -> cache entry size
overflow, and reorder a few headers so we compile clean.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104688
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 17 Aug 2004 16:31:23 +0000 (16:31 +0000)]
* modules/ssl/ssl_engine_io.c (ssl_io_input_read): Fix rollback
handling for AP_MODE_SPECULATIVE.
PR: 30134
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104687
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 17 Aug 2004 13:47:10 +0000 (13:47 +0000)]
Implement -t -DDUMP_MODULES using generic test_config hook rather than
hooking into mod_so from main.c:
* include/http_config.h, server/config.c: Declare test_config hook.
* server/main.c: Drop hooks into mod_so; run test_config hooks.
* modules/mappers/mod_so.h: Drop ap_dump_loaded_modules optional
function.
* modules/mappers/mod_so.c (dump_loaded_modules): Renamed from
ap_dump_loaded_modules; only run if -DDUMP_MODULES is defined.
(register_hooks): Register test_config hook instead of optional
function.
Reviewed by: Justin Erenkrantz, Paul Querna
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104685
13f79535 -47bb-0310-9956-
ffa450edef68
Bradley Nicholes [Mon, 16 Aug 2004 21:55:26 +0000 (21:55 +0000)]
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
Jeff Trawick [Mon, 16 Aug 2004 16:09:48 +0000 (16:09 +0000)]
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
Bradley Nicholes [Mon, 16 Aug 2004 14:58:18 +0000 (14:58 +0000)]
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
André Malo [Sun, 15 Aug 2004 23:58:46 +0000 (23:58 +0000)]
sync
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104681
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 15 Aug 2004 23:46:32 +0000 (23:46 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104678
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 15 Aug 2004 23:40:39 +0000 (23:40 +0000)]
fix version number
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104675
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 15 Aug 2004 22:34:52 +0000 (22:34 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104670
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 15 Aug 2004 22:27:16 +0000 (22:27 +0000)]
fix version number
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104668
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 15 Aug 2004 17:19:04 +0000 (17:19 +0000)]
filepath_info wasn't set by the httpd for over 7 years
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104664
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 15 Aug 2004 14:36:47 +0000 (14:36 +0000)]
Remove "PATH_INFO Changes in CGI Environment" documentation.
Reason: It's outdated and wrong. For 7 years and 3 months.
The behaviour was changed back during Apache 1.2 (!) development.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104662
13f79535 -47bb-0310-9956-
ffa450edef68
Astrid Malo [Sun, 15 Aug 2004 14:26:10 +0000 (14:26 +0000)]
don't forget the metafile
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104660
13f79535 -47bb-0310-9956-
ffa450edef68
Astrid Malo [Sun, 15 Aug 2004 14:00:13 +0000 (14:00 +0000)]
update translation
Committed by: nd
Reviewed by: kess
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104659
13f79535 -47bb-0310-9956-
ffa450edef68
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