[nginx/el6] Numerous bug fixes

[Jamie Nguyen]

commit 1092aafa84032b57943c0db1686d400970d3890a
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sun Oct 28 16:19:42 2012 +0000

    Numerous bug fixes

 default.conf |    2 +-
 nginx.conf   |   33 +++------------------------------
 nginx.spec   |   22 +++++++++++++++-------
 3 files changed, 19 insertions(+), 38 deletions(-)
---
diff --git a/default.conf b/default.conf
index 33cd547..c5a6dad 100644
--- a/default.conf
+++ b/default.conf
@@ -2,7 +2,7 @@
 # The default server
 #
 server {
-    listen       80;
+    listen       80 default_server;
     server_name  _;
 
     #charset koi8-r;
diff --git a/nginx.conf b/nginx.conf
index dc8091c..58ec621 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,19 +1,6 @@
-#######################################################################
-#
-# This is the main Nginx configuration file.  
-#
-# More information about the configuration options is available on 
-#   * the English wiki - http://wiki.nginx.org/Main
-#   * the Russian documentation - http://sysoev.ru/nginx/
-#
-#######################################################################
-
-#----------------------------------------------------------------------
-# Main Module - directives that cover basic functionality
-#
-#   http://wiki.nginx.org/NginxHttpMainModule
-#
-#----------------------------------------------------------------------
+# For more information on configuration, see:
+#   * Official English Documentation: http://nginx.org/en/docs/
+#   * Official Russian Documentation: http://nginx.org/ru/docs/
 
 user              nginx;
 worker_processes  1;
@@ -25,25 +12,11 @@ error_log  /var/log/nginx/error.log;
 pid        /var/run/nginx.pid;
 
 
-#----------------------------------------------------------------------
-# Events Module 
-#
-#   http://wiki.nginx.org/NginxHttpEventsModule
-#
-#----------------------------------------------------------------------
-
 events {
     worker_connections  1024;
 }
 
 
-#----------------------------------------------------------------------
-# HTTP Core Module
-#
-#   http://wiki.nginx.org/NginxHttpCoreModule 
-#
-#----------------------------------------------------------------------
-
 http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
diff --git a/nginx.spec b/nginx.spec
index 8c9a468..39be066 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -9,7 +9,7 @@
 
 Name:              nginx
 Version:           1.0.15
-Release:           2%{?dist}
+Release:           3%{?dist}
 
 Summary:           A high performance web server and reverse proxy server
 Group:             System Environment/Daemons
@@ -144,6 +144,8 @@ install -p -m 0644 %{SOURCE101} %{SOURCE102} \
 install -p -m 0644 %{SOURCE103} %{SOURCE104} \
     %{buildroot}%{nginx_webroot}
 
+install -p -D -m 0644 %{_builddir}/nginx-%{version}/man/nginx.8 \
+    %{buildroot}%{_mandir}/man8/nginx.8
 
 %pre
 if [ $1 -eq 1 ]; then
@@ -174,7 +176,8 @@ fi
 %doc LICENSE CHANGES README
 %{nginx_datadir}/
 %{_sbindir}/nginx
-%{_mandir}/man3/nginx.3pm.gz
+%{_mandir}/man3/nginx.3pm*
+%{_mandir}/man8/nginx.8*
 %{_initrddir}/nginx
 %dir %{nginx_confdir}
 %dir %{nginx_confdir}/conf.d
@@ -205,21 +208,26 @@ fi
 
 
 %changelog
-* Mon May 14 2012 Jamie Nguyen <jamie at tomoyolinux.co.uk> - 1.0.15-2
+* Sun Oct 28 2012 Jamie Nguyen <jamielinux at fedoraproject.org> - 1.0.15-3
+- add nginx man page (#870738)
+- link to official documentation not the community wiki (#870733)
+- default.conf: add "default_server" to the "listen" directive (#842738)
+
+* Mon May 14 2012 Jamie Nguyen <jamielinux at fedoraproject.org> - 1.0.15-2
 - fix postrotate script in nginx.logrotate (#705264)
 
-* Thu Apr 19 2012 Jamie Nguyen <jamie at tomoyolinux.co.uk> - 1.0.15-1
+* Thu Apr 19 2012 Jamie Nguyen <jamielinux at fedoraproject.org> - 1.0.15-1
 - update to upstream release 1.0.15
 - CVE-2012-2089 (#812093)
 
-* Thu Mar 15 2012 Jamie Nguyen <jamie at tomoyolinux.co.uk> - 1.0.14-1
+* Thu Mar 15 2012 Jamie Nguyen <jamielinux at fedoraproject.org> - 1.0.14-1
 - update to upstream release 1.0.14
 - CVE-2012-1180 (#803856)
 
-* Wed Mar 04 2012 Jamie Nguyen <jamie at tomoyolinux.co.uk> - 1.0.13-2
+* Wed Mar 04 2012 Jamie Nguyen <jamielinux at fedoraproject.org> - 1.0.13-2
 - remove incorrect BR
 
-* Tue Mar 03 2012 Jamie Nguyen <jamie at tomoyolinux.co.uk> - 1.0.13-1
+* Tue Mar 03 2012 Jamie Nguyen <jamielinux at fedoraproject.org> - 1.0.13-1
 - update to upstream release 1.0.13
 - general spec file cleanup to match rawhide (for easier diff), including:
 - replace %%define with %%global