From 6e00ffd62f135c30be3b5a6404a722beb1bdf215 Mon Sep 17 00:00:00 2001
From: Diego Nehab <diego@impa.br>
Date: Tue, 11 Jun 2013 19:10:03 +0800
Subject: [PATCH] Changing from 2.1-rc1 to 3.0-rc1.

---
 doc/index.html                                | 32 +++++++++++--------
 doc/installation.html                         | 14 +++-----
 doc/tcp.html                                  |  2 +-
 doc/udp.html                                  |  2 +-
 ...t-2.1-1.rockspec => luasocket-3.0.rockspec |  0
 src/ltn12.lua                                 |  2 +-
 src/luasocket.h                               |  5 ++-
 src/makefile                                  |  2 +-
 src/mime.h                                    |  4 +--
 src/url.lua                                   |  4 +--
 10 files changed, 33 insertions(+), 34 deletions(-)
 rename luasocket-2.1-1.rockspec => luasocket-3.0.rockspec (100%)

diff --git a/doc/index.html b/doc/index.html
index d8ee4a4..b8f8798 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -49,7 +49,7 @@ functionality commonly needed by applications that deal with the Internet.
 The core support has been  implemented so that it  is both efficient and
 simple to use.  It is available to any Lua application once it has been
 properly initialized by the interpreter in use. The code has been tested
-and runs well on several Windows and Unix platforms. </p>
+and runs well on several Windows and UNIX platforms. </p>
 
 <p>
 Among the support modules, the most commonly used implement the 
@@ -78,7 +78,7 @@ LuaSocket.
 </p>
 
 <p>
-Copyright &copy; 1999-2012 Diego Nehab. All rights reserved. <br>
+Copyright &copy; 1999-2013 Diego Nehab. All rights reserved. <br>
 Author: <A href="http://www.impa.br/~diego">Diego Nehab</a>
 </p>
 
@@ -87,7 +87,7 @@ Author: <A href="http://www.impa.br/~diego">Diego Nehab</a>
 <h2 id=download>Download</h2>
 
 <p>
-LuaSocket version 2.1-rc1 is now available for download! 
+LuaSocket version 3.0-rc1 is now available for download! 
 It is compatible with  Lua&nbsp;5.1 and 5.2, and has    
 been tested on Windows&nbsp;XP, Linux, and Mac OS X. Chances
 are it works well on most UNIX distributions and Windows flavors.
@@ -96,7 +96,7 @@ are it works well on most UNIX distributions and Windows flavors.
 <p>
 The library can be downloaded in source code from the
 <a href="https://github.com/diegonehab/luasocket/downloads">LuaSocket
-project page</a> at GitHub. Besides the full C and Lua source code 
+project page</a> on GitHub. Besides the full C and Lua source code 
 for the library, the distribution contains several examples, 
 this user's manual and basic test procedures.
 </p>
@@ -113,11 +113,12 @@ manual to find out how to properly install the library.
 <p>
 This marks the first release of LuaSocket that
 wholeheartedly embraces the open-source development
-philosophy. After a long hiatus, Matthew Wild finally 
-convinced me it was time for a release including IPv6
-and Lua 5.2 support. Special thanks to Sam Roberts, Florian
-Zeitz, and Paul Aurich, Liam Devine, and everybody else that
-has helped bring this library back to life. 
+philosophy. After a long hiatus, Matthew Wild finally
+convinced me it was time for a release including IPv6 and
+Lua 5.2 support. It was more work than we anticipated.
+Special thanks to Sam Roberts, Florian Zeitz, and Paul
+Aurich, Liam Devine, Alexey Melnichuk, and everybody else
+that has helped bring this library back to life. 
 </p>
 
 <!-- whatsnew +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
@@ -125,12 +126,16 @@ has helped bring this library back to life.
 <h2 id=new>What's New</h2>
 
 <p>
-Main changes for LuaSocket&nbsp;2.1-rc1 are IPv6 support
+Main changes for LuaSocket&nbsp;3.0-rc1 are IPv6 support
 and Lua&nbsp;5.2 compatibility. 
 </p>
 
 <ul>
