slight improvement to wording

More followon to r1671397 for proxy server-status in auto mode: - remove remaining HTML markup

Followon to r1671397 for proxy server-status in auto mode: - don't show HTML legend - Show correct worker name

Add output for "?auto" version of server-status to proxy status, mod_ssl session cache info, mod_cache_socache and the status hook of the individual socache implementations.

* 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.

mod_proxy(es): Avoid error response/document handling by the core if some input filter already did it while reading client's payload. When an input filter returns AP_FILTER_ERROR, it has already called ap_die() or at least already responded to the client. Here we don't want to lose AP_FILTER_ERROR when returning from proxy handlers, so we use ap_map_http_request_error() to forward any AP_FILTER_ERROR to ap_die() which knows whether a response needs to be completed or not. Before this commit, returning an HTTP error code in this case caused a double response to be generated. Depends on r1657881 to preserve r->status (for logging) when nothing is to be done by ap_die() when handling AP_FILTER_ERROR.

mod_proxy: Don't put non balancer-member workers in error state by default for connection or 500/503 errors, and honor status=+I for any error. PR 48388.

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.

mod_proxy: better check for worker->s->is_name_matchable

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

s/apr_pstrndup/apr_pstrmemdup/ to save a few cycles

revert 1602523, until there is understanding about what the actual issue and "requirement" are.

Allow for "magic" scheme "auto" which makes the scheme of the backend worker match whatever the scheme of the incoming request was... For example: ProxyPass / auto://foo.example.com/ If the incoming request is http:.../lala then the resultant will be http://foo.example.com/lala If it's wws:.../lolo then we'd send wws://foo.example.com/lolo

* Give ap_proxy_post_request as chance to act correctly on the status code by setting r->status temporarily to access_status. r->status might be different than access_status e.g. r->status could be HTTP_OK if e.g. we override the error page on the proxy or if the error was not generated by the backend itself but by the proxy e.g. a bad gateway.

strncmp(r->filename, "proxy:", 6) is faster than a note. Plus, allows for checking even if not due to rewrite.

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.

Allow reverse-proxy to be set via explicit handler

* Do not parse URL in case of regular expression as they likely do not follow the URL syntax. PR: 56074

make mod_rewrite and mod_proxy UDS work together...

Oops (fix r1556912)

Add missing break.

Add a "MATCH_" prefix to variables set within LocationMatch/DirectoryMatch/FilesMatch.

c89 fix

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

Remove <Proxy ~ wildcard-url> syntax which: - is equivalent to <ProxyMatch wildcard-url> - has never been documented - incorrectly checks parameters (!cmd->path should be !cmd->path[0]) - is buggy (! is missing in front of strncasecmp)

UDS urls need to be desockified when configuring...

Eclipse code analysis warning

No more magic numbers.

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

syntax sugar... if the worker is associated w/ a UDS, then make sure the log reporting has a visual clue.

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

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?

Add in logno's

add in child_init which is needed

revert... we are good

force subpool

mod_proxy: Use a global mutex for handling workers.

Adjust format string type was changed by r1481302

mod_proxy: Reject invalid values for Max-Forwards.

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

mod_proxy: Clarify the usage suggestion for BalancerInherit and ProxyPassInherit.

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

Fix indent

realign and fix logic

ProxyPassInherit directive

Redfine - we are just worried about balancers and workers, so have the directive clear about that.

restrict inherit control to those fields that "require" it...

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.

be consistent

inherit inherit

rjung's suggestions...

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

force these

fix BalancerInherit command processing from r1388029 (still not tested)

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.

and this one as well... persist isn't inherited

Oops... didn't mean to commit that.

Re-instate balancer merge (for the time being) but force persistence if the top-level server has it defined....

wtf are we doing merging in these from the parent?? These are server specific!

Use identifying server_rec info when we know we have unique and useful data :)

