aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Nehab <diego@tecgraf.puc-rio.br>2005-01-02 22:51:33 +0000
committerDiego Nehab <diego@tecgraf.puc-rio.br>2005-01-02 22:51:33 +0000
commit49445951a8e3a6960c9024a6686d4c14fb81f43c (patch)
treeb94e030c1c8424fc091a92666a553143b96f2c96
parent97b26e0b66c840a446a0179200c7df23565330d1 (diff)
downloadluasocket-49445951a8e3a6960c9024a6686d4c14fb81f43c.tar.gz
luasocket-49445951a8e3a6960c9024a6686d4c14fb81f43c.tar.bz2
luasocket-49445951a8e3a6960c9024a6686d4c14fb81f43c.zip
Few extra changes...
-rw-r--r--src/luasocket.c2
-rw-r--r--src/mime.c2
-rw-r--r--src/socket.lua2
-rw-r--r--src/timeout.c1
-rw-r--r--test/httptest.lua2
5 files changed, 4 insertions, 5 deletions
diff --git a/src/luasocket.c b/src/luasocket.c
index d07b90f..4b829f8 100644
--- a/src/luasocket.c
+++ b/src/luasocket.c
@@ -20,11 +20,11 @@
20#include <lua.h> 20#include <lua.h>
21#include <lauxlib.h> 21#include <lauxlib.h>
22#include "compat-5.1.h" 22#include "compat-5.1.h"
23#include "luasocket.h"
23 24
24/*=========================================================================*\ 25/*=========================================================================*\
25* LuaSocket includes 26* LuaSocket includes
26\*=========================================================================*/ 27\*=========================================================================*/
27#include "luasocket.h"
28 28
29#include "auxiliar.h" 29#include "auxiliar.h"
30#include "except.h" 30#include "except.h"
diff --git a/src/mime.c b/src/mime.c
index bd48920..dcc4af3 100644
--- a/src/mime.c
+++ b/src/mime.c
@@ -8,8 +8,8 @@
8 8
9#include <lua.h> 9#include <lua.h>
10#include <lauxlib.h> 10#include <lauxlib.h>
11#include "compat-5.1.h"
12 11
12#include "compat-5.1.h"
13#include "mime.h" 13#include "mime.h"
14 14
15/*=========================================================================*\ 15/*=========================================================================*\
diff --git a/src/socket.lua b/src/socket.lua
index e3c85f0..1c82750 100644
--- a/src/socket.lua
+++ b/src/socket.lua
@@ -69,7 +69,7 @@ socket.sinkt["http-chunked"] = function(sock)
69 __call = function(self, chunk, err) 69 __call = function(self, chunk, err)
70 if not chunk then return sock:send("0\r\n\r\n") end 70 if not chunk then return sock:send("0\r\n\r\n") end
71 local size = string.format("%X\r\n", string.len(chunk)) 71 local size = string.format("%X\r\n", string.len(chunk))
72 return sock:send(size, chunk, "\r\n") 72 return sock:send(size .. chunk .. "\r\n")
73 end 73 end
74 }) 74 })
75end 75end
diff --git a/src/timeout.c b/src/timeout.c
index 7d55031..be68228 100644
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -9,7 +9,6 @@
9#include <lua.h> 9#include <lua.h>
10#include <lauxlib.h> 10#include <lauxlib.h>
11 11
12#include "luasocket.h"
13#include "auxiliar.h" 12#include "auxiliar.h"
14#include "timeout.h" 13#include "timeout.h"
15 14
diff --git a/test/httptest.lua b/test/httptest.lua
index 8862ceb..2335fcb 100644
--- a/test/httptest.lua
+++ b/test/httptest.lua
@@ -23,7 +23,7 @@ http.TIMEOUT = 10
23local t = socket.gettime() 23local t = socket.gettime()
24 24
25host = host or "diego.student.princeton.edu" 25host = host or "diego.student.princeton.edu"
26proxy = proxy or "http://dell-diego:3128" 26proxy = proxy or "http://localhost:3128"
27prefix = prefix or "/luasocket-test" 27prefix = prefix or "/luasocket-test"
28cgiprefix = cgiprefix or "/luasocket-test-cgi" 28cgiprefix = cgiprefix or "/luasocket-test-cgi"
29index_file = "test/index.html" 29index_file = "test/index.html"