Merge pull request alibaba#456 from cfsego/tengine_2.0.3

Tengine 2.0.3
jim9 · May 30, 2014 · 412ba64 · 412ba64
2 parents 60b81ed + 5272608
commit 412ba64
Show file tree

Hide file tree

Showing 78 changed files with 114 additions and 77 deletions.
diff --git a/CHANGES.cn b/CHANGES.cn
@@ -1,3 +1,13 @@
+Tengine 2.0.3 [2014-05-30]
+* Feature: 支持按指定维度(域名，url等)收集Tengine运行状态 [cfsego]
+* Feature: 支持debian、ubuntu打包 [betetrpm, szepeviktor]
+* Change: 合并nginx-1.4.7的修改 [chobits]
+* Change: 使用红黑树优化upstream配置解析和查找 [SarahWang]
+* Change: 更新版权信息
+* Bugfix: 修复session-sticky模块相关问题 [dinic]
+* Bugfix: 修复DSO编译和安装模块的问题 [cfsego]
+* Bugfix: 修复spdy相关问题 [chobits]
+
 Tengine 2.0.2 [2014-03-28]
 * Bugfix: 在读事件处理完后继续发送SPDY数据 [chobits]
 * Bugfix: CVE-2014-0133以及CVE-2014-0088 [chobits]

diff --git a/CHANGES.te b/CHANGES.te
@@ -1,3 +1,25 @@
+Changes with Tengine 2.0.3                                         30 May 2014
+
+    *) Feature: added support for collecting the running status of Tengine
+       according to specific key (domain, url, etc). (cfsego)
+
+    *) Feature: added support for generating package of debian/ubuntu
+       format(*.deb). (betetrpm, szepeviktmr)
+
+    *) Change: merged changes between nginx-1.4.6 and nginx-1.4.7. (chobits)
+
+    *) Change: optimized the parsing and searching strategy of upstream by
+       using rbtree. (SarahWang)
+
+    *) Change: updated the copyright.
+
+    *) Bugfix: fixed bugs of session-sticky module. (dinic)
+
+    *) Bugfix: fixed compiling and installing issues of DSO modules. (cfsego)
+
+    *) Bugfix: fixed bugs of SPDY protocol. (chobits)
+
+
 Changes with Tengine 2.0.2                                       28 March 2014
 
     *) Bugfix: send output queue after processing of read event in SPDY. (chobits)

diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,7 @@
 /* 
  * Copyright (C) 2002-2013 Igor Sysoev
  * Copyright (C) 2011,2013 Nginx, Inc.
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  * Copyright (C) 2011-2013 Xiaozhe "chaoslawful" Wang
  * Copyright (C) 2011-2013 Zhang "agentzh" Yichun
  * Copyright (C) 2011-2013 Weibin Yao

diff --git a/auto/lib/jemalloc/conf b/auto/lib/jemalloc/conf
@@ -1,5 +1,5 @@
 
-# Copyright (C) 2010-2013 Alibaba Group Holding Limited
+# Copyright (C) 2010-2014 Alibaba Group Holding Limited
 
 
 if [ $JEMALLOC != NONE ]; then

diff --git a/auto/lib/jemalloc/make b/auto/lib/jemalloc/make
@@ -1,5 +1,5 @@
 
-# Copyright (C) 2010-2013 Alibaba Group Holding Limited
+# Copyright (C) 2010-2014 Alibaba Group Holding Limited
 
 
 done=NO

diff --git a/auto/lib/libyajl/conf b/auto/lib/libyajl/conf
@@ -1,5 +1,5 @@
 
-# Copyright (C) 2010-2013 Alibaba Group Holding Limited
+# Copyright (C) 2010-2014 Alibaba Group Holding Limited
 
 ngx_feature_name=
 ngx_feature_run=no

diff --git a/auto/make b/auto/make
@@ -628,7 +628,7 @@ END
     cat << END                                            > $NGX_DSO_COMPILE
 #!/bin/sh
 
-# Copyright (C) 2010-2013 Alibaba Group Holding Limited
+# Copyright (C) 2010-2014 Alibaba Group Holding Limited
 
 
 ngx_soext='$NGX_SOEXT'

diff --git a/auto/modules b/auto/modules
@@ -704,6 +704,7 @@ fi
 
 if [ $HTTP_UPSTREAM_RBTREE = YES ]; then
     have=NGX_HTTP_UPSTREAM_RBTREE . auto/have
+    NGX_DSO_ABI_COMPATIBILITY=$(($NGX_DSO_ABI_COMPATIBILITY|$NGX_DSO_UPSTREAM_RBTREE_TAG))
 fi
 
 #if [ -r $NGX_OBJS/auto ]; then

diff --git a/auto/options b/auto/options
@@ -161,7 +161,7 @@ NGX_DSO_ABI_ALL_TAG="
     with-ipv6
     with-syslog
     with-http-gzip
-    with-http-gzip-satic
+    with-http-gzip-static
     with-http-ssi
     with-http-dav
     with-http-realip
@@ -171,7 +171,8 @@ NGX_DSO_ABI_ALL_TAG="
     with-http-proxy
     with-http-degradation
     with-http-upstream-check
-    with-http-stat-stub"
+    with-http-stat-stub
+    with-http-upstream-rbtree"
 
 NGX_DSO_ABI_COMPATIBILITY=0x00000000
 NGX_DSO_DEBUG_TAG=0x00000001
@@ -191,6 +192,7 @@ NGX_DSO_PROXY_TAG=0x00002000
 NGX_DSO_DEGRADATION_TAG=0x00004000
 NGX_DSO_UPSTREAM_CHECK_TAG=0x00008000
 NGX_DSO_STAT_STUB_TAG=0x00010000
+NGX_DSO_UPSTREAM_RBTREE_TAG=0x00020000
 
 
 HTTP=YES
@@ -867,6 +869,8 @@ cat << END
   --with-perl_modules_path=PATH      set Perl modules path
   --with-perl=PATH                   set perl binary pathname
 
+  --without-http-upstream-rbtree     disable using rbtree for upstream lookup
+
   --with-http_lua_module             enable ngx_http_lua_module (will also enable --with-md5 and --with-sha1)
   --with-http_lua_module=shared      enable ngx_http_lua_module (shared) (will also enable --with-md5 and --with-sha1)
   --with-luajit-inc=PATH             set LuaJIT headers path (where lua.h/lauxlib.h/... are located)

diff --git a/src/core/nginx.h b/src/core/nginx.h
@@ -14,8 +14,8 @@
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #define TENGINE            "Tengine"
-#define tengine_version    2000002
-#define TENGINE_VERSION    "2.0.2"
+#define tengine_version    2000003
+#define TENGINE_VERSION    "2.0.3"
 #define TENGINE_VER        TENGINE "/" TENGINE_VERSION
 
 #define NGINX_VAR          "NGINX"

diff --git a/src/core/ngx_dso_module.c b/src/core/ngx_dso_module.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/core/ngx_segment_tree.c b/src/core/ngx_segment_tree.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/core/ngx_segment_tree.h b/src/core/ngx_segment_tree.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/core/ngx_trie.c b/src/core/ngx_trie.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/core/ngx_trie.h b/src/core/ngx_trie.h
@@ -1,6 +1,6 @@
 
 /*
- *  Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ *  Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/ngx_http_concat_module.c b/src/http/modules/ngx_http_concat_module.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/ngx_http_footer_filter_module.c b/src/http/modules/ngx_http_footer_filter_module.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/ngx_http_slice_module.c b/src/http/modules/ngx_http_slice_module.c
@@ -1,7 +1,7 @@
 
 /*
  * Copyright (C) Igor Sysoev
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/ngx_http_sysguard_module.c b/src/http/modules/ngx_http_sysguard_module.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/ngx_http_trim_filter_module.c b/src/http/modules/ngx_http_trim_filter_module.c
@@ -1,6 +1,6 @@
 
 /*
- *  Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ *  Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/ngx_http_upstream_consistent_hash_module.c b/src/http/modules/ngx_http_upstream_consistent_hash_module.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/ngx_http_upstream_session_sticky_module.c b/src/http/modules/ngx_http_upstream_session_sticky_module.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/ngx_http_user_agent_module.c b/src/http/modules/ngx_http_user_agent_module.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_connection_pool.c b/src/http/modules/tfs/ngx_http_connection_pool.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_connection_pool.h b/src/http/modules/tfs/ngx_http_connection_pool.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_tfs.c b/src/http/modules/tfs/ngx_http_tfs.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_tfs.h b/src/http/modules/tfs/ngx_http_tfs.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_tfs_block_cache.c b/src/http/modules/tfs/ngx_http_tfs_block_cache.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_tfs_block_cache.h b/src/http/modules/tfs/ngx_http_tfs_block_cache.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_tfs_data_server_message.c b/src/http/modules/tfs/ngx_http_tfs_data_server_message.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_tfs_data_server_message.h b/src/http/modules/tfs/ngx_http_tfs_data_server_message.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_tfs_duplicate.c b/src/http/modules/tfs/ngx_http_tfs_duplicate.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_tfs_duplicate.h b/src/http/modules/tfs/ngx_http_tfs_duplicate.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_tfs_errno.h b/src/http/modules/tfs/ngx_http_tfs_errno.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_tfs_json.c b/src/http/modules/tfs/ngx_http_tfs_json.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_tfs_json.h b/src/http/modules/tfs/ngx_http_tfs_json.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_tfs_local_block_cache.c b/src/http/modules/tfs/ngx_http_tfs_local_block_cache.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_tfs_local_block_cache.h b/src/http/modules/tfs/ngx_http_tfs_local_block_cache.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_tfs_meta_server_message.c b/src/http/modules/tfs/ngx_http_tfs_meta_server_message.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_tfs_meta_server_message.h b/src/http/modules/tfs/ngx_http_tfs_meta_server_message.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_tfs_module.c b/src/http/modules/tfs/ngx_http_tfs_module.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_tfs_name_server_message.c b/src/http/modules/tfs/ngx_http_tfs_name_server_message.c
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */
 
 

diff --git a/src/http/modules/tfs/ngx_http_tfs_name_server_message.h b/src/http/modules/tfs/ngx_http_tfs_name_server_message.h
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (C) 2010-2013 Alibaba Group Holding Limited
+ * Copyright (C) 2010-2014 Alibaba Group Holding Limited
  */