merge r1243246 from trunk:

Fix regression introduced in r1222917: in ssl_find_vhost(), we must use
the *new* SSL_CTX settings for the SSL_set_options/SSL_set_verify calls.

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

BZ 52623: Fix building against PCRE 8.30.

PCRE dropped support for pcre_info() which is
deprecated since a long time. Use pcre_fullinfo()
instead, which exists since version 3.0 of PCRE.

Patch provided by Ruediger Pluem.

Backport of r1243176 from trunk.

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

Fix spelling.

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

enter manpage section assignment to property file

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

update transformation

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

fix validation error

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

fixup properties

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

Remove repeated word

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

Rebuild xdoc

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

Replace occurences of Apache with Apache httpd.

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

Trivial typo

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

xforms

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

Merge r1242351 from trunk:

Handle cases, esp when using mod_proxy_fcgi, when we do not
want SCRIPT_FILENAME to include the query string.
Reviewed/backported by: jim

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

Add cleanup for SSLProxyMachineCertificateChainFile during init

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

Upgrading...

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

xfers

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

Build instruct updates

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

remove -deps info from INSTALL

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

Correct the --with_included_apr error message. We no longer provide
an included/bundled version of apr/apu for the convenience of
our users.

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

Fixes example in httpd.conf, as per bug 52604

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

Backport:
aix: Add a set of build scripts that make packages suitable for installp
on the AIX platform.
Submitted by: Michael Felt <mamfelt gmail com>

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

Add CHANGES entry
two known issues gone

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

Merge r1235019, r1236122, r1240470:

    Make the core input/output filter contexts private and provide a hook
    to insert a custom bucket, for use bye mpm_winnt and mod_ftp.

    This allows to add members to the context structs without breaking binary
    compatibility.

This should be ABI back-compatible, so only a minor MMN bump.

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

Merge r1240315:
Fix various filter functions to return apr_status_t instead of int

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

Backport fix for PR52402 from trunk

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

oops, this got forgotten when copy/paste from dev branch

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

C/C++ 101 on how to traverse the array of pointers ;). Fix core

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

s/Apache/Apache httpd/.

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

Rebuilds other recent changes.

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

Typo fix, courtesy of humbedooh AT humbedooh.com - Daniel Gruno
Rebuilds other fixes.

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

Typo fix, courtesy of humbedooh AT humbedooh.com - Daniel Gruno

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

Backport:
Add a configuration layout for the AIX platform.
Submitted by: Michael Felt <mamfelt gmail com>

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

Merge r1239174 from trunk:

Document AllowOverride Nonfatal option

Submitted by: niq
Reviewed/backported by: jim

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

Align 2.4 w/ trunk... since 2.4.0 was never released, API change is OK.

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

Merge r1233882 from trunk:

* server/core_filters.c (ap_core_input_filter): Only treat EAGAIN as
  success if a non-blocking read was requested; for a blocking read,
  it is an error condition.

Submitted by: jorton
Reviewed/backported by: jim

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

Improve Lua 5.2.0 compatibility.

This is not yet complete. Building should
still work with Lua 5.1.4, but needs
-DLUA_COMPAT_ALL in CPPFLAGS when compiled
against 5.2.0. Automatically handling
this in configure is still a TODO.

Backport from trunk of the following revisions:

r1221205: Make mod_lua compile with lua 5.2.x.
MOdified patch submitted by NormW (nornw gknw net).

r1239029: luaL_reg was already deprecated in Lua 5.1.4.
It is gone in Lua 5.2.0 and was replaced by luaL_Reg
which already existed in 5.1.4. So use that one.

r1239030: Remove luaL_reg macro definition no longer needed
and simplify lua_load compatibility macro.

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

No need for multi-version compatibility.

Backport of r1239071 from trunk.

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

Um. I'm sorry. That's the wrong spot.

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

Make apachectl -h aware of status, fullstatus, and configtest.

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

Fixed c&p error.

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

Fix handling of piped, syslog, or inherited ErrorLog entries

Backport of r1225223 from trunk.

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

Merge r1225199:
Check during configtest that the directories for error logs exist

PR: 29941

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

Merge r1234899:

    * server/core_filters.c (send_brigade_nonblocking): Use a non-blocking
      bucket read, allowing any pending data to be flushed before trying a
      (potentially slow) blocking read.

Submitted by: Joe Orton

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

I think this was fixed by Stefan in r1234646.

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

zap an unhelpful, out of date comment from httpd 1.2

Backport of r1213391 from trunk.

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

Fix broken backport of r1232630.

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

Fix typos

Backport of r1210148 from trunk.

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

