* mod_proxy: Allow setting options to globally defined balancer from ProxyPass used in VirtualHost. Balancers are now merged using the new merge_balancers method which merges the balancers options.

Change the return value to const, so the const non-matching input can just be returned.

Allow SetHandler+UDS+fcgi to take advantage of dedicated workers including opting in to connection reuse and other proxy options (max=, etc). adds 'enablereuse' proxyoption and a minor MMN bump to share proxy_desocketfy outside of mod_proxy.c, which is required to match workers to URLs.

Might as well make it 256 and be done w/ it. The extra bytes are moot nowaways.

PR53218 Allow for longer worker names and make truncation a non-fatal error...

mod_proxy: add ap_proxy_define_match_worker() and use it for ProxyPassMatch and ProxyMatch section to distinguish between normal workers and workers with regex substitutions in the name. Implement handling of such workers in ap_proxy_get_worker(). PR 43513

mod_proxy: Don't limit the size of the connectable Unix Domain Socket paths. Since connect() to UDS path is used at several places, introduce ap_proxy_connect_uds() in proxy_util.

Clarify an existing requirement of the server_portstr parameter to ap_proxy_determine_connection(): it must be a buffer of at least one byte in size. (And don't bother with using strcpy in order to zap a string.)

mod_proxy_http: Add detach_backend hook. The immediate use is for a SSL-related module which works on the backend proxy connection to be able to "leak" information into the client r for logging. This could be useful with other proxy scheme handlers.

Redo what was reverted in r1572627. Don't reuse a SSL backend connection whose SNI differs. PR 55782. This may happen when ProxyPreserveHost is on and the proxy-worker handles connections to different Hosts.

Move newly added proxy_conn_rec's uds_path field to the end of the struct like in 2.4.x.

Revert r1572606 for the time being since backport would conflict with 2.4.x's proxy_conn_rec. The uds_path field is at the end of the struct in 2.4.x but not in trunk. Fix that first, then recommit.

Don't reuse a SSL backend connection whose SNI differs. PR 55782. This may happen when ProxyPreserveHost is on and the proxy-worker handles connections to different Hosts.

make mod_rewrite and mod_proxy UDS work together...

core: Support named groups and backreferences within the LocationMatch, DirectoryMatch, FilesMatch and ProxyMatch directives.

We were not being consistent between http and others if we added the default port or not during the canonizing phase... Baseline the http method (don't add unless the port provided isn't the default).

Expand some of these fields... mostlt it's the workers that we need to expand due to them mapping to actual hostnames NOTE: 96 enough?

Put the uds path in its own field, and adjust the logic to look for an empty string rather than a flag.

Ensure that userland format of UDS is the same as how it is configured, no matter how we store and use it internally.

Reformat the UDS support inline with a new naming structure. Use a flag for speed for testing.

mod_proxy: Add ap_connection_reusable() for checking if a connection is reusable as of this point in processing. mod_proxy_fcgi uses the new API to determine if FCGI_CONN_CLOSE should be enabled, but that doesn't change existing behavior since the connection is currently marked for closure elsewhere in the module.

Allow for a simple socket check in addition to the higher level protocol-level checks for backends... Not sure if it makes sense to do both or not... Comments?

fix Doxygen warnings/comments

update comments

core: Stop the HTTP_IN filter from attempting to write error buckets to the output filters, which is bogus in the proxy case. Create a clean mapping from APR codes to HTTP status codes, and use it where needed.

mod_proxy, mod_proxy_http: Connection headers must be stripped on the way in and out, support an optional function to handle this.

Mod_proxy used the global pool w/o mutex. fix.

Add failontimeout to allow server admin to mark balancer member in err if IO timeout occurs.

Pull out duplicated code to proxy_util...

Add in rough uds support (Bugx 54101) from Blaise Tarr <blaise.tarr@gmail.com>

realign and fix logic

ProxyPassInherit directive

Allow for searching w/i shm slots for a specific worker and balancer

Use inherit_set to let the global server set the default for all vhosts. Otherwise inherit would need to be disabled redundantly in each vhost.

Anticipate ordering for 2.4 backport

API sync... not crucial for trunk

Allow for setting of sticky session split char... Bugz 53893

OK, enable/allow previous broken, bad behavior iff the user really, really wants it. And warn that b-m isn't recommended in those cases.

Persist local balancer-manager changes across restart/graceful.

Fix handling of ProxyBlock if a forward proxy is configured, and fix mod_proxy_connect to avoid an inappropriate DNS lookup: * modules/proxy/proxy_util.c (ap_proxy_checkproxyblock): Take hostname argument, make address argument optional. Check names against hostname arg, omit if addr not given. (ap_proxy_determine_connection): Adjust for the above; pass hostname from URI not the next hop. * modules/proxy/mod_proxy_ftp.c (proxy_ftp_handler): Adjust for ap_proxy_checkproxyblock change. * modules/proxy/mod_proxy_connect.c (proxy_connect_handler): Adjust similarly, and avoid the DNS lookup on the request-URI hostname if a proxy is used. * include/ap_mmn.h: Bump MMN. PR: 43697

* Add the forcerecovery balancer parameter that determines if recovery for balancer workers without considering the retry value of workers is enforced. There might be cases where an already overloaded backend can get into deeper trouble if the recovery of all workers is enforced without considering the retry parameter of each worker

Handle cases, esp when using mod_proxy_fcgi, when we do not want SCRIPT_FILENAME to include the query string.

Cure size_t abuse, curse some recent code [recommit good bits from r1227852]

Revert a whole mess that was not ment to be committed

Cure size_t abuse, curse some recent code

mod_proxy: Remove dead code ap_proxy_table_unmerge().

mod_proxy: Move ap_proxy_strmatch_path and ap_proxy_strmatch_domain out of the public API.

mod_proxy: Remove ap_proxy_make_fake_req() from the public API.

mod_proxy: Remove dead PROXY_OPTIONAL_HOOK macro.

mod_proxy: Remove dead code.

mod_proxy: Make the ap_proxy_is* functions private.

mod_proxy: Remove ap_proxy_date_canon() from the public API.

mod_proxy: Remove ap_proxy_buckets_lifetime_transform() from the public API.

mod_proxy: Remove ap_proxy_liststr(), it duplicates ap_find_token().

mod_proxy: Move ap_proxy_string_read() out of the public API into mod_proxy_ftp.

mod_proxy: Make ap_proxy_retry_worker() into an optional function. Allows mod_lbmethod_bybusyness, mod_lbmethod_byrequests, mod_lbmethod_bytraffic and mod_lbmethod_heartbeat to be loaded without mod_proxy yet being present, which happens when modules are loaded in alphabetical order.

Use 2 sep hashing functions to account for collisions... Safe enough

Some optimization... we have a hash, use it. Quicker than all these string comparisons.

Logic which makes the balancer "active" or not... so we can turn them off and on as needed.

Instead of running thru all kinds of logic paths, just add in a on/off bit... No need for other balancer statuses(sp)?

Pull this out as a sep function to allow for full vhosting adjustment between get and define balancers...

"Final" (I hope) proxy struct/API changes in order to support dynamic balancer allocation AND dynamic vhost-balancers

Error-check.

Move useful and shared balancer stuff to the shm slot... Provide hooks for post-config/runtime addition of balancers.

Allow compile time changes of field sizes and be more "clear" regarding the diff between balancer and worker slots...

Modify placement of PROXY_DECLARE_DATA to fix build problems with MSVC, reported by Gregg L. Smith

Removed prototype which had no implementation.

There is absolutely no reason to have two 4k-sized constant strmatch patterns in each per-dir config.

Remove ap_proxy_removestr(). It has been unused for a decade and has quadratic memory usage.

Implement draining capability for proxy workers... only accept sticky on these puppies.

Add in BalancerGrowth and its functionality... this lays the framework for adding additional Balancers: post-config by allowing for shm growth.

Fixed only some proxy prototype formats. Function names must follow the *_DECLARE() in the same line regardless how long the function names are!

If we change the LB method, or we take add in a new balancermember ("enable" her), then we need to have the LBmethod reset its params as required...

change signed single-bit fields to unsigned some of these were exposed to mods so the mmn is bumped, without regard to whether any compiler will have to generate different code

No longer depend on how fork() works when laying out segments... function pointers in shm are... nasty ;)

