Merge branch 'master' into mk

Makefile

@@ -35,8 +35,9 @@ clean:
 	rm src/fastcgi/lfcgi.o src/fastcgi/lfcgi.so
 
 snapshot:
-	cvs export -r HEAD -d wsapi-1.0-snapshot wsapi
-	tar czf wsapi-1.0-snapshot.tar.gz wsapi-1.0-snapshot
-	rm -rf wsapi-1.0-snapshot
-	scp wsapi-1.0-snapshot.tar.gz mascarenhas@139.82.100.4:public_html/
+	git archive --format=tar --prefix=wsapi-$(VERSION)/ HEAD | gzip > wsapi-$(VERSION).tar.gz
 
+rockspecs:
+	for pkg in wsapi wsapi-fcgi wsapi-xavante ; do cp rockspec/$$pkg-$(VERSION_OLD)-1.rockspec rockspec/$$pkg-$(VERSION_NEW)-1.rockspec ; done
+	for pkg in wsapi wsapi-fcgi wsapi-xavante; do sed -e "s/$(VERSION_OLD)/$(VERSION_NEW)/g" -i "" rockspec/$$pkg-$(VERSION_NEW)-1.rockspec ; done
+	for pkg in wsapi wsapi-fcgi wsapi-xavante; do git add rockspec/$$pkg-$(VERSION_NEW)-1.rockspec ; done

README

@@ -19,7 +19,7 @@ tries to follow standard Lua idioms.
 WSAPI is free software and uses the same license as Lua 5.1
 
 Status
-Current version is 1.3. It was developed for Lua 5.1.
+Current version is 1.3.3. It was developed for Lua 5.1.
 
 Download
 WSAPI can be downloaded from its LuaForge page. You can also get WSAPI using LuaRocks:
@@ -30,6 +30,16 @@ WSAPI CVS and bug tracker are available at its Github page.
 
 History
 
+WSAPI 1.3.3 [22/Mar/2010]
+    * Bugfix release, fix memory leak with reload option for persistent loaders
+
+WSAPI 1.3.2 [19/Mar/2010]
+    * Bugfix release, do not send Transfer-Encoding header unless it is
+      raw HTTP response
+
+WSAPI 1.3.1 [19/Mar/2010]
+    * Bugfix release, fix the unknown symbol in lfcgi.getenv()
+
 WSAPI 1.3 [18/Mar/2010]
     * Fixed segmentation fault when non-string is provided to lfcgi.getenv() (thanks to mkottman@github)
     * Added CGILua bootstrap to wsapi.sapi, so CGILua can run without a kepler_init module present
@@ -69,4 +79,4 @@ Credits
 WSAPI was designed and developed by Fabio Mascarenhas and Andre Carregal,
 and is maintained by Fabio Mascarenhas.
 
-For more information please check the HTML documentation at /doc/us
+For more information please check the HTML documentation at /doc/us

doc/us/index.html

@@ -62,7 +62,7 @@ <h2>Overview</h2>
 
 <h2>Status</h2>
 
-<p>Current version is 1.3. It was developed for Lua 5.1.</p>
+<p>Current version is 1.3.3. It was developed for Lua 5.1.</p>
 
 <h2>Download</h2>
 
@@ -94,10 +94,10 @@ <h3>Customizing the installer</h3>
 PACKAGE_OPT=wsapi 
 PACKAGE_ROCK=wsapi-xavante 
 INSTALLER_VERSION=0.6 
-PACKAGE_VERSION=1.3 
+PACKAGE_VERSION=1.3.3
 LUAROCKS_REPO=http://luarocks.org/repositories/rocks
-LUAROCKS_URL=http://www.luarocks.org/releases/luarocks-2.0.1.tar.gz
-LUAROCKS_VERSION=2.0.1 
+LUAROCKS_URL=http://www.luarocks.org/releases/luarocks-2.0.2.tar.gz
+LUAROCKS_VERSION=2.0.2 
 </pre>
 
 
@@ -131,6 +131,25 @@ <h2>Latest Sources and Bug Tracker</h2>
 
 <h2>History</h2>
 
+<p><strong>WSAPI 1.3.3</strong> [22/Mar/2010]</p>
+
+<ul>
+    <li>Bugfix release, fix memory leak with reload option for persistent loaders</li>
+</ul>
+
+<p><strong>WSAPI 1.3.2</strong> [19/Mar/2010]</p>
+
+<ul>
+    <li>Bugfix release, do not send Transfer-Encoding header unless it is
+    raw HTTP response</li>
+</ul>
+
+<p><strong>WSAPI 1.3.1</strong> [19/Mar/2010]</p>
+
+<ul>
+    <li>Bugfix release, fix the unknown symbol in lfcgi.getenv()</li>
+</ul>
+
 <p><strong>WSAPI 1.3</strong> [18/Mar/2010]</p>
 
 <ul>

doc/us/index.md

@@ -17,7 +17,7 @@ WSAPI is free software and uses the same license as Lua 5.1
 
 ## Status
 
-Current version is 1.3. It was developed for Lua 5.1.
+Current version is 1.3.3. It was developed for Lua 5.1.
 
 ## Download
 
