]> granicus.if.org Git - apache/log
apache
9 years agomod_proxy_http: follow up to r1656259.
Yann Ylavic [Mon, 11 May 2015 15:48:58 +0000 (15:48 +0000)]
mod_proxy_http: follow up to r1656259.
The proxy connection may be NULL during prefetch, don't try to dereference it!
Still origin->keepalive will be set according to p_conn->close by the caller
(proxy_http_handler).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1678771 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_proxy: check for the correct pool (lifetime) in connection_cleanup(),
Yann Ylavic [Mon, 11 May 2015 15:26:13 +0000 (15:26 +0000)]
mod_proxy: check for the correct pool (lifetime) in connection_cleanup(),
according to the associated comment and the value really NULLed in
conn_pool_cleanup().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1678768 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_proxy: only cleanup the socket for a connection asked to be closed but
Yann Ylavic [Mon, 11 May 2015 14:53:34 +0000 (14:53 +0000)]
mod_proxy: only cleanup the socket for a connection asked to be closed but
whose address can still be reused.

This saves unnecessary socket pool destroy and creation at cleanup and reuse
time, plus the same initialization of conn->pool's associated data which can
be reused in that case.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1678763 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sun, 10 May 2015 16:57:51 +0000 (16:57 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1678580 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
Lucien Gentis [Sun, 10 May 2015 16:56:41 +0000 (16:56 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1678579 13f79535-47bb-0310-9956-ffa450edef68

9 years agoxforms
Eric Covener [Sun, 10 May 2015 15:38:16 +0000 (15:38 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1678566 13f79535-47bb-0310-9956-ffa450edef68

9 years agoincorporate feedback from 2.4 version
Eric Covener [Sun, 10 May 2015 15:37:12 +0000 (15:37 +0000)]
incorporate feedback from 2.4 version

http://httpd.apache.org/docs/2.4/mod/mod_mime.html#comment_3996

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1678565 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Fri, 8 May 2015 15:39:40 +0000 (15:39 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1678384 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
Lucien Gentis [Fri, 8 May 2015 15:38:33 +0000 (15:38 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1678383 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild HTML
Rich Bowen [Fri, 8 May 2015 15:10:46 +0000 (15:10 +0000)]
Rebuild HTML

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1678372 13f79535-47bb-0310-9956-ffa450edef68

9 years agoLink to canonical hostnames recipe from "avoid" document.
Rich Bowen [Fri, 8 May 2015 15:07:33 +0000 (15:07 +0000)]
Link to canonical hostnames recipe from "avoid" document.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1678371 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRemove some entries already in the 2.4.x branch
Jeff Trawick [Thu, 7 May 2015 22:00:06 +0000 (22:00 +0000)]
Remove some entries already in the 2.4.x branch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1678267 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFix compatibility note for ProxySCGIInternalRedirect to reflect
Jeff Trawick [Thu, 7 May 2015 21:54:57 +0000 (21:54 +0000)]
Fix compatibility note for ProxySCGIInternalRedirect to reflect
inclusion in 2.4.13

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1678266 13f79535-47bb-0310-9956-ffa450edef68

9 years agohttp: Don't remove the Content-Length of zero from a HEAD response if
Yann Ylavic [Thu, 7 May 2015 14:05:25 +0000 (14:05 +0000)]
http: Don't remove the Content-Length of zero from a HEAD response if
it comes from an origin server, module or script.

Instead of removing the C-L in ap_http_header_filter() after it has been
set by ap_content_length_filter(), just don't set it in the latter.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1678215 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl namespacing: Rename SSL_SESSION_id2sz() to modssl_SSL_SESSION_id2sz().
Stefan Sperling [Tue, 5 May 2015 14:35:48 +0000 (14:35 +0000)]
mod_ssl namespacing: Rename SSL_SESSION_id2sz() to modssl_SSL_SESSION_id2sz().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677835 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl namespacing: Move SSL_CTX_use_certificate_chain() into ssl_engine_init.c
Stefan Sperling [Tue, 5 May 2015 14:29:11 +0000 (14:29 +0000)]
mod_ssl namespacing: Move SSL_CTX_use_certificate_chain() into ssl_engine_init.c
and make it a static function called use_certificate_chain().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677834 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl namespacing: Move modssl_X509_INFO_load_file() into ssl_engine_init.c
Stefan Sperling [Tue, 5 May 2015 14:20:19 +0000 (14:20 +0000)]
mod_ssl namespacing: Move modssl_X509_INFO_load_file() into ssl_engine_init.c
and make it a static function called load_x509_info().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677832 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl namespacing: Merge SSL_X509_INFO_load_path() into its only caller
Stefan Sperling [Tue, 5 May 2015 14:09:35 +0000 (14:09 +0000)]
mod_ssl namespacing: Merge SSL_X509_INFO_load_path() into its only caller
ssl_init_proxy_certs() in ssl_engine_init.c. No functional change.
Review by: kbrand

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677830 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMake REDIRECT_URL a complete URL (where set).
Nick Kew [Mon, 4 May 2015 22:05:14 +0000 (22:05 +0000)]
Make REDIRECT_URL a complete URL (where set).
PR 57785

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677702 13f79535-47bb-0310-9956-ffa450edef68

9 years agoconst goodness
Jeff Trawick [Sun, 3 May 2015 21:46:47 +0000 (21:46 +0000)]
const goodness

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677489 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_dav: Avoid doing the walk on a COPY source for handling preconditions if
Ben Reser [Sun, 3 May 2015 18:02:33 +0000 (18:02 +0000)]
mod_dav: Avoid doing the walk on a COPY source for handling preconditions if
there are no preconditions provided.

* modules/dav/main/util.c:
  (dav_validate_request): avoid validating locks and ETags when there are
    no If headers providing them on a resource we aren't modifying.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677462 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sun, 3 May 2015 16:33:44 +0000 (16:33 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677444 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
Lucien Gentis [Sun, 3 May 2015 16:32:35 +0000 (16:32 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677443 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl: Rename static convert_asn1_to_utf8 function to asn1_string_to_utf8.
Stefan Sperling [Sat, 2 May 2015 19:02:40 +0000 (19:02 +0000)]
mod_ssl: Rename static convert_asn1_to_utf8 function to asn1_string_to_utf8.
Suggested by: kbrand

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677339 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sat, 2 May 2015 16:38:24 +0000 (16:38 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677331 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
Lucien Gentis [Sat, 2 May 2015 16:37:06 +0000 (16:37 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677330 13f79535-47bb-0310-9956-ffa450edef68

9 years agoNew file.
Lucien Gentis [Sat, 2 May 2015 14:23:33 +0000 (14:23 +0000)]
New file.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677318 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFollow up to r1677187.
Christophe Jaillet [Fri, 1 May 2015 18:59:00 +0000 (18:59 +0000)]
Follow up to r1677187.
Add compatibility note

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677210 13f79535-47bb-0310-9956-ffa450edef68

9 years agoProblem with mod_log_forensic.xml.fr
Lucien Gentis [Fri, 1 May 2015 17:58:56 +0000 (17:58 +0000)]
Problem with mod_log_forensic.xml.fr

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677196 13f79535-47bb-0310-9956-ffa450edef68

9 years agoNew file.
Lucien Gentis [Fri, 1 May 2015 17:50:15 +0000 (17:50 +0000)]
New file.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677194 13f79535-47bb-0310-9956-ffa450edef68

9 years agoDeleting non-existing file
Lucien Gentis [Fri, 1 May 2015 17:49:07 +0000 (17:49 +0000)]
Deleting non-existing file

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677193 13f79535-47bb-0310-9956-ffa450edef68

9 years agoIn 2.4.x
Jim Jagielski [Fri, 1 May 2015 17:07:11 +0000 (17:07 +0000)]
In 2.4.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677189 13f79535-47bb-0310-9956-ffa450edef68

9 years agoNew file.
Lucien Gentis [Fri, 1 May 2015 16:47:26 +0000 (16:47 +0000)]
New file.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677179 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Fri, 1 May 2015 16:45:14 +0000 (16:45 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677178 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
Lucien Gentis [Fri, 1 May 2015 16:44:05 +0000 (16:44 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677177 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl namespacing: SSL_X509_INFO_load_file -> modssl_X509_INFO_load_file
Stefan Sperling [Fri, 1 May 2015 14:49:45 +0000 (14:49 +0000)]
mod_ssl namespacing: SSL_X509_INFO_load_file -> modssl_X509_INFO_load_file

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677159 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl namespacing: SSL_X509_match_name -> modssl_X509_match_name
Stefan Sperling [Fri, 1 May 2015 14:42:42 +0000 (14:42 +0000)]
mod_ssl namespacing: SSL_X509_match_name -> modssl_X509_match_name

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677156 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl namespacing: Make SSL_X509_getIDs a static function inside the
Stefan Sperling [Fri, 1 May 2015 14:40:01 +0000 (14:40 +0000)]
mod_ssl namespacing: Make SSL_X509_getIDs a static function inside the
file ssl_util_ssl.c (no outside callers). Rename to just getIDs().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677155 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl namespacing: SSL_X509_getSAN -> modssl_X509_getSAN
Stefan Sperling [Fri, 1 May 2015 14:37:25 +0000 (14:37 +0000)]
mod_ssl namespacing: SSL_X509_getSAN -> modssl_X509_getSAN

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677154 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl namespacing: SSL_X509_NAME_to_string -> modssl_X509_NAME_to_string
Stefan Sperling [Fri, 1 May 2015 14:34:38 +0000 (14:34 +0000)]
mod_ssl namespacing: SSL_X509_NAME_to_string -> modssl_X509_NAME_to_string

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677153 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl namespacing: Rename SSL_X509_NAME_ENTRY_to_string to
Stefan Sperling [Fri, 1 May 2015 14:32:11 +0000 (14:32 +0000)]
mod_ssl namespacing: Rename SSL_X509_NAME_ENTRY_to_string to
modssl_X509_NAME_ENTRY_to_string.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677151 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl namespacing: Make SSL_ASN1_STRING_to_utf8 a static function inside
Stefan Sperling [Fri, 1 May 2015 14:28:59 +0000 (14:28 +0000)]
mod_ssl namespacing: Make SSL_ASN1_STRING_to_utf8 a static function inside
ssl_util_ssl.c (no callers outside this file). The new static function name
chosen is convert_asn1_to_utf8, based on the assumption that neither SSL_
nor ASN1_ are safe prefixes to use without potential future overlap.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677149 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl namespacing: SSL_X509_getBC -> modssl_X509_getBC
Stefan Sperling [Fri, 1 May 2015 14:15:22 +0000 (14:15 +0000)]
mod_ssl namespacing: SSL_X509_getBC -> modssl_X509_getBC

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677146 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl namespacing: SSL_smart_shutdown -> modssl_smart_shutdown
Stefan Sperling [Fri, 1 May 2015 14:10:23 +0000 (14:10 +0000)]
mod_ssl namespacing: SSL_smart_shutdown -> modssl_smart_shutdown

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677145 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl namespacing: SSL_read_PrivateKey -> modssl_read_privatekey
Stefan Sperling [Fri, 1 May 2015 14:08:18 +0000 (14:08 +0000)]
mod_ssl namespacing: SSL_read_PrivateKey -> modssl_read_privatekey

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677144 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl namespacing: Rename SSL_init_app_data2_idx, SSL_get_app_data2,
Stefan Sperling [Fri, 1 May 2015 14:03:04 +0000 (14:03 +0000)]
mod_ssl namespacing: Rename SSL_init_app_data2_idx, SSL_get_app_data2,
and SSL_set_app_data2 from SSL_* to modssl_*. Update references in
README.dsov.* files. Rename static variable SSL_app_data2_idx to just
app_data2_idx since the symbol is internal to ssl_util_ssl.c.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677143 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFix typo. PR57879
Christophe Jaillet [Fri, 1 May 2015 11:56:35 +0000 (11:56 +0000)]
Fix typo.  PR57879

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677116 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFollowup to r1671397 so these will build
Gregg Lewis Smith [Fri, 1 May 2015 04:09:02 +0000 (04:09 +0000)]
Followup to r1671397 so these will build

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677096 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFix typo
Christophe Jaillet [Thu, 30 Apr 2015 08:26:46 +0000 (08:26 +0000)]
Fix typo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1676924 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFollow up to r1674542 and r1675410: CHANGES entry.
Yann Ylavic [Wed, 29 Apr 2015 20:08:43 +0000 (20:08 +0000)]
Follow up to r1674542 and r1675410: CHANGES entry.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1676842 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFormatting and wording improvements for ALPN (no code changes)
Kaspar Brand [Wed, 29 Apr 2015 10:27:32 +0000 (10:27 +0000)]
Formatting and wording improvements for ALPN (no code changes)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1676709 13f79535-47bb-0310-9956-ffa450edef68

9 years agoThe increased use of UuidCreate() in APR 1.5.2+ introduces an unresolved
Gregg Lewis Smith [Wed, 29 Apr 2015 01:43:33 +0000 (01:43 +0000)]
The increased use of UuidCreate() in APR 1.5.2+ introduces an unresolved
reference to UuidCreate() to these support applications that link with
apr-1.lib and do not already link rpcrt4.lib.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1676654 13f79535-47bb-0310-9956-ffa450edef68

9 years agoGive a better hint.
Eric Covener [Tue, 28 Apr 2015 18:56:47 +0000 (18:56 +0000)]
Give a better hint.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1676593 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sun, 26 Apr 2015 16:45:15 +0000 (16:45 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1676123 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
Lucien Gentis [Sun, 26 Apr 2015 16:43:26 +0000 (16:43 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1676122 13f79535-47bb-0310-9956-ffa450edef68

9 years agoadjust link to SSL_CONF_cmd man page on www.openssl.org, again
Kaspar Brand [Sun, 26 Apr 2015 07:16:35 +0000 (07:16 +0000)]
adjust link to SSL_CONF_cmd man page on www.openssl.org, again

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1676088 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMerge r1650047 from trunk:
Kaspar Brand [Sun, 26 Apr 2015 07:03:31 +0000 (07:03 +0000)]
Merge r1650047 from trunk:

Add support for extracting subjectAltName entries of type
rfc822Name and dNSName into SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n
variables.

* docs/manual/mod/mod_ssl.xml: add SSL_*_SAN_*_n entries to the
  environment variables table

* modules/ssl/ssl_engine_kernel.c: in ssl_hook_Fixup, add extraction
  of subjectAltName entries for the "StdEnvVars" case

* modules/ssl/ssl_engine_vars.c: add support for retrieving the
  SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n variables, either with
  individual on-demand lookup (ssl_var_lookup_ssl_cert_san),
  or with full-list extraction to the environment ("StdEnvVars")

* modules/ssl/ssl_private.h: add modssl_var_extract_san_entries prototype

* modules/ssl/ssl_util_ssl.c: implement SSL_X509_getSAN and
  SSL_ASN1_STRING_to_utf8 helper functions, with factoring out common
  code from SSL_X509_getIDs and SSL_X509_NAME_ENTRY_to_string where
  suitable. Limit SSL_X509_getSAN to the two most common subjectAltName
  entry types appearing in user or server certificates (i.e., rfc822Name
  and dNSName), for the time being.

* modules/ssl/ssl_util_ssl.h: add SSL_ASN1_STRING_to_utf8
  and SSL_X509_getSAN prototypes

Proposed by: kbrand
Reviewed by: ylavic, druggeri

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1676087 13f79535-47bb-0310-9956-ffa450edef68

9 years agoconsistently output SSLCertificateChainFile deprecation warnings
Kaspar Brand [Sun, 26 Apr 2015 06:43:26 +0000 (06:43 +0000)]
consistently output SSLCertificateChainFile deprecation warnings

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1676085 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRemove NPN support and focus on ALPN (RFC 7301)
Kaspar Brand [Sat, 25 Apr 2015 09:46:09 +0000 (09:46 +0000)]
Remove NPN support and focus on ALPN (RFC 7301)

* modules/ssl/mod_ssl.c, modules/ssl/mod_ssl.h: drop
  modssl_register_npn optional function and related declarations.

* modules/ssl/ssl_engine_init.c (ssl_init_ctx_callbacks):
  no longer set NPN advertisement callback.

* modules/ssl/ssl_engine_io.c (ssl_io_filter_input): remove
  NPN handling.

* modules/ssl/ssl_engine_kernel.c (ssl_callback_AdvertiseNextProtos):
  remove callback.

* modules/ssl/ssl_private.h: remove NPN prototypes, set
  HAVE_TLS_ALPN (OpenSSL 1.0.2 and later) with feature-based detection.

Rename SSLAlpnPreference to SSLALPNPreference, and add documentation.

Previous commits related to NPN and ALPN, for reference purposes:

r1332643 - Add support for TLS Next Protocol Negotiation
r1487772 - mod_ssl: Redesign NPN (Next Protocol Negotiation) API
           to avoid use of hooks API and inter-module hard linkage
r1670397 - ALPN support, based on mod_spdy/mod_h2 patch set
r1670434 - More ALPN goodness

(plus some minor tweaks: r1670578, r1670440, r1670578,
 r1670738, r1675459, and r1675549)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1676004 13f79535-47bb-0310-9956-ffa450edef68

9 years agoupdate transformation
André Malo [Fri, 24 Apr 2015 19:34:44 +0000 (19:34 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675936 13f79535-47bb-0310-9956-ffa450edef68

9 years agoWork around issues w/ "broken" BSD Makefile translation...
Jim Jagielski [Fri, 24 Apr 2015 11:29:20 +0000 (11:29 +0000)]
Work around issues w/ "broken" BSD Makefile translation...
If we have gmake, then prefer that.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675819 13f79535-47bb-0310-9956-ffa450edef68

9 years ago* mod_journald: Remove JournaldCustomLog. It is not needed now when
Jan Kaluža [Fri, 24 Apr 2015 06:56:43 +0000 (06:56 +0000)]
* mod_journald: Remove JournaldCustomLog. It is not needed now when
  mod_log_config can use mod_journald as errorlog provider.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675797 13f79535-47bb-0310-9956-ffa450edef68

9 years ago* mod_journald: use -lsystemd instead of -lsystemd-journald when found
Jan Kaluža [Thu, 23 Apr 2015 18:29:38 +0000 (18:29 +0000)]
* mod_journald: use -lsystemd instead of -lsystemd-journald when found

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675701 13f79535-47bb-0310-9956-ffa450edef68

9 years agoGenerated doc changes
Mike Rumph [Thu, 23 Apr 2015 17:22:16 +0000 (17:22 +0000)]
Generated doc changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675686 13f79535-47bb-0310-9956-ffa450edef68

9 years agoSimplify. Checking for OPENSSL_NO_TLSEXT already
Rainer Jung [Thu, 23 Apr 2015 07:33:34 +0000 (07:33 +0000)]
Simplify. Checking for OPENSSL_NO_TLSEXT already
happens in a surrounding block.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675549 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_log_config: Fix a bug introduced by r1674261, when using a log provider
Ben Reser [Thu, 23 Apr 2015 03:18:52 +0000 (03:18 +0000)]
mod_log_config: Fix a bug introduced by r1674261, when using a log provider
the return of ap_default_log_writer was an uninitialized variable.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675534 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_log_config: Add %M format to output request duration in milliseconds.
Ben Reser [Thu, 23 Apr 2015 03:12:30 +0000 (03:12 +0000)]
mod_log_config: Add %M format to output request duration in milliseconds.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675533 13f79535-47bb-0310-9956-ffa450edef68

9 years agoGenerated doc changes
Mike Rumph [Wed, 22 Apr 2015 21:09:18 +0000 (21:09 +0000)]
Generated doc changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675500 13f79535-47bb-0310-9956-ffa450edef68

9 years agoGrammar improvements in performance tuning doc
Mike Rumph [Wed, 22 Apr 2015 21:03:04 +0000 (21:03 +0000)]
Grammar improvements in performance tuning doc

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675498 13f79535-47bb-0310-9956-ffa450edef68

9 years agoxforms
Eric Covener [Wed, 22 Apr 2015 20:28:29 +0000 (20:28 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675493 13f79535-47bb-0310-9956-ffa450edef68

9 years agovalidate
Eric Covener [Wed, 22 Apr 2015 20:26:32 +0000 (20:26 +0000)]
validate

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675491 13f79535-47bb-0310-9956-ffa450edef68

9 years agoreword per feedback
Eric Covener [Wed, 22 Apr 2015 19:37:03 +0000 (19:37 +0000)]
reword per feedback

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675471 13f79535-47bb-0310-9956-ffa450edef68

9 years agoHAVE_TLS_NPN was defined twice in this file.
Rainer Jung [Wed, 22 Apr 2015 19:29:07 +0000 (19:29 +0000)]
HAVE_TLS_NPN was defined twice in this file.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675459 13f79535-47bb-0310-9956-ffa450edef68

9 years agofix syntax
Eric Covener [Wed, 22 Apr 2015 19:08:08 +0000 (19:08 +0000)]
fix syntax

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675455 13f79535-47bb-0310-9956-ffa450edef68

9 years agoGenerated doc changes
Mike Rumph [Wed, 22 Apr 2015 17:58:47 +0000 (17:58 +0000)]
Generated doc changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675446 13f79535-47bb-0310-9956-ffa450edef68

9 years agono --with-perl since 1.3
Eric Covener [Wed, 22 Apr 2015 17:50:27 +0000 (17:50 +0000)]
no --with-perl since 1.3

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675441 13f79535-47bb-0310-9956-ffa450edef68

9 years agoxforms
Eric Covener [Wed, 22 Apr 2015 17:44:08 +0000 (17:44 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675437 13f79535-47bb-0310-9956-ffa450edef68

9 years agoadd a prominent caveat about the effect of caching.
Eric Covener [Wed, 22 Apr 2015 17:44:00 +0000 (17:44 +0000)]
add a prominent caveat about the effect of caching.

PR55089

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675436 13f79535-47bb-0310-9956-ffa450edef68

9 years agoxforms
Eric Covener [Wed, 22 Apr 2015 17:25:47 +0000 (17:25 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675430 13f79535-47bb-0310-9956-ffa450edef68

9 years agotypoes
Eric Covener [Wed, 22 Apr 2015 17:25:09 +0000 (17:25 +0000)]
typoes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675429 13f79535-47bb-0310-9956-ffa450edef68

9 years agoPR57778
Eric Covener [Wed, 22 Apr 2015 17:19:37 +0000 (17:19 +0000)]
PR57778

document legacy AddType/ForceType magic types as Handler names
for the curious.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675426 13f79535-47bb-0310-9956-ffa450edef68

9 years agoApplies patch from bz56214 thanks to Javier Llorente - updates spanish
Rich Bowen [Wed, 22 Apr 2015 17:06:38 +0000 (17:06 +0000)]
Applies patch from bz56214 thanks to Javier Llorente - updates spanish
translation of error docs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675420 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl: Make the config parser complain if SSLRandomSeed specifies
Stefan Sperling [Wed, 22 Apr 2015 16:39:20 +0000 (16:39 +0000)]
mod_ssl: Make the config parser complain if SSLRandomSeed specifies
the Entropy Gathering Daemon (EGD) as source while the underlying
SSL library does not support EGD (e.g. in case of LibreSSL).

Suggested and reviewed by: kbrand

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675410 13f79535-47bb-0310-9956-ffa450edef68

9 years agoadd PR
Eric Covener [Tue, 21 Apr 2015 12:26:12 +0000 (12:26 +0000)]
add PR

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675105 13f79535-47bb-0310-9956-ffa450edef68

9 years agoIf a directory exists but no indexes can be resolved, the fallback resource
Eric Covener [Tue, 21 Apr 2015 12:23:33 +0000 (12:23 +0000)]
If a directory exists but no indexes can be resolved, the fallback resource
should be attempted first before giving up.

Submitted By: Jack <tjerk.meesters gmail.com> , covener
Committed By: covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675103 13f79535-47bb-0310-9956-ffa450edef68

9 years agoGenerated doc changes
Mike Rumph [Mon, 20 Apr 2015 23:29:57 +0000 (23:29 +0000)]
Generated doc changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675005 13f79535-47bb-0310-9956-ffa450edef68

9 years agoGrammar improvements in performance tuning doc
Mike Rumph [Mon, 20 Apr 2015 23:20:03 +0000 (23:20 +0000)]
Grammar improvements in performance tuning doc

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675004 13f79535-47bb-0310-9956-ffa450edef68

9 years agoGenerated doc changes
Mike Rumph [Mon, 20 Apr 2015 19:44:57 +0000 (19:44 +0000)]
Generated doc changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674969 13f79535-47bb-0310-9956-ffa450edef68

9 years agompm_event: follow up to r1666468 and r1666618.
Yann Ylavic [Sun, 19 Apr 2015 20:57:13 +0000 (20:57 +0000)]
mpm_event: follow up to r1666468 and r1666618.
We don't need to return 0 in the compare function, but for debugging purpose
which we could implement later if necessary (in a separate function).
For now, keep the function simple as in 2.4.x to ease backport, and add a
comment about why we never return 0 here.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674697 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sun, 19 Apr 2015 16:46:45 +0000 (16:46 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674642 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
Lucien Gentis [Sun, 19 Apr 2015 16:45:41 +0000 (16:45 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674641 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_proxy_wstunnel: Bypass the handler while the connection is not
Yann Ylavic [Sun, 19 Apr 2015 15:51:03 +0000 (15:51 +0000)]
mod_proxy_wstunnel: Bypass the handler while the connection is not
upgraded to WebSocket, so that other modules can possibly take over
the leading HTTP requests.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674632 13f79535-47bb-0310-9956-ffa450edef68

9 years agobuild
Christophe Jaillet [Sun, 19 Apr 2015 11:54:43 +0000 (11:54 +0000)]
build

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674611 13f79535-47bb-0310-9956-ffa450edef68

9 years agomotorz: add missing (fix duplicated) APLOGNOs.
Yann Ylavic [Sun, 19 Apr 2015 11:53:07 +0000 (11:53 +0000)]
motorz: add missing (fix duplicated) APLOGNOs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674609 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFix doc as spotted by Falco Schwarz in online doc
Christophe Jaillet [Sun, 19 Apr 2015 11:50:25 +0000 (11:50 +0000)]
Fix doc as spotted by Falco Schwarz in online doc

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674608 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFix duplicated APLOGNOs from r1661067 and r1661448.
Yann Ylavic [Sun, 19 Apr 2015 11:42:52 +0000 (11:42 +0000)]
Fix duplicated APLOGNOs from r1661067 and r1661448.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674606 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl: Check for RAND_egd() at configure time and only use it if present.
Stefan Sperling [Sat, 18 Apr 2015 17:03:47 +0000 (17:03 +0000)]
mod_ssl: Check for RAND_egd() at configure time and only use it if present.
Fixes the build with LibreSSL which does not provide this function.

Submitted by: Bernard Spil <pil.oss gmail com>, stsp
Committed by: stsp

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674542 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl namespacing: Rename ssl_util_ssl.h macros from SSL_foo to MODSSL_foo.
Stefan Sperling [Sat, 18 Apr 2015 16:43:34 +0000 (16:43 +0000)]
mod_ssl namespacing: Rename ssl_util_ssl.h macros from SSL_foo to MODSSL_foo.
For related discussion, see the dev@ thread starting at:
http://mail-archives.apache.org/mod_mbox/httpd-dev/201504.mbox/%3C20150415163613.GC15209%40fintan.stsp.name%3E

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674538 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sat, 18 Apr 2015 16:11:59 +0000 (16:11 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674531 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
Lucien Gentis [Sat, 18 Apr 2015 16:10:21 +0000 (16:10 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674530 13f79535-47bb-0310-9956-ffa450edef68