Ugg... unbalanced workers *do* need a mutex as well (good catch Rüdiger!)

Remove the thread mutex from the worker... it really should be in the balancer. Thus we have global and thread for the balancer. Use global when updating the full, shm list of workers; use thread when being local.

Expose this as part of the API. That way, other code/modules which want to overload mod_proxy's trans phase can use it to handle ProxyPass as well, without requiring monkeying with conf->aliases...

Here we go... we can now, via balancer-manager, add new workers to existing balancers. Still work to be done, like error checking that we aren't trying to add more than we can (right now, it fails, but it would be nice to handle it nicer), disabling and *deleting* workers we don't want anymore, the actual drain method, etc... but this is some major goodness.

No need to pollute the whole namespace...

Optimize... create a struct to hold the worker status info (need to align w/ set_params later on) and note when we update timestamps

Again, abstract out the worker status magic to it's handled by funcs...

bitfields should be unsigned

Move the setting of flags into a func... that way there is one place to maintain as the number of flags grow... Since we are using just the bits, make unsigned.

Move the lbmethod to also allow it to be adjusted runtime

tuck away code that lets us ensure that the id is always "unique"

Move some "nice to be able to change" balancer stuff to shm

Add a patch from Vincent Deffontaines to make the adding of X-forwarded-* headers configurable: ProxyAddHeaders, defaulting to 'On'. http://www.mail-archive.com/dev@httpd.apache.org/msg49971.html

Make the balancer shared memory slot more human readable. But we need to make it a "safe" filename, so create 2 funcs which do that.

Align proxy_worker_shared in slotmem shm using default APR alignment.

Move nonce to balancer struct and add logic for nonce and growth. Adjust mmn and update doccos

