- update version 1.6.3 stable
- Feature: now the "tcp_nodelay" directive works with SPDY
connections.
- Bugfix: in error handling. Thanks to Yichun Zhang and Daniil
Bondarev.
- Bugfix: alerts "header already sent" appeared in logs if the
"post_action" directive was used; the bug had appeared in
1.5.4.
- Bugfix: alerts "sem_post() failed" might appear in logs.
- Bugfix: in hash table handling. Thanks to Chris West.
- Bugfix: in integer overflow handling. Thanks to Régis Leroy.
- no longer install the init script when using systemd service file
- create rcnginx for systemd case
OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=49
This commit is contained in:
Git OBS Bridge
parent
ad7a98a650
commit
40cbe6bb50
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18
|
||||
size 804164
|
||||
3
nginx-1.6.3.tar.gz
Normal file
3
nginx-1.6.3.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0a98e95b366e4d6042f331e1fa4d70e18fd1e49d8993e589008e70e742b7e757
|
||||
size 805253
|
||||
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Apr 12 04:06:26 UTC 2015 - mrueckert@suse.de
|
||||
|
||||
- update version 1.6.3 stable
|
||||
- Feature: now the "tcp_nodelay" directive works with SPDY
|
||||
connections.
|
||||
- Bugfix: in error handling. Thanks to Yichun Zhang and Daniil
|
||||
Bondarev.
|
||||
- Bugfix: alerts "header already sent" appeared in logs if the
|
||||
"post_action" directive was used; the bug had appeared in
|
||||
1.5.4.
|
||||
- Bugfix: alerts "sem_post() failed" might appear in logs.
|
||||
- Bugfix: in hash table handling. Thanks to Chris West.
|
||||
- Bugfix: in integer overflow handling. Thanks to Régis Leroy.
|
||||
- no longer install the init script when using systemd service file
|
||||
- create rcnginx for systemd case
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 25 13:09:27 UTC 2015 - vpereirabr@opensuse.org
|
||||
|
||||
|
||||
10
nginx.init
10
nginx.init
@ -115,7 +115,7 @@ NGINX_BIN=/usr/sbin/nginx
|
||||
test -x $NGINX_BIN || { echo "$NGINX_BIN not installed";
|
||||
if [ "$1" = "stop" ]; then exit 0;
|
||||
else exit 5; fi; }
|
||||
NGINX_PID=/var/run/nginx.pid
|
||||
NGINX_PID=/run/nginx.pid
|
||||
|
||||
# Check for existence of needed config file and read it
|
||||
#NGINX_CONFIG=/etc/sysconfig/nginx
|
||||
@ -221,7 +221,7 @@ case "$1" in
|
||||
echo -n "Reload service nginx "
|
||||
## if it supports it:
|
||||
/sbin/killproc -p $NGINX_PID -HUP $NGINX_BIN
|
||||
#touch /var/run/nginx.pid
|
||||
#touch /run/nginx.pid
|
||||
rc_status -v
|
||||
|
||||
## Otherwise:
|
||||
@ -235,7 +235,7 @@ case "$1" in
|
||||
# If it supports signaling:
|
||||
echo -n "Reload service nginx "
|
||||
/sbin/killproc -p $NGINX_PID -HUP $NGINX_BIN
|
||||
#touch /var/run/nginx.pid
|
||||
#touch /run/nginx.pid
|
||||
rc_status -v
|
||||
|
||||
## Otherwise if it does not support reload:
|
||||
@ -255,7 +255,7 @@ case "$1" in
|
||||
|
||||
# Return value is slightly different for the status command:
|
||||
# 0 - service up and running
|
||||
# 1 - service dead, but /var/run/ pid file exists
|
||||
# 1 - service dead, but /run/ pid file exists
|
||||
# 2 - service dead, but /var/lock/ lock file exists
|
||||
# 3 - service not running (unused)
|
||||
# 4 - service status unknown :-(
|
||||
@ -272,7 +272,7 @@ case "$1" in
|
||||
## argument to this init script which is required for a reload.
|
||||
## Note: probe is not (yet) part of LSB (as of 1.9)
|
||||
|
||||
test /etc/nginx/nginx.conf -nt /var/run/nginx.pid && echo reload
|
||||
test /etc/nginx/nginx.conf -nt /run/nginx.pid && echo reload
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
|
||||
|
||||
28
nginx.spec
28
nginx.spec
@ -58,7 +58,7 @@ BuildRequires: systemd
|
||||
%endif
|
||||
|
||||
Name: nginx
|
||||
Version: 1.6.2
|
||||
Version: 1.6.3
|
||||
Release: 0
|
||||
Summary: A HTTP server and IMAP/POP3 proxy server
|
||||
License: BSD-2-Clause
|
||||
@ -206,7 +206,7 @@ sed -i "s/\/var\/run/\/run/" %{_sourcedir}/nginx.init
|
||||
--with-http_sub_module \
|
||||
--with-http_dav_module \
|
||||
--with-http_flv_module \
|
||||
--with-http_mp4_module \
|
||||
--with-http_mp4_module \
|
||||
--with-http_gzip_static_module \
|
||||
--with-http_random_index_module \
|
||||
--with-http_secure_link_module \
|
||||
@ -249,37 +249,38 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
|
||||
|
||||
install -d -m 0750 %{buildroot}%{ngx_home}/{,tmp,proxy,fastcgi,scgi,uwsgi}
|
||||
|
||||
install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{pkg_name}
|
||||
ln -s -f %{_sysconfdir}/init.d/%{pkg_name} %{buildroot}%{_sbindir}/rc%{pkg_name}
|
||||
|
||||
install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{pkg_name}
|
||||
|
||||
%if 0%{?with_systemd}
|
||||
install -D -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/nginx.service
|
||||
ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rcnginx
|
||||
%else
|
||||
install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{pkg_name}
|
||||
ln -s -f %{_sysconfdir}/init.d/%{pkg_name} %{buildroot}%{_sbindir}/rc%{pkg_name}
|
||||
%endif
|
||||
|
||||
rm %{buildroot}/srv/www/htdocs/index.html
|
||||
|
||||
%post
|
||||
%fillup_and_insserv %{pkg_name}
|
||||
|
||||
%if 0%{?with_systemd}
|
||||
%service_add_post nginx.service
|
||||
%else
|
||||
%fillup_and_insserv %{pkg_name}
|
||||
%endif
|
||||
|
||||
%preun
|
||||
%stop_on_removal %{pkg_name}
|
||||
|
||||
%if 0%{?with_systemd}
|
||||
%service_del_preun nginx.service
|
||||
%else
|
||||
%stop_on_removal %{pkg_name}
|
||||
%endif
|
||||
|
||||
%postun
|
||||
%restart_on_update %{pkg_name}
|
||||
%insserv_cleanup
|
||||
|
||||
%if 0%{?with_systemd}
|
||||
%service_del_postun nginx.service
|
||||
%else
|
||||
%restart_on_update %{pkg_name}
|
||||
%insserv_cleanup
|
||||
%endif
|
||||
|
||||
%pre
|
||||
@ -316,7 +317,6 @@ rm %{buildroot}/srv/www/htdocs/index.html
|
||||
%if 0%{?suse_version} && 0%{?suse_version} < 1140
|
||||
%{_localstatedir}/adm/perl-modules/%{name}
|
||||
%endif
|
||||
%{_sysconfdir}/init.d/%{pkg_name}
|
||||
%{_sbindir}/rc%{pkg_name}
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/%{pkg_name}
|
||||
%dir %attr(750,%{ngx_user_group},%{ngx_user_group}) %{_localstatedir}/log/nginx/
|
||||
@ -333,6 +333,8 @@ rm %{buildroot}/srv/www/htdocs/index.html
|
||||
%endif
|
||||
%if 0%{?with_systemd}
|
||||
%{_unitdir}/nginx.service
|
||||
%else
|
||||
%{_sysconfdir}/init.d/%{pkg_name}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user