Further sync docs with trunk.

I haven't backported docs for the cache-invalidate
env var, since although it is present in 2.4.x
the functionality around it was removed for future
definition, so I guess it is not really useful
right now.

Please correct me if tha is wrong and we should
add the cache-invalidate to the 2.4.x docs
like we have right now in trunk.

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

No longer trunk here.

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

Update.

iBackport of r1234511 from trunk.

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

Update.

Backport of r1236701 from trunk.

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

Remove unwanted tanslation leftover.
Was introduced in r1210120.

Backport of r1238768 from trunk.

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

Updates.

Backport of r1210120 from trunk.

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

Updates.

Backport of r1231518 from trunk.

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

Update.

Backport of r1203980 from trunk.

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

Updates.

Backport of r1206472 from trunk.

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

Update.

Backport of r1231508 from trunk.

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

Updates.

Backport of r1203714 from trunk.

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

Updates.

Backport of r1201450 from trunk.

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

fix typo.
Submitted by: OKANO Takayoshi <kano@na.rim.or.jp>

Backport of r1210067 from trunk.

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

Update translation.

Backport of r1210336 from trunk.

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

Docs fixes backports from trunk:

r1206940: fix typo.  Submitted by: OKANO Takayoshi <kano@na.rim.or.jp>
r1206978: fix typo

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

Backports from trunk:

- r1200955: Patch from Luke Meyer, clarifies usage of ProxyPassReverseCookiePath directive. As per bug #51126
- r1200968: A little clarification about variable interpolation, as requested in bug #51125
- r1202453: Fix xml

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

Typos

Backport of r1212872 from trunk.

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

Document configure change

Backport of r1200496 from trunk.

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

Update mergeinfo.

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

Updates.

Partial backport of r1231510 from trunk.

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

Update.

Backport of r1215514 from trunk.

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

xforms

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

c/p error

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

* modules/filters/mod_proxy_html.c: Fix various code style issues.
* Use apr_is* ctype macro wrappers.

Backport of r1200556 from trunk.

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

Merge r1229021 from trunk:

Core configuration: add AllowOverride option to treat syntax
errors in .htaccess as non-fatal.
PR 52439

Submitted by: niq
Reviewed/backported by: jim

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

Update CHANGES.

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

Fix copy&paste error in comment.

Backport of r1238545 from trunk.

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

Make doxygen generate (useful) graphs

Backport of r1201032 from trunk.

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

Formatting, no functional change.

Backport of r1200702 from trunk.

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

Line ordering. Partial backport of 1221216
from trunk to keep deltas small.

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

Fixed NetWare install.

Backport of r1201956 from trunk.

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

Simple edit, when 'saved' this will always alphasort anyways

Backport of r1227910 from trunk.

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

Reduce code drift: replace r1205569 with
exact merge of 1205568 from trunk.

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

* include/util_varbuf.h: Doxygen tweaks.

Backport of r1211351 from trunk.

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

* modules/: More doxy group fixes.

Partial backport of ir1211495.

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

* include/httpd.h, server/mpm/*/*.h: Tidy up doxygen tree view by moving
  private interfaces into a separate group.

Backport of r1211490 from trunk.

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

include/: Various doxy markup tweaks.

Backport of r1211364 from trunk.

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

definAtely

Backport of r1213381 from trunk.

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

silly indentation fix

Backport of r1203400 from trunk.

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

s/insure/ensure/

Backport of r1237407 from trunk.

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

configure: Move the --with-included-apr check so that srcdir!=builddir builds
aren't broken by it.

Backport of r1232838 from trunk.

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

Merge r1236350 from trunk:

https also needs QS

Reviewed/backported by: jim

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

Restore attribution

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

Add reference to CVE-2012-0021, quoting the 2.3.x version in which
the problem was introduced.

(following r1235875 which DidTRT for 2.2.x/CHANGES)

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

Update xforms

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

Some doc updates

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

Merge r1234876:
Document how Include should behave. The present inconsistencies are now subject
of PR 52505 instead.

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

Merge r1234848 from trunk:

* server/core_filters.c (ap_core_output_filter): Don't read the entire
  output of a morphing bucket into RAM.

Submitted by: jorton, sf

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

SECURITY: CVE-2012-0053 (cve.mitre.org) Fix an issue in error responses that
could expose "httpOnly" cookies when no custom ErrorDocument is specified
for status code 400.

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

remove mistakenly commited patches...

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

update xforms

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

Merge r1234643:
Fix docs for Include, add docs for IncludeOptional

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

Merge r1234642:
Add a validate-xml target

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