whitespace

Builds and passes tests as prefork... good save state

Adjust for conf->workers being *proxy_worker and balancer->workers being **proxy_worker

More movement to shared stuff...

OK... a good commit point (we don't quite compile yet though...) Pull out the worker scoreboard cruft and start moving most worker stuff to shm. Use slotmem for workers and provide space for growth. Redo logic: ap_proxy_define_* ap_proxy_create_* ap_proxy_initialize_* Right now just for workers, but lay framework for balancers as well. The idea is to break out the functional parts to make it easy for dynamics. Defining is simply describing the worker, and tucking that info away. When we create, we go ahead and create the shared memory, etc... Initialize is simply to allow child process to access the shm...

Use branch now

Update the comment to indicate what the backend request is really used for.

* The concept of the cleaned flag is flawed: Once we returned the connection to the pool we cannot longer rely on it as another thread could have leased the connection in the meantime and might have modified it. BUT: We only use this flag once we returned the connection to the pool. So signal that we returned the connection to the pool by something that is local to the thread, in this case set backend to NULL if we already have returende the connection.

Revert r1035504, this was the wrong way to do it.

Fix pool lifetime issues when the proxy backend connection is terminated early by forcing a setaside on transient buckets placed in the brigade by mod_ssl. This has the effect of extending the lifetime of buckets until the end of the request. This is a variation on the original fix for this problem, which added transient buckets to be setaside later in the process.

Fix mod_proxy to support setting source address. PR 29404 Seems lots of users want this, and a couple of them have recenly asked nicely

improve wording of some function descriptions add explicit "FIXME" to an ancient issue remove implicit fixme wording related to mutex use

axe outdated comment about FIXMEs/CHECKMEs

Fix a number of typos and misspellings. Reported by Ville Skytta. PR48496.

Optimise more of the flags within proxy structures.

mod_proxy: Release the backend connection as soon as EOS is detected, so the backend isn't forced to wait for the client to eventually acknowledge the data.

mod_proxy: Optimise ProxyPass within a Location so that it is stored per-directory, and chosen during the location walk. Make ProxyPass work correctly from within a LocationMatch.

Optimise the set flags in the mod_proxy structures.

mod_proxy: Move the ProxyErrorOverride directive to have per directory scope.

Fold in possible use of FNV if desired

Fold in some stuff to allow for matching of workers to their actual scoreboard slots, independent of slot ID.

Allow for modules to keep track of worker slot numbers themselves if they want, by allowing for worker create/alloc functions to take a slot number id. Done via _wid() variants of 3 proxy funcs.

re-order many struct members for better alignment on 64bit

log issues with CONNECT at request scope instead of server scope

Add updatelbstatus to allow to have all the LB logic in the balancers.

Proxy balancer: support setting error status according to HTTP response code from a backend. PR 48939 [Daniel Ruggeri <DRuggeri primary.net>]

Support remote https proxies by using HTTP CONNECT. PR: 19188 Submitted by: Philippe Dutrueux <lilas evidian.com> Reviewed by: rjung

Fix typo in comment.

Move ProxyFtpDirCharset from mod_proxy to mod_proxy_ftp.

Move AllowCONNECT from mod_proxy to mod_proxy_connect.

Fix a lot of doxygen warnings. Thanks to Brad Hards for the patch. I added a few more fixes, and there are still more that might need a doxygen expert. PR: 48061 Submitted by: Brad Hards Reviewed by: poirier

Allow ProxyPreserveHost to work in <Proxy> sections PR: 34901

kinda old

Allow the load balancing method to "create" workers.

server_rec *r... Oops should be server_rec *s.

Arrange the proxy_balancer_method: - Put context back after the finder(). - Use server_rec as second parameter for reset() and age(). - Add the call for reset().

fix docco

optimize.... rp! :)

Change the order of mod_proxy and mod_proxy_balancer child_init(). Change the balancer workers area to the address of workers instead copying the workers. Arrange lbmethod accordingly. Move the creation of conf->forward worker to mod_proxy child_init().

Fold in initial template for methods to be able to reset (initialize) and "age" their data, useful when adding new workers, or when workers come back into the fold.... Logic and code to come in a bit :)

Add configuration of the Flush provider for mod_proxy_fdpass.

* Rip out the old flushing approach for solving lifetime issues between the backend connection bucket allocator and front end connection bucket allocator. Instead copy the buckets from the backend over to ones that have been created using the front end bucket allocator. For metabucket this is done by recreating them, for data buckets this is done by reading them and putting the read data in a transient bucket. PR: 45792

Allow determination of whether to use ';' as a sticky session path delim/sep (ala mod_jk) to be runtime (and balancer-wise) configurable.

* Add the possibility to set a separate connection timeout for backend workers. PR: 45445 Submitted by: rahul <rahul sun.com> Reviewed by: rpluem

Switch ftp_directory_charset and interpolate_env in proxy_dir_conf, with a major MMN bump. As suggested by rpluem in r661069 to enable backport *without* a major bump (ABI breakage) in 2.2.x.

Remove all references to CORE_PRIVATE.

