From: areq <areq@pld-linux.org>
Date: Mon, 5 Sep 2011 19:47:00 +0000 (+0000)
Subject: - 1.0.6
X-Git-Tag: auto/th/nginx-1_0_6-1
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fnginx.git;a=commitdiff_plain;h=06e274b9cee0341d8b535483fe23555adf98cf8e

- 1.0.6

Changed files:
    nginx-gcc46-build.patch -> 1.2
    nginx.spec -> 1.107
    proxy.conf -> 1.1
---

diff --git a/nginx-gcc46-build.patch b/nginx-gcc46-build.patch
deleted file mode 100644
index 052aec7..0000000
--- a/nginx-gcc46-build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur nginx-1.0.5-orig/src/event/ngx_event_openssl.c nginx-1.0.5/src/event/ngx_event_openssl.c
---- nginx-1.0.5-orig/src/event/ngx_event_openssl.c	2011-01-20 13:33:17.000000000 +0100
-+++ nginx-1.0.5/src/event/ngx_event_openssl.c	2011-08-24 17:21:39.107319828 +0200
-@@ -1687,20 +1687,24 @@
-     ngx_int_t                 rc;
-     ngx_shm_zone_t           *shm_zone;
-     ngx_slab_pool_t          *shpool;
--    ngx_connection_t         *c;
--    ngx_rbtree_node_t        *node, *sentinel;
-+#if (NGX_DEBUG)
-+	ngx_connection_t         *c;
-+#endif
-+	ngx_rbtree_node_t        *node, *sentinel;
-     ngx_ssl_session_t        *sess;
-     ngx_ssl_sess_id_t        *sess_id;
-     ngx_ssl_session_cache_t  *cache;
-     u_char                    buf[NGX_SSL_MAX_SESSION_SIZE];
- 
--    c = ngx_ssl_get_connection(ssl_conn);
--
-     hash = ngx_crc32_short(id, (size_t) len);
-     *copy = 0;
- 
-+#if (NGX_DEBUG)
-+    c = ngx_ssl_get_connection(ssl_conn);
-+
-     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                    "ssl get session: %08XD:%d", hash, len);
-+#endif
- 
-     shm_zone = SSL_CTX_get_ex_data(SSL_get_SSL_CTX(ssl_conn),
-                                    ngx_ssl_session_cache_index);
diff --git a/nginx.spec b/nginx.spec
index fea2612..e59b279 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -23,16 +23,15 @@
 Summary:	High perfomance HTTP and reverse proxy server
 Summary(pl.UTF-8):	Serwer HTTP i odwrotne proxy o wysokiej wydajności
 Name:		nginx
-Version:	1.0.5
+Version:	1.0.6
 Release:	1
 License:	BSD-like
 Group:		Networking/Daemons/HTTP
-Source0:	http://sysoev.ru/nginx/%{name}-%{version}.tar.gz
-# Source0-md5:	373c7761a7c682b92b164c8ee3d6d243
-Source1:	http://www.nginx.eu/favicon.ico
+Source0:	http://nginx.org/download/%{name}-%{version}.tar.gz
+# Source0-md5:	bc98bac3f0b85da1045bc02e6d8fc80d
+Source1:	http://nginx.net/favicon.ico
 # Source1-md5:	2aaf2115c752cbdbfb8a2f0b3c3189ab
-Source2:	http://www.nginx.eu/download/proxy.conf
-# Source2-md5:	f5263ae01c2edb18f46d5d1df2d3a5cd
+Source2:	proxy.conf
 Source3:	%{name}.logrotate
 Source4:	%{name}.mime
 Source5:	%{name}-light.conf
@@ -48,7 +47,6 @@ Source14:	%{name}-standard.conf
 Source15:	%{name}-standard.monitrc
 Source16:	%{name}-standard.init
 Source17:	%{name}-mime.types.sh
-Patch0:		%{name}-gcc46-build.patch
 URL:		http://nginx.net/
 BuildRequires:	mailcap
 BuildRequires:	openssl-devel
@@ -211,7 +209,6 @@ Plik monitrc do monitorowania serwera WWW nginx.
 
 %prep
 %setup -q
-%patch0 -p1
 
 # build mime.types.conf
 #sh %{SOURCE17} /etc/mime.types
diff --git a/proxy.conf b/proxy.conf
new file mode 100644
index 0000000..cef058b
--- /dev/null
+++ b/proxy.conf
@@ -0,0 +1,15 @@
+proxy_redirect			off;
+proxy_set_header		Host $host;
+proxy_set_header		X-Real-IP $remote_addr;
+proxy_set_header		X-Forwarded-For $proxy_add_x_forwarded_for;
+client_max_body_size		10m;
+client_body_buffer_size		128k;
+proxy_connect_timeout		90;
+proxy_send_timeout		90;
+proxy_read_timeout		90;
+proxy_buffer_size		4k;
+proxy_buffers			4 32k;
+proxy_busy_buffers_size		64k;
+proxy_temp_file_write_size	64k;
+
+