Skip to content

Commit 4388b1e

Browse files
committed
doc: bumped version to 0.9.15; also stated that we work with nginx 1.7.10.
1 parent f88d4a9 commit 4388b1e

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

README.markdown

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Production ready.
5757
Version
5858
=======
5959

60-
This document describes ngx_lua [v0.9.14](https://github.com/openresty/lua-nginx-module/tags) released on 21 January 2015.
60+
This document describes ngx_lua [v0.9.15](https://github.com/openresty/lua-nginx-module/tags) released on 18 February 2015.
6161

6262
Synopsis
6363
========
@@ -291,7 +291,7 @@ Nginx Compatibility
291291
===================
292292
The latest module is compatible with the following versions of Nginx:
293293

294-
* 1.7.x (last tested: 1.7.7)
294+
* 1.7.x (last tested: 1.7.10)
295295
* 1.6.x
296296
* 1.5.x (last tested: 1.5.12)
297297
* 1.4.x (last tested: 1.4.4)
@@ -307,7 +307,7 @@ The latest module is compatible with the following versions of Nginx:
307307
Installation
308308
============
309309

310-
The [ngx_openresty bundle](http://openresty.org) can be used to install Nginx, ngx_lua, either one of the standard Lua 5.1 interpreter or LuaJIT 2.0/2.1, as well as a package of powerful companion Nginx modules. The basic installation step is a simple `./configure --with-luajit && make && make install`.
310+
It is highly recommended to use the [ngx_openresty bundle](http://openresty.org) that bundles Nginx, ngx_lua, LuaJIT 2.0/2.1 (or the optional standard Lua 5.1 interpreter), as well as a package of powerful companion Nginx modules. The basic installation step is a simple command: `./configure --with-luajit && make && make install`.
311311

312312
Alternatively, ngx_lua can be manually compiled into Nginx:
313313

@@ -320,9 +320,9 @@ Build the source with this module:
320320

321321
```bash
322322

323-
wget 'http://nginx.org/download/nginx-1.7.7.tar.gz'
324-
tar -xzvf nginx-1.7.7.tar.gz
325-
cd nginx-1.7.7/
323+
wget 'http://nginx.org/download/nginx-1.7.10.tar.gz'
324+
tar -xzvf nginx-1.7.10.tar.gz
325+
cd nginx-1.7.10/
326326

327327
# tell nginx's build system where to find LuaJIT 2.0:
328328
export LUAJIT_LIB=/path/to/luajit/lib
@@ -338,6 +338,7 @@ Build the source with this module:
338338

339339
# Here we assume Nginx is to be installed under /opt/nginx/.
340340
./configure --prefix=/opt/nginx \
341+
--with-ld-opt='-Wl,-rpath,/path/to/luajit-or-lua/lib" \
341342
--add-module=/path/to/ngx_devel_kit \
342343
--add-module=/path/to/lua-nginx-module
343344

doc/HttpLuaModule.wiki

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Production ready.
1010

1111
= Version =
1212

13-
This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.9.14] released on 21 January 2015.
13+
This document describes ngx_lua [https://github.com/openresty/lua-nginx-module/tags v0.9.15] released on 18 February 2015.
1414

1515
= Synopsis =
1616
<geshi lang="nginx">
@@ -233,7 +233,7 @@ The Lua state (Lua VM instance) is shared across all the requests handled by a s
233233
= Nginx Compatibility =
234234
The latest module is compatible with the following versions of Nginx:
235235

236-
* 1.7.x (last tested: 1.7.7)
236+
* 1.7.x (last tested: 1.7.10)
237237
* 1.6.x
238238
* 1.5.x (last tested: 1.5.12)
239239
* 1.4.x (last tested: 1.4.4)
@@ -246,7 +246,7 @@ The latest module is compatible with the following versions of Nginx:
246246
247247
= Installation =
248248

249-
The [http://openresty.org ngx_openresty bundle] can be used to install Nginx, ngx_lua, either one of the standard Lua 5.1 interpreter or LuaJIT 2.0/2.1, as well as a package of powerful companion Nginx modules. The basic installation step is a simple <code>./configure --with-luajit && make && make install</code>.
249+
It is highly recommended to use the [http://openresty.org ngx_openresty bundle] that bundles Nginx, ngx_lua, LuaJIT 2.0/2.1 (or the optional standard Lua 5.1 interpreter), as well as a package of powerful companion Nginx modules. The basic installation step is a simple command: <code>./configure --with-luajit && make && make install</code>.
250250

251251
Alternatively, ngx_lua can be manually compiled into Nginx:
252252

@@ -258,9 +258,9 @@ Alternatively, ngx_lua can be manually compiled into Nginx:
258258
Build the source with this module:
259259

260260
<geshi lang="bash">
261-
wget 'http://nginx.org/download/nginx-1.7.7.tar.gz'
262-
tar -xzvf nginx-1.7.7.tar.gz
263-
cd nginx-1.7.7/
261+
wget 'http://nginx.org/download/nginx-1.7.10.tar.gz'
262+
tar -xzvf nginx-1.7.10.tar.gz
263+
cd nginx-1.7.10/
264264

265265
# tell nginx's build system where to find LuaJIT 2.0:
266266
export LUAJIT_LIB=/path/to/luajit/lib
@@ -276,6 +276,7 @@ Build the source with this module:
276276
277277
# Here we assume Nginx is to be installed under /opt/nginx/.
278278
./configure --prefix=/opt/nginx \
279+
--with-ld-opt='-Wl,-rpath,/path/to/luajit-or-lua/lib" \
279280
--add-module=/path/to/ngx_devel_kit \
280281
--add-module=/path/to/lua-nginx-module
281282

0 commit comments

Comments
 (0)