Add in mod_jk's disablereuse analog for mod_proxy.

Introduce the ProxyFtpDirCharset directive, allowing the administrator to identify a default, or specific servers or paths which list their contents in other-than ISO-8859-1 charset (e.g. utf-8). Submitted by: Ruediger Pluem

* Fix a SEGFAULT by ensuring that buckets that may have been buffered in the network filters get flushed to the network. This is needed since these buckets have been created with the bucket allocator of the backend connection. This allocator either gets destroyed if conn->close is set or the worker address is not reusable which causes the connection to the backend to be closed or it will be used again by another frontend connection that wants to recycle the backend connection. In this case we could run into nasty race conditions (e.g. if the next user of the backend connection destroys the allocator before we sent the buckets to the network). Remark 1: Doing a setaside does not help here as the buckets remain created by the wrong allocator in this case. Remark 2: Yes, this creates a possible performance penalty in the case of pipelined requests as we may send only a small amount of data over the wire.

* Use a separate subpool to manage the data for the socket and the connection member of the proxy_conn_rec struct as we destroy this data more frequently than other data in the proxy_conn_rec struct like hostname and addr (at least in the case where we have keepalive connections that timed out and were closed by the backend). This fixes a memory leak with short lived and broken connections. PR: 44026

* Enable the proxy to keep connections persistent in the HTTPS case. Basicly the persistence is created by keeping the conn_rec structure created for our backend connection (whether http or https) in the connection pool. This required to adjust scoreboard.c in a way that its functions can properly deal with a NULL scoreboard handle by ignoring the call or returning an error code.

Update the patch for environment variable interpolation in ProxyPass/Reverse/etc directives: r421686, r422178, r421686, r421725 That patch stalled on wrowe's veto. This update introduces a new "interpolate" keyword to all directives affected, so should meet his concerns by adding explicit per-directive control (disabled by default).

mod_proxy: add "nocanon" keyword to ProxyPass, to suppress URI-canonicalisation in a reverse proxy. PR 41798

Semi-revert 583466; just remove the ap_proxy_isvalidenc() function until we canonically set the "allowed" list.

Abstract out "verification of valid encoding" via ap_proxy_isvalidenc(). Now we can use it in other proxy protocols.

Default to NOT setting Max-Forwards in violation of RFC2616 Leave old behaviour as a configuration option (ProxyMaxForwards) PR 16137

Maintain the illusion. It's not worth my time or energy to care about this anymore.

Reinsert extern int PROXY_DECLARE_DATA proxy_lb_workers into the Proxy API.

Reinstate the lb_score patch, but, protect against conflicting leakage as per jfc proposal.

Be proactively safe. A cheap check, but helps prevents badness :)

Add sticky_path to solve PR41897.

Add regex pattern matching to ProxyPass, allowing, for example: ProxyPass ~ \.gif balancer://imagecluster

spellcheck

Move new struct member to the end of the struct, so we can keep the compatibility.

Enable retry=0 for the worker. This allows to have an option to always retry the workers in error state instead using a specified time.

Cleanup: Remove close_on_recycle from proxy_conn_rec. It behaves the same as close.

Add in a very simple balancer "set" concept, which allows for members to be assigned to a particular cluster set such that members in lower-numbered sets are checked/used before those in higher ones. Also bundled in this are some HTML cleanups for the balancer manager UI. Sorry for the mixins :) Compiles/builds clean: passes test framework as well as more normal usage tests ;)

Cleanup: Remove checking for pre 2.0.46 MMN. It is obvious that the new mod_proxy will never be backported to the 2.0 branch.

Added cping/cpong support for the AJP protocol.

Support environment variable interpolation in reverse proxy configuration

It never fails. I sit on a patch for awhile and it's not until almost right after I commit it that I think "hey, there's a better way to do that." Anyway, I was never happy about the code duplication of the primary/standby checks... This fixes that.

update license header text

Clean up some proxy macros. Avoid the use of magic numbers, and instead use pre-defined defines. Also, ensure that usable workers have been initialized :) Allocate a bit for hot standbys. Adjust so that normal "usable" workers don't count these.

Update the copyright year in all .c, .h and .xml files

* Avoid calling ap_proxy_http_cleanup twice as this releases a connection from the connection pool twice. This causes this connection to be present in the connection pool twice. Thus it may be used by different threads at the same time which causes many troubles (segfaults in this case). Furthermore implement a logic to prevent double releases to the connection pool if they are triggered by buggy code and log an error message in this case. - mod_proxy_http.c: remove double calls to ap_proxy_http_cleanup - proxy_util.c: Add logic to prevent double releases of a connection to the connection pool. PR: 38793

Document the removal of the flushing bandaid to a runtime param. Since other protocols might benefit from this, remove the ajp_ prefixes, to make it more generic looking.

Make AJP flushing admin configurable.