By using a consistent naming structure, we can persist across stop/starts (assuming people don't change such basics as scheme, hostname, etc...)

Persist local balancer-manager changes across restart/graceful.

remove obsolete comment (PROXY_MAGIC_TYPE is not used anywhere anymore)

* 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

* Readd the reverse assignment to avoid segfaults in ap_proxy_initialize_worker PR: 52935 Obtained from: Petter Berntsen <petterb gmail.com>

* Correctly save the reverse proxy worker in all virtual host proxy configs. PR: 52935 Obtained from: Petter Berntsen <petterb gmail.com>

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

Adjust CVE-2011-3368/CVE-2011-4317 fixes to rely solely on core's translate-name to fail unsupported URIs. Rewrite and proxy now decline what they don't support rather than fail the request. Suggested by: trawick Implemented by: jorton Tweaked by: wrowe

restore the generic proxy workers to not being address-reusable. The guts of mod_proxy is not really ready for the addr and host on a proxy_conn_rec to change over time and differ from the 1 cached in the worker. * proxy_worker->cp->addr needs to know what host/port it cached * conn->addr and conn->hostname need to be allocated from their own subpool so they can be cleared as they change * ap_proxy_determine_connection needs to be more careful about which addr is the TCP endpoint and what we have in either cache. * may need to avoid updating the proxy_worker addr cache if we know the value is flipping.

Add lots of unique tags to error log messages

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.

Fix for additional cases of URL rewriting with ProxyPassMatch or RewriteRule, where particular request-URIs could result in undesired backend network exposure in some configurations. (CVE-2011-4317) Thanks to Prutha Parikh from Qualys for reporting this issue. * modules/proxy/mod_proxy.c (proxy_trans): Decline to handle the "*" request-URI. Fail for cases where r->uri does not begin with a "/". * modules/mappers/mod_rewrite.c (hook_uri2file): Likewise.

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.

whitespace

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

Expose the path that the balancer handles...

Error-check.

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

great proxy logging cleanup: * remove "proxy:", "FCGI", etc. prefixes and pid which are now included in the error log format * propagate frontend request's logconfig to backend request * use ap_log_rerror where possible * remove obsolete APLOG_NOERRNO

More error checking for ap_pregsub

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

Force base 10 when parsing the Content-Length. It doesn't matter in this case, but in general using strto*(..., 0) for parsing HTTP headers is a bug.

Cleanup effort in prep for GA push: Trim trailing whitespace... no func change

Forbid some directives in .htaccess because of AllowOverrideList: core: AllowOverride, AllowOverrideList mod_authn_dbd: AuthDBDUserPWQuery, AuthDBDUserRealmQuery mod_authz_dbd: AuthzDBDQuery, AuthzDBDRedirectQuery mod_proxy: BalancerMember, ProxySet Adjust for use in .htaccess: mod_actions: Script

Code cleanup: replace apr_table_set with non-copying apr_table_setn in a few places Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>

Avoid some memory allocations by using apr_table_setn where the string arguments are allocated from the request pool and not modified later on. Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr> PR: 51358

Introduce ap_(get|set)_core_module_config() functions/macros and use them everywhere. We know that the core module has module_index 0. Therefore we can save some pointer operations in ap_get_module_config(cv, &core_module) and ap_set_module_config(cv, &core_module, val). As these are called rather often, this may actually have some (small) measurable effect.

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

fix some grammar mistakes, mostly in comments

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

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.

Oops.... we need to adjust sticky, which is an array now

Instead of just enabling/disabling, we can now adjust more useful worker status bits, such as whether hot stby, etc...

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

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.

We can now change lbmethod at runtime. Provide a stub for other balancer-related params to be adjusted as well, like timeout, sticky, etc...

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

mod_slotmem_shm is a predecessor of mod_proxy_balancer, not mod_proxy.

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

The alias_set variable is set when a parent location contains a ProxyPass, so this check catches valid ProxyPasses. Remove the check.

mod_proxy: Fix ProxyPassInterpolateEnv directive. PR: 50292

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

PR47765: ProxyPass and ProxyPassReverse should not be accepted in Directory or Files sections.

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.

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

Change behaviour of worker sharing. A proxy worker is shared, if its URL is a leading substring of the URL of another worker defined later in the configuration. Before this change this - triggered the "worker ... already used by another worker" message - resulted in a hard to understand configuration for this worker - Attributes explicitely given in the later worker overwrote attributes in the worker which was defined first - General proxy attributes (e.g. ProxyTimeout ) overwrote attributes in the worker which was defined first New behaviour: - Talk about "sharing" of workers and log both worker URLs in the info log message instead of the "already used" message - Do not overwrite attributes. If attributes were explicitely given in the later worker, log a warning that those are ignored because of sharing.

Minor style nits.

mod_proxy: Rename erroronstatus to failonstatus... ... by popular demand, and add documentation. Submitted by: Daniel Ruggeri <DRuggeri primary.net>

Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take advantage of per-module loglevels

Correct bogus code; stack alloc of variable length is not portable from C++. And look, there's an apr for that.

small style tweaks to r930125

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

mod_proxy: Tone down a warning message that appears when the same backend website is reverse proxied two or more times into the frontend URL space. PR: 48947

Move ProxyFtpDirCharset from mod_proxy to mod_proxy_ftp.

Move AllowCONNECT from mod_proxy to mod_proxy_connect.

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

Allow the load balancing method to "create" workers.

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().

Simple style fix, this message still is nonsensical

Prevent key=value being accepted as url.

* Set the error time if we set a worker in error mode.

Add configuration of the Flush provider for mod_proxy_fdpass.

Import the core parts of the DTrace patch. This is a modified and updated version of what was submited by Theo before: <http://mail-archives.apache.org/mod_mbox/httpd-dev/200805.mbox/%3C6AFBCFE8-4CCA-4A02-8A43-F9170689695D@omniti.com%3E> Note, this does not hook it up into the build system at this time, because the original patch was a little too creative there. Submitted By: Theo Schlossnagle <jesus omniti.com>

Ummm why bother setting vars if we are bailing?

Fix the io buffersize code. Have the docs match the code and allow more flexibility in settings. Also, document the ProxyPass/worker options of io and rec buffersize.

* Move ap_timeout_parameter_parse from mod_proxy.c to server/util.c and thus make it part of the public API.

* Add the possibility to set the worker parameters connectiontimeout and ping in milliseconds and the parameter acquire in seconds. Add the new currently static function ap_timeout_parameter_parse that should become a general utility function once its API is hammered out.

Allow for the smax param to be 0, so that all connections are available to be dropped, should they be idle long enough. PR 43371

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

typo

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

Use what we have. This logic belongs here anyway...

Remove all references to CORE_PRIVATE.

If you study all of the directive implementations, you'll note that we get less than 20% of the NOT_IN_LIMIT rules correct. <Limit > works in about 4 directive contexts and yet, we ignore this fact for 100's of directives. Simply eliminate this nonsense in anticipation of a 100% solution.

When sending a proxy request of the form GET http://[3ffe:1:1001:3000:230:5ff:fe05:3c3c]/server-status HTTP/1.0 through the httpd-2.x mod_proxy.c code, while a directive ProxyDomain .my.dom.ain is in effect, the request is redirected to Location: http://[3ffe:1:1001:3000:230:5ff:fe05:3c3c.my.dom.ain]/server-status The patch fixes this bug, by testing whether the hostname part of the unparsed_uri contains colon characters (which is the case only for IPv6 literals). This patch is also a candidate for httpd-2.0 and httpd-2.2

* Do not retry a direct connection if the request has a request body

Add in mod_jk's disablereuse analog for mod_proxy.

style check

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

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

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

Failing to load a protocol handler is a server error, not a forbidden.

Remove useless variable.

lb_score is bigger proxy_worker_stat. Prevent wasting space.

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.

as not everyone needs sticky sessions - avoid segfault in balancer manager and mod_status

mod_proxy: Add Proxypass status option to ignore errors PR 43167. Patch by Francisco Gimeno

Fix the warning: mod_proxy.c:284: warning: passing argument 1 of 'ap_strchr' discards qualifiers from pointer target type Thanks Joe for catch it.

Don't display "PHPSESSIONID | PHPSESSIONID" but only "PHPSESSIONID".

Remove the balancer modification logic of balancer-manager because it can't work. And add the sticky_path to the sticky display.

Add sticky_path to solve PR41897.

Fold in ProxyPassMatch directive with docs. Support full regex substitution but also allow for "simple" cases (ala JkMount) to work as well.

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

Return METHOD_NOT_ALLOWED, not FORBIDDEN, to a TRACE request when TraceEnable is Off. This agrees with our documentation, and with our Allow: header in response to OPTIONS.

Patch for PR#11540 (submitted by Stuart Children)

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.

* Print the correct error message for erroneous configured ProxyPass directives. PR: 40439 Submitted by: serai lans-tv.com Reviewed by: rpluem

* modules/proxy/mod_proxy.c (proxysection): Fix another strchr() warning.

Allow optional name=value options within <Proxy section line. Additional arguments are allowed only for 'standard' url's, meaning that the wildchar urls will return error like before. This allow to specify the worker/balancer parameters on the definition line, without the need for extra ProxySet options.

Enable ProxySet inside <Proxy> section to create balancer or worker if they were not already created. This allows to have ProxySet directive before BalancerMember directives inside Proxy section.

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 ;)

