Skip to content

Commit a8ba738

Browse files
committed
Prepares 1.6.1 release
Prepares the 1.6.1 release by updating the documentation and adding new rockspecs. It also fixes a bug in ringer.lua related to coxpcall usage.
1 parent 1107877 commit a8ba738

File tree

11 files changed

+301
-144
lines changed

11 files changed

+301
-144
lines changed

README

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ tries to follow standard Lua idioms.
1919
WSAPI is free software and uses the same license as Lua 5.1
2020

2121
Status
22-
Current version is 1.6. It supports both Lua 5.1 and Lua 5.2.
22+
Current version is 1.6.1. It supports both Lua 5.1 and Lua 5.2.
2323

2424
Download
2525
WSAPI can be downloaded from its LuaForge page. You can also get WSAPI using
@@ -32,6 +32,13 @@ WSAPI CVS and bug tracker are available at its Github page.
3232

3333
History
3434

35+
WSAPI 1.6.1 [21/Mar/2014]
36+
* Restores Lua 5.1 compatibility (incorrect usage of coxpcall)
37+
* Improvements to wsapi.mock
38+
* wsapi.request.qs_encode produces proper querystrings
39+
* FastCGI fixes
40+
* Additional options for cookies such as httponly and max age.
41+
3542
WSAPI 1.6 [30/Jan/2013]
3643
* Lua 5.2 compatibility
3744

@@ -82,7 +89,7 @@ WSAPI 1.3 [18/Mar/2010]
8289
* Added an `extra_vars` paremeter to wsapi.xavante.makeHandler and wsapi.xavante.makeGenericHandler, to
8390
let you pass extra variables in the WSAPI environment
8491
* Added `overwrite` option to wsapi.request that tells the parameter parser to overwrite repeated parameters
85-
instead of collecting them in a list
92+
instead of collecting them in a list
8693
* Added a parameter `isolated` to the persistent generic loaders that controls whether you isolate
8794
each script in a Lua state or not
8895
* Added parameters to the persistent generic loaders that let the user control the life cycle of Lua
@@ -97,7 +104,7 @@ WSAPI 1.2 [27/Oct/2009]
97104
* Adds "wsapi" laucher script, to start a Xavante WSAPI server
98105
* Fixed "undefined media type" error
99106
* Added is_empty utility function to check if a string is nil or ''
100-
* Fixed bug with empty bodies in wsapi.xavante, and added full http status codes to responses
107+
* Fixed bug with empty bodies in wsapi.xavante, and added full http status codes to responses
101108
* Changing order of evaluating PATH_TRANSLATED and SCRIPT_FILENAME, to make non-wrapped launchers work in OSX Apache
102109
* Reload support for load_isolated_launcher
103110

doc/us/index.html

Lines changed: 65 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
44
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
55
<head>
6-
<title>WSAPI</title>
6+
<title>WSAPI</title>
77
<link rel="stylesheet" href="doc.css" type="text/css"/>
8-
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
8+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
99
</head>
1010

1111
<body>
@@ -14,30 +14,30 @@
1414

1515
<div id="product">
1616

17-
<div id="product_logo">
17+
<div id="product_logo">
1818
<a href="http://wsapi.luaforge.net">
19-
<img alt="WSAPI" src="wsapi.png"/>
20-
</a>
19+
<img alt="WSAPI" src="wsapi.png"/>
20+
</a>
2121
</div>
22-
<div id="product_name"><big><strong>WSAPI</strong></big></div>
23-
<div id="product_description">Lua Web Server API</div>
22+
<div id="product_name"><big><strong>WSAPI</strong></big></div>
23+
<div id="product_description">Lua Web Server API</div>
2424
</div> <!-- id="product" -->
2525

2626
<div id="main">
27-
27+
2828
<div id="navigation">
2929
<h1>WSAPI</h1>
30-
<ul>
30+
<ul>
3131

32-
<li><strong>Home</strong></li>
32+
<li><strong>Home</strong></li>
3333

34-
<li><a href="manual.html">Manual</a></li>
34+
<li><a href="manual.html">Manual</a></li>
3535

36-
<li><a href="libraries.html">Libraries</a></li>
36+
<li><a href="libraries.html">Libraries</a></li>
3737

38-
<li><a href="license.html">License</a></li>
38+
<li><a href="license.html">License</a></li>
3939

40-
</ul>
40+
</ul>
4141
</div> <!-- id="navigation" -->
4242

4343
<div id="content">
@@ -62,7 +62,7 @@ <h2>Overview</h2>
6262

6363
<h2>Status</h2>
6464

65-
<p>Current version is 1.5. It was developed for Lua 5.1.</p>
65+
<p>Current version is 1.6.1. It supports both Lua 5.1 and Lua 5.2.</p>
6666

6767
<h2>Download</h2>
6868

