# HG changeset patch # User Yaroslav Zhuravlev # Date 1542298173 -10800 # Node ID 4ad2cf470ed85d421e03c3400a5f5eefdae98cb7 # Parent 2fa3c989e8ba163b3928c8019f34da53b4ea09dd Updated OpenSSL and PCRE versions. diff -r 2fa3c989e8ba -r 4ad2cf470ed8 xml/en/docs/configure.xml --- a/xml/en/docs/configure.xml Thu Nov 15 17:36:26 2018 +0300 +++ b/xml/en/docs/configure.xml Thu Nov 15 19:09:33 2018 +0300 @@ -8,7 +8,7 @@
+ rev="15">
@@ -1179,7 +1179,7 @@ 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 PCRE site and extracted. The rest is done by nginx’s ./configure and make. @@ -1306,7 +1306,7 @@ --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 diff -r 2fa3c989e8ba -r 4ad2cf470ed8 xml/en/docs/howto_build_on_win32.xml --- a/xml/en/docs/howto_build_on_win32.xml Thu Nov 15 17:36:26 2018 +0300 +++ b/xml/en/docs/howto_build_on_win32.xml Thu Nov 15 19:09:33 2018 +0300 @@ -9,7 +9,7 @@
+ rev="12">
@@ -79,9 +79,9 @@ 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 @@ -103,9 +103,9 @@ --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 diff -r 2fa3c989e8ba -r 4ad2cf470ed8 xml/ru/docs/configure.xml --- a/xml/ru/docs/configure.xml Thu Nov 15 17:36:26 2018 +0300 +++ b/xml/ru/docs/configure.xml Thu Nov 15 19:09:33 2018 +0300 @@ -8,7 +8,7 @@
+ rev="15">
@@ -1160,7 +1160,7 @@ задаёт путь к исходным текстам библиотеки PCRE. Дистрибутив библиотеки (версию -4.4—8.41) нужно взять на сайте PCRE +4.4—8.42) нужно взять на сайте PCRE и распаковать. Всё остальное сделают ./configure nginx’а и make. @@ -1286,7 +1286,7 @@ --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