Skip to content

Commit 95a17b7

Browse files
author
Fabio Mascarenhas
committedMar 18, 2010
docs and rockspec for version 2.2.0
1 parent 6737095 commit 95a17b7

File tree

7 files changed

+81
-30
lines changed

7 files changed

+81
-30
lines changed
 

‎README

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Xavante 2.1.0
1+
Xavante 2.2.0
22
http://keplerproject.org/xavante/
33

44
Xavante is a Lua HTTP 1.1 Web server that uses a modular architecture based on
@@ -21,19 +21,22 @@ Dependencies
2121
Xavante dependencies can be separated by the used handlers:
2222

2323
Xavante Core
24-
* Lua 5.1.x
25-
* Copas 1.1
24+
* Lua 5.1.4
25+
* Copas 1.1.6
2626
* LuaSocket 2.0
2727

2828
File Handler (optional)
29-
* LuaFileSystem 1.4
29+
* LuaFileSystem 1.5
3030

3131
The portability of Xavante is determined by its binary components
3232
(LuaSocket and LuaFileSystem) and Lua itself. The other components are written
3333
in Lua and are as portable as Lua itself.
3434

3535
History
3636

37+
Xavante 2.2.0 [18/Mar/2010]
38+
* xavante.cgiluahandler now works with WSAPI 1.2/1.3 without needing kepler_init
39+
3740
Xavante 2.1.0 [20/Oct/2009]
3841
* Fixes security bug on filehandler with ".." used in paths (access to files outside the doc root)
3942
* Added "reload" option to xavante.cgiluahandler, to force new state for every request

‎doc/us/index.html

+12-6
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,14 @@ <h2><a name="over"></a>Overview</h2>
7171

7272
<h2><a name="status"></a>Status</h2>
7373

74-
<p>Current version is 2.1.0 and works with Lua 5.1.</p>
74+
<p>Current version is 2.2.0 and works with Lua 5.1.</p>
7575

7676
<h2><a name="download"></a>Download</h2>
7777

7878
<p>
7979
Xavante can be downloaded from its
80-
<a href="http://luaforge.net/projects/xavante/files">LuaForge</a> page.
80+
<a href="http://github.com/keplerproject/xavante">Github</a> page, at
81+
the Downloads tab.
8182
</p>
8283

8384
<p>You can also install Xavante using <a href="http://www.luarocks.org">LuaRocks</a>:</p>
@@ -100,16 +101,16 @@ <h2><a name="dependencies"></a>Dependencies</h2>
100101
<dt><strong>Xavante Core</strong></dt>
101102
<dd>
102103
<ul>
103-
<li><a href="http://www.lua.org">Lua 5.1.x</a></li>
104-
<li><a href="http://www.keplerproject.org/copas">Copas 1.1</a></li>
104+
<li><a href="http://www.lua.org">Lua 5.1.4</a></li>
105+
<li><a href="http://www.keplerproject.org/copas">Copas 1.1.6</a></li>
105106
<li><a href="http://www.cs.princeton.edu/~diego/professional/luasocket">LuaSocket 2.0</a></li>
106107
</ul>
107108
</dd>
108109

109110
<dt><strong>File Handler</strong> (optional)</dt>
110111
<dd>
111112
<ul>
112-
<li><a href="http://www.keplerproject.org/luafilesystem">LuaFileSystem 1.4</a></li>
113+
<li><a href="http://www.keplerproject.org/luafilesystem">LuaFileSystem 1.5.0</a></li>
113114
</ul>
114115
</dd>
115116
</dl>
@@ -121,7 +122,12 @@ <h2><a name="dependencies"></a>Dependencies</h2>
121122

122123
<h2><a name="history"></a>History</h2>
123124
<dl>
124-
<dt><strong>Xavante 2.1.0</strong> [20/Oct/2009]</dt>
125+
<dt><strong>Xavante 2.2.0</strong> [18/Mar/2010]</dt>
126+
<dd><ul>
127+
<li>Changed xavante.cgiluahandler to works with WSAPI 1.2/1.3 without needing kepler_init</li>
128+
</ul></dd>
129+
130+
<dt><strong>Xavante 2.1.0</strong> [20/Oct/2009]</dt>
125131
<dd><ul>
126132
<li>Adds "reload" option to xavante.cgiluahandler, to force new state for every request </li>
127133
<li>Fixes a bug in File Handler that was allowing the use of ".." to access forbiden directories (bug report by Matthew Wild).</li>

‎doc/us/license.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ <h1>Xavante License</h1>
8484
</p>
8585

8686
<hr />
87-
<p>Copyright &copy; 2003 Kepler Project.</p>
87+
<p>Copyright &copy; 2003-2010 Kepler Project.</p>
8888

8989
<p>Permission is hereby granted, free of charge, to any person
9090
obtaining a copy of this software and associated documentation

‎doc/us/manual.html

+13-16
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,24 @@ <h1>Xavante</h1>
5757

5858
<h2><a name="install"></a>Installing</h2>
5959

