]>
granicus.if.org Git - apache/log
Christophe Jaillet [Mon, 1 Jun 2015 05:12:54 +0000 (05:12 +0000)]
Concat string at compile time in order to save a few cycles.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1682816 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 29 May 2015 14:22:10 +0000 (14:22 +0000)]
PR 57968: Don't lowercase the argument to SetHandler if the handler is
proxy:unix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1682482 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 28 May 2015 17:01:26 +0000 (17:01 +0000)]
Allow for array of multiple simul requests per connection and
keep track of them (mostly need to worry about when there are
no more requests, but having the list could be useful later on)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1682280 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 27 May 2015 18:59:59 +0000 (18:59 +0000)]
Clarify the change to the default cipher suite lists
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1682099 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 26 May 2015 17:24:13 +0000 (17:24 +0000)]
initialize args to not print garbage mem during a RewriteRule parse error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1681795 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 26 May 2015 13:51:29 +0000 (13:51 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1681760 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 26 May 2015 12:12:22 +0000 (12:12 +0000)]
Follow up to r1676004: revert changes to html files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1681746 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 26 May 2015 11:21:00 +0000 (11:21 +0000)]
CHANGES: add ALPN entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1681741 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 26 May 2015 07:25:08 +0000 (07:25 +0000)]
mod_proxy: Don't put the worker in error state for 500 or 503 errors
returned by the backend unless failonstatus is configured to. PR 56925.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1681694 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 26 May 2015 05:57:36 +0000 (05:57 +0000)]
Save a few bytes in conf pool
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1681685 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 25 May 2015 15:56:10 +0000 (15:56 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1681599 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 25 May 2015 15:54:20 +0000 (15:54 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1681598 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 24 May 2015 14:39:48 +0000 (14:39 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1681465 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 24 May 2015 14:38:38 +0000 (14:38 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1681464 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 24 May 2015 12:32:22 +0000 (12:32 +0000)]
Save a few bytes in conf pool and axe a function that duplicates 'ap_set_string_slot'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1681440 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 24 May 2015 08:09:15 +0000 (08:09 +0000)]
Constify + save a few bytes in conf pool (+ some minor space adjustments)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1681424 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 23 May 2015 16:30:17 +0000 (16:30 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1681364 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 23 May 2015 16:29:01 +0000 (16:29 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1681363 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 23 May 2015 11:57:56 +0000 (11:57 +0000)]
stapling improvement now in 2.4.x branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1681330 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 22 May 2015 19:09:40 +0000 (19:09 +0000)]
remove some entries for fixes recently backported to 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1681190 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 22 May 2015 08:22:19 +0000 (08:22 +0000)]
Be more precise.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1681037 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 22 May 2015 05:57:46 +0000 (05:57 +0000)]
Typo in comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1680997 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 21 May 2015 19:20:44 +0000 (19:20 +0000)]
Follow-up to r1680895:
Let %T be the format character which accepts time resolution
arguments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1680942 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 21 May 2015 15:17:50 +0000 (15:17 +0000)]
Fix syntax.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1680900 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 21 May 2015 15:07:15 +0000 (15:07 +0000)]
mod_log_config: instead of using the new dedicated
pattern format "%M" for duration milliseconds,
overload the existing "%D" to choose the time precision
("%{s}D" for seconds, "%{ms}D" for milliseconds and
"%{us}D" for microseconds).
The existing %T and %D without precision are kept for
compatibility.
The previously introduced "%M" (r1677187) is removed,
it has not yet been released. Format pattern characters
are rare, so we should only use a new one if an
existing one isn't a good fit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1680895 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 19 May 2015 12:47:16 +0000 (12:47 +0000)]
OCSP stapling: slight simplification to some internal interfaces,
add a few comments and sanity checks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1680276 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Tue, 19 May 2015 04:34:33 +0000 (04:34 +0000)]
Follow-up to r1666417, update -d to -D in the synopsis docs for rotatelogs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1680166 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 17 May 2015 15:11:56 +0000 (15:11 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1679872 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 17 May 2015 15:10:02 +0000 (15:10 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1679871 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 16 May 2015 09:17:29 +0000 (09:17 +0000)]
core: Follow up to r1599601: s/ap_log_common/ap_log_mpm_common/.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1679714 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 16 May 2015 09:06:25 +0000 (09:06 +0000)]
Follow up to r1679181: fix warning (return discards qualifiers from pointer target type).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1679712 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 15 May 2015 18:44:49 +0000 (18:44 +0000)]
revert r1675103 because it [at least] causes FallBackResource to kick
in before mod_autoindex might have kicked in.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1679620 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 14 May 2015 22:38:20 +0000 (22:38 +0000)]
mod_ssl: follow up to r1527291.
Always prepend "!aNULL:!eNULL:" to SSL_DEFAULT_CIPHER_LIST (default for
SSL[Proxy]CipherSuite) since we support OpenSSL versions where this was
not yet included by default.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1679470 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 14 May 2015 19:01:08 +0000 (19:01 +0000)]
Document RFC 7525 changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1679432 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 14 May 2015 18:44:52 +0000 (18:44 +0000)]
Conform to RFC 7525, with additional suggestion to drop RSA Kx ciphers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1679428 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 13 May 2015 12:33:38 +0000 (12:33 +0000)]
Follow-up to r1679032:
Fix regression in check for cached response.
(Essentially) Submitted by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1679192 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 13 May 2015 11:35:22 +0000 (11:35 +0000)]
Follup up to r1679181: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1679182 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 13 May 2015 11:34:30 +0000 (11:34 +0000)]
mod_authn_dbd, mod_authz_dbd, mod_session_dbd, mod_rewrite: Fix lifetime
of DB lookup entries independently of the selected DB engine. PR 46421.
Suggested by: Michel Stam <michel reverze net>
Proposed by: Steven whitson <steven.whitson gmail com>
Reviewed/Extended/Committed by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1679181 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 12 May 2015 18:59:29 +0000 (18:59 +0000)]
mod_ssl OCSP Stapling: Don't block initial handshakes while refreshing
the OCSP response for a different certificate. mod_ssl has an additional
global mutex, "ssl-stapling-refresh".
Not mentioned in CHANGES:
Stapling no longer uses a mutex when using a stapling cache
implementation which doesn't require it. (A further, unrelated
code change to mod_ssl is required to allow the use of memcache
as a stapling cache, and I haven't tested with distcache; thus
it isn't clear if this helps in practice yet.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1679032 13f79535 -47bb-0310-9956-
ffa450edef68
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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