nginx-0.3.10-RELEASE importrelease-0.3.10

    *) Change: the "valid_referers" directive and the "$invalid_referer"
       variable were moved to the new ngx_http_referer_module from the
       ngx_http_rewrite_module.

    *) Change: the "$apache_bytes_sent" variable name was changed to
       "$body_bytes_sent".

    *) Feature: the "$sent_http_..." variables.

    *) Feature: the "if" directive supports the "=" and "!=" operations.

    *) Feature: the "proxy_pass" directive supports the HTTPS protocol.

    *) Feature: the "proxy_set_body" directive.

    *) Feature: the "post_action" directive.

    *) Feature: the ngx_http_empty_gif_module.

    *) Feature: the "worker_cpu_affinity" directive for Linux.

    *) Bugfix: the "rewrite" directive did not unescape URI part in
       redirect, now it is unescaped except the %00-%25 and %7F-%FF
       characters.

    *) Bugfix: nginx could not be built by the icc 9.0 compiler.

    *) Bugfix: if the SSI was enabled for zero size static file, then the
       chunked response was encoded incorrectly.

1 files changed, 63 insertions, 2 deletions

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 783ea2e7d..4e3708b1e 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -3,6 +3,9 @@
 worker_processes  1;
 
 #error_log  logs/error.log;
+#error_log  logs/error.log  notice;
+#error_log  logs/error.log  info;
+
 #pid        logs/nginx.pid;
 
 
@@ -15,7 +18,14 @@ http {
     include       conf/mime.types;
     default_type  application/octet-stream;
 
+    #log_format  main  '$remote_addr - $remote_user [$time_gmt] $status '
+    #                  '"$request" $body_bytes_sent "$http_referer" '
+    #                  '"$http_user_agent" "http_x_forwarded_for"';
+
+    #access_log  logs/access.log  main;
+
     sendfile        on;
+    #tcp_nopush     on;
     #tcp_nodelay    on;
 
     #keepalive_timeout  0;
@@ -23,11 +33,12 @@ http {
     #gzip  on;
 
     server {
-        listen  80;
+        listen       80;
+        server_name  localhost;
 
         #charset koi8-r;
 
-        #access_log  logs/access.log;
+        #access_log  logs/host.access.log  main;
 
         location / {
             root   html;
@@ -40,10 +51,60 @@ http {
         #    proxy_pass   http://127.0.0.1;
         #}
 
+        # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+        #
+        #location ~ \.php$ {
+        #    fastcgi_pass   127.0.0.1:9000;
+        #    fastcgi_index  index.php;
+        #    fastcgi_param  PATH_TRANSLATED  /scripts$fastcgi_script_name;
+        #    include        conf/fastcgi_params;
+        #}
+
         # deny access to .htaccess files
         #
         #location ~ /\.ht {
         #    deny  all;
         #}
+
+        #error_page  404              /404.html;
+        #error_page  500 502 503 504  /50x.html;
     }
+
+
+    # another virtual host using mix of IP-, name-, and port-based configuration
+    #
+    #server {
+    #    listen       8000;
+    #    listen       somename:8080;
+    #    server_name  somename  alias  another.alias;
+
+    #    location / {
+    #        root   html;
+    #        index  index.html index.htm;
+    #    }
+    #}
+
+
+    # HTTPS server
+    #
+    #server {
+    #    listen       443;
+    #    server_name  localhost;
+
+    #    ssl                  on;
+    #    ssl_certificate      cert.pem;
+    #    ssl_certificate_key  cert.key;
+
+    #    ssl_session_timeout  5m;
+
+    #    ssl_protocols  SSLv2 SSLv3 TLSv1;
+    #    ssl_ciphers  ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP;
+    #    ssl_prefer_server_ciphers   on;
+
+    #    location / {
+    #        root   html;
+    #        index  index.html index.htm;
+    #    }
+    #}
+
 }