Added cping/cpong support for the AJP protocol.

Use <string.h>-compatible versions of ap_str* functions.

Don't down cast

Support environment variable interpolation in reverse proxy configuration

Issue a warning when the same worker name is reused.

Add in hot-standby balancer member. If all other members are disabled or not-usable, ONLY THEN will the hot standby's be used.

update license header text

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

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.

* 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.

Fix typo in ProxyStatus syntax error message. Submitted by: Christophe Jaillet <christophe.jaillet wanadoo.fr> Reviewed by: trawick

No functional Change: Removing trailing whitespace. This also means that "blank" lines consisting of just spaces or tabs are now really blank lines

* Fix PR36906 by not lower caseing the whole worker name. Only lower case the schema when storing the worker url. Thus preventing case sensitive URI's in BalancerMembers to get broken.

* run the request_status hook in proxy_handler if HTTP_SERVICE_UNAVAILABLE is returned by ap_proxy_pre_request. Suggested by: Brian Akins <brian.akins turner.com>, Mladen Turk Reviewed by: Jim Jagielski

* modules/proxy/mod_proxy_balancer.c (balancer_handler): Fix gcc warning; no functional change. * modules/proxy/mod_proxy.c (set_balancer_param): Likewise.

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

Minor nit. Methods are server-wide, so simply use the base version table.

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

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 build error from cut&paste

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>

