Mercurial > hg > nginx-site
changeset 1749:153a99d25210
Updated versions of PCRE, zlib, and OpenSSL.
author | Yaroslav Zhuravlev <yar@nginx.com> |
---|---|
date | Tue, 05 Jul 2016 21:47:42 +0300 |
parents | be371be7a5c8 |
children | 0e591e97737c |
files | xml/en/docs/configure.xml xml/en/docs/howto_build_on_win32.xml xml/ru/docs/configure.xml |
diffstat | 3 files changed, 12 insertions(+), 12 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="6"> + rev="7"> <section> @@ -180,7 +180,7 @@ The OpenSSL library is required to build <literal>--with-pcre=<value>path</value></literal>—sets the path to the sources of the PCRE library. The library distribution (version -4.4—8.38) needs to be downloaded from the +4.4—8.39) 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>. @@ -249,7 +249,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.38 + --with-pcre=../pcre-8.39 --with-zlib=../zlib-1.2.8 </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="1"> + rev="2"> <section name="Prerequisites"> @@ -79,9 +79,9 @@ sources into lib directory: mkdir objs mkdir objs/lib cd objs/lib -tar -xzf ../../pcre-8.32.tar.gz -tar -xzf ../../zlib-1.2.7.tar.gz -tar -xzf ../../openssl-1.0.1e.tar.gz +tar -xzf ../../pcre-8.39.tar.gz +tar -xzf ../../zlib-1.2.8.tar.gz +tar -xzf ../../openssl-1.0.2h.tar.gz </programlisting> </listitem> @@ -94,8 +94,8 @@ auto/configure --with-cc=cl --builddir=o --sbin-path=nginx.exe --http-client-body-temp-path=temp/client_body_temp \ --http-proxy-temp-path=temp/proxy_temp \ --http-fastcgi-temp-path=temp/fastcgi_temp \ ---with-cc-opt=-DFD_SETSIZE=1024 --with-pcre=objs/lib/pcre-8.32 \ ---with-zlib=objs/lib/zlib-1.2.7 --with-openssl=objs/lib/openssl-1.0.1e \ +--with-cc-opt=-DFD_SETSIZE=1024 --with-pcre=objs/lib/pcre-8.39 \ +--with-zlib=objs/lib/zlib-1.2.8 --with-openssl=objs/lib/openssl-1.0.2h \ --with-select_module --with-http_ssl_module --with-ipv6 </programlisting> </listitem>
--- 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="6"> + rev="7"> <section> @@ -175,7 +175,7 @@ HTTPS</link>. <literal>--with-pcre=<value>путь</value></literal>—задаёт путь к исходным текстам библиотеки PCRE. Дистрибутив библиотеки (версию -4.4—8.38) нужно взять на сайте <link url="http://www.pcre.org">PCRE</link> +4.4—8.39) нужно взять на сайте <link url="http://www.pcre.org">PCRE</link> и распаковать. Всё остальное сделают <command>./configure</command> nginx’а и <command>make</command>. @@ -240,7 +240,7 @@ 1.1.3—1.2.8) нужно взять на сайте --conf-path=/usr/local/nginx/nginx.conf --pid-path=/usr/local/nginx/nginx.pid --with-http_ssl_module - --with-pcre=../pcre-8.38 + --with-pcre=../pcre-8.39 --with-zlib=../zlib-1.2.8 </programlisting> </para>