Mercurial > hg > nginx-site

changeset 1894:d011ffde3760

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated zlib and PCRE versions.
author Yaroslav Zhuravlev <yar@nginx.com>
date Thu, 26 Jan 2017 18:29:48 +0300
parents f1c18acbe785
children 46cda296d844
files xml/en/docs/configure.xml xml/en/docs/howto_build_on_win32.xml xml/ru/docs/configure.xml
diffstat 3 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/configure.xml	Tue Jan 24 17:45:29 2017 +0300
+++ b/xml/en/docs/configure.xml	Thu Jan 26 18:29:48 2017 +0300
@@ -8,7 +8,7 @@
 <article name="Building nginx from Sources"
          link="/en/docs/configure.html"
          lang="en"
-         rev="7">
+         rev="8">
 
 <section>
 
@@ -180,7 +180,7 @@
 <literal>--with-pcre=<value>path</value></literal>&mdash;sets
 the path to the sources of the PCRE library.
 The library distribution (version
-4.4&mdash;8.39) needs to be downloaded from the
+4.4&mdash;8.40) 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>.
@@ -205,7 +205,7 @@
 <literal>--with-zlib=<value>path</value></literal>&mdash;sets
 the path to the sources of the zlib library.
 The library distribution (version
-1.1.3&mdash;1.2.8) needs to be downloaded from the
+1.1.3&mdash;1.2.11) needs to be downloaded from the
 <link url="http://zlib.net">zlib</link> site and extracted.
 The rest is done by nginx’s <command>./configure</command> and
 <command>make</command>.
@@ -249,8 +249,8 @@
     --conf-path=/usr/local/nginx/nginx.conf
     --pid-path=/usr/local/nginx/nginx.pid
     --with-http_ssl_module
-    --with-pcre=../pcre-8.39
-    --with-zlib=../zlib-1.2.8
+    --with-pcre=../pcre-8.40
+    --with-zlib=../zlib-1.2.11
 </programlisting>
 </para>
 
--- a/xml/en/docs/howto_build_on_win32.xml	Tue Jan 24 17:45:29 2017 +0300
+++ b/xml/en/docs/howto_build_on_win32.xml	Thu Jan 26 18:29:48 2017 +0300
@@ -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="5">
+         rev="6">
 
 <section name="Prerequisites">
 
@@ -79,8 +79,8 @@
 mkdir objs
 mkdir objs/lib
 cd objs/lib
-tar -xzf ../../pcre-8.39.tar.gz
-tar -xzf ../../zlib-1.2.8.tar.gz
+tar -xzf ../../pcre-8.40.tar.gz
+tar -xzf ../../zlib-1.2.11.tar.gz
 tar -xzf ../../openssl-1.0.2j.tar.gz
 </programlisting>
 </listitem>
@@ -94,8 +94,8 @@
 --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.39 \
---with-zlib=objs/lib/zlib-1.2.8 --with-openssl=objs/lib/openssl-1.0.2j \
+--with-cc-opt=-DFD_SETSIZE=1024 --with-pcre=objs/lib/pcre-8.40 \
+--with-zlib=objs/lib/zlib-1.2.11 --with-openssl=objs/lib/openssl-1.0.2j \
 --with-select_module --with-http_ssl_module
 </programlisting>
 </listitem>
--- a/xml/ru/docs/configure.xml	Tue Jan 24 17:45:29 2017 +0300
+++ b/xml/ru/docs/configure.xml	Thu Jan 26 18:29:48 2017 +0300
@@ -8,7 +8,7 @@
 <article name="Сборка nginx из исходных файлов"
          link="/ru/docs/configure.html"
          lang="ru"
-         rev="7">
+         rev="8">
 
 <section>
 
@@ -175,7 +175,7 @@
 <literal>--with-pcre=<value>путь</value></literal>&mdash;задаёт
 путь к исходным текстам библиотеки PCRE.
 Дистрибутив библиотеки (версию
-4.4&mdash;8.39) нужно взять на сайте <link url="http://www.pcre.org">PCRE</link>
+4.4&mdash;8.40) нужно взять на сайте <link url="http://www.pcre.org">PCRE</link>
 и распаковать.
 Всё остальное сделают <command>./configure</command> nginx’а и
 <command>make</command>.
@@ -198,7 +198,7 @@
 <para>
 <literal>--with-zlib=<value>путь</value></literal>&mdash;задаёт
 путь к исходным текстам библиотеки zlib. Дистрибутив библиотеки (версию
-1.1.3&mdash;1.2.8) нужно взять на сайте
+1.1.3&mdash;1.2.11) нужно взять на сайте
 <link url="http://zlib.net">zlib</link> и распаковать.
 Всё остальное сделают <command>./configure</command> nginx’а и
 <command>make</command>.
@@ -240,8 +240,8 @@
     --conf-path=/usr/local/nginx/nginx.conf
     --pid-path=/usr/local/nginx/nginx.pid
     --with-http_ssl_module
-    --with-pcre=../pcre-8.39
-    --with-zlib=../zlib-1.2.8
+    --with-pcre=../pcre-8.40
+    --with-zlib=../zlib-1.2.11
 </programlisting>
 </para>