* Correctly signal broken backend connections up the chain also for the ajp backend (see also r357461). Furthermore move common code in mod_proxy_http.c and mod_proxy_ajp.c into a new function (ap_proxy_backend_broke) in proxy_util.c. modules/proxy/mod_proxy_ajp.c : Signal broken backend connection for ajp backend modules/proxy/proxy_util.c : Add ap_proxy_backend_broke modules/proxy/mod_proxy_http.c: - Use ap_proxy_backend_broke - Return DONE also if backend broke modules/proxy/mod_proxy.h : Add declaration of ap_proxy_backend_broke

* revert r355823 and r355837

* Move handling of backends that broke after the headers have been sent into the proxy handler of mod_proxy. This patch still sets r->connection->aborted to 1 which is currently vetoed by Roy. Moving it from the scheme handler to the proxy handler should ease the reimplementation of this, as the scheme handlers only needs to return PROXY_BACKEND_BROKEN to signal the above situation to the proxy handler. mod_proxy.h: Add define for PROXY_BACKEND_BROKEN mod_proxy.c: Handle PROXY_BACKEND_BROKEN in proxy handler mod_proxy_http.c: Sent back PROXY_BACKEND_BROKEN if backend broke after we sent the headers.

Proxy balancer lbmethods are now registered as providers and not via hooks. Move various find() functions back to mod_proxy_balancer where they belong :)

Restruct of lbmethod find-best algo's, bypassing hook mechanism. Looking into provider method, but until then... Prevent core dump when balancer not in vhosts

Doxygen fixup / cleanup submited by: Neale Ranns neale ranns.org reviewed by: Ian Holsman

simple, functional interface to add additional balancer lb selection methods without requiring code changes to mod_proxy/mod_proxy_balancer; these can be implemented via sub-modules now. Let the games begin...

Fix mess left by incompleteness of previous ProxyPassReverse fix

Fix ProxyPassReverse & family to work correctly in <Location>

Add status param option so that current worker status can be changed via editing httpd.conf instead just using web page. Seems the ApacheCon is paying of. Thanks to Sander for pointing that out.

This patch adds a new hook (request_status) that gets ran in proxy_handler just before the final return. This gives modules an opportunity to do something based on the proxy status. A couple of examples where this is useful: -You are using a caching module and would rather return stale content rather than an error to the client if the origin is down. -you proxy some subrequests (using SSI - mod_include) and do not want SSI errors when the backend is down. If you would normally return HTTP_BAD_GATEWAY, you may have a module that serves some other content. new hook -- so mmn bump.. i made it a major one, hope thats ok Patch From Brian Akins <Brian.Akins turner.com>

Use two optional functions from mod_ssl so that we can receive both is_ssl and ssl_var for ajp protocol. This is combined work based on patch from Brad Boyer and Joe Orton's suggestion to use ssl_var_lookup.

Move the POSIX reg* implementations into the ap_* namespace; internalise the ap_reg*<->PCRE wrapper: * configure.in: Add srclib/pcre to the include path. * include/ap_regex.h: Renamed from include/pcreposix.h. Prefix all constants with AP_; prefix all functions and types with ap_. Define AP_DECLARE to nothing if necessary. Remove regcomp error codes. * include/httpd.h: Include ap_regex.h not pcreposix.h. (ap_pregcomp, ap_regexec, ap_regfree): s/regex_t/ap_regex_t/. (ap_regexec, ap_regerror): Prototypes moved to ap_regex.h. * server/util.c (regex_cleanup, ap_pregcomp, ap_pregsub, ap_pregfree): Adjust for ap_ prefixed types. (ap_regexec, ap_regerror): Removed. * server/Makefile.in: Build util_pcre.c. * server/util_pcre.c: Copied from srclib/pcre/pcreposix.c; remove use of PCRE-internals to do error mapping; rename types to add AP_/ap_ prefixes as above. Use APR includes. (ap_regerror): Use apr_snprintf. * srclib/pcre/Makefile.in: Don't build pcreposix.c into libpcre.la. * modules/*: Update to use new type and constant names. PR: 27750 (part one) Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton

Update copyright year to 2005 and standardize on current copyright owner line.

Close PR 32459, 15207. API change for PROXY_DECLARE ap_proxy_canonenc()

Add in a weighted byte count of all traffic (in and out) as an alternative balancing method. We do not "adjust" the byte count wrt scheme or method, simply by factoring in the lbfactor value.

