Mercurial > hg > nginx-site

changeset 985:e4704604ed29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Proxy: documented the "proxy_ssl_protocols" directive.
author Andrei Belov <defan@nginx.com>
date Thu, 19 Sep 2013 18:31:34 +0400
parents 4e13823acdc0
children 5e84ce26c7a7
files xml/en/docs/http/ngx_http_proxy_module.xml xml/ru/docs/http/ngx_http_proxy_module.xml
diffstat 2 files changed, 42 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_proxy_module.xml	Thu Sep 19 14:11:24 2013 +0000
+++ b/xml/en/docs/http/ngx_http_proxy_module.xml	Thu Sep 19 18:31:34 2013 +0400
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_proxy_module"
         link="/en/docs/http/ngx_http_proxy_module.html"
         lang="en"
-        rev="12">
+        rev="13">
 
 <section id="summary">
 
@@ -1380,6 +1380,26 @@
 </directive>
 
 
+<directive name="proxy_ssl_protocols">
+<syntax>
+    [<literal>SSLv2</literal>]
+    [<literal>SSLv3</literal>]
+    [<literal>TLSv1</literal>]
+    [<literal>TLSv1.1</literal>]
+    [<literal>TLSv1.2</literal>]</syntax>
+<default>SSLv3 TLSv1 TLSv1.1 TLSv1.2</default>
+<context>http</context>
+<context>server</context>
+<context>location</context>
+<appeared-in>1.5.6</appeared-in>
+
+<para>
+Enables the specified protocols for HTTPS requests to a proxied server.
+</para>
+
+</directive>
+
+
 <directive name="proxy_store">
 <syntax>
     <literal>on</literal> |
--- a/xml/ru/docs/http/ngx_http_proxy_module.xml	Thu Sep 19 14:11:24 2013 +0000
+++ b/xml/ru/docs/http/ngx_http_proxy_module.xml	Thu Sep 19 18:31:34 2013 +0400
@@ -10,7 +10,7 @@
 <module name="Модуль ngx_http_proxy_module"
         link="/ru/docs/http/ngx_http_proxy_module.html"
         lang="ru"
-        rev="12">
+        rev="13">
 
 <section id="summary">
 
@@ -1374,6 +1374,26 @@
 </directive>
 
 
+<directive name="proxy_ssl_protocols">
+<syntax>
+    [<literal>SSLv2</literal>]
+    [<literal>SSLv3</literal>]
+    [<literal>TLSv1</literal>]
+    [<literal>TLSv1.1</literal>]
+    [<literal>TLSv1.2</literal>]</syntax>
+<default>SSLv3 TLSv1 TLSv1.1 TLSv1.2</default>
+<context>http</context>
+<context>server</context>
+<context>location</context>
+<appeared-in>1.5.6</appeared-in>
+
+<para>
+Разрешает указанные протоколы для HTTPS-запросов к проксируемому серверу.
+</para>
+
+</directive>
+
+
 <directive name="proxy_store">
 <syntax>
     <literal>on</literal> |