From c0a34e8ed6520bce46a58872e3dd6b17cde781ae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Malo?= Date: Thu, 26 Dec 2013 15:16:59 +0000 Subject: [PATCH] update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1553494 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_authnz_ldap.html.en | 1 + docs/manual/mod/mod_authnz_ldap.html.fr | 4 +++- docs/manual/mod/mod_proxy.html.fr | 2 +- docs/manual/mod/mod_ssl.html.en | 22 ++++++++++++---------- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/docs/manual/mod/mod_authnz_ldap.html.en b/docs/manual/mod/mod_authnz_ldap.html.en index a608c23a7f1..b3b9421280c 100644 --- a/docs/manual/mod/mod_authnz_ldap.html.en +++ b/docs/manual/mod/mod_authnz_ldap.html.en @@ -714,6 +714,7 @@ Require group mygroupfile Override:AuthConfig Status:Extension Module:mod_authnz_ldap +Compatibility:exec: was added in 2.2.25.

A bind password to use in conjunction with the bind DN. Note that the bind password is probably sensitive data, and should be diff --git a/docs/manual/mod/mod_authnz_ldap.html.fr b/docs/manual/mod/mod_authnz_ldap.html.fr index 9ff0ddb9bd3..7ce9d3d8a5c 100644 --- a/docs/manual/mod/mod_authnz_ldap.html.fr +++ b/docs/manual/mod/mod_authnz_ldap.html.fr @@ -32,7 +32,7 @@ HTTP de base. Statut:Extension Identificateur de Module:authnz_ldap_module Fichier Source:mod_authnz_ldap.c -Compatibilité:Disponible depuis les versions 2.1 et supérieures +Compatibilité:Dosponible depuis les versions 2.1 et supérieures d'Apache

Sommaire

@@ -778,6 +778,8 @@ connexion AllowOverride:AuthConfig Statut:Extension Module:mod_authnz_ldap +Compatibilité:exec: est disponible depuis la version 2.2.25 du +serveur HTTP Apache.

Cette directive permet de spécifier un mot de passe à utiliser en conjonction avec le DN de connexion. Notez que ce mot de passe diff --git a/docs/manual/mod/mod_proxy.html.fr b/docs/manual/mod/mod_proxy.html.fr index b747d72b2be..de68fc4910f 100644 --- a/docs/manual/mod/mod_proxy.html.fr +++ b/docs/manual/mod/mod_proxy.html.fr @@ -687,7 +687,7 @@ mandat

Les directives situées dans une section <Proxy> ne s'appliquent qu'au contenu mandaté concerné. Les jokers de style shell sont autorisés.

-

Par eexemple, les lignes suivantes n'autoriseront à accéder à un +

Par exemple, les lignes suivantes n'autoriseront à accéder à un contenu via votre serveur mandataire que les hôtes appartenant à votre-reseau.example.com :

diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en index 1f891f2702a..8e698d51e7f 100644 --- a/docs/manual/mod/mod_ssl.html.en +++ b/docs/manual/mod/mod_ssl.html.en @@ -388,14 +388,15 @@ SSLCertificateChainFile /usr/local/apache2/conf/ssl.crt/ca.crt Context:server config, virtual host Status:Extension Module:mod_ssl +Compatibility:ECC support is available in Apache 2.2.26 and later

This directive points to the PEM-encoded Certificate file for the server and optionally also to the corresponding RSA or DSA Private Key file for it (contained in the same file). If the contained Private Key is encrypted the Pass Phrase dialog is forced at startup time. This directive can be used up to -two times (referencing different filenames) when both a RSA and a DSA based -server certificate is used in parallel.

+three times (referencing different filenames) when both a RSA, a DSA, and an +ECC based server certificate is used in parallel.

Example

SSLCertificateFile /usr/local/apache2/conf/ssl.crt/server.crt

@@ -409,6 +410,7 @@ SSLCertificateFile /usr/local/apache2/conf/ssl.crt/server.crt Context:server config, virtual host Status:Extension Module:mod_ssl +Compatibility:ECC support is available in Apache 2.2.26 and later

This directive points to the PEM-encoded Private Key file for the @@ -420,8 +422,8 @@ contains both the Certificate and the Private Key this directive need not be used. But we strongly discourage this practice. Instead we recommend you to separate the Certificate and the Private Key. If the contained Private Key is encrypted, the Pass Phrase dialog is forced -at startup time. This directive can be used up to two times -(referencing different filenames) when both a RSA and a DSA based +at startup time. This directive can be used up to three times +(referencing different filenames) when both a RSA, a DSA, and an ECC based private key is used in parallel.

Example

SSLCertificateKeyFile /usr/local/apache2/conf/ssl.key/server.key @@ -979,12 +981,12 @@ query can be done in two ways which can be configured by Here an external program is configured which is called at startup for each encrypted Private Key file. It is called with two arguments (the first is of the form ``servername:portnumber'', the second is either - ``RSA'' or ``DSA''), which indicate for which - server and algorithm it has to print the corresponding Pass Phrase to - stdout. The intent is that this external program first runs - security checks to make sure that the system is not compromised by an - attacker, and only when these checks were passed successfully it provides - the Pass Phrase.

+ ``RSA'', ``DSA'', or ``ECC''), which + indicate for which server and algorithm it has to print the corresponding + Pass Phrase to stdout. The intent is that this external + program first runs security checks to make sure that the system is not + compromised by an attacker, and only when these checks were passed + successfully it provides the Pass Phrase.

Both these security checks, and the way the Pass Phrase is determined, can be as complex as you like. Mod_ssl just defines the interface: an -- 2.47.2