* include/util_ldap.h: Treat LDAP_UNAVAILABLE as a transient error
  with non-MS LDAP SDKs; seen with OpenLDAP against Novell eDirectory.

Submitted by: Filip Valder <filip.valder vsb.cz> (via RH bugzilla)
Reviewed by: jorton, sf, rjung


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

r1052419 changed the default value of Options to FollowSymlinks, 
but inadvertently made "AllowOverride Options" behave like 
"AllowOverride Options=FollowSymLinks".

PR53444



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

mod_rewrite: Fix RewriteCond integer checks to be parsed correctly.

PR: 53023
Submitted by: Axel Reinhold <apache freakout.de>
Reviewed/Updated by: nd

Submitted by: nd
Reviewed/backported by: jim


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

Fix parsing of Require arguments in <AuthzProviderAlias>.
Add some logging and an assert for a case that should not happen.

PR: 53048

Submitted by: sf
Reviewed/backported by: jim


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

PR 53104 - %{abc}C truncates cookies whose values contain '='

Submitted by: gregames
Reviewed/backported by: jim


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

     trunk patch: http://svn.apache.org/viewvc?rev=1356115&view=rev
                  http://svn.apache.org/viewvc?view=revision&revision=1356813
     2.4.x patch: http://people.apache.org/~jorton/httpd-pr52774.patch
     +1: jorton, covener, druggeri, jim


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

    SECURITY: CVE-2012-2687 (cve.mitre.org):

    mod_negotiation: Escape filenames in variant list to prevent an
    possible XSS for a site where untrusted users can upload files to a
    location with MultiViews enabled.

    * modules/mappers/mod_negotiation.c (make_variant_list): Escape
      filenames in variant list.

    Submitted by: Niels Heinen <heinenn google.com>

Reviewed by: covener, jorton, sf


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

     htdbm/htpasswd: fix handling of crypt() failures.

Reviewed by: jorton, covener, sf


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

    * server/mpm_unix.c (dummy_connection): Use a TLS 1.0 close_notify
      alert if the chosen listener is configured for https; not perfect
      but better than sending an HTTP request.  Adjust comments.


    * server/mpm_unix.c (dummy_connection): Fix spello.

Reviewed by: jorton, jim, covener


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

    Use the the same hostname for SNI as for the HTTP request when forwarding
    to SSL backends.

    PR: 53134
    Based on a patch from: Michael Weiser <michael weiser.dinsnail.net>

Reviewed by: rpluem, druggeri, covener


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

	
	mod_info: Display registered providers.

Reviewed by: sf, jorton, covener


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

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

When receiving http on https, send the error response with http 1.0
It is important that we send a proper error status, or search engines
may index the error message.

Remove the link in the speaking-http-on-https error message.
With SNI, the link will usually be wrong. So better send no link at all.
    
PR: 50823
Reviewed by: sf, jorton, trawick


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

Fix segfault in logging if r->useragent_addr or c->client_addr is unset.

Reviewed by: sf, jorton, trawick


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

static scope for rewritemap_mutex_type.

Submitted by: nd
Reviewed by: sf, jorton, trawick


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

add CHANGES entry:

 log_server_status: Bring Perl style forward to the present, use
 standard modules, update for new format of server-status output.

Submitted by: rbowen, Dave Brondsema, igalic, humbedooh
Reviewed by: rbowen, jim, sf


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

mod_sed, mod_log_debug: Symbol namespace cleanups.

Submitted by: jorton
Reviewed by: jorton , jim, sf


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

* server/main.c (main): Bail out *before* signalling the server
  if the config is bad. (as per the claim in the docs!)

Submitted by: jorton
Reviewed by: jorton, jim, sf


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

If there is an error reading the headers from the backend,
send an error to the client


add PR reference

Submitted by: sf
Reviewed/backported by: jim


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

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

Use new ap_runtime_dir_relative() API

Document use of the DefaultRuntimeDir directive.

Submitted by: jim, minfrin
Reviewed/backported by: jim


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

Initialize EC temporary key on server startup, as for DH and
RSA. This fixes a race condition that could lead to a crash with threaded
MPMs.

Submitted by: sf
Reviewed/backported by: jim


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

* 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

Committed by: rpluem
Reviewed by: rpluem, covener, sf


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

* Revert r1294936 (Jeff's revert) and fix NetWare / Win32 build.
  Added the missing AP_DECLARE* decorations for the function 
  implementations and variables.

* Fix changes in parameter names in function definitions done in r1303201

* Partly revert r1303435 and rename pconf back to in_pconf to avoid shadowing
  the global variable with the same name and create a bogus assignment.

  Pointed out by: Eric Covener

Committed by: fuankg, rpluem
Reviewed by: fuankg, minfrin, trawick


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

* Correctly save the reverse proxy worker in all virtual host proxy configs.

PR: 52935
Obtained from: Petter Berntsen <petterb gmail.com>
Committed by: rpluem
Reviewed by: covener, minfrin, sf


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

mod_sed: Don't define PATH_MAX to a potentially undefined value, causing
compile problems on GNU hurd.
Submitted by: sf
Reviewed by: minfrin, fuankg


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

core: Add ap_runtime_dir_relative() and DefaultRuntimeDir.
Submitted by: trawick
Reviewed by: jim, minfrin


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

core: Fix breakage of Listen directives with MPMs that use a
per-directory config. PR 52904.
Submitted by: sf
Reviewed by: covener, minfrin


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

core: Disallow directives in AllowOverrideList which are only allowed
in VirtualHost or server context. These are usually not prepared to be
called in .htaccess files.
Submitted by: sf
Reviewed by: covener, druggeri


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

core: In AllowOverrideList, do not allow 'None' together with other
directives. PR 52823.


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

mod_slotmem_shm: Support DEFAULT_REL_RUNTIMEDIR for file-based shm.


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

Reviewed by: sf, trawick, covener

Merge r1304852 from trunk:

Fix merging of AllowOverrideList and ContentDigest.
Remove some useless code.
Pointed out by covener



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

Reviewed by: covener, igalic, sf

Merge r1304641 from trunk:


PR52981: mod_request: fix check for bad KeptBodySize argument






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

add filesystem paths to some common error messages.

(slightly modified from dev@ post to not bury the "failed/denied")


Submitted by: covener
Reviewed/backported by: jim


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

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

Properly handle errors from subsequent input filters.

PR 52914.


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

* server/mpm_unix.c (dummy_connection): Destroy temp pool and return
  on connect() failure.

Reviewed by: jim, trawick, jorton

[added user-incomprehensible CHANGES entry as directed ;) ]


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

PR52845: "DirectoryIndex disabled" should blow away the DirectoryIndex settings
in the current config section, not just override previous config sections.

Submitted by: covener
Reviewed/backported by: jim


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

Fix insecure handling of LD_LIBRARY_PATH that could lead to the
current working directory to be searched for DSOs

CVE-2012-0883

Submitted by: sf
Reviewed/backported by: jim


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

Pass the EOS bucket down the filter chain

PR: 52766

Submitted by: sf
Reviewed/backported by: jim


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