mirror of
https://github.com/openresty/openresty.git
synced 2024-10-13 00:29:41 +00:00
Compare commits
13 Commits
Author | SHA1 | Date | |
---|---|---|---|
46ec035831 | |||
7d6c400d3d | |||
7df5c5c851 | |||
8fa9eb77bd | |||
cd77c676c3 | |||
3702d98b4a | |||
04709aa2e6 | |||
70d58760ef | |||
942411c114 | |||
b644d3d531 | |||
087ec653a5 | |||
4df2272a77 | |||
73f13092eb |
31
README
31
README
@ -15,6 +15,18 @@ A quick note to Debian and Ubuntu users:
|
|||||||
|
|
||||||
apt-get install libreadline-dev libpcre3-dev libssl-dev perl
|
apt-get install libreadline-dev libpcre3-dev libssl-dev perl
|
||||||
|
|
||||||
|
If you want to enable LuaJIT, ensure that your system's "ldconfig"
|
||||||
|
utility is in your PATH environment. You can check out
|
||||||
|
the path of your "ldconfig" by using the "whereis" command:
|
||||||
|
|
||||||
|
whereis ldconfig
|
||||||
|
|
||||||
|
On Debian systems, it's usually /sbin, and you just need to add
|
||||||
|
it to your PATH this way:
|
||||||
|
|
||||||
|
PATH=/sbin:$PATH
|
||||||
|
export PATH
|
||||||
|
|
||||||
A quick note to Fedora/RedHat users:
|
A quick note to Fedora/RedHat users:
|
||||||
You're recommended to install the following packages using yum before
|
You're recommended to install the following packages using yum before
|
||||||
installing this bundle:
|
installing this bundle:
|
||||||
@ -34,11 +46,11 @@ in your PATH environment, and then follow the following steps:
|
|||||||
|
|
||||||
1. download the latest ngx_openresty tarball can be downloaded from
|
1. download the latest ngx_openresty tarball can be downloaded from
|
||||||
|
|
||||||
http://agentzh.org/misc/nginx/ngx_openresty-0.8.54.5.tar.gz
|
http://agentzh.org/misc/nginx/ngx_openresty-0.8.54.6.tar.gz
|
||||||
|
|
||||||
we will eventually migrate to the openresty.org domain.
|
we will eventually migrate to the openresty.org domain.
|
||||||
|
|
||||||
2. and then enter the ngx_openresty-0.8.54.5/ directory,
|
2. and then enter the ngx_openresty-0.8.54.6/ directory,
|
||||||
and type the following command to configure:
|
and type the following command to configure:
|
||||||
|
|
||||||
./configure
|
./configure
|
||||||
@ -58,6 +70,10 @@ in your PATH environment, and then follow the following steps:
|
|||||||
so when it complaints about OpenSSL and you have indeed
|
so when it complaints about OpenSSL and you have indeed
|
||||||
already installed it, specify the --with-ld-opt='-L/lib' option.
|
already installed it, specify the --with-ld-opt='-L/lib' option.
|
||||||
|
|
||||||
|
Errors in running the ./configure script can be found in this file:
|
||||||
|
|
||||||
|
build/nginx-0.8.54/objs/autoconf.err
|
||||||
|
|
||||||
3. build everything locally
|
3. build everything locally
|
||||||
|
|
||||||
make
|
make
|
||||||
@ -73,7 +89,8 @@ in your PATH environment, and then follow the following steps:
|
|||||||
|
|
||||||
Then you can start your server this way:
|
Then you can start your server this way:
|
||||||
|
|
||||||
/usr/local/openresty/nginx/sbin/nginx -p /path/to/your/server/root -c /path/to/your/nginx.conf
|
/usr/local/openresty/nginx/sbin/nginx -p /path/to/your/server/root \
|
||||||
|
-c /path/to/your/nginx.conf
|
||||||
|
|
||||||
assuming you're using the default "prefix", i.e., /usr/local/openresty, in Step 2.
|
assuming you're using the default "prefix", i.e., /usr/local/openresty, in Step 2.
|
||||||
|
|
||||||
@ -89,12 +106,12 @@ For bundle maintainers:
|
|||||||
|
|
||||||
at the top of the bundle source tree.
|
at the top of the bundle source tree.
|
||||||
|
|
||||||
The following packages are bundled in the 0.8.54.5 release:
|
The following packages are bundled in the 0.8.54.6 release:
|
||||||
|
|
||||||
LuaJIT-2.0.0-beta7
|
LuaJIT-2.0.0-beta7
|
||||||
array-var-nginx-module-0.02
|
array-var-nginx-module-0.02
|
||||||
auth-request-nginx-module-0.2
|
auth-request-nginx-module-0.2
|
||||||
drizzle-nginx-module-0.0.15rc9
|
drizzle-nginx-module-0.0.15rc10
|
||||||
echo-nginx-module-0.36rc3
|
echo-nginx-module-0.36rc3
|
||||||
encrypted-session-nginx-module-0.01
|
encrypted-session-nginx-module-0.01
|
||||||
form-input-nginx-module-0.07rc4
|
form-input-nginx-module-0.07rc4
|
||||||
@ -105,10 +122,10 @@ The following packages are bundled in the 0.8.54.5 release:
|
|||||||
memc-nginx-module-0.12rc1
|
memc-nginx-module-0.12rc1
|
||||||
nginx-0.8.54
|
nginx-0.8.54
|
||||||
ngx_devel_kit-0.2.17
|
ngx_devel_kit-0.2.17
|
||||||
ngx_lua-0.1.6rc9
|
ngx_lua-0.1.6rc12
|
||||||
ngx_postgres-0.8
|
ngx_postgres-0.8
|
||||||
rds-json-nginx-module-0.11rc2
|
rds-json-nginx-module-0.11rc2
|
||||||
redis2-nginx-module-0.07rc1
|
redis2-nginx-module-0.07rc2
|
||||||
set-misc-nginx-module-0.21
|
set-misc-nginx-module-0.21
|
||||||
srcache-nginx-module-0.12rc4
|
srcache-nginx-module-0.12rc4
|
||||||
upstream-keepalive-nginx-module-0.3
|
upstream-keepalive-nginx-module-0.3
|
||||||
|
17
patches/LuaJIT-2.0.0-beta7-symlink_lib.patch
Normal file
17
patches/LuaJIT-2.0.0-beta7-symlink_lib.patch
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
--- LuaJIT-2.0.0-beta7/Makefile 2011-05-05 22:30:00.000000000 +0800
|
||||||
|
+++ LuaJIT-2.0.0-beta7-patched/Makefile 2011-05-26 15:32:02.888893148 +0800
|
||||||
|
@@ -113,13 +113,8 @@
|
||||||
|
$(RM) $(FILE_PC).tmp
|
||||||
|
cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC)
|
||||||
|
cd lib && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
|
||||||
|
+ $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)
|
||||||
|
@echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ===="
|
||||||
|
- @echo ""
|
||||||
|
- @echo "Note: the beta releases deliberately do NOT install a symlink for luajit"
|
||||||
|
- @echo "You can do this now by running this command (with sudo):"
|
||||||
|
- @echo ""
|
||||||
|
- @echo " $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)"
|
||||||
|
- @echo ""
|
||||||
|
|
||||||
|
##############################################################################
|
||||||
|
|
74
t/sanity.t
74
t/sanity.t
@ -200,13 +200,13 @@ cd nginx-0.8.54
|
|||||||
--add-module=../set-misc-nginx-module-0.21 \
|
--add-module=../set-misc-nginx-module-0.21 \
|
||||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||||
--add-module=../drizzle-nginx-module-0.0.15rc9 \
|
--add-module=../drizzle-nginx-module-0.0.15rc10 \
|
||||||
--add-module=../ngx_lua-0.1.6rc9 \
|
--add-module=../ngx_lua-0.1.6rc12 \
|
||||||
--add-module=../headers-more-nginx-module-0.15rc1 \
|
--add-module=../headers-more-nginx-module-0.15rc1 \
|
||||||
--add-module=../srcache-nginx-module-0.12rc4 \
|
--add-module=../srcache-nginx-module-0.12rc4 \
|
||||||
--add-module=../array-var-nginx-module-0.02 \
|
--add-module=../array-var-nginx-module-0.02 \
|
||||||
--add-module=../memc-nginx-module-0.12rc1 \
|
--add-module=../memc-nginx-module-0.12rc1 \
|
||||||
--add-module=../redis2-nginx-module-0.07rc1 \
|
--add-module=../redis2-nginx-module-0.07rc2 \
|
||||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||||
--add-module=../auth-request-nginx-module-0.2 \
|
--add-module=../auth-request-nginx-module-0.2 \
|
||||||
--add-module=../rds-json-nginx-module-0.11rc2 \
|
--add-module=../rds-json-nginx-module-0.11rc2 \
|
||||||
@ -260,13 +260,13 @@ cd nginx-0.8.54
|
|||||||
--add-module=../set-misc-nginx-module-0.21 \
|
--add-module=../set-misc-nginx-module-0.21 \
|
||||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||||
--add-module=../drizzle-nginx-module-0.0.15rc9 \
|
--add-module=../drizzle-nginx-module-0.0.15rc10 \
|
||||||
--add-module=../ngx_lua-0.1.6rc9 \
|
--add-module=../ngx_lua-0.1.6rc12 \
|
||||||
--add-module=../headers-more-nginx-module-0.15rc1 \
|
--add-module=../headers-more-nginx-module-0.15rc1 \
|
||||||
--add-module=../srcache-nginx-module-0.12rc4 \
|
--add-module=../srcache-nginx-module-0.12rc4 \
|
||||||
--add-module=../array-var-nginx-module-0.02 \
|
--add-module=../array-var-nginx-module-0.02 \
|
||||||
--add-module=../memc-nginx-module-0.12rc1 \
|
--add-module=../memc-nginx-module-0.12rc1 \
|
||||||
--add-module=../redis2-nginx-module-0.07rc1 \
|
--add-module=../redis2-nginx-module-0.07rc2 \
|
||||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||||
--add-module=../auth-request-nginx-module-0.2 \
|
--add-module=../auth-request-nginx-module-0.2 \
|
||||||
--add-module=../rds-json-nginx-module-0.11rc2 \
|
--add-module=../rds-json-nginx-module-0.11rc2 \
|
||||||
@ -295,7 +295,7 @@ clean:
|
|||||||
--- cmd: ./configure --with-http_ssl_module --without-http_ssl_module
|
--- cmd: ./configure --with-http_ssl_module --without-http_ssl_module
|
||||||
--- exit: 255
|
--- exit: 255
|
||||||
--- err
|
--- err
|
||||||
--with-http_ssl_module conflicts with --without-http_ssl_module
|
--with-http_ssl_module conflicts with --without-http_ssl_module.
|
||||||
--- out
|
--- out
|
||||||
platform: linux (linux)
|
platform: linux (linux)
|
||||||
|
|
||||||
@ -329,13 +329,13 @@ cd nginx-0.8.54
|
|||||||
--add-module=../set-misc-nginx-module-0.21 \
|
--add-module=../set-misc-nginx-module-0.21 \
|
||||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||||
--add-module=../drizzle-nginx-module-0.0.15rc9 \
|
--add-module=../drizzle-nginx-module-0.0.15rc10 \
|
||||||
--add-module=../ngx_lua-0.1.6rc9 \
|
--add-module=../ngx_lua-0.1.6rc12 \
|
||||||
--add-module=../headers-more-nginx-module-0.15rc1 \
|
--add-module=../headers-more-nginx-module-0.15rc1 \
|
||||||
--add-module=../srcache-nginx-module-0.12rc4 \
|
--add-module=../srcache-nginx-module-0.12rc4 \
|
||||||
--add-module=../array-var-nginx-module-0.02 \
|
--add-module=../array-var-nginx-module-0.02 \
|
||||||
--add-module=../memc-nginx-module-0.12rc1 \
|
--add-module=../memc-nginx-module-0.12rc1 \
|
||||||
--add-module=../redis2-nginx-module-0.07rc1 \
|
--add-module=../redis2-nginx-module-0.07rc2 \
|
||||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||||
--add-module=../auth-request-nginx-module-0.2 \
|
--add-module=../auth-request-nginx-module-0.2 \
|
||||||
--add-module=../rds-json-nginx-module-0.11rc2 \
|
--add-module=../rds-json-nginx-module-0.11rc2 \
|
||||||
@ -388,13 +388,13 @@ cd nginx-0.8.54
|
|||||||
--add-module=../set-misc-nginx-module-0.21 \
|
--add-module=../set-misc-nginx-module-0.21 \
|
||||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||||
--add-module=../drizzle-nginx-module-0.0.15rc9 \
|
--add-module=../drizzle-nginx-module-0.0.15rc10 \
|
||||||
--add-module=../ngx_lua-0.1.6rc9 \
|
--add-module=../ngx_lua-0.1.6rc12 \
|
||||||
--add-module=../headers-more-nginx-module-0.15rc1 \
|
--add-module=../headers-more-nginx-module-0.15rc1 \
|
||||||
--add-module=../srcache-nginx-module-0.12rc4 \
|
--add-module=../srcache-nginx-module-0.12rc4 \
|
||||||
--add-module=../array-var-nginx-module-0.02 \
|
--add-module=../array-var-nginx-module-0.02 \
|
||||||
--add-module=../memc-nginx-module-0.12rc1 \
|
--add-module=../memc-nginx-module-0.12rc1 \
|
||||||
--add-module=../redis2-nginx-module-0.07rc1 \
|
--add-module=../redis2-nginx-module-0.07rc2 \
|
||||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||||
--add-module=../auth-request-nginx-module-0.2 \
|
--add-module=../auth-request-nginx-module-0.2 \
|
||||||
--add-module=../rds-json-nginx-module-0.11rc2 \
|
--add-module=../rds-json-nginx-module-0.11rc2 \
|
||||||
@ -447,13 +447,13 @@ cd nginx-0.8.54
|
|||||||
--add-module=../set-misc-nginx-module-0.21 \
|
--add-module=../set-misc-nginx-module-0.21 \
|
||||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||||
--add-module=../drizzle-nginx-module-0.0.15rc9 \
|
--add-module=../drizzle-nginx-module-0.0.15rc10 \
|
||||||
--add-module=../ngx_lua-0.1.6rc9 \
|
--add-module=../ngx_lua-0.1.6rc12 \
|
||||||
--add-module=../headers-more-nginx-module-0.15rc1 \
|
--add-module=../headers-more-nginx-module-0.15rc1 \
|
||||||
--add-module=../srcache-nginx-module-0.12rc4 \
|
--add-module=../srcache-nginx-module-0.12rc4 \
|
||||||
--add-module=../array-var-nginx-module-0.02 \
|
--add-module=../array-var-nginx-module-0.02 \
|
||||||
--add-module=../memc-nginx-module-0.12rc1 \
|
--add-module=../memc-nginx-module-0.12rc1 \
|
||||||
--add-module=../redis2-nginx-module-0.07rc1 \
|
--add-module=../redis2-nginx-module-0.07rc2 \
|
||||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||||
--add-module=../auth-request-nginx-module-0.2 \
|
--add-module=../auth-request-nginx-module-0.2 \
|
||||||
--add-module=../rds-json-nginx-module-0.11rc2 \
|
--add-module=../rds-json-nginx-module-0.11rc2 \
|
||||||
@ -499,12 +499,12 @@ cd nginx-0.8.54
|
|||||||
--add-module=../set-misc-nginx-module-0.21 \
|
--add-module=../set-misc-nginx-module-0.21 \
|
||||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||||
--add-module=../ngx_lua-0.1.6rc9 \
|
--add-module=../ngx_lua-0.1.6rc12 \
|
||||||
--add-module=../headers-more-nginx-module-0.15rc1 \
|
--add-module=../headers-more-nginx-module-0.15rc1 \
|
||||||
--add-module=../srcache-nginx-module-0.12rc4 \
|
--add-module=../srcache-nginx-module-0.12rc4 \
|
||||||
--add-module=../array-var-nginx-module-0.02 \
|
--add-module=../array-var-nginx-module-0.02 \
|
||||||
--add-module=../memc-nginx-module-0.12rc1 \
|
--add-module=../memc-nginx-module-0.12rc1 \
|
||||||
--add-module=../redis2-nginx-module-0.07rc1 \
|
--add-module=../redis2-nginx-module-0.07rc2 \
|
||||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||||
--add-module=../auth-request-nginx-module-0.2 \
|
--add-module=../auth-request-nginx-module-0.2 \
|
||||||
--add-module=../rds-json-nginx-module-0.11rc2 \
|
--add-module=../rds-json-nginx-module-0.11rc2 \
|
||||||
@ -555,12 +555,12 @@ cd nginx-0.8.54
|
|||||||
--add-module=../set-misc-nginx-module-0.21 \
|
--add-module=../set-misc-nginx-module-0.21 \
|
||||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||||
--add-module=../drizzle-nginx-module-0.0.15rc9 \
|
--add-module=../drizzle-nginx-module-0.0.15rc10 \
|
||||||
--add-module=../headers-more-nginx-module-0.15rc1 \
|
--add-module=../headers-more-nginx-module-0.15rc1 \
|
||||||
--add-module=../srcache-nginx-module-0.12rc4 \
|
--add-module=../srcache-nginx-module-0.12rc4 \
|
||||||
--add-module=../array-var-nginx-module-0.02 \
|
--add-module=../array-var-nginx-module-0.02 \
|
||||||
--add-module=../memc-nginx-module-0.12rc1 \
|
--add-module=../memc-nginx-module-0.12rc1 \
|
||||||
--add-module=../redis2-nginx-module-0.07rc1 \
|
--add-module=../redis2-nginx-module-0.07rc2 \
|
||||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||||
--add-module=../auth-request-nginx-module-0.2 \
|
--add-module=../auth-request-nginx-module-0.2 \
|
||||||
--add-module=../rds-json-nginx-module-0.11rc2 \
|
--add-module=../rds-json-nginx-module-0.11rc2 \
|
||||||
@ -607,12 +607,12 @@ cd nginx-0.8.54
|
|||||||
--add-module=../set-misc-nginx-module-0.21 \
|
--add-module=../set-misc-nginx-module-0.21 \
|
||||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||||
--add-module=../drizzle-nginx-module-0.0.15rc9 \
|
--add-module=../drizzle-nginx-module-0.0.15rc10 \
|
||||||
--add-module=../headers-more-nginx-module-0.15rc1 \
|
--add-module=../headers-more-nginx-module-0.15rc1 \
|
||||||
--add-module=../srcache-nginx-module-0.12rc4 \
|
--add-module=../srcache-nginx-module-0.12rc4 \
|
||||||
--add-module=../array-var-nginx-module-0.02 \
|
--add-module=../array-var-nginx-module-0.02 \
|
||||||
--add-module=../memc-nginx-module-0.12rc1 \
|
--add-module=../memc-nginx-module-0.12rc1 \
|
||||||
--add-module=../redis2-nginx-module-0.07rc1 \
|
--add-module=../redis2-nginx-module-0.07rc2 \
|
||||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||||
--add-module=../auth-request-nginx-module-0.2 \
|
--add-module=../auth-request-nginx-module-0.2 \
|
||||||
--add-module=../rds-json-nginx-module-0.11rc2 \
|
--add-module=../rds-json-nginx-module-0.11rc2 \
|
||||||
@ -657,12 +657,12 @@ cd nginx-0.8.54
|
|||||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||||
--add-module=../ngx_postgres-0.8 \
|
--add-module=../ngx_postgres-0.8 \
|
||||||
--add-module=../ngx_lua-0.1.6rc9 \
|
--add-module=../ngx_lua-0.1.6rc12 \
|
||||||
--add-module=../headers-more-nginx-module-0.15rc1 \
|
--add-module=../headers-more-nginx-module-0.15rc1 \
|
||||||
--add-module=../srcache-nginx-module-0.12rc4 \
|
--add-module=../srcache-nginx-module-0.12rc4 \
|
||||||
--add-module=../array-var-nginx-module-0.02 \
|
--add-module=../array-var-nginx-module-0.02 \
|
||||||
--add-module=../memc-nginx-module-0.12rc1 \
|
--add-module=../memc-nginx-module-0.12rc1 \
|
||||||
--add-module=../redis2-nginx-module-0.07rc1 \
|
--add-module=../redis2-nginx-module-0.07rc2 \
|
||||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||||
--add-module=../auth-request-nginx-module-0.2 \
|
--add-module=../auth-request-nginx-module-0.2 \
|
||||||
--add-module=../rds-json-nginx-module-0.11rc2 \
|
--add-module=../rds-json-nginx-module-0.11rc2 \
|
||||||
@ -707,12 +707,12 @@ cd nginx-0.8.54
|
|||||||
--add-module=../set-misc-nginx-module-0.21 \
|
--add-module=../set-misc-nginx-module-0.21 \
|
||||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||||
--add-module=../ngx_lua-0.1.6rc9 \
|
--add-module=../ngx_lua-0.1.6rc12 \
|
||||||
--add-module=../headers-more-nginx-module-0.15rc1 \
|
--add-module=../headers-more-nginx-module-0.15rc1 \
|
||||||
--add-module=../srcache-nginx-module-0.12rc4 \
|
--add-module=../srcache-nginx-module-0.12rc4 \
|
||||||
--add-module=../array-var-nginx-module-0.02 \
|
--add-module=../array-var-nginx-module-0.02 \
|
||||||
--add-module=../memc-nginx-module-0.12rc1 \
|
--add-module=../memc-nginx-module-0.12rc1 \
|
||||||
--add-module=../redis2-nginx-module-0.07rc1 \
|
--add-module=../redis2-nginx-module-0.07rc2 \
|
||||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||||
--add-module=../auth-request-nginx-module-0.2 \
|
--add-module=../auth-request-nginx-module-0.2 \
|
||||||
--add-module=../rds-json-nginx-module-0.11rc2 \
|
--add-module=../rds-json-nginx-module-0.11rc2 \
|
||||||
@ -763,13 +763,13 @@ cd nginx-0.8.54
|
|||||||
--add-module=../set-misc-nginx-module-0.21 \
|
--add-module=../set-misc-nginx-module-0.21 \
|
||||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||||
--add-module=../drizzle-nginx-module-0.0.15rc9 \
|
--add-module=../drizzle-nginx-module-0.0.15rc10 \
|
||||||
--add-module=../ngx_lua-0.1.6rc9 \
|
--add-module=../ngx_lua-0.1.6rc12 \
|
||||||
--add-module=../headers-more-nginx-module-0.15rc1 \
|
--add-module=../headers-more-nginx-module-0.15rc1 \
|
||||||
--add-module=../srcache-nginx-module-0.12rc4 \
|
--add-module=../srcache-nginx-module-0.12rc4 \
|
||||||
--add-module=../array-var-nginx-module-0.02 \
|
--add-module=../array-var-nginx-module-0.02 \
|
||||||
--add-module=../memc-nginx-module-0.12rc1 \
|
--add-module=../memc-nginx-module-0.12rc1 \
|
||||||
--add-module=../redis2-nginx-module-0.07rc1 \
|
--add-module=../redis2-nginx-module-0.07rc2 \
|
||||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||||
--add-module=../auth-request-nginx-module-0.2 \
|
--add-module=../auth-request-nginx-module-0.2 \
|
||||||
--add-module=../rds-json-nginx-module-0.11rc2 \
|
--add-module=../rds-json-nginx-module-0.11rc2 \
|
||||||
@ -977,12 +977,12 @@ cd nginx-0.8.54
|
|||||||
--add-module=../set-misc-nginx-module-0.21 \
|
--add-module=../set-misc-nginx-module-0.21 \
|
||||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||||
--add-module=../ngx_lua-0.1.6rc9 \
|
--add-module=../ngx_lua-0.1.6rc12 \
|
||||||
--add-module=../headers-more-nginx-module-0.15rc1 \
|
--add-module=../headers-more-nginx-module-0.15rc1 \
|
||||||
--add-module=../srcache-nginx-module-0.12rc4 \
|
--add-module=../srcache-nginx-module-0.12rc4 \
|
||||||
--add-module=../array-var-nginx-module-0.02 \
|
--add-module=../array-var-nginx-module-0.02 \
|
||||||
--add-module=../memc-nginx-module-0.12rc1 \
|
--add-module=../memc-nginx-module-0.12rc1 \
|
||||||
--add-module=../redis2-nginx-module-0.07rc1 \
|
--add-module=../redis2-nginx-module-0.07rc2 \
|
||||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||||
--add-module=../auth-request-nginx-module-0.2 \
|
--add-module=../auth-request-nginx-module-0.2 \
|
||||||
--add-module=../rds-json-nginx-module-0.11rc2 \
|
--add-module=../rds-json-nginx-module-0.11rc2 \
|
||||||
@ -1032,13 +1032,13 @@ cd nginx-0.8.54
|
|||||||
--add-module=../set-misc-nginx-module-0.21 \
|
--add-module=../set-misc-nginx-module-0.21 \
|
||||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||||
--add-module=../drizzle-nginx-module-0.0.15rc9 \
|
--add-module=../drizzle-nginx-module-0.0.15rc10 \
|
||||||
--add-module=../ngx_lua-0.1.6rc9 \
|
--add-module=../ngx_lua-0.1.6rc12 \
|
||||||
--add-module=../headers-more-nginx-module-0.15rc1 \
|
--add-module=../headers-more-nginx-module-0.15rc1 \
|
||||||
--add-module=../srcache-nginx-module-0.12rc4 \
|
--add-module=../srcache-nginx-module-0.12rc4 \
|
||||||
--add-module=../array-var-nginx-module-0.02 \
|
--add-module=../array-var-nginx-module-0.02 \
|
||||||
--add-module=../memc-nginx-module-0.12rc1 \
|
--add-module=../memc-nginx-module-0.12rc1 \
|
||||||
--add-module=../redis2-nginx-module-0.07rc1 \
|
--add-module=../redis2-nginx-module-0.07rc2 \
|
||||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||||
--add-module=../auth-request-nginx-module-0.2 \
|
--add-module=../auth-request-nginx-module-0.2 \
|
||||||
--add-module=../rds-json-nginx-module-0.11rc2 \
|
--add-module=../rds-json-nginx-module-0.11rc2 \
|
||||||
@ -1091,13 +1091,13 @@ cd nginx-0.8.54
|
|||||||
--add-module=../set-misc-nginx-module-0.21 \
|
--add-module=../set-misc-nginx-module-0.21 \
|
||||||
--add-module=../form-input-nginx-module-0.07rc4 \
|
--add-module=../form-input-nginx-module-0.07rc4 \
|
||||||
--add-module=../encrypted-session-nginx-module-0.01 \
|
--add-module=../encrypted-session-nginx-module-0.01 \
|
||||||
--add-module=../drizzle-nginx-module-0.0.15rc9 \
|
--add-module=../drizzle-nginx-module-0.0.15rc10 \
|
||||||
--add-module=../ngx_lua-0.1.6rc9 \
|
--add-module=../ngx_lua-0.1.6rc12 \
|
||||||
--add-module=../headers-more-nginx-module-0.15rc1 \
|
--add-module=../headers-more-nginx-module-0.15rc1 \
|
||||||
--add-module=../srcache-nginx-module-0.12rc4 \
|
--add-module=../srcache-nginx-module-0.12rc4 \
|
||||||
--add-module=../array-var-nginx-module-0.02 \
|
--add-module=../array-var-nginx-module-0.02 \
|
||||||
--add-module=../memc-nginx-module-0.12rc1 \
|
--add-module=../memc-nginx-module-0.12rc1 \
|
||||||
--add-module=../redis2-nginx-module-0.07rc1 \
|
--add-module=../redis2-nginx-module-0.07rc2 \
|
||||||
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
--add-module=../upstream-keepalive-nginx-module-0.3 \
|
||||||
--add-module=../auth-request-nginx-module-0.2 \
|
--add-module=../auth-request-nginx-module-0.2 \
|
||||||
--add-module=../rds-json-nginx-module-0.11rc2 \
|
--add-module=../rds-json-nginx-module-0.11rc2 \
|
||||||
|
24
util/configure
vendored
24
util/configure
vendored
@ -5,6 +5,7 @@ use strict;
|
|||||||
use warnings;
|
use warnings;
|
||||||
|
|
||||||
use File::Spec;
|
use File::Spec;
|
||||||
|
use ExtUtils::MakeMaker ();
|
||||||
|
|
||||||
sub shell ($@);
|
sub shell ($@);
|
||||||
sub env ($$);
|
sub env ($$);
|
||||||
@ -258,7 +259,7 @@ sub build_resty_opts {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($opts->{no_http_ssl} && $opts->{http_ssl}) {
|
if ($opts->{no_http_ssl} && $opts->{http_ssl}) {
|
||||||
die "--with-http_ssl_module conflicts with --without-http_ssl_module\n";
|
die "--with-http_ssl_module conflicts with --without-http_ssl_module.\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! $opts->{no_http_ssl} && ! $opts->{http_ssl}) {
|
if (! $opts->{no_http_ssl} && ! $opts->{http_ssl}) {
|
||||||
@ -266,6 +267,10 @@ sub build_resty_opts {
|
|||||||
push @ngx_opts, '--with-http_ssl_module';
|
push @ngx_opts, '--with-http_ssl_module';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($platform eq 'linux' && $opts->{luajit} && ! can_run("ldconfig")) {
|
||||||
|
die "you need to have ldconfig in your PATH env when enabling luajit.\n";
|
||||||
|
}
|
||||||
|
|
||||||
my $opts_line = '';
|
my $opts_line = '';
|
||||||
|
|
||||||
if ($opts->{debug}) {
|
if ($opts->{debug}) {
|
||||||
@ -628,3 +633,20 @@ sub gen_makefile {
|
|||||||
close $out;
|
close $out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# check if we can run some command
|
||||||
|
sub can_run {
|
||||||
|
my ($cmd) = @_;
|
||||||
|
|
||||||
|
#warn "can run: @_\n";
|
||||||
|
my $_cmd = $cmd;
|
||||||
|
return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
|
||||||
|
|
||||||
|
for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
|
||||||
|
next if $dir eq '';
|
||||||
|
my $abs = File::Spec->catfile($dir, $_[0]);
|
||||||
|
return $abs if (-x $abs or $abs = MM->maybe_command($abs));
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
root=$(readlink -f -- "$(dirname -- "$0")/..")
|
#root=$(readlink -f -- "$(dirname -- "$0")/..")
|
||||||
|
root=`perl -MCwd -e'print Cwd::abs_path(shift)' $(dirname -- "$0")/..`
|
||||||
work=$root/work
|
work=$root/work
|
||||||
|
|
||||||
if [ ! -d $work ]; then
|
if [ ! -d $work ]; then
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
root=$(readlink -f -- "$(dirname -- "$0")/..")
|
#root=$(readlink -f -- "$(dirname -- "$0")/..")
|
||||||
|
root=`perl -MCwd -e'print Cwd::abs_path(shift)' $(dirname -- "$0")/..`
|
||||||
|
|
||||||
. util/ver
|
. util/ver
|
||||||
|
|
||||||
@ -71,14 +72,14 @@ mv agentzh-headers-more-nginx-module-* headers-more-nginx-module-$ver || exit 1
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.0.15rc9
|
ver=0.0.15rc10
|
||||||
$root/util/get-tarball "http://github.com/chaoslawful/drizzle-nginx-module/tarball/v$ver" -O drizzle-nginx-module-$ver.tar.gz || exit 1
|
$root/util/get-tarball "http://github.com/chaoslawful/drizzle-nginx-module/tarball/v$ver" -O drizzle-nginx-module-$ver.tar.gz || exit 1
|
||||||
tar -xzf drizzle-nginx-module-$ver.tar.gz || exit 1
|
tar -xzf drizzle-nginx-module-$ver.tar.gz || exit 1
|
||||||
mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
|
mv chaoslawful-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1
|
||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.1.6rc9
|
ver=0.1.6rc12
|
||||||
$root/util/get-tarball "http://github.com/chaoslawful/lua-nginx-module/tarball/v$ver" -O lua-nginx-module-$ver.tar.gz || exit 1
|
$root/util/get-tarball "http://github.com/chaoslawful/lua-nginx-module/tarball/v$ver" -O lua-nginx-module-$ver.tar.gz || exit 1
|
||||||
tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
|
tar -xzf lua-nginx-module-$ver.tar.gz || exit 1
|
||||||
mv chaoslawful-lua-nginx-module-* ngx_lua-$ver || exit 1
|
mv chaoslawful-lua-nginx-module-* ngx_lua-$ver || exit 1
|
||||||
@ -149,7 +150,7 @@ mv FRiCKLE-ngx_postgres-* ngx_postgres-$ver || exit 1
|
|||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.07rc1
|
ver=0.07rc2
|
||||||
$root/util/get-tarball "http://github.com/agentzh/redis2-nginx-module/tarball/v$ver" -O redis2-nginx-module-$ver.tar.gz || exit 1
|
$root/util/get-tarball "http://github.com/agentzh/redis2-nginx-module/tarball/v$ver" -O redis2-nginx-module-$ver.tar.gz || exit 1
|
||||||
tar -xzf redis2-nginx-module-$ver.tar.gz || exit 1
|
tar -xzf redis2-nginx-module-$ver.tar.gz || exit 1
|
||||||
mv agentzh-redis2-nginx-module-* redis2-nginx-module-$ver || exit 1
|
mv agentzh-redis2-nginx-module-* redis2-nginx-module-$ver || exit 1
|
||||||
@ -180,6 +181,8 @@ ver=2.0.0-beta7
|
|||||||
$root/util/get-tarball "http://luajit.org/download/LuaJIT-$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1
|
$root/util/get-tarball "http://luajit.org/download/LuaJIT-$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1
|
||||||
tar -xzf LuaJIT-$ver.tar.gz || exit 1
|
tar -xzf LuaJIT-$ver.tar.gz || exit 1
|
||||||
|
|
||||||
|
patch -p0 < $root/patches/LuaJIT-$ver-symlink_lib.patch || exit 1
|
||||||
|
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
ver=0.8
|
ver=0.8
|
||||||
|
Reference in New Issue
Block a user