@@ -46,10 +46,10 @@ PACKAGE=WSAPI
 PACKAGE_OPT=wsapi 
 PACKAGE_ROCK=wsapi-xavante 
 INSTALLER_VERSION=0.6 
-PACKAGE_VERSION=1.3 
+PACKAGE_VERSION=1.3.3
 LUAROCKS_REPO=http://luarocks.org/repositories/rocks
-LUAROCKS_URL=http://www.luarocks.org/releases/luarocks-2.0.1.tar.gz
-LUAROCKS_VERSION=2.0.1 
+LUAROCKS_URL=http://www.luarocks.org/releases/luarocks-2.0.2.tar.gz
+LUAROCKS_VERSION=2.0.2 
 </pre>
 
 To install something else change PACKAGE to the full name of the 
@@ -80,6 +80,19 @@ WSAPI sources and bug tracker are available at its [Github](http://github.com/ke
 
 ## History
 
+**WSAPI 1.3.3** [22/Mar/2010]
+
+* Bugfix release, fix memory leak with reload option for persistent loaders
+
+**WSAPI 1.3.2** [19/Mar/2010]
+
+* Bugfix release, do not send Transfer-Encoding header unless it is
+  raw HTTP response
+
+**WSAPI 1.3.1** [19/Mar/2010]
+
+* Bugfix release, fix the unknown symbol in lfcgi.getenv()
+
 **WSAPI 1.3** [18/Mar/2010]
 
 * Fixed segmentation fault when non-string is provided to lfcgi.getenv() (thanks to mkottman@github)

rockspec/wsapi-1.3.1-1.rockspec

@@ -0,0 +1,34 @@
+package = "WSAPI"
+
+version = "1.3.1-1"
+
+description = {
+  summary = "Lua Web Server API",
+  detailed = [[
+    WSAPI is an API that abstracts the web server from Lua web applications. This is the rock
+    that contains the base WSAPI libraries plus the CGI adapters.
+  ]],
+  license = "MIT/X11",
+  homepage = "http://www.keplerproject.org/wsapi"
+}
+
+dependencies = { "luafilesystem >= 1.5.0" }
+
+source = {
+  url = "http://github.com/downloads/keplerproject/wsapi/wsapi-1.3.1.tar.gz"
+}
+
+build = {
+  type = "builtin",
+  modules = {
+    ["wsapi.common"] = "src/wsapi/common.lua",
+    ["wsapi.request"] = "src/wsapi/request.lua",
+    ["wsapi.response"] = "src/wsapi/response.lua",
+    ["wsapi.util"] = "src/wsapi/util.lua",
+    ["wsapi.cgi"] = "src/wsapi/cgi.lua",
+    ["wsapi.sapi"] = "src/wsapi/sapi.lua",
+    ["wsapi.ringer"] = "src/wsapi/ringer.lua",
+  },
+  copy_directories = { "samples", "doc", "tests" },
+  install = { bin = { "src/launcher/wsapi.cgi" } }
+}

rockspec/wsapi-1.3.2-1.rockspec

@@ -0,0 +1,34 @@
+package = "WSAPI"
+
+version = "1.3.2-1"
+
+description = {
+  summary = "Lua Web Server API",
+  detailed = [[
+    WSAPI is an API that abstracts the web server from Lua web applications. This is the rock
+    that contains the base WSAPI libraries plus the CGI adapters.
+  ]],
+  license = "MIT/X11",
+  homepage = "http://www.keplerproject.org/wsapi"
+}
+
+dependencies = { "luafilesystem >= 1.5.0" }
+
+source = {
+  url = "http://github.com/downloads/keplerproject/wsapi/wsapi-1.3.2.tar.gz"
+}
+
+build = {
+  type = "builtin",
+  modules = {
+    ["wsapi.common"] = "src/wsapi/common.lua",
+    ["wsapi.request"] = "src/wsapi/request.lua",
+    ["wsapi.response"] = "src/wsapi/response.lua",
+    ["wsapi.util"] = "src/wsapi/util.lua",
+    ["wsapi.cgi"] = "src/wsapi/cgi.lua",
+    ["wsapi.sapi"] = "src/wsapi/sapi.lua",
+    ["wsapi.ringer"] = "src/wsapi/ringer.lua",
+  },
+  copy_directories = { "samples", "doc", "tests" },
+  install = { bin = { "src/launcher/wsapi.cgi" } }
+}

rockspec/wsapi-1.3.3-1.rockspec

@@ -0,0 +1,34 @@
+package = "WSAPI"
+
+version = "1.3.3-1"
+
+description = {
+  summary = "Lua Web Server API",
+  detailed = [[
+    WSAPI is an API that abstracts the web server from Lua web applications. This is the rock
+    that contains the base WSAPI libraries plus the CGI adapters.
+  ]],
+  license = "MIT/X11",
+  homepage = "http://www.keplerproject.org/wsapi"
+}
+
+dependencies = { "luafilesystem >= 1.5.0" }
+
+source = {
+  url = "http://github.com/downloads/keplerproject/wsapi/wsapi-1.3.3.tar.gz"
+}
+
+build = {
+  type = "builtin",
+  modules = {
+    ["wsapi.common"] = "src/wsapi/common.lua",
+    ["wsapi.request"] = "src/wsapi/request.lua",
+    ["wsapi.response"] = "src/wsapi/response.lua",
+    ["wsapi.util"] = "src/wsapi/util.lua",
+    ["wsapi.cgi"] = "src/wsapi/cgi.lua",
+    ["wsapi.sapi"] = "src/wsapi/sapi.lua",
+    ["wsapi.ringer"] = "src/wsapi/ringer.lua",
+  },
+  copy_directories = { "samples", "doc", "tests" },
+  install = { bin = { "src/launcher/wsapi.cgi" } }
+}

rockspec/wsapi-fcgi-1.3.1-1.rockspec

@@ -0,0 +1,43 @@
+package = "WSAPI-FCGI"
+
+version = "1.3.1-1"
+
+description = {
+  summary = "Lua Web Server API FastCGI Adapter",
+  detailed = [[
+    WSAPI is an API that abstracts the web server from Lua web applications. This
+    is the rock that contains the FCGI module lfcgi.
+  ]],
+  license = "MIT/X11",
+  homepage = "http://www.keplerproject.org/wsapi"
+}
+
+dependencies = { "wsapi >= 1.3", "rings >= 1.2.3", "coxpcall >= 1.13" }
+
+external_dependencies = {
+  platforms = {
+    unix = {
+      FASTCGI = {
+        header = "fcgi_stdio.h"
+      }
+    }
+  }
+}
+
+source = {
+  url = "http://github.com/downloads/keplerproject/wsapi/wsapi-1.3.1.tar.gz"
+}
+
+build = {
+    type = "builtin",
+	modules = {
+	  ["wsapi.fastcgi"] = "src/wsapi/fastcgi.lua",
+	  lfcgi = {
+            sources = "src/fastcgi/lfcgi.c",
+            libraries = "fcgi",
+	    incdirs = "$(FASTCGI_INCDIR)",
+	    libdirs = "$(FASTCGI_LIBDIR)"
+          }
+        },
+       install = { bin = { "src/launcher/wsapi.fcgi" } }
+}

rockspec/wsapi-fcgi-1.3.2-1.rockspec

@@ -0,0 +1,43 @@
+package = "WSAPI-FCGI"
+
+version = "1.3.2-1"
+
+description = {
+  summary = "Lua Web Server API FastCGI Adapter",
+  detailed = [[
+    WSAPI is an API that abstracts the web server from Lua web applications. This
+    is the rock that contains the FCGI module lfcgi.
+  ]],
+  license = "MIT/X11",
+  homepage = "http://www.keplerproject.org/wsapi"
+}
+
+dependencies = { "wsapi >= 1.3.2", "rings >= 1.2.3", "coxpcall >= 1.13" }
+
+external_dependencies = {
+  platforms = {
+    unix = {
+      FASTCGI = {
+        header = "fcgi_stdio.h"
+      }
+    }
+  }
+}
+
+source = {
+  url = "http://github.com/downloads/keplerproject/wsapi/wsapi-1.3.2.tar.gz"
+}
+
+build = {
+    type = "builtin",
+	modules = {
+	  ["wsapi.fastcgi"] = "src/wsapi/fastcgi.lua",
+	  lfcgi = {
+            sources = "src/fastcgi/lfcgi.c",
+            libraries = "fcgi",
+	    incdirs = "$(FASTCGI_INCDIR)",
+	    libdirs = "$(FASTCGI_LIBDIR)"
+          }
+        },
+       install = { bin = { "src/launcher/wsapi.fcgi" } }
+}

rockspec/wsapi-fcgi-1.3.3-1.rockspec

@@ -0,0 +1,43 @@
+package = "WSAPI-FCGI"
+
+version = "1.3.3-1"
+
+description = {
+  summary = "Lua Web Server API FastCGI Adapter",
+  detailed = [[
+    WSAPI is an API that abstracts the web server from Lua web applications. This
+    is the rock that contains the FCGI module lfcgi.
+  ]],
+  license = "MIT/X11",
+  homepage = "http://www.keplerproject.org/wsapi"
+}
+
+dependencies = { "wsapi >= 1.3.3", "rings >= 1.2.3", "coxpcall >= 1.13" }
+
+external_dependencies = {
+  platforms = {
+    unix = {
+      FASTCGI = {
+        header = "fcgi_stdio.h"
+      }
+    }
+  }
+}
+
+source = {
+  url = "http://github.com/downloads/keplerproject/wsapi/wsapi-1.3.3.tar.gz"
+}
+
+build = {
+    type = "builtin",
+	modules = {
+	  ["wsapi.fastcgi"] = "src/wsapi/fastcgi.lua",
+	  lfcgi = {
+            sources = "src/fastcgi/lfcgi.c",
+            libraries = "fcgi",
+	    incdirs = "$(FASTCGI_INCDIR)",
+	    libdirs = "$(FASTCGI_LIBDIR)"
+          }
+        },
+       install = { bin = { "src/launcher/wsapi.fcgi" } }
+}