-<li> Added: Compatible with Lua&nbsp;5.2 (using <tt>LUA_COMPAT_MODULE</tt>);
+<li> Added: Compatible with Lua&nbsp;5.2 
+<ul>
+<li> Note that unless you define <tt>LUA_COMPAT_MODULE</tt>,
+package tables will <em>not</em> be exported as globals!
+</ul>
 <li> Added: IPv6 support;
 <ul>
 <li> <tt>Socket.connect</tt> and <tt>socket.bind</tt> support IPv6 addresses;
@@ -138,7 +143,8 @@ and Lua&nbsp;5.2 compatibility.
 IPv6 addresses, and return the socket family as a third value;
 <li> URL module updated to support IPv6 host names;
 <li> New <tt>socket.tcp6</tt> and <tt>socket.udp6</tt> functions;
-<li> New <tt>socket.dns.getaddrinfo</tt> function;
+<li> New <tt>socket.dns.getaddrinfo</tt> and 
+    <tt>socket.dns.getnameinfo</tt> functions;
 </ul>
 <li> Added: <tt>getoption</tt> method;
 <li> Fixed: <tt>url.unescape</tt> was returning additional values;
@@ -176,7 +182,7 @@ still available for those that have compatibility issues.
 <p>
 <small>
 Last modified by Diego Nehab on <br>
-Mon Apr 16 21:58:56 HKT 2012
+Tue Jun 11 18:50:23 HKT 2013
 </small>
 </p>
 </center>
diff --git a/doc/installation.html b/doc/installation.html
index 37c309b..28a9fbb 100644
--- a/doc/installation.html
+++ b/doc/installation.html
@@ -39,12 +39,6 @@ Installation">
 
 <h2>Installation</h2>
 
-<p> LuaSocket 2.1-rc still uses Lua&nbsp;5.1's package
-system. Users that have already made the switch to
-Lua&nbsp;5.2 should leave the default
-<tt>LUA_COMPAT_MODULE</tt> defined when compiling their Lua
-distribution for compatibility with LuaSocket. </p>
-
 <p> Here we describe the standard distribution.  If the
 standard doesn't meet your needs, we refer you to the Lua
 discussion list, where any question about the package scheme
@@ -92,17 +86,17 @@ it should be easy to use LuaSocket. Just fire the interpreter and use the
 <tt>require</tt> function to gain access to whatever module you need:</p>
 
 <pre class=example>
-Lua 5.1.5  Copyright (C) 1994-2012 Lua.org, PUC-Rio
+Lua 5.2.2  Copyright (C) 1994-2013 Lua.org, PUC-Rio
 &gt; socket = require("socket")
 &gt; print(socket._VERSION)
---&gt; LuaSocket 2.1-rc1
+--&gt; LuaSocket 3.0-rc1
 </pre>
 
 <p> Each module loads their dependencies automatically, so you only need to
 load the modules you directly depend upon: </p>
 
 <pre class=example>
-Lua 5.1.5  Copyright (C) 1994-2012 Lua.org, PUC-Rio
+Lua 5.2.2  Copyright (C) 1994-2013 Lua.org, PUC-Rio
 &gt; http = require("socket.http")
 &gt; print(http.request("http://www.impa.br/~diego/software/luasocket"))
 --&gt; homepage gets dumped to terminal
@@ -123,7 +117,7 @@ Lua 5.1.5  Copyright (C) 1994-2012 Lua.org, PUC-Rio
 <p>
 <small>
 Last modified by Diego Nehab on <br>
-Mon Apr 16 21:01:42 HKT 2012
+Tue Jun 11 19:06:14 HKT 2013
 </small>
 </p>
 </center>
diff --git a/doc/tcp.html b/doc/tcp.html
index 151a4c9..4226d78 100644
--- a/doc/tcp.html
+++ b/doc/tcp.html
@@ -208,7 +208,7 @@ established.
 </p>
 
 <p class=note>
-Note: Starting with LuaSocket 2.1, the host name resolution
+Note: Starting with LuaSocket 3.0, the host name resolution
 depends on whether the socket was created by <a
 href=#socket.tcp><tt>socket.tcp</tt></a> or <a
 href=#socket.tcp6><tt>socket.tcp6</tt></a>. Addresses from
