add missing module info for unit-test; remove unused code; update ndk dependency

README.markdown

@@ -1240,6 +1240,7 @@ To run the test suite, you also need the following dependencies:
 	* drizzle-nginx-module: <http://github.com/chaoslawful/drizzle-nginx-module>
 	* rds-json-nginx-module: <http://github.com/agentzh/rds-json-nginx-module>
 	* set-misc-nginx-module: <http://github.com/agentzh/set-misc-nginx-module>
+	* headers-more-nginx-module: <http://github.com/agentzh/headers-more-nginx-module>
 	* memc-nginx-module: <http://github.com/agentzh/memc-nginx-module>
 	* srcache-nginx-module: <http://github.com/agentzh/srcache-nginx-module>
 	* ngx_auth_request: <http://mdounin.ru/hg/ngx_http_auth_request_module/>
@@ -1264,9 +1265,10 @@ filtering chain affects a lot. The correct configure adding order is:
 4. echo-nginx-module
 5. memc-nginx-module
 6. lua-nginx-module (i.e. this module)
-7. srcache-nginx-module
-8. drizzle-nginx-module
-9. rds-json-nginx-module
+7. headers-more-nginx-module
+8. srcache-nginx-module
+9. drizzle-nginx-module
+10. rds-json-nginx-module
 
 TODO
 ====

deps/ngx_devel_kit

@@ -1 +1 @@
-Subproject commit 7dbb4ce99fa8ec79667e780f613793d01b71422f
+Subproject commit bc97eea6d900013a8cd26b1117491dc513450d27

src/ngx_http_lua_common.h

@@ -158,12 +158,6 @@ typedef struct {
 } ngx_http_lua_ctx_t;
 
 
-typedef enum {
-    exec,
-    location_capture
-} ngx_http_lua_io_cmd_t;
-
-
 extern ngx_module_t ngx_http_lua_module;
 extern ngx_http_output_header_filter_pt ngx_http_lua_next_header_filter;
 extern ngx_http_output_body_filter_pt ngx_http_lua_next_body_filter;

src/ngx_http_lua_hook.c

@@ -802,9 +802,7 @@ ngx_http_lua_ngx_location_capture_multi(lua_State *L)
         lua_pop(L, 2); /* pop the subrequest argument and uri */
     }
 
-    lua_pushinteger(L, location_capture);
-
-    return lua_yield(L, 1);
+    return lua_yield(L, 0);
 }
 
 

util/build.sh

@@ -21,7 +21,6 @@ tar -xzvf nginx-$version.tar.gz
 cd nginx-$version/
 if [[ "$BUILD_CLEAN" -eq 1 || ! -f Makefile || "$root/config" -nt Makefile || "$root/util/build.sh" -nt Makefile ]]; then
 	./configure --prefix=$root/work \
-            --with-cc-opt="-O0" \
 				--add-module=$root \
 				--add-module=$root/deps/ngx_devel_kit \
 				$opts