End abuse of apr_strnat[case]cmp - it isn't str[case]cmp. Unsure if apr_strnatcasecmp(conf_ip, uri_ip) was intentional, on the off chance that the left or right hand ip string happens to contain leading zeros.

This test for TraceEnable cases cannot be buried within the max-forwards logic cases.

Plug AllowTrace extended|on|off into proxy and http core. It still is not 'correct' until REQUEST_CHUNKED_PASS is reimplemented and passes some chunk headers, since we aren't echoing the entire request. But it gets me further on testing 1.3 -> 2.0 -> 2.1 -> 2.0 -> 1.3 proxy behaviors.

Make sure mod_rewrite always runs before mod_proxy in the translate_name hook. This makes doing RewriteRules on a Reverse Proxy.. Slightly more predictable than the order of LoadModules. Reported By: David D. Miller <justdave bugzilla.org>

Add failover to mod proxy. If the service is unavailable, check another worker in case this is balancer request. In case the error in unrecoverable, fail with returned status code.

Move direct_connect out of attempt loop. No need to calculate that value on each attempt, because it's always the same.

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.

mod_proxy: Fix ProxyRemoteMatch directive. PR: 33170 Submitted by: Rici Lake <rici ricilake.net> Reviewed by: Justin Erenkrantz

Clean up some crumbs... The sandwich is next. * modules\proxy\mod_proxy.c (alias_match): Removed unused variables.

Remove old FIX_15207 snippets

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

Fix #32367 support for ProxyPass /foo !

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.

FINALLY Correct ap_http_method()! It is NOT a method, it's a SCHEME! Bumped mmn, and ap module cookie, for this function rename. It's not a deprecation, as ap_http_method would be a lovely function name sometime in the future: to determine what the function name implies.

