comparison conf/nginx.conf @ 408:4243eecbd594

Merge with nginx 0.6.11.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 11 Aug 2008 03:17:24 +0400
parents 9fc4ab6673f9
children babd3d9efb62
comparison
equal deleted inserted replaced
407:fa809001e681 408:4243eecbd594
13 worker_connections 1024; 13 worker_connections 1024;
14 } 14 }
15 15
16 16
17 http { 17 http {
18 include conf/mime.types; 18 include mime.types;
19 default_type application/octet-stream; 19 default_type application/octet-stream;
20 20
21 #log_format main '$remote_addr - $remote_user [$time_local] $request ' 21 #log_format main '$remote_addr - $remote_user [$time_local] $request '
22 # '"$status" $body_bytes_sent "$http_referer" ' 22 # '"$status" $body_bytes_sent "$http_referer" '
23 # '"$http_user_agent" "$http_x_forwarded_for"'; 23 # '"$http_user_agent" "$http_x_forwarded_for"';
64 # 64 #
65 #location ~ \.php$ { 65 #location ~ \.php$ {
66 # fastcgi_pass 127.0.0.1:9000; 66 # fastcgi_pass 127.0.0.1:9000;
67 # fastcgi_index index.php; 67 # fastcgi_index index.php;
68 # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; 68 # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
69 # include conf/fastcgi_params; 69 # include fastcgi_params;
70 #} 70 #}
71 71
72 # deny access to .htaccess files, if Apache's document root 72 # deny access to .htaccess files, if Apache's document root
73 # concurs with nginx's one 73 # concurs with nginx's one
74 # 74 #