Mercurial > hg > nginx-site
changeset 2277:4ad2cf470ed8
Updated OpenSSL and PCRE versions.
author | Yaroslav Zhuravlev <yar@nginx.com> |
---|---|
date | Thu, 15 Nov 2018 19:09:33 +0300 |
parents | 2fa3c989e8ba |
children | f047bd9403d5 |
files | xml/en/docs/configure.xml xml/en/docs/howto_build_on_win32.xml xml/ru/docs/configure.xml |
diffstat | 3 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/xml/en/docs/configure.xml +++ b/xml/en/docs/configure.xml @@ -8,7 +8,7 @@ <article name="Building nginx from Sources" link="/en/docs/configure.html" lang="en" - rev="14"> + rev="15"> <section> @@ -1179,7 +1179,7 @@ forces the usage of the PCRE library. <tag-desc> sets the path to the sources of the PCRE library. The library distribution (version -4.4—8.41) needs to be downloaded from the +4.4—8.42) needs to be downloaded from the <link url="http://www.pcre.org">PCRE</link> site and extracted. The rest is done by nginx’s <command>./configure</command> and <command>make</command>. @@ -1306,7 +1306,7 @@ Example of parameters usage (all of this --conf-path=/usr/local/nginx/nginx.conf --pid-path=/usr/local/nginx/nginx.pid --with-http_ssl_module - --with-pcre=../pcre-8.41 + --with-pcre=../pcre-8.42 --with-zlib=../zlib-1.2.11 </programlisting> </para>
--- a/xml/en/docs/howto_build_on_win32.xml +++ b/xml/en/docs/howto_build_on_win32.xml @@ -9,7 +9,7 @@ <article name="Building nginx on the Win32 platform with Visual C" link="/en/docs/howto_build_on_win32.html" lang="en" - rev="11"> + rev="12"> <section name="Prerequisites"> @@ -79,9 +79,9 @@ sources into lib directory: mkdir objs mkdir objs/lib cd objs/lib -tar -xzf ../../pcre-8.41.tar.gz +tar -xzf ../../pcre-8.42.tar.gz tar -xzf ../../zlib-1.2.11.tar.gz -tar -xzf ../../openssl-1.0.2n.tar.gz +tar -xzf ../../openssl-1.0.2p.tar.gz </programlisting> </listitem> @@ -103,9 +103,9 @@ auto/configure \ --http-scgi-temp-path=temp/scgi_temp \ --http-uwsgi-temp-path=temp/uwsgi_temp \ --with-cc-opt=-DFD_SETSIZE=1024 \ - --with-pcre=objs/lib/pcre-8.41 \ + --with-pcre=objs/lib/pcre-8.42 \ --with-zlib=objs/lib/zlib-1.2.11 \ - --with-openssl=objs/lib/openssl-1.0.2n \ + --with-openssl=objs/lib/openssl-1.0.2p \ --with-openssl-opt=no-asm \ --with-select_module \ --with-http_ssl_module
--- a/xml/ru/docs/configure.xml +++ b/xml/ru/docs/configure.xml @@ -8,7 +8,7 @@ <article name="Сборка nginx из исходных файлов" link="/ru/docs/configure.html" lang="ru" - rev="14"> + rev="15"> <section> @@ -1160,7 +1160,7 @@ HTTP-сервера. <tag-desc> задаёт путь к исходным текстам библиотеки PCRE. Дистрибутив библиотеки (версию -4.4—8.41) нужно взять на сайте <link url="http://www.pcre.org">PCRE</link> +4.4—8.42) нужно взять на сайте <link url="http://www.pcre.org">PCRE</link> и распаковать. Всё остальное сделают <command>./configure</command> nginx’а и <command>make</command>. @@ -1286,7 +1286,7 @@ 1.1.3—1.2.11) нужно взять на сайте --conf-path=/usr/local/nginx/nginx.conf --pid-path=/usr/local/nginx/nginx.pid --with-http_ssl_module - --with-pcre=../pcre-8.41 + --with-pcre=../pcre-8.42 --with-zlib=../zlib-1.2.11 </programlisting> </para>