@@ -76,61 +76,77 @@ <h2>Download</h2>
7676

7777
<h3>Unix Installer Script</h3>
7878

79-
<p>You can also get an installer script that installs Lua+LuaRocks+WSAPI
80-
<a href="http://github.com/downloads/keplerproject/wsapi/wsapi-install-1.5.tar.gz">here</a>. See
79+
<p>You can also get an installer script that installs Lua+LuaRocks+WSAPI
80+
<a href="http://www.keplerproject.org/files/wsapi-install-1.6.1.tar.gz">here</a>. See
8181
the <a href="manual.html">manual</a> for installation instructions.</p>
8282

8383
<h3>Customizing the installer</h3>
8484

85-
<p>There is a section of wsapi-install-1.5 with the parameters that
86-
control the installer: </p>
85+
<p>There is a section of wsapi-install-1.6 with the parameters that
86+
control the installer:</p>
8787

8888

8989
<pre class="example">
90-
# Installer parameters
91-
92-
LUA_VERSION=5.1.4
93-
PACKAGE=WSAPI
94-
PACKAGE_OPT=wsapi
95-
PACKAGE_ROCK=wsapi-xavante
96-
INSTALLER_VERSION=0.6
97-
PACKAGE_VERSION=1.5
90+
# Installer parameters
91+
92+
LUA_VERSION=5.2.1
93+
PACKAGE=WSAPI
94+
PACKAGE_OPT=wsapi
95+
PACKAGE_ROCK=wsapi-xavante
96+
INSTALLER_VERSION=0.7
97+
PACKAGE_VERSION=1.6
9898
LUAROCKS_REPO=http://luarocks.org/repositories/rocks
99-
LUAROCKS_URL=http://www.luarocks.org/releases/luarocks-2.0.4.1.tar.gz
100-
LUAROCKS_VERSION=2.0.4.1
99+
LUAROCKS_URL=http://www.luarocks.org/releases/luarocks-2.0.12.tar.gz
100+
LUAROCKS_VERSION=2.0.12
101101
</pre>
102102

103103

104-
<p>To install something else change PACKAGE to the full name of the
105-
package, PACKAGE_OPT to the name of the --with-foo option that lets
106-
the user override the version (or skip installation of the package),
107-
PACKAGE_ROCK to the name of the rock, and PACKAGE_VERSION to the
108-
version. Also change LUAROCKS_REPO if you want to use another
109-
repository (the installer uses --from, so will pull packages from
110-
other repositories if the one you specified does not have them). </p>
104+
<p>To install something else change PACKAGE to the full name of the
105+
package, PACKAGE_OPT to the name of the --with-foo option that lets
106+
the user override the version (or skip installation of the package),
107+
PACKAGE_ROCK to the name of the rock, and PACKAGE_VERSION to the
108+
version. Also change LUAROCKS_REPO if you want to use another
109+
repository (the installer uses --from, so will pull packages from
110+
other repositories if the one you specified does not have them).</p>
111111

112-
<p>If there is a LuaRocks update then change LUAROCKS_URL and
113-
LUAROCKS_VERSION. Changing Lua version is much more involved, so I
114-
won't go into that. </p>
112+
<p>If there is a LuaRocks update then change LUAROCKS_URL and
113+
LUAROCKS_VERSION. Changing Lua version is much more involved, so I
114+
won't go into that.</p>
115115

116-
<p>Now to make the tarball, put the installer script in an empty folder and run: </p>
116+
<p>Now to make the tarball, put the installer script in an empty folder and run:</p>
117117

118118

119119
<pre class = "example">
120-
bash ./your-install-script --prefix=/tmp/anything --bootstrap
120+
bash ./your-install-script --prefix=/tmp/anything --bootstrap
121121
</pre>
122122

123123

124-
<p>After it finishes you will have lua-5.1.4.tar.gz,
125-
luarocks-2.0.4.1.tar.gz, and a rocks folder with .src.rocks for all the
126-
rocks that the installer installs. </p>
124+
<p>After it finishes you will have lua-5.2.1.tar.gz,
125+
luarocks-2.0.12.tar.gz, and a rocks folder with .src.rocks for all the
126+
rocks that the installer installs.</p>
127127

128128
<h2>Latest Sources and Bug Tracker</h2>
129129

130130
<p>WSAPI sources and bug tracker are available at its <a href="http://github.com/keplerproject/wsapi/">Github</a> page.</p>
131131

132132
<h2>History</h2>
133133

