taobao/tengine — pull request #12 by zhuzhaoyuan (2012-06-14 09:05:54+00:00)
Title: merged changes between nginx-1.0.15 and nginx-1.2.0

Conflicts have been fixed manually.

Please review this pull request. As this version, tengine will base on the nginx-1.2 stable branch. Every single line should be checked carefully. Thank you very much, guys!