1.9.0
thread pool & stream module added.
example_ssl.conf removed
diff --git a/debian/changelog b/debian/changelog
index 596497f..c3b422a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+nginx (1.9.0-1) unstable; urgency=low
+
+ * 1.9.0
+ * thread pool support added
+ * stream module added
+ * example_ssl.conf removed
+
+ -- Sergey Budnevitch <sb@nginx.com> Tue, 28 Apr 2015 11:29:00 +0300
+
nginx (1.7.12-1) unstable; urgency=low
* 1.7.12
diff --git a/debian/nginx.vh.example_ssl.conf b/debian/nginx.vh.example_ssl.conf
deleted file mode 100644
index 67ad4a1..0000000
--- a/debian/nginx.vh.example_ssl.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# HTTPS server
-#
-#server {
-# listen 443 ssl;
-# server_name localhost;
-
-# ssl_certificate /etc/nginx/cert.pem;
-# ssl_certificate_key /etc/nginx/cert.key;
-
-# ssl_session_cache shared:SSL:1m;
-# ssl_session_timeout 5m;
-
-# ssl_ciphers HIGH:!aNULL:!MD5;
-# ssl_prefer_server_ciphers on;
-
-# location / {
-# root /usr/share/nginx/html;
-# index index.html index.htm;
-# }
-#}
diff --git a/debian/rules b/debian/rules
index 8fe9d76..38dfa3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,6 +46,9 @@
--with-http_secure_link_module \
--with-http_stub_status_module \
--with-http_auth_request_module \
+ --with-threads \
+ --with-stream \
+ --with-stream_ssl_module \
--with-mail \
--with-mail_ssl_module \
--with-file-aio \
@@ -84,6 +87,9 @@
--with-http_secure_link_module \
--with-http_stub_status_module \
--with-http_auth_request_module \
+ --with-threads \
+ --with-stream \
+ --with-stream_ssl_module \
--with-mail \
--with-mail_ssl_module \
--with-file-aio \
@@ -106,5 +112,4 @@
/usr/bin/install -m 644 html/index.html debian/nginx/usr/share/nginx/html/
/usr/bin/install -m 644 html/50x.html debian/nginx/usr/share/nginx/html/
/usr/bin/install -m 644 debian/nginx.vh.default.conf debian/nginx/etc/nginx/conf.d/default.conf
- /usr/bin/install -m 644 debian/nginx.vh.example_ssl.conf debian/nginx/etc/nginx/conf.d/example_ssl.conf
/usr/bin/install -m 755 objs/nginx debian/nginx/usr/sbin/
diff --git a/rpm/SOURCES/nginx.vh.example_ssl.conf b/rpm/SOURCES/nginx.vh.example_ssl.conf
deleted file mode 100644
index 67ad4a1..0000000
--- a/rpm/SOURCES/nginx.vh.example_ssl.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# HTTPS server
-#
-#server {
-# listen 443 ssl;
-# server_name localhost;
-
-# ssl_certificate /etc/nginx/cert.pem;
-# ssl_certificate_key /etc/nginx/cert.key;
-
-# ssl_session_cache shared:SSL:1m;
-# ssl_session_timeout 5m;
-
-# ssl_ciphers HIGH:!aNULL:!MD5;
-# ssl_prefer_server_ciphers on;
-
-# location / {
-# root /usr/share/nginx/html;
-# index index.html index.htm;
-# }
-#}
diff --git a/rpm/SPECS/nginx.spec b/rpm/SPECS/nginx.spec
index 53b3101..1ac5a08 100644
--- a/rpm/SPECS/nginx.spec
+++ b/rpm/SPECS/nginx.spec
@@ -58,7 +58,7 @@
Summary: High performance web server
Name: nginx
-Version: 1.7.12
+Version: 1.9.0
Release: 1%{?dist}.ngx
Vendor: nginx inc.
URL: http://nginx.org/
@@ -69,7 +69,6 @@
Source3: nginx.sysconf
Source4: nginx.conf
Source5: nginx.vh.default.conf
-Source6: nginx.vh.example_ssl.conf
Source7: nginx.suse.init
Source8: nginx.service
Source9: nginx.upgrade.sh
@@ -130,6 +129,9 @@
--with-http_secure_link_module \
--with-http_stub_status_module \
--with-http_auth_request_module \
+ --with-threads \
+ --with-stream \
+ --with-stream_ssl_module \
--with-mail \
--with-mail_ssl_module \
--with-file-aio \
@@ -169,6 +171,9 @@
--with-http_secure_link_module \
--with-http_stub_status_module \
--with-http_auth_request_module \
+ --with-threads \
+ --with-stream \
+ --with-stream_ssl_module \
--with-mail \
--with-mail_ssl_module \
--with-file-aio \
@@ -198,8 +203,6 @@
$RPM_BUILD_ROOT%{_sysconfdir}/nginx/nginx.conf
%{__install} -m 644 -p %{SOURCE5} \
$RPM_BUILD_ROOT%{_sysconfdir}/nginx/conf.d/default.conf
-%{__install} -m 644 -p %{SOURCE6} \
- $RPM_BUILD_ROOT%{_sysconfdir}/nginx/conf.d/example_ssl.conf
%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
%{__install} -m 644 -p %{SOURCE3} \
@@ -350,6 +353,12 @@
fi
%changelog
+* Tue Apr 28 2015 Sergey Budnevitch <sb@nginx.com>
+- 1.9.0
+- thread pool support added
+- stream module added
+- example_ssl.conf removed
+
* Tue Apr 7 2015 Sergey Budnevitch <sb@nginx.com>
- 1.7.12