Rewrite Cookies and other headers in mod_proxy_ajp as configured with ProxyPassReverse and ProxyPassReverseCookiePath. * modules/proxy/proxy_ajp.c (ap_proxy_ajp_request): Update call to ajp_parse_header(). * modules/proxy/ajp.h (ajp_msg_get_string): constify argument. (ajp_parse_header): Add conf argument. * modules/proxy/proxy_util.c (ap_proxy_location_reverse_map): Promoted from mod_proxy_http. (ap_proxy_cookie_reverse_map): Promoted from mod_proxy_http; renamed from proxy_cookie_reverse_map. * modules/proxy/ajp_msg.c (ajp_msg_get_string): constify argument. * modules/proxy/proxy_http.c (ap_proxy_location_reverse_map, proxy_cookie_reverse_map: Removed. (process_proxy_header): Update header mapping table to reference the now public functions. * modules/proxy/ajp_header.c (ajp_unmarshal_response): And conf argument. Reverse map cookies and other headers. (ajp_parse_header): Update call to ajp_unmarshal_response(). * modules/proxy/mod_proxy.h (ap_proxy_location_reverse_map, ap_proxy_cookie_reverse_map): Declare functions that have been promoted to be public. (ap_proxy_header_reverse_map_fn): Typedef for the signature of the above two functions (currently used in mod_proxy_http).

"transfered" is not a word. s/transfered/transferred/g;

grammatical parameter change... "readed" -> "read"

Make proxy address cache thread safe and available only to pooled workers.

Add generic reverse proxy worker so that module-driven reverse proxying works. It is enabled by default, but IMO it should be configurable like any other worker so we can limit the number of outgoing connections.

Add server_rec to initialize_worker_share so that it get's correctly.

Reformat code to no tab and no CR-LF

Make sure that we don't increase balancer worker count on gracefull restart. Thanks to Christian...again.

Remove proxy_runtime_worker and make the things simpler by sharing runtime status accross child processes. Also make sure that shared data is initialized after the scoreboard is created.

Make worker retry algorithm much simpler removing incremental timeout increase.

Add maximum nuber of attempts for failover and run scheme handler if worker is in error state up to that number. Another great idea from Christian von Roques.

Register output function so that core can retrieve it and set scoreboard accordingly

Always use prive connection pool for allocation, and call apr_pool_clear when the connection is closed on recycle, so that we don't leak on persistent connections.

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.

Remove the unused close_connection function.

Just like for balancers initialize the workers on post_config instead on first request to skip the race condition.

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.

Add PROXY_WORKER_IGNORE_ERRORS flags that disables puting the entire worker in retry mode, cause for forward workers the remote is not fixed.

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.

Add 'default' foward proxy worker to the proxy_server_conf.

Untabify the source.

Add pool used for allocating proxy_server_conf to that struct. It will be used for dynamic configuration, to ensure that dynamic params has the same lifetime as the config has.

Document new API functions.

Remove the tabs from code.

Fix some compiler warnings in proxy PR: Obtained from: Submitted by: Geoffrey Young <geoff@modperlcookbook.org> Reviewed by:

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

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

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

Add route and redirect to worker so they can be set trough configuration. Add worker status flag definitions. Submitted by: mturk

Fix structure element typo. Submitted by: mturk

Fix some config checking params. Added route and route redirect to the runtime worker. Submitted by: mturk

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

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

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

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

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

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

Added iobuffersize and receivebuffersize to be worker specific. As for timeout their default value is from proxy_conf. Submitted by: mturk

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

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

Remove proxy_mdule_conf. We will change the scheme hook api to include the worker. Submitted by: mturk

Remove proxy_conn struct and add it's params to proxy_conn_rec. Use named structure type declarations. Submitted by: mturk

Add worker timeout inherited from ProxyTimeout. Submitted by: mturk

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

Added ap_proxy_determine_connection. It will be used both for http and ajp handlers. Started writing apr_reslist connection pool. Submitted by: mturk

Add ap_proxy_pre_request API function. It calls the actual module pre_request hook if present Submitted by: mturk

Add pre_request and post_request proxy hooks. They will be mainly used for loadbalancers for finding and maintaining workers. Submitted by: mturk

Added API for creating balancers. Added property setter for balancers. Submitted by: mturk

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

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

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

Add initial structures for connection pool and load balancer. Submitted by: mturk

Fixes the build of proxy on Windows. Since the proxy_module is declared as extern using AP_MODULE_DECLARE_DATA that expands to dllexport, there is a LNK2001 error when building proxy_http. PR: Obtained from: Mladen Turk <mturk@apache.org> Submitted by: Reviewed by:

style

Fix for multiple proxy bugs - review please: #10722 Reverse proxying cookies #15207 Proxy passing canonicalised URIs to backend #16812 Case-insensitivity of proxypassreverse #19317 Canonicalised URI causing infinite loop #20372 AllowEncodedSlashes May also fix 13577 (untested) This is really two fixes: 10722 and 15207; the others are trivial consequences. To make review easier, the simpler fix (#15207) is entirely contained in #ifdef FIX_15207 (new code) and #ifndef FIX_15207 (removed code)

fix name of The Apache Software Foundation

fix copyright dates according to the first check in

apply Apache License, Version 2.0

update license to 2004.

finished that boring job: update license to 2003. Happy New Year! ;-))

Haven't heard any vetoes regarding this, so might as well fold it in. Not too happy about cluttering up the list of directives either. But, at least, it allows 2.0 to proxy stupid IIS as much as 1.3. Docs to come soon. PR: Obtained from: Submitted by: Reviewed by:

add PROXY_OPTIONAL_HOOK() macro for modules that want to optionally provide a mod_proxy hook

No crutches, people!

Cleanup proxy timeouts a bit to remove emits and make consistent to vhost timeout.

get basic HTTP proxy working on EBCDIC machines (I would bet that there is more work to do throughout proxy, but at least it can serve some pages now)

