diff --git a/README b/README index 8572736..acb4dfe 100644 --- a/README +++ b/README @@ -1,7 +1,6 @@ -This release is a "beta" version. It has been tested on WinXP, Mac OS X, -and Linux. Although no major API changes should happen before the -final version is released, please look for and report any bugs (or -"features") you encounter. +This is the LuaSocket 2.0. It has been tested on WinXP, Mac OS X, +and Linux. Please use the Lua mailing list to report any bugs +(or "features") you encounter. Have fun, Diego Nehab. diff --git a/config b/config index 55a9a63..8394af3 100644 --- a/config +++ b/config @@ -35,13 +35,21 @@ INSTALL_EXEC=cp #------ # Compiler and linker settings +# for Mac OS X # CC=gcc DEF=-DLUASOCKET_DEBUG -DUNIX_HAS_SUN_LEN -CFLAGS= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -O2 +CFLAGS= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -O2 -fno-common LDFLAGS=-bundle -undefined dynamic_lookup LD=export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc +# for Linux +#CC=gcc +#DEF=-DLUASOCKET_DEBUG -DUNIX_HAS_SUN_LEN +#CFLAGS= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -O2 -fpic +#LDFLAGS=-O -shared +#LD=gcc + #------ # End of makefile configuration # diff --git a/etc/check-links.lua b/etc/check-links.lua index 5c124a8..725cd2a 100644 --- a/etc/check-links.lua +++ b/etc/check-links.lua @@ -5,7 +5,7 @@ -- Author: Diego Nehab -- RCS ID: $$ ----------------------------------------------------------------------------- -local url = require("url") +local url = require("socket.url") local dispatch = require("dispatch") local http = require("socket.http") dispatch.TIMEOUT = 10 diff --git a/etc/get.lua b/etc/get.lua index bd5af28..0c95d54 100644 --- a/etc/get.lua +++ b/etc/get.lua @@ -7,7 +7,7 @@ local socket = require("socket") local http = require("socket.http") local ftp = require("socket.ftp") -local url = require("url") +local url = require("socket.url") local ltn12 = require("ltn12") -- formats a number of seconds into human readable form diff --git a/etc/links b/etc/links new file mode 100644 index 0000000..087f1c0 --- /dev/null +++ b/etc/links @@ -0,0 +1,17 @@ + bla + bla + bla + bla + bla + bla + bla + bla + bla + bla + bla + bla + bla + bla + bla + bla + bla diff --git a/mime.vcproj b/mime.vcproj index c4e328f..f5c57c3 100644 --- a/mime.vcproj +++ b/mime.vcproj @@ -19,7 +19,7 @@ + RelativePath=".\src\lua-5.0.2\lib\lua50.lib"> diff --git a/socket.vcproj b/socket.vcproj index ddfb46e..133c902 100644 --- a/socket.vcproj +++ b/socket.vcproj @@ -69,7 +69,7 @@ CharacterSet="2"> + RelativePath=".\src\lua-5.0.2\lib\lua50.lib"> diff --git a/test/httptest.lua b/test/httptest.lua index 3816b54..0951389 100644 --- a/test/httptest.lua +++ b/test/httptest.lua @@ -22,8 +22,8 @@ http.TIMEOUT = 10 local t = socket.gettime() -host = host or "localhost" -- "diego.student.princeton.edu" -proxy = proxy or "http://localhost:3128" +host = host or "dell-diego" -- "diego.student.princeton.edu" +proxy = proxy or "http://dell-diego:3128" prefix = prefix or "/luasocket-test" cgiprefix = cgiprefix or "/luasocket-test-cgi" index_file = "index.html"