Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'v4.36+xforwarded-for' into x-ssl-protocol

  • Loading branch information...
commit e9fb16b7658310ff7de91d455a220110c00422e6 2 parents e6d4402 + 0088217
@copiousfreetime copiousfreetime authored
View
8 doc/stunnel.8
@@ -559,10 +559,6 @@ time to keep an idle connection
.IP "\fBtransparent\fR = none | source | destination | both (Unix only)" 4
.IX Item "transparent = none | source | destination | both (Unix only)"
enable transparent proxy support on selected platforms
-.IP "\fBxforwardedfor\fR = yes | no" 4
-.IX Item "xforwardedfor = yes | no"
-append an 'X-Forwarded-For:' HTTP request header providing the
-client's IP address to the server.
.IP "\fBxsslprotocol\fR = yes | no" 4
.IX Item "xsslprotocol= yes | no"
append an 'X-SSL-Protocol:' HTTP request header providing the
@@ -680,6 +676,10 @@ certificate is accepted regardless of its Common Name. For this reason a
dedicated \s-1CA\s0 should be used with level 2, and not a generic \s-1CA\s0 commonly used
for webservers. Level 3 is preferred for point-to-point connections.
.RE
+.IP "\fBxforwardedfor\fR = yes | no" 4
+.IX Item "xforwardedfor = yes | no"
+append an 'X-Forwarded-For:' HTTP request header providing the
+client's IP address to the server.
.SH "RETURN VALUE"
.IX Header "RETURN VALUE"
\&\fBstunnel\fR returns zero on success, non-zero on error.
View
8 doc/stunnel.fr.8
@@ -397,10 +397,6 @@ Durée d'attente sur une connexion inactive
.IP "\fBtransparent\fR = yes | no (Unix seulement)" 4
.IX Item "transparent = yes | no (Unix seulement)"
Mode mandataire transparent
-.IP "\fBxforwardedfor\fR = yes | no" 4
-.IX Item "xforwardedfor = yes | no"
-Ajoute un en-t�te 'X-Forwarded-For:' dans la requ�te HTTP fournissant
-au serveur l'adresse IP du client.
.Sp
Ré\-écrit les adresses pour qu'elles apparaissent provenir de la
machine client \s-1SSL\s0 plutôt que de celle qui exécute \fBstunnel\fR.
@@ -411,6 +407,10 @@ l'option \fItransparent proxy\fR et seulement en mode serveur. Cette
option ne se combine pas au mode mandataire (\fIconnect\fR) sauf si la
route par défaut du client vers la cible passe par l'hôte qui fait
tourner \fBstunnel\fR, qui ne peut être localhost.
+.IP "\fBxforwardedfor\fR = yes | no" 4
+.IX Item "xforwardedfor = yes | no"
+Ajoute un en-t�te 'X-Forwarded-For:' dans la requ�te HTTP fournissant
+au serveur l'adresse IP du client.
.SH "VALEUR DE RETOUR"
.IX Header "VALEUR DE RETOUR"
\&\fBstunnel\fR renvoie zéro en cas de succès, une autre valeur en cas d'erreur.
View
6 doc/stunnel.fr.pod
@@ -411,8 +411,12 @@ option ne se combine pas au mode mandataire (I<connect>) sauf si la
route par défaut du client vers la cible passe par l'hôte qui fait
tourner B<stunnel>, qui ne peut être localhost.
-=back
+=item B<xforwardedfor> = yes | no
+
+Ajoute un en-tête 'X-Forwarded-For:' dans la requête HTTP fournissant au serveur
+l'adresse IP du client.
+=back
=head1 VALEUR DE RETOUR
View
6 doc/stunnel.pod
@@ -702,8 +702,12 @@ certificate is accepted regardless of its Common Name. For this reason a
dedicated CA should be used with level 2, and not a generic CA commonly used
for webservers. Level 3 is preferred for point-to-point connections.
-=back
+=item B<xforwardedfor> = yes | no
+
+Append an 'X-Forwarded-For:' HTTP request header providing the client's IP
+address to the server.
+=back
=head1 RETURN VALUE
Please sign in to comment.
Something went wrong with that request. Please try again.