diff --git a/doc/udp.html b/doc/udp.html
index 554fa31..e5b0ad0 100644
--- a/doc/udp.html
+++ b/doc/udp.html
@@ -365,7 +365,7 @@ and can result in up to 30% performance gains.
 </p>
 
 <p class=note>
-Note: Starting with LuaSocket 2.1, the host name resolution
+Note: Starting with LuaSocket 3.0, the host name resolution
 depends on whether the socket was created by <a
 href=#socket.udp><tt>socket.udp</tt></a> or <a
 href=#socket.udp6><tt>socket.udp6</tt></a>. Addresses from
diff --git a/luasocket-2.1-1.rockspec b/luasocket-3.0.rockspec
similarity index 100%
rename from luasocket-2.1-1.rockspec
rename to luasocket-3.0.rockspec
diff --git a/src/ltn12.lua b/src/ltn12.lua
index 8742b0e..5b10f56 100644
--- a/src/ltn12.lua
+++ b/src/ltn12.lua
@@ -23,7 +23,7 @@ _M.pump = pump
 
 -- 2048 seems to be better in windows...
 _M.BLOCKSIZE = 2048
-_M._VERSION = "LTN12 1.0.2"
+_M._VERSION = "LTN12 1.0.3"
 
 -----------------------------------------------------------------------------
 -- Filter stuff
diff --git a/src/luasocket.h b/src/luasocket.h
index f4463a7..f75d21f 100644
--- a/src/luasocket.h
+++ b/src/luasocket.h
@@ -11,9 +11,8 @@
 /*-------------------------------------------------------------------------*\
 * Current socket library version
 \*-------------------------------------------------------------------------*/
-#define LUASOCKET_VERSION    "LuaSocket 2.1-rc1"
-#define LUASOCKET_COPYRIGHT  "Copyright (C) 1999-2012 Diego Nehab"
-#define LUASOCKET_AUTHORS    "Diego Nehab"
+#define LUASOCKET_VERSION    "LuaSocket 3.0-rc1"
+#define LUASOCKET_COPYRIGHT  "Copyright (C) 1999-2013 Diego Nehab"
 
 /*-------------------------------------------------------------------------*\
 * This macro prefixes all exported API functions
diff --git a/src/makefile b/src/makefile
index 313ca51..50d5cc1 100644
--- a/src/makefile
+++ b/src/makefile
@@ -202,7 +202,7 @@ SOCKET_win32=wsocket.obj
 #
 SO=$(SO_$(PLAT))
 O=$(O_$(PLAT))
-SOCKET_V=2.1
+SOCKET_V=3.0-rc1
 MIME_V=1.0.3
 SOCKET_SO=socket.$(SO).$(SOCKET_V)
 MIME_SO=mime.$(SO).$(MIME_V)
diff --git a/src/mime.h b/src/mime.h
index 150e7ad..99968a5 100644
--- a/src/mime.h
+++ b/src/mime.h
@@ -13,8 +13,8 @@
 /*-------------------------------------------------------------------------*\
 * Current MIME library version
 \*-------------------------------------------------------------------------*/
-#define MIME_VERSION    "MIME 1.0.3-rc1"
-#define MIME_COPYRIGHT  "Copyright (C) 2004-2012 Diego Nehab"
+#define MIME_VERSION    "MIME 1.0.3"
+#define MIME_COPYRIGHT  "Copyright (C) 2004-2013 Diego Nehab"
 #define MIME_AUTHORS    "Diego Nehab"
 
 /*-------------------------------------------------------------------------*\
diff --git a/src/url.lua b/src/url.lua
index 3c4f85d..7809535 100644
--- a/src/url.lua
+++ b/src/url.lua
@@ -18,7 +18,7 @@ local _M = socket.url
 -----------------------------------------------------------------------------
 -- Module version
 -----------------------------------------------------------------------------
-_M._VERSION = "URL 1.0.2"
+_M._VERSION = "URL 1.0.3"
 
 -----------------------------------------------------------------------------
 -- Encodes a string into its escaped hexadecimal representation
@@ -304,4 +304,4 @@ function _M.build_path(parsed, unsafe)
     return path
 end
 
-return _M
\ No newline at end of file
+return _M