134+
<p><strong>WSAPI 1.6.1</strong> [21/Mar/2014]</p>
135+
136+
<ul>
137+
<li>Restores Lua 5.1 compatibility (incorrect usage of coxpcall)</li>
138+
<li>Improvements to wsapi.mock</li>
139+
<li>wsapi.request.qs_encode produces proper querystrings</li>
140+
<li>FastCGI fixes</li>
141+
<li>Additional options for cookies such as httponly and max age.</li>
142+
</ul>
143+
144+
<p><strong>WSAPI 1.6</strong> [30/Jan/2013]</p>
145+
146+
<ul>
147+
<li>Lua 5.2 compatibility</li>
148+
</ul>
149+
134150
<p><strong>WSAPI 1.5</strong> [21/Apr/2011]</p>
135151

136152
<ul>
@@ -198,7 +214,7 @@ <h2>History</h2>
198214
<li>Added an <code>extra_vars</code> paremeter to wsapi.xavante.makeHandler and wsapi.xavante.makeGenericHandler, to
199215
let you pass extra variables in the WSAPI environment</li>
200216
<li>Added <code>overwrite</code> option to wsapi.request that tells the parameter parser to overwrite repeated parameters
201-
instead of collecting them in a list </li>
217+
instead of collecting them in a list</li>
202218
<li>Added a parameter <code>isolated</code> to the persistent generic loaders that controls whether you isolate
203219
each script in a Lua state or not</li>
204220
<li>Added parameters to the persistent generic loaders that let the user control the life cycle of Lua
@@ -216,7 +232,7 @@ <h2>History</h2>
216232
<li>Adds "wsapi" laucher script, to start a Xavante WSAPI server</li>
217233
<li>Fixed "undefined media type" error</li>
218234
<li>Added is_empty utility function to check if a string is nil or ''</li>
219-
<li>Fixed bug with empty bodies in wsapi.xavante, and added full http status codes to responses </li>
235+
<li>Fixed bug with empty bodies in wsapi.xavante, and added full http status codes to responses</li>
220236
<li>Changing order of evaluating PATH_TRANSLATED and SCRIPT_FILENAME, to make non-wrapped launchers work in OSX Apache</li>
221237
<li>Reload support for load_isolated_launcher</li>
222238
</ul>
@@ -250,8 +266,8 @@ <h2>Contact Us</h2>
250266
<p>For more information please <a href="mailto:[email protected]">contact us</a>.
251267
Comments are welcome!</p>
252268

253-
<p>You can also reach us and other developers and users on the Kepler Project
254-
<a href="http://luaforge.net/mail/?group_id=104">mailing list</a>. </p>
269+
<p>You can also reach us and other developers and users on the Kepler Project
270+
<a href="http://luaforge.net/mail/?group_id=104">mailing list</a>.</p>
255271

256272

257273

@@ -261,7 +277,7 @@ <h2>Contact Us</h2>
261277
</div> <!-- id="main" -->
262278

263279
<div id="about">
264-
<p><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a></p>
280+
<p><a href="http://validator.w3.org/check?uri=referer">Valid XHTML 1.0!</a></p>
265281
</div> <!-- id="about" -->
266282

267283
</div> <!-- id="container" -->

doc/us/index.md

Lines changed: 39 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ WSAPI is free software and uses the same license as Lua 5.1.
1717

1818
## Status
1919

20-
Current version is 1.6. It supports both Lua 5.1 and Lua 5.2.
20+
Current version is 1.6.1. It supports both Lua 5.1 and Lua 5.2.
2121

2222
## Download
2323

@@ -29,57 +29,65 @@ luarocks install wsapi-xavante
2929

3030
### Unix Installer Script
3131

