Merge branch 'import'. Closes #1

Author: clue

.gitignore

@@ -1,4 +1 @@
 /vendor
-/composer.lock
-/composer.phar
-/build

CHANGELOG.md

@@ -4,36 +4,15 @@ This file is a manually maintained list of changes for each release. Feel free
 to add your changes here when sending pull requests. Also send corrections if
 you spot any mistakes.
 
-## 0.4.0 (2013-05-24)
+## 1.0.0 (2014-05-xx)
 
-* BC break: Update react to current v0.3 and thus also replace `ConnectionManager` with `Connector`
-* BC break: New `Client::createConnector()` replaces inheriting `ConnectionManagerInterface`
-* BC break: New `Client::createSecureConnector()` replaces `Client::createSecureConnectionManager()` 
+* First stable release
+* Async SOCKS `Client` and `Server` implementation
+* Project was originally part of [clue/socks](https://github.com/clue/php-socks)
+  and was split off from its latest releave v0.4.0
+  ([#1](https://github.com/clue/reactphp-socks/issues/1))
 
-## 0.3.1 (2012-12-29)
-
-* Fix: Server event logging
-* Fix: Closing invalid connections
-
-## 0.3.0 (2012-12-23)
-
-* Feature: Add async `Server` implementation
-
-## 0.2.0 (2012-12-03)
-
-* BC break: Whole new API, now using async patterns based on react/react
-* BC break: Re-organize into `Socks` namespace
-* Feature: Whole new async API: `PromiseInterface Client::getConnection(string $hostname, int $port)`
-* Feature: SOCKS5 username/password authentication: `Client::setAuth(string $username, string $password)`
-* Feature: SOCKS4a/SOCKS5 support local *and* remote resolving: `Client::setResolveLocal(boolean $resolveLocal)`
-* Feature: SOCKS protocol can now be switched during runtime: `Client::setProtocolVersion(string $version)`
-* Feature: Simple interface for HTTP over SOCKS: `HttpClient Client::createHttpClient()`
-* Feature: Simple interface for SSL/TLS over SOCKS: `Client` now implements `ConnectionManagerInterface`
-* Feature: Simple interface for TCP over SOCKS: `SecureConnectionManager Client::createSecureConnectionManager()`
-
-## 0.1.0 (2011-05-16)
-
-* First tagged release
-* Simple, blocking API: `resource Socks::connect(string $hostname, int $port)`
-* Support for SOCKS4, SOCKS4a, SOCKS5 and hostname, IPv4 and IPv6 addressing
+## 0.0.0 (2011-04-26)
 
+* Initial concept, originally tracked as part of
+  [clue/socks](https://github.com/clue/php-socks)

license.txt LICENSElicense.txt renamed to LICENSE

@@ -1,21 +1,21 @@
-The MIT License
+The MIT License (MIT)
 
-Copyright (c) 2011 Christian Lück, <https://github.com/clue/Socks>
+Copyright (c) 2011 Christian Lück
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

README.md

@@ -1,4 +1,4 @@
-# clue/socks - SOCKS client and server [![Build Status](https://travis-ci.org/clue/socks.png?branch=master)](https://travis-ci.org/clue/socks)
+# clue/socks-react - SOCKS client and server [![Build Status](https://travis-ci.org/clue/reactphp-socks.png?branch=master)](https://travis-ci.org/clue/socks)
 
 Async SOCKS client library to connect to SOCKS4, SOCKS4a and SOCKS5 proxy servers,
 as well as a SOCKS server implementation, capable of handling multiple concurrent
@@ -253,11 +253,11 @@ The recommended way to install this library is [through composer](http://getcomp
 ```JSON
 {
     "require": {
-        "clue/Socks": "0.4.*"
+        "clue/socks-react": "1.*"
     }
 }
 ```
 
 ## License
 
-MIT, see license.txt
+MIT, see LICENSE

composer.json

@@ -1,12 +1,17 @@
 {
-    "name": "clue/socks",
-    "type": "library",
+    "name": "clue/socks-react",
     "description": "Async SOCKS proxy client and server (SOCKS4, SOCKS4a and SOCKS5)",
     "keywords": ["socks client", "socks server", "tcp tunnel", "socks protocol", "async", "react"],
-    "homepage": "http://github.com/clue/socks",
+    "homepage": "https://github.com/clue/reactphp-socks",
     "license": "MIT",
+    "authors": [
+        {
+            "name": "Christian Lück",
+            "email": "christian@lueck.tv"
+        }
+    ],
     "autoload": {
-        "psr-0": {"Socks": ""}
+        "psr-4": {"Clue\\React\\Socks\\": "src"}
     },
     "require": {
         "react/http-client": "0.3.*",