Skip to content

Commit a8cad73

Browse files
committed
updated docs to reflect recent changes.
1 parent 1d7626f commit a8cad73

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

README

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Status
88
This module is under active development and is production ready.
99

1010
Version
11-
This document describes ngx_lua v0.5.0rc2
12-
(<https://github.com/chaoslawful/lua-nginx-module/tags>) released on 5
11+
This document describes ngx_lua v0.5.0rc3
12+
(<https://github.com/chaoslawful/lua-nginx-module/tags>) released on 6
1313
February 2012.
1414

1515
Synopsis
@@ -3298,6 +3298,12 @@ Nginx API for Lua
32983298
In case of success, it returns the total number of bytes that have been
32993299
sent. Otherwise, it returns "nil" and a string describing the error.
33003300

3301+
The input argument `data` can either be a Lua string or a (nested) Lua
3302+
table holding string fragments. In case of table arguments, this method
3303+
will automatically copy all the string elements piece by piece to the
3304+
underlying Nginx socket send buffers, which is usually optimal than
3305+
doing string concatenation operations on the Lua land.
3306+
33013307
Timeout for the sending operation is controlled by the
33023308
lua_socket_send_timeout config directive and the settimeout method. And
33033309
the latter takes priority. For example:
@@ -4033,6 +4039,8 @@ TODO
40334039
(<http://w3.impa.br/~diego/software/luasocket/udp.html>) in our
40344040
cosocket API.
40354041

4042+
* implement the "ngx.re.split" method.
4043+
40364044
* add configure options for different strategies of handling the
40374045
cosocket connection exceeding in the pools.
40384046

README.markdown

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This module is under active development and is production ready.
1313
Version
1414
=======
1515

16-
This document describes ngx_lua [v0.5.0rc2](https://github.com/chaoslawful/lua-nginx-module/tags) released on 5 February 2012.
16+
This document describes ngx_lua [v0.5.0rc3](https://github.com/chaoslawful/lua-nginx-module/tags) released on 6 February 2012.
1717

1818
Synopsis
1919
========
@@ -3116,6 +3116,8 @@ This method is a synchronous operation that will not return until *all* the data
31163116

31173117
In case of success, it returns the total number of bytes that have been sent. Otherwise, it returns `nil` and a string describing the error.
31183118

3119+
The input argument `data` can either be a Lua string or a (nested) Lua table holding string fragments. In case of table arguments, this method will automatically copy all the string elements piece by piece to the underlying Nginx socket send buffers, which is usually optimal than doing string concatenation operations on the Lua land.
3120+
31193121
Timeout for the sending operation is controlled by the [lua_socket_send_timeout](http://wiki.nginx.org/HttpLuaModule#lua_socket_send_timeout) config directive and the [settimeout](http://wiki.nginx.org/HttpLuaModule#tcpsock:settimeout) method. And the latter takes priority. For example:
31203122

31213123

@@ -3677,6 +3679,7 @@ Short Term
36773679
----------
36783680
* make [tcpsock:send](http://wiki.nginx.org/HttpLuaModule#tcpsock:send) method accept (nested) Lua tables of strings as its first argument to save string concatenation operations on the Lua user land.
36793681
* implement [LuaSocket UDP API](http://w3.impa.br/~diego/software/luasocket/udp.html) in our cosocket API.
3682+
* implement the `ngx.re.split` method.
36803683
* add configure options for different strategies of handling the cosocket connection exceeding in the pools.
36813684
* add directives to run Lua codes when nginx stops/reloads.
36823685
* deal with TCP 3-second delay problem under great connection harness.

doc/HttpLuaModule.wiki

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This module is under active development and is production ready.
1010

1111
= Version =
1212

13-
This document describes ngx_lua [https://github.com/chaoslawful/lua-nginx-module/tags v0.5.0rc2] released on 5 February 2012.
13+
This document describes ngx_lua [https://github.com/chaoslawful/lua-nginx-module/tags v0.5.0rc3] released on 6 February 2012.
1414

1515
= Synopsis =
1616
<geshi lang="nginx">
@@ -3015,6 +3015,8 @@ This method is a synchronous operation that will not return until ''all'' the da
30153015
30163016
In case of success, it returns the total number of bytes that have been sent. Otherwise, it returns <code>nil</code> and a string describing the error.
30173017
3018+
The input argument `data` can either be a Lua string or a (nested) Lua table holding string fragments. In case of table arguments, this method will automatically copy all the string elements piece by piece to the underlying Nginx socket send buffers, which is usually optimal than doing string concatenation operations on the Lua land.
3019+
30183020
Timeout for the sending operation is controlled by the [[#lua_socket_send_timeout|lua_socket_send_timeout]] config directive and the [[#tcpsock:settimeout|settimeout]] method. And the latter takes priority. For example:
30193021
30203022
<geshi lang="lua">
@@ -3553,6 +3555,7 @@ Please report bugs or submit patches by:
35533555
== Short Term ==
35543556
* make [[#tcpsock:send|tcpsock:send]] method accept (nested) Lua tables of strings as its first argument to save string concatenation operations on the Lua user land.
35553557
* implement [http://w3.impa.br/~diego/software/luasocket/udp.html LuaSocket UDP API] in our cosocket API.
3558+
* implement the <code>ngx.re.split</code> method.
35563559
* add configure options for different strategies of handling the cosocket connection exceeding in the pools.
35573560
* add directives to run Lua codes when nginx stops/reloads.
35583561
* deal with TCP 3-second delay problem under great connection harness.

0 commit comments

Comments
 (0)