PR: Obtained from: Submitted by: Daniel Lopez <daniel@covalent.net> Reviewed by: dougm, rbb add optional fixup hook to proxy

fix ProxyPass when frontend is https and backend is http

PR: Obtained from: Submitted by: Reviewed by: Ryan Bloom remove call to ap_proxy_reset_output_filters() and the function itself. this call breaks ssl proxy when the client is using keepalives. this function is also no longer needed with recent-ish filter changes.

hook into mod_ssl for https support

Update our copyright for this year.

New directive ProxyIOBufferSize. Sets the size of the buffer used when reading from a remote HTTP server in proxy. Modify receive/send loop in proxy_http and proxy_ftp so that should it be necessary, the remote server socket is closed before transmitting the last buffer (set by ProxyIOBufferSize) to the client. This prevents the backend server from being forced to hang around while the last few bytes are transmitted to a slow client. Fix the case where no error checking was performed on the final brigade in the loop. PR: Obtained from: Submitted by: Reviewed by:

implement a common function for getting a socket and trying to connect to the target host; use that common function for proxy HTTP and proxy CONNECT In that new function, fix this problem: Proxy HTTP and CONNECT: Keep trying other addresses from the DNS when we can't get a socket in the specified address family. We may have gotten back an IPv6 address first and yet our system is not configured to allow IPv6 sockets. An example host is www.ipv6.org. The first address I get back is an IPv6 address, but my machine may not be configured to allow an AF_INET6 socket. Before the fix: The apr_socket() failure was fatal. After the fix: When apr_socket() fails, we go to the next address from the resolver, successfully create a socket in the specified family (AF_INET), and all is well. (an unrelated fix in this commit was to pass a server_rec in a broken ap_log_error() call)

Add the ProxyRemoteMatch directive to the mod_proxy code. Doccos to be done soon

fix the linkage of and add a prototype for ap_proxy_table_unmerge()

add a ProxyTimeout directive

Minor tipos

Cleanup some fallout from the recent install_transport_filters commit. Deprecate ap_proxy_pre_http_connection.

new directive 'ProxyPreserveHost' which allows the incoming host line to be sent to the proxied server. Submitted by: g.russell@ieee.org (1.3 version) Reviewed by: Ian Holsman/Graham Legget/Chuck Murcko

get the declarations for strncasecmp() on AIX

The proxy does not actually need this header.

Cleanup the proxy code that creates a request to the origin server. This change adds an optional hook, which allows modules to gain control while the request is created if the proxy module is loaded. The purpose of this hook is to allow modules to add input and/or output filters to the request to the origin. While I was at it, I made the core use this hook, so that proxy request creation uses some of the code from the core. This can still be greatly improved, but this is a good start.

initial port of new Request-mode HTTP_IN filter to proxy. Status: It serves a reverse-proxy page.. but SLOWLY. VERY SLOWLY. still looking at why, but now it serves pages instead of dumping core. PR: Obtained from: Submitted by: Reviewed by:

Fix the "merge" behaviour of the ProxyErrorOverride directive. PR: Obtained from: Submitted by: Reviewed by:

Some style cleanups related to the ProxyErrorOverride function. PR: Obtained from: Submitted by: Reviewed by:

Added New Option 'HTTPProxyOverrideReturnedErrors' which lets the server override the error pages returned from the proxied server and replace them with the standard server error handling on the main server. Reviewed by: Graham, Chuck

Fix a broken declaration (supress type conversion warning on win32).

Split proxy: space using <Proxy[Match] > directive blocks from the <Directory[Match] > and <Files[Match] > blocks. Mod_proxy now bypasses the directory and files testing phase (and skips the http TRACE default handler on it's own, as well). Note that <Location > blocks continue to be processed for proxy: requests. Remaining questions include canonicalization and case folding of proxied uri space, prior to the proxy_walk testing and the second <Location > walk.

Remove a no-longer-needed header.

After checking what this does with Bill Rowe, and discovering it to be dead wood, I am tossing it.

Being slightly picky: properly namespace protect make_fake_req()

Oops. Include the right headers...

Nobody screamed. ;) This gets rid of ap_proxy_host2addr, and a few other useless functions, and allows us to be threadsafe when doing DNS resolution.

Use apr-util's date functions now

Fixes to proxy, after util-uri move, plus fixes to the .mak file.

Allows Mod_proxy to be dynamically loaded on win32 systems PR: Obtained from: Submitted by: ianh Reviewed by: Chuck Murcko, Graham

Split each individual proxy protocol into separate modules. PR: Obtained from: Reviewed by:

Make hooks work for the *_canon() functions. Work continues. PR: Obtained from: Reviewed by:

Initial support for proxy protocol handler sub-modules. Work continues. PR: Obtained from: Reviewed by:

Added Max-Forwards support for all request types so as to prevent loops. PR: 1085 Obtained from: Reviewed by:

FTP directory filter works now. Many FIXME notes added. Much overhauling of proxy_ftp.c PR: Obtained from: Reviewed by:

