Tengine

Commit Graph

Author	SHA1	Message	Date
weiyue	253830a2ac	merged change between nginx 1.6.2 and 1.6.1	11 years ago
weiyue	16a0d841ea	merged changes between nginx 1.4.7 and 1.6.1 except spdy updated testcases	11 years ago
Xiaochen Wang	f6322d6126	merge changes between nginx 1.4.6 and 1.4.7 Details are as following: ) Security: a heap memory buffer overflow might occur in a worker process while handling a specially crafted request by ngx_http_spdy_module, potentially resulting in arbitrary code execution (CVE-2014-0133). Thanks to Lucas Molas, researcher at Programa STIC, Fundación Dr. Manuel Sadosky, Buenos Aires, Argentina. Changeset: http://hg.nginx.org/nginx/rev/e7f7d30196e3 Note that this bug has been fixed in Tengine-2.0.2. ) Bugfix: in the "fastcgi_next_upstream" directive. Thanks to Lucas Molas. Changeset: http://hg.nginx.org/nginx/rev/b246018860a2	11 years ago
weiyue	916049ea2e	merged changes between nginx-1.4.5 and nginx-1.4.6 updated CHANGES.*	12 years ago
Xiaochen Wang	cd8dc4f267	merge changes between nginx 1.4.4 and 1.4.5 Details are as following: ) Bugfix: the $ssl_session_id variable contained full session serialized instead of just a session id. Thanks to Ivan Ristić. Changeset: http://hg.nginx.org/nginx/rev/70f4d99ded41 ) Bugfix: client connections might be immediately closed if deferred accept was used; the bug had appeared in 1.3.15. Changeset: http://hg.nginx.org/nginx/rev/462ae7eedc68 ) Bugfix: alerts "zero size buf in output" might appear in logs while proxying; the bug had appeared in 1.3.9. Changeset: http://hg.nginx.org/nginx/rev/3b7463b08747 ) Bugfix: a segmentation fault might occur in a worker process if the ngx_http_spdy_module was used. Changeset: http://hg.nginx.org/nginx/rev/b8e6297358b5 ) Bugfix: proxied WebSocket connections might hang right after handshake if the select, poll, or /dev/poll methods were used. Changeset: http://hg.nginx.org/nginx/rev/560de9681661 More details are available here: http://mailman.nginx.org/pipermail/nginx/2014-January/041839.html ) Bugfix: a timeout might occur while reading client request body in an SSL connection using chunked transfer encoding. Changeset: http://hg.nginx.org/nginx/rev/35b00bcf72fe More details are available here: http://mailman.nginx.org/pipermail/nginx/2013-November/041178.html *) Bugfix: memory leak in nginx/Windows. Changeset: http://hg.nginx.org/nginx/rev/fd77e2018652 Note that this patch is not merged because tengine does not support win32.	12 years ago
weiyue	f78483e5c1	update changelogs	12 years ago
cfsego	7fcd8e2647	merge changes between nginx 1.2.9 and 1.4.3 merge nginx tests	12 years ago
Weibin Yao	efdd8ee4bb	merged the changes from nginx-1.2.9	12 years ago
Weibin Yao	5d76972304	merged the diff between nginx-1.2.7 and nginx-1.2.8	12 years ago
cfsego	18630203c4	merge changes between nginx 1.2.6 and nginx 1.2.7	13 years ago
cfsego	62f1e66d58	merge CHANGES file between nginx 1.2.5 and 1.2.6	13 years ago
Joshua Zhu	e2708ba92d	merged changes between nginx-1.2.4 and nginx-1.2.5	13 years ago
Joshua Zhu	1eb19fdad0	merged changes between nginx-1.2.3 and nginx-1.2.4	13 years ago
Joshua Zhu	c7d377e9b0	merged changes between nginx-1.2.2 and nginx-1.2.3	13 years ago
Weibin Yao	f4b1bd1673	merged changes between nginx-1.2.0 and nginx-1.2.2	13 years ago
Joshua Zhu	246f4133f6	merged changes between nginx-1.0.15 and nginx-1.2.0	13 years ago
shudu	6b7ccf4884	merged changes between nginx-1.0.14 and nginx-1.0.15 http://rb.corp.taobao.com/r/29610/ git-svn-id: http://code.taobao.org/svn/tengine/trunk@57 8a6cbc4f-5610-49f6-9325-3f9afe71ff98	13 years ago
shudu	4670de6688	merged nginx-1.0.14 http://rb.corp.taobao.com/r/26223/ git-svn-id: http://code.taobao.org/svn/tengine/trunk@41 8a6cbc4f-5610-49f6-9325-3f9afe71ff98	14 years ago
shudu	7736248a7b	merge changes between nginx-1.0.11 and nginx-1.0.12 http://rb.corp.taobao.com/r/23810/ git-svn-id: http://code.taobao.org/svn/tengine/trunk@28 8a6cbc4f-5610-49f6-9325-3f9afe71ff98	14 years ago
shudu	81899b01c6	merge changes between nginx-1.0.10 adn nginx-1.0.11 http://rb.corp.taobao.com/r/22580/ git-svn-id: http://code.taobao.org/svn/tengine/trunk@19 8a6cbc4f-5610-49f6-9325-3f9afe71ff98	14 years ago
shudu	ddd10d2bf4	the first public release git-svn-id: http://code.taobao.org/svn/tengine/trunk@2 8a6cbc4f-5610-49f6-9325-3f9afe71ff98	14 years ago

21 Commits (tengine-2.2.1)