SECURITY (CVE-2012-0031): Fix possible crash on shutdown if a child
changes the sb_type field in the scoreboard.  Since unprivileged
children should not be able to affect the parent in this way, this is
treated as a Low severity security issue.

Thanks to "halfdog" <me halfdog.net> for reporting this issue.

* server/scoreboard.c (ap_cleanup_scoreboard, ap_create_scoreboard):
  Use a static global to store an authoritative copy of the scoreboard
  type.


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

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

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

Add <glossary> to nroff.xsl and revert r1222335(r1222355) partially.

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

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

Rename ap_func_attr_* macros to AP_FN_ATTR_*
Add macro for attribute alloc_size on newer gcc's


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

Sync with 2.2 branch

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

rewrite guesses URL or Filesystem in server context, but treats everything
as a URL in per-dir context.




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

fix signedness issue with SSL_X509_NAME_to_string()'s maxlen argument


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

optimize this... Do strlen() ONLY if we need to check
for overflow.
Reviewed/backported by: jim


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

excluded from this cleanup as they must be signature identical to the
clib functions, and although the definition of size_t has been flakey,
the definition of those functions appears to be generally clean since
ANSI C.

Backports: r1228323

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

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

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

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.



Update the comment and checks around address/connection reusability
in mod_proxy.  

The checks and comment are a vestige of 2.0.x
mod_proxy_http where the backend proxy conn was stored in 
the frontend r->conn_config, but ap_proxy_determine_connection()
doesn't associate the frontend and backend conns like this.





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

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

fill in the heartbeat modules' documentation.


add heartbeat to list of lb methods living in other modules.



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

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

add/enhance some hints about configuration section merging (or lack of it in
the case of mod_access_compat)
PR52406




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

Add a bit of debug logging


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

Avoid using C++ reserved word 'new' in arg name in header
Doc tweaks


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

Sort list of modules


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

Display all those shiny new hooks that we have in 2.4

Add new section "Other Hooks" for those that don't fit into "Startup Hooks"
or "Request Hooks"


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

Fix another case of #ifdef-within-a-macro (which was inadvertently
introduced a few days ago).


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

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

Document the unfortunate side effect of converting ap_log_*error into macros
with respect to #ifdef.


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

Don't use #ifdef inside macro calls

The behavior is undefined according to C99 6.10.3.11 and it breaks with
xlc on AIX

PR: 52394


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

Fix segfault when trying to log a nameless valueless cookie

PR: 52256
Submitted by: Rainer Canavan <rainer-apache 7val com>


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

Fix -DDUMP_RUN_CFG output for piped and syslog loggers


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

Adapt loglevel of config errors during second pass

Don't use APLOG_STARTUP since at that point, the error log is already
available. This gives us timestamps if these errors happen during graceful
restart.

Use level 'emerg' as these errors are fatal.


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

Adjust the translations to  r1223050 (Apache Tomcat link)

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

Fix link to Apache Tomcat.



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

add missing #ifdef in ssl_cmd_protocol_parse (should have been in r1222921)


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

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

SSLProtocol: allow explicit control of TLSv1.1 and TLSv1.2 flavors when
compiled against OpenSSL 1.0.1 or later. Update documentation.


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

Set OPENSSL_NO_SSL_INTERN when compiling against OpenSSL 1.0.1
or later, so that mod_ssl retains binary compatibility with future
versions when internal structures are changed. Use API functions
where available, and fall back to direct access for OpenSSL up
to 1.0.0, where needed.

Remove SSL_make_ciphersuite() from ssl_util_ssl.[ch], as it was
never used by any released version of mod_ssl.


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

REMOTE_ADDR is now r->useragent_ip, which is not/never available at
SSL_CB_HANDSHAKE_DONE time. ap_log_cerror() already logs c->client_ip
for us, however, so we can simply drop REMOTE_ADDR from the message.


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

mod_mime: Don't arbitrarily bypass AddOutputFilter during a ProxyPass,
but then allow AddOutputFilter during a RewriteRule [P]. Make mod_mime
behave identically in both cases. PR52342.


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

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

Clarify how the filters are merged when defined using the AddOuputFilter
directive.


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

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