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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209958 13f79535-47bb-0310-9956-ffa450edef68

Add APLOGNO() macro for unique tags for every log message.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209777 13f79535-47bb-0310-9956-ffa450edef68

ap_core_translate: factor out duplicate code.  no functional change.

Submitted by: Greg Ames


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209748 13f79535-47bb-0310-9956-ffa450edef68

Fix apr_status_t being passed as loglevel


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209742 13f79535-47bb-0310-9956-ffa450edef68

- Add some error handling for writing to the output filter chain.
- Add some ap_assert()s for error cases that probably should not happen (and
  the following code would break).
  These fix some compiler warnings about "variable 'rv' set but not used".
- Prevent a leak of a bucket in one error case.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209736 13f79535-47bb-0310-9956-ffa450edef68

mod_auth_form: Use apr_status_t for the mod_session API.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209626 13f79535-47bb-0310-9956-ffa450edef68

mod_session_dbd: Use apr_status_t as a return code across the mod_session API.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209620 13f79535-47bb-0310-9956-ffa450edef68

mod_session: Use apr_status_t as a return code across the mod_session API,
clarify where we ignore errors and why.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209606 13f79535-47bb-0310-9956-ffa450edef68

Fix segfault with Solaris LDAP SDK when enabling ldaps.

Enable SSL by passing secure=1 to apr_ldap_init instead of calling
apr_ldap_set_option(... APR_LDAP_OPT_TLS ...).

This change carefully avoids any change of behavior on non-Solaris LDAP SDKs.

PR: 42682


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209604 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209506 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209500 13f79535-47bb-0310-9956-ffa450edef68

mod_session_crypto: Fix a pool lifetime problem when reading from
SessionCryptoPassphraseFile.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209466 13f79535-47bb-0310-9956-ffa450edef68

* server/listen.c (open_listeners): Fix logic error caught by
  Coverity; possible NULL pointer deref at startup with a
  particular (and unlikely) listener/system config.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209439 13f79535-47bb-0310-9956-ffa450edef68

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.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209436 13f79535-47bb-0310-9956-ffa450edef68

Bring Windows httpd.conf up to date with documented or required modules


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209331 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209090 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209089 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209070 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209062 13f79535-47bb-0310-9956-ffa450edef68

mod_rewrite: Add the AllowNoSlash RewriteOption, which makes it possible
for RewriteRules to be placed in .htaccess files that match the directory
with no trailing slash. PR 48304.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209057 13f79535-47bb-0310-9956-ffa450edef68

regexes for no additional cost.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208917 13f79535-47bb-0310-9956-ffa450edef68

Use 2 sep hashing functions to account for collisions...
Safe enough
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208899 13f79535-47bb-0310-9956-ffa450edef68

Remove some getpid() logging, this is now also included in the error log format.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208848 13f79535-47bb-0310-9956-ffa450edef68

mod_cache: Apply the API change that allows future mod_cache providers to
invalidate cache entries, which will fix PR15868.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208824 13f79535-47bb-0310-9956-ffa450edef68

Remove some more now redundant log prefixes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208820 13f79535-47bb-0310-9956-ffa450edef68

Clarify the peer IP of the connection and the client IP of the request within
the docs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208754 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208727 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208533 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208527 13f79535-47bb-0310-9956-ffa450edef68

mod_session_crypto: Add a SessionCryptoPassphraseFile directive so that the
administrator can hide the keys from the configuration.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208518 13f79535-47bb-0310-9956-ffa450edef68

use a style sheet... ideally we would pull one off the filesystem,
but for now...
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208412 13f79535-47bb-0310-9956-ffa450edef68

as per the following thread:
http://www.gossamer-threads.com/lists/apache/dev/395830?do=post_view_threaded#395830


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208384 13f79535-47bb-0310-9956-ffa450edef68

Introduce a per request version of the remote IP address, which can be
optionally modified by a module when the effective IP of the client
is not the same as the real IP of the client (such as a load balancer).
Introduce a per connection "peer_ip" and a per request "client_ip" to
distinguish between the raw IP address of the connection and the effective
IP address of the request.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208378 13f79535-47bb-0310-9956-ffa450edef68

root of the project as the canonical mergeinfo property. Missed another one.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208371 13f79535-47bb-0310-9956-ffa450edef68

root of the project as the canonical mergeinfo property. Missed one.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208365 13f79535-47bb-0310-9956-ffa450edef68

root of the project as the canonical mergeinfo property.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208364 13f79535-47bb-0310-9956-ffa450edef68

- Build shared mpms instead of static, reduce the RPM to a simple one
pass build of the server into a single binary and modules.
- Create a dedicated generic RPM layout, ensuring that all example
config files have the correct paths embedded within them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208124 13f79535-47bb-0310-9956-ffa450edef68

Remove more log message prefixes that are now redundant as the
the error log format includes the module name.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208112 13f79535-47bb-0310-9956-ffa450edef68

mod_dbd: The dbd_prepared_init() function reported the result of the last
prepared statement, obscuring earlier errors. Fixed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208081 13f79535-47bb-0310-9956-ffa450edef68

whitespace

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

Ensure casing doesn't matter... (we know balancer->s->name is
lc)
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208071 13f79535-47bb-0310-9956-ffa450edef68