32-
You can also get an installer script that installs Lua+LuaRocks+WSAPI
33-
[here](http://www.keplerproject.org/files/wsapi-install-1.6.tar.gz). See
32+
You can also get an installer script that installs Lua+LuaRocks+WSAPI
33+
[here](http://www.keplerproject.org/files/wsapi-install-1.6.1.tar.gz). See
3434
the [manual](manual.html) for installation instructions.
3535

3636
### Customizing the installer
3737

38-
There is a section of wsapi-install-1.6 with the parameters that
39-
control the installer:
38+
There is a section of wsapi-install-1.6 with the parameters that
39+
control the installer:
4040

4141
<pre class="example">
42-
# Installer parameters
42+
# Installer parameters
4343

44-
LUA_VERSION=5.2.1
45-
PACKAGE=WSAPI
46-
PACKAGE_OPT=wsapi
47-
PACKAGE_ROCK=wsapi-xavante
48-
INSTALLER_VERSION=0.7
44+
LUA_VERSION=5.2.1
45+
PACKAGE=WSAPI
46+
PACKAGE_OPT=wsapi
47+
PACKAGE_ROCK=wsapi-xavante
48+
INSTALLER_VERSION=0.7
4949
PACKAGE_VERSION=1.6
5050
LUAROCKS_REPO=http://luarocks.org/repositories/rocks
5151
LUAROCKS_URL=http://www.luarocks.org/releases/luarocks-2.0.12.tar.gz
52-
LUAROCKS_VERSION=2.0.12
52+
LUAROCKS_VERSION=2.0.12
5353
</pre>
5454

55-
To install something else change PACKAGE to the full name of the
56-
package, PACKAGE\_OPT to the name of the --with-foo option that lets
57-
the user override the version (or skip installation of the package),
58-
PACKAGE\_ROCK to the name of the rock, and PACKAGE\_VERSION to the
59-
version. Also change LUAROCKS\_REPO if you want to use another
60-
repository (the installer uses --from, so will pull packages from
61-
other repositories if the one you specified does not have them).
55+
To install something else change PACKAGE to the full name of the
56+
package, PACKAGE\_OPT to the name of the --with-foo option that lets
57+
the user override the version (or skip installation of the package),
58+
PACKAGE\_ROCK to the name of the rock, and PACKAGE\_VERSION to the
59+
version. Also change LUAROCKS\_REPO if you want to use another
60+
repository (the installer uses --from, so will pull packages from
61+
other repositories if the one you specified does not have them).
6262

63-
If there is a LuaRocks update then change LUAROCKS\_URL and
64-
LUAROCKS\_VERSION. Changing Lua version is much more involved, so I
65-
won't go into that.
63+
If there is a LuaRocks update then change LUAROCKS\_URL and
64+
LUAROCKS\_VERSION. Changing Lua version is much more involved, so I
65+
won't go into that.
6666

67-
Now to make the tarball, put the installer script in an empty folder and run:
67+
Now to make the tarball, put the installer script in an empty folder and run:
6868

6969
<pre class = "example">
70-
bash ./your-install-script --prefix=/tmp/anything --bootstrap
70+
bash ./your-install-script --prefix=/tmp/anything --bootstrap
7171
</pre>
7272

73-
After it finishes you will have lua-5.2.1.tar.gz,
74-
luarocks-2.0.12.tar.gz, and a rocks folder with .src.rocks for all the
75-
rocks that the installer installs.
73+
After it finishes you will have lua-5.2.1.tar.gz,
74+
luarocks-2.0.12.tar.gz, and a rocks folder with .src.rocks for all the
75+
rocks that the installer installs.
7676

7777
## Latest Sources and Bug Tracker
7878

7979
WSAPI sources and bug tracker are available at its [Github](http://github.com/keplerproject/wsapi/) page.
8080

8181
## History
8282

83+
**WSAPI 1.6.1** [21/Mar/2014]
84+
85+
* Restores Lua 5.1 compatibility (incorrect usage of coxpcall)
86+
* Improvements to wsapi.mock
87+
* wsapi.request.qs_encode produces proper querystrings
88+
* FastCGI fixes
89+
* Additional options for cookies such as httponly and max age.
90+
8391
**WSAPI 1.6** [30/Jan/2013]
8492

8593
* Lua 5.2 compatibility
@@ -138,7 +146,7 @@ WSAPI sources and bug tracker are available at its [Github](http://github.com/ke
138146
* Added an `extra_vars` paremeter to wsapi.xavante.makeHandler and wsapi.xavante.makeGenericHandler, to
139147
let you pass extra variables in the WSAPI environment
140148
* Added `overwrite` option to wsapi.request that tells the parameter parser to overwrite repeated parameters
141-
instead of collecting them in a list
149+
instead of collecting them in a list
142150
* Added a parameter `isolated` to the persistent generic loaders that controls whether you isolate
143151
each script in a Lua state or not
144152
* Added parameters to the persistent generic loaders that let the user control the life cycle of Lua
@@ -154,7 +162,7 @@ WSAPI sources and bug tracker are available at its [Github](http://github.com/ke
154162
* Adds "wsapi" laucher script, to start a Xavante WSAPI server
155163
* Fixed "undefined media type" error
156164
* Added is_empty utility function to check if a string is nil or ''
157-
* Fixed bug with empty bodies in wsapi.xavante, and added full http status codes to responses
165+
* Fixed bug with empty bodies in wsapi.xavante, and added full http status codes to responses
158166
* Changing order of evaluating PATH\_TRANSLATED and SCRIPT\_FILENAME, to make non-wrapped launchers work in OSX Apache
159167
* Reload support for load\_isolated\_launcher
160168

@@ -183,6 +191,6 @@ Andr&eacute; Carregal, and is maintained by Fabio Mascarenhas.
183191
For more information please [contact us](mailto:[email protected]).
184192
Comments are welcome!
185193

186-
You can also reach us and other developers and users on the Kepler Project
187-
[mailing list](http://luaforge.net/mail/?group_id=104).
194+
You can also reach us and other developers and users on the Kepler Project
195+
[mailing list](http://luaforge.net/mail/?group_id=104).
188196

0 commit comments

Comments
 (0)