60-
<p>
61-
Xavante follows the
62-
<a href="http://www.inf.puc-rio.br/~roberto/pil2/chapter15.pdf">package model</a>
63-
for Lua 5.1, therefore it should be "installed" in your <code>package.path</code>.
64-
</p>
60+
<p>You can install Xavante using <a href="http://www.luarocks.org">LuaRocks</a>:</p>
6561

66-
<p>
67-
This will add Xavante as a module to your system so you can <code>require</code> it as part of your application. If you want to use Xavante as a standalone web server please check the Kepler distribution. Kepler offers Xavante launchers for Unix and Windows both on the command line and as a Windows Tray application.
68-
</p>
62+
<pre class="example">
63+
luarocks install xavante
64+
</pre>
65+
66+
<p>The "xavante" package installs Xavante as a library. To run Xavante as an application please install <a href="http://wsapi.luaforge.net">WSAPI</a>:</p>
67+
68+
<pre class="example">
69+
luarocks install wsapi-xavante
70+
</pre>
6971

7072
<h2><a name="config"></a>Configuring</h2>
7173

7274
<p>
73-
After the Xavante module is loaded, it needs to be configured before being able to serve requests. If you are using Kepler this is done in the <code>KEPLER_CONF/xavante/config.lua</code> file, but if you are using Xavante as a module you need to register the handlers using the
74-
<code>xavante.HTTP</code> constructor.
75+
After the Xavante module is loaded, it needs to be configured before
76+
being able to serve requests. You need to register the handlers
77+
using the <code>xavante.HTTP</code> constructor.
7578
</p>
7679

7780
<p>
@@ -146,12 +149,6 @@ <h2><a name="config"></a>Configuring</h2>
146149

147150
<h2><a name="running"></a>Running</h2>
148151

149-
<p>
150-
If you are using Xavante as part of the Kepler distribution, please refer to
151-
the Kepler documentation for details on how to execute Xavante from the
152-
command line or the Windows Tray bar.
153-
</p>
154-
155152
<p>
156153
If you are using Xavante as a module, then to start it you need to call
157154
<code>xavante.start([checkfunction[, timeout]])</code> passing an optional

‎rockspec/xavante-2.1.0-1.rockspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ description = {
1515
dependencies = { 'luasocket >= 2.0.2', 'copas >= 1.1.5', 'luafilesystem >= 1.4.2' }
1616

1717
source = {
18-
url = "http://cloud.github.com/downloads/keplerproject/xavante/xavante-2.1.0.tar.gz"
18+
url = "http://github.com/downloads/keplerproject/xavante/xavante-2.1.0.tar.gz"
1919
}
2020

2121
local XAVANTE_LUAS = { "src/xavante/cgiluahandler.lua",

‎rockspec/xavante-2.2.0-1.rockspec

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
package = "Xavante"
2+
3+
version = "2.2.0-1"
4+
5+
description = {
6+
summary = "Lua Web Server Library",
7+
detailed = [[
8+
Xavante is a Lua HTTP 1.1 Web server that uses a modular architecture based on URI mapped handlers.
9+
This rock installs Xavante as a library that other applications can use.
10+
]],
11+
license = "MIT/X11",
12+
homepage = "http://www.keplerproject.org/xavante"
13+
}
14+
15+
dependencies = { 'luasocket >= 2.0', 'copas >= 1.1.5', 'luafilesystem >= 1.5.0' }
16+
17+
source = {
18+
url = "http://github.com/downloads/keplerproject/xavante/xavante-2.2.0.tar.gz"
19+
}
20+
21+
local XAVANTE_LUAS = { "src/xavante/cgiluahandler.lua",
22+
"src/xavante/encoding.lua",
23+
"src/xavante/filehandler.lua",
24+
"src/xavante/httpd.lua",
25+
"src/xavante/mime.lua",
26+
"src/xavante/patternhandler.lua",
27+
"src/xavante/redirecthandler.lua",
28+
"src/xavante/vhostshandler.lua",
29+
"src/xavante/indexhandler.lua",
30+
"src/xavante/urlhandler.lua",
31+
"src/xavante/ruleshandler.lua" }
32+
33+
build = {
34+
type = "module",
35+
modules = {
36+
sajax = "src/sajax/sajax.lua",
37+
xavante = "src/xavante/xavante.lua"
38+
}
39+
}
40+
41+
for i = 1,#(XAVANTE_LUAS) do
42+
local src = XAVANTE_LUAS[i]
43+
local mod = "xavante." .. src:match("^src/xavante/([^%.]+)%.lua")
44+
build.modules[mod] = src
45+
end

‎src/xavante/xavante.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ require "xavante.patternhandler"
2020
require "xavante.vhostshandler"
2121

2222
-- Meta information is public even begining with an "_"
23-
_COPYRIGHT = "Copyright (C) 2004 Kepler Project"
23+
_COPYRIGHT = "Copyright (C) 2004-2010 Kepler Project"
2424
_DESCRIPTION = "A Copas based Lua Web server with WSAPI support"
25-
_VERSION = "Xavante 2.0.1"
25+
_VERSION = "Xavante 2.2.0"
2626

2727
local _startmessage = function (ports)
2828
print(string.format("Xavante started on port(s) %s", table.concat(ports, ", ")))

0 commit comments

Comments
 (0)