Fixed some thread-safety issues with the HTTP proxy in mod_proxy. PR: Obtained from: Reviewed by:

Make sure the filter stack in a reused downstream connection is reset so we don't get lots of DECHUNK filters when we don't want them. PR: Obtained from: Reviewed by:

We now keep the entire conn_rec across downstream keepalives, not just the socket. Made the "keepalive mismatch" message more accurate. PR: Obtained from: Reviewed by:

More fixes... PR: Obtained from: Reviewed by:

Compiler warnings - yuck! Moved ap_proxy_string_read() to proxy_util.c so it can be used by proxy_http.c PR: Obtained from: Reviewed by:

*) PASV FTP works now. *) Reworked the line-at-a-time read from the control connection to workaround a stray empty bucket returned by the HTTP_IN filter. PR: Obtained from: Reviewed by:

Goodbye more dead code. PR: Obtained from: Reviewed by:

Stopped the CORE filter from sending off an HTTP response when a CONNECT tunnel was closed. Fixed some filter definition madness that proves that I need some sleep. PR: Obtained from: Reviewed by:

HTTP_VERSION() is the correct way to do this... PR: Obtained from: Reviewed by:

Add #defines for protocol version checks... PR: Obtained from: Reviewed by:

Bugfixes to proxy_ftp.c -> in some places uri_addr was used instead of connect_addr - all hail cut and paste! PR: Obtained from: Submitted by: Reviewed by:

Converted send_dir() to ap_proxy_send_dir_filter() in proxy_ftp.c. Fixed up the header files PR: Obtained from: Submitted by: Reviewed by:

Cleanup of dead functions within proxy_util.c. PR: Obtained from: Reviewed by:

Reworked the storage of the client socket between keepalive connections to fix some nasty problems with the socket lasting longer than the memory pool it was allocated from. PR: Obtained from: Reviewed by:

Some code rewriting in ap_proxy_connect_handler(): *) Fixed bug where a hostname without a "." in it (such as "localhost") would not trigger an IP address check with ProxyBlock. *) Fixed ProxyBlock bugs with ap_proxy_http_handler() and ap_proxy_connect_handler(). *) Updated ap_proxy_connect_handler() to support APR, while moving some common code between http_handler and connect_handler to proxy_util.c. PR: Obtained from: Reviewed by:

*) Added support for downstream keepalives in mod_proxy. *) Changed mod_proxy ap_proxy_http_handler() to support APR properly. PR: Obtained from: Reviewed by:

reorganize STATUS; update copyright

Cache removed, with other spooge PR: Obtained from: Submitted by: Reviewed by:

Virtual host config file fix backported from v1.3 PR: Obtained from: Reviewed by:

Fix for moved macros PR: Obtained from: Submitted by: Reviewed by:

*) continued header revamping *) torch some headers (and some libs) from the autoconf stuff

Changes to get running on the current codebase PR: Obtained from: Submitted by: Reviewed by:

Switch to the APR-provided APR_CHARSET_EBCDIC feature test macro.

Force all Apache functions to be linked into the executable, whether they are used or not. This uses the same mechanism that is used for APR and APR-util. This may not be the correct solution, but it works, and that is what I really care about. This also renames CHARSET_EBCDIC to AP_CHARSET_EBCDIC. This is for namespace correctness, but it also makes the exports script a bit easier.

Begin to remove some of the cache-ing logic from the http proxy.

This removes all BUFF's from the HTTP proxy. This code is relatively ugly, but it does proxy pages. This even fixes the content-type bug that I introduced yesterday sometime. As soon as BUFF is removed from the FTP proxy, the buff.c and buff.h files need to go away.

Make the proxy work with filters. We are still using BUFF for the back-end communication, but BUFF has been removed from the communication with the client. The headers are not working correctly yet, but we are making progress. The most important part of this commit is that we are able to actually filter data coming from the proxy.

Simplify ap_proxy_doconnect(); now returns apr_status_t PR: Obtained from: Submitted by: Reviewed by:

The whole proxy compiles cleanly now. Now we need to make it actually work again, but at least we are making progress.

proxy_ftp and proxy_http both compile now. Not tested because the rest of the proxy is still not compiling, but we are making progress.

Pick up buff.h for the moment, now to get the conn_rec changes from the last few days taken care of. PR: Obtained from: Chuck Murcko Submitted by: Reviewed by:

This is 1.3.x current proxy folded into 2.0. PR: Obtained from: Sam Magnuson Submitted by: Chuck Murcko Reviewed by:

Renamed all MODULE_EXPORT symbols to AP_MODULE_DECLARE and all symbols for CORE_EXPORT to AP_CORE_DECLARE (namespace protecting the wrapper) and retitled API_EXPORT as AP_DECLARE and APR_EXPORT as APR_DECLARE. All _VAR_ flavors changes to _DATA to be absolutely clear. Thank you Greg, for the most obvious suggestion.

Remove all compiler warnings from the proxy code. There are no garauntees that this still works, but most of the changes were just const-safeness changes. PR: 6631

prefix libapr functions and types with apr_