Commit Graph

340 Commits

Author SHA1 Message Date
d1bc0aafaa upgrade version number to 1.1.13.1 v1.1.13.1 2012-01-20 00:47:14 +08:00
8ccb6abbb2 Merge remote-tracking branch 'origin/master' into nginx-1.1.x 2012-01-20 00:44:45 +08:00
fd80fa22ef Merge branch 'nginx-1.1.x' of github.com:agentzh/ngx_openresty into nginx-1.1.x 2012-01-19 18:12:58 +08:00
2bffe13e20 added patches for nginx 1.1.13. 2012-01-19 18:11:53 +08:00
92e0dd7abf Merge commit 'v1.1.12.5' into nginx-1.1.x 2012-01-19 17:56:42 +08:00
86af3896ba bumped version number to 1.1.12.5 v1.1.12.5 2012-01-19 17:56:16 +08:00
065bf15551 Merge commit 'v1.1.12.5' into nginx-1.1.x 2012-01-19 17:51:25 +08:00
d9782b738d remove upstream_keepalive from util/configure 2012-01-19 17:50:24 +08:00
5abfef061a merge nginx-1.1.x version (util/ver) 2012-01-19 17:20:19 +08:00
7ce68bd980 bumped version number to 1.1.12.4, with v1.0.10.44 merged v1.1.12.4 2012-01-19 17:17:12 +08:00
cbb2c2f247 Merge commit 'v1.0.10.44' into nginx-1.1.12
Conflicts:
	util/ver
2012-01-19 17:16:24 +08:00
a6814b92ea upgraded ngx_drizzle to 0.1.2rc6 and ngx_lua to 0.4.1rc3. v1.0.10.45 2012-01-19 12:43:09 +08:00
e96bacd8fd remove ngx_http_upstream_keepalive in util/configure 2012-01-18 19:44:24 +08:00
8479638467 merged master to nginx-1.1.x. 2012-01-18 13:17:51 +08:00
64da4f2081 upgraded ngx_echo to 0.38rc1, ngx_set_misc to 0.22rc5, ngx_headers_more to 0.17rc1, ngx_drizzle to 0.1.2rc5, ngx_lua to 0.4.1rc1, and ngx_memc to 0.13rc3. 2012-01-17 14:55:15 +08:00
a05b74863b updated tests to reflect recent changes. v1.0.10.44 2012-01-16 22:14:23 +08:00
722e2e26c3 bumped version to 1.0.10.44. 2012-01-16 22:06:46 +08:00
5712e9bfdf upgraded ngx_echo to 0.37 and ngx_headers_more to 0.16. 2012-01-16 15:00:21 +08:00
f589bfc4f0 Merge pull request #5 from nightsailer/master
again, fix sed issue
2012-01-15 06:57:34 -08:00
b76b9903de fix sed on osx/darwin issue 2012-01-15 18:11:30 +08:00
fb89742f47 Prepare for the ngx_openresty devel version 1.0.10
* upgraded ngx_lua to 0.4.0.
* upgraded ngx_encrypted_session to 0.02.
* bugfix: fixed issues with relative path DIR in --with-openssl=DIR.
v1.0.10.43
2012-01-12 15:19:27 +08:00
880010cf91 bumped version number to 1.1.12.3. v1.1.12.3 2012-01-10 17:58:47 +08:00
111c045db9 bumped version number to 1.1.12.2. 2012-01-10 17:58:20 +08:00
fc61696e25 no longer bundle ngx_http_upstream_keepalive because it is already in the nginx core. 2012-01-10 17:57:46 +08:00
1982776375 merged master to nginx-1.1.x. 2012-01-10 17:28:35 +08:00
487eb2e40a upgraded ngx_echo to 0.37rc8. v1.0.10.41 2012-01-09 18:14:53 +08:00
6e9ed6fa71 upgraded ngx_upstream_keepalive to 0.7. 2012-01-09 18:07:29 +08:00
9afd5ad5f7 added patches for nginx 1.0.11. 2012-01-07 11:33:25 +08:00
bfdd9471fc upgraded ngx_lua to 0.3.1rc45. 2012-01-04 18:50:24 +08:00
5ef81b5aab upgraded ngx_lua to v0.3.1rc44. 2012-01-04 17:28:18 +08:00
6dd8f079dd upgraded ngx_lua to 0.3.1rc43. 2011-12-30 23:49:38 +08:00
06312e656b upgraded ngx_headers_more to 0.16rc7. v1.0.10.35 2011-12-30 23:14:53 +08:00
53499aeca1 bumped version number to 1.1.12. 2011-12-29 13:16:29 +08:00
b2b220e332 merged master into nginx-1.1.x. 2011-12-29 13:12:41 +08:00
1bc8f9b8be bugfix: make the "install" phony target depend on the "all" phony target in the Makefile generated by ./configure. thanks Weibin Yao for reporting this issue. 2011-12-29 12:49:14 +08:00
6d1405ceaa fixed the test plan. v1.0.10.33 2011-12-29 11:14:54 +08:00
af701e5b64 improved Yao Weibin's patch for the --add-module option a bit and also added a test case. 2011-12-29 11:14:10 +08:00
5fb3e869e5 updated tests to reflect recent changes. 2011-12-29 11:01:39 +08:00
35afee967e support to add relative path module in configure 2011-12-29 10:56:44 +08:00
1a91ab941c re-enable bundling unwind.h for LuaJIT on *BSD and Solaris because we still need to do that. v1.0.10.31 2011-12-25 20:40:19 +08:00
2b7c8182d9 removed the gzip_ok_invalid_read_fix patch because it is no longer needed. 2011-12-25 00:02:27 +08:00
6081a9b032 upgraded ngx_lua to 0.3.1rc42 and ngx_headers_more to 0.16rc6. 2011-12-25 00:01:24 +08:00
5fd1a15da2 upgraded luajit to 2.0.0 beta9 and also applied the patch nginx-1.0.10-gzip_ok_invalid_read_fix.patch. 2011-12-22 11:39:27 +08:00
0e98bb399f checked in the gzip_ok_invalid_read_fix patch. 2011-12-22 11:36:43 +08:00
041652a80d upgraded ngx_headers_more to 0.16rc5 and ngx_lua to 0.3.1rc41. v1.0.10.29 2011-12-16 22:37:01 +08:00
74c6036eb1 updated .gitignore. v1.0.10.27 2011-12-16 21:26:21 +08:00
68fe4b0a84 upgraded ngx_lua to 0.3.1rc40 and ngx_set_misc to v0.22rc4. 2011-12-16 21:22:12 +08:00
85a80e83b2 upgraded ngx_lua to 0.3.1rc39. 2011-12-16 15:53:31 +08:00
d0fc49168d bugfix: some old version of "cp" does not support trailing slashes in the destination argument and could break the ./configure script. thanks Weibin Yao for reporting it. 2011-12-16 14:50:02 +08:00
893262d13a upgraded ngx_srcache to 0.13rc3 and ngx_xss to 0.03rc8. v1.0.10.25 2011-12-14 20:25:52 +08:00