simplify the BalancerMember load factor weighting. Instead of being percentages (and adjusting when the number don't add up), loadfactors/lbfactors are now normalized values, so values like: worker a b c lbfactor 1 1 2 work as expected (ie: a gets 25%, b gets 25% and c gets 50%). So we could also have the above as: worker a b c lbfactor 25 25 50 or even worker a b c lbfactor 15 15 30

"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.

Merge the proxy_status too. Thanks to Christian von Rouques for the patch.

Use apr_strftime instead our own format_byte_out function.

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

Initialize workers for every virtual server not just for default one.

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.

Display worker status under server-status

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

Add more comments to the code -- No functional change.

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.

Initialize the forward proxy worker too.

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

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 'default' foward proxy worker to the proxy_server_conf. Forward worker is constructed on ProxyRequests directive with sceme and host equals '*', meaning all.

remove unused variables and fix some compiler warnings about const qualifiers

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.

Untabify the code. Have no idea who put all those tabs in sources.

Added ProxySet directive (can be rename to something else). The purpose is to be able to set the worker/balancer params withouth the need for very long config lines : <Proxy balancer://cluster> ProxySet stickysession=JSESSIONID </Proxy> Or... ProxySet balancer://cluser nofaiover=On timeout=2

Remove BalancerStickySession directive. This directive was leftover from the initial implementation. The stickysession is set using 'name=val' like any other option.

Clean up some bogus error messages. (I'll note that the code style in this file borders on unreadable.)

Prevent / beeing accepted wrongly by the proxy when having for example: <Location /examples/> ProxyPass ajp://localhost:8009/examples/ </Location>

fix format string mismatch (int vs. apr_time_t)

Small status displaying fix. Submitted by: mturk

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

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

Use the pool for add_worker call. Submitted by: mturk

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

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 KeepAlive worker option. The scheme handler will override this setting if required, depending on the protocol itself and keepalive_set flag. 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

Remove unusable code. The constructor and destructor will be in proxy_util. Add a trace. Submitted by: mturk, jfclere

Use pre_pequest function and set proxy_module_conf bound to client connection so it cen be obtained inside scheme handlers. Submitted by: mturk

dup real and fake Submitted by: jfclere

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

Remove all worker/balancer API's to proxy_util. Submitted by: mturk

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

Use RAW_ARGS instead ITERATE. Add options for connection pool when using ProxyPass 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

Obtain balancer using API. 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

Enable backwards compatibility with 2.0-HEAD, define ajp module base, and note CHANGES so far to proxy Submitted by: mturk

badly encoded urls could cause a null byte skipping (read buffer overflow). (e.g. % as last character). avoid that.

style

fix a bunch of compiler warnings

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 a bunch of cases where the return code of the regex compiler was not checked properly. This affects: mod_setenvif, mod_usertrack, mod_proxy, mod_proxy_ftp and core. PR: 28218

Move mod_ssl-internal interfaces into ssl_private.h; allow mod_ssl.h to be included even when mod_ssl is not enabled. * Makefile.in (install-include): Only install mod_ssl.h. * modules/ssl/ssl_private.h: New file. * modules/ssl/mod_ssl.h: Move everything apart from than the optional hook definitions into ssl_private.h. * modules/ssl/*.c: Include ssl_private.h not mod_ssl.h * modules/ssl/config.m4: Always add the mod_ssl directory to the include path so other modules can find mod_ssl.h. * modules/proxy/mod_proxy.c: Include mod_ssl.h to pick up the optional hook definitions rather than copy'n'pasting them.

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.

Check to make sure that the file name is not NULL before passing it to the strncmp() function. At least on NetWare this prevents the strncmp() function from faulting and also brings the code into sync with similar checks for a NULL file name before calling strncmp() in other areas of this file.

Hook mod_proxy's fixup before mod_rewrite's fixup, so that by mod_rewrite proxied URLs will not be escaped accidentally by mod_proxy's fixup. PR: 16368

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:

Check that r->filename is non-null before trying to use it in proxy_map_location() PR: 12340

Changes for deprecated apr_is_fnmatch

Renames Pending: This clears the list of renames pending in apr-util. Parts of this list was alreadu done, but the pending list hadn't been updated. apr_hook_debug_current from apr_current_hooking_module apr_hook_debug_show from apr_show_hook apr_hook_global_pool from apr_global_hook_pool apr_hook_sort_all from apr_sort_hooks apr_uri_port_of_scheme from apr_uri_default_port_for_scheme apr_uri_unparse from apr_uri_unparse_components apr_uri_parse from apr_uri_parse_components apr_uri_parse_hostinfo from apr_uri_parse_hostinfo_components apr_uri_t from apr_uri_components All APR_URI_* from all APU_URI_* symbols All APR_UNP_* from all UNP_* symbols PR: Obtained from: Submitted by: Thom May Reviewed by:

No crutches, people!

Solve the 80/20 by initializing and storing server_rec->timeout and server_rec->keep_alive_timeout in apr_time_interval_t format (in apr units, whatever they be), as both values exist to pass into APR, and all APR timeouts are in apr_time_t. Reviewed by: Cliff Woolley

Switch mod_proxy to using the brigade/filter calls directly rather than the *_client_block calls.

stop using APLOG_NOERRNO in calls to ap_log_[pr]error()

Add an intelligent error message should no proxy submodules be valid to handle a request. PR: 8407 Obtained from: Submitted by: Reviewed by:

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

Fix another linkage error for 2.0.34 and cvs head

import ssl_proxy_enable in the post config phase, otherwise LoadModule order may leave us without the function.

hook into mod_ssl for https support

Change the header merging behaviour in proxy, as some headers (like Set-Cookie) cannot be unmerged due to stray commas in dates. PR: Obtained from: Submitted by: Reviewed by:

Update our copyright for this year.

provide missing MAX() macro so that proxy can compile again

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:

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

Out foul tabs. No function change.

missed a '&'