diff --git a/CHANGELOG.md b/CHANGELOG.md index b89314e4..6ea577ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 1.3.0 (2019-07-10) + +* Feature: Forward compatibility with upcoming stable DNS component. + (#206 by @clue) + ## 1.2.1 (2019-06-03) * Avoid uneeded fragmented TLS work around for PHP 7.3.3+ and diff --git a/README.md b/README.md index 3ed2c71e..b10e0e2b 100644 --- a/README.md +++ b/README.md @@ -407,7 +407,7 @@ $second = new React\Socket\Server(8080, $loop); See the exception message and code for more details about the actual error condition. -Optionally, you can specify [TCP socket context options](http://php.net/manual/en/context.socket.php) +Optionally, you can specify [TCP socket context options](https://www.php.net/manual/en/context.socket.php) for the underlying stream socket resource like this: ```php @@ -420,7 +420,7 @@ $server = new React\Socket\Server('[::1]:8080', $loop, array( )); ``` -> Note that available [socket context options](http://php.net/manual/en/context.socket.php), +> Note that available [socket context options](https://www.php.net/manual/en/context.socket.php), their defaults and effects of changing these may vary depending on your system and/or PHP version. Passing unknown context options has no effect. @@ -431,7 +431,7 @@ You can start a secure TLS (formerly known as SSL) server by simply prepending the `tls://` URI scheme. Internally, it will wait for plaintext TCP/IP connections and then performs a TLS handshake for each connection. -It thus requires valid [TLS context options](http://php.net/manual/en/context.ssl.php), +It thus requires valid [TLS context options](https://www.php.net/manual/en/context.ssl.php), which in its most basic form may look something like this if you're using a PEM encoded certificate file: @@ -473,7 +473,7 @@ $server = new React\Socket\Server('tls://127.0.0.1:8000', $loop, array( )); ``` -> Note that available [TLS context options](http://php.net/manual/en/context.ssl.php), +> Note that available [TLS context options](https://www.php.net/manual/en/context.ssl.php), their defaults and effects of changing these may vary depending on your system and/or PHP version. The outer context array allows you to also use `tcp` (and possibly more) @@ -561,7 +561,7 @@ configuration. See the exception message and code for more details about the actual error condition. -Optionally, you can specify [socket context options](http://php.net/manual/en/context.socket.php) +Optionally, you can specify [socket context options](https://www.php.net/manual/en/context.socket.php) for the underlying stream socket resource like this: ```php @@ -572,7 +572,7 @@ $server = new React\Socket\TcpServer('[::1]:8080', $loop, array( )); ``` -> Note that available [socket context options](http://php.net/manual/en/context.socket.php), +> Note that available [socket context options](https://www.php.net/manual/en/context.socket.php), their defaults and effects of changing these may vary depending on your system and/or PHP version. Passing unknown context options has no effect. @@ -598,7 +598,7 @@ and is responsible for providing a secure TLS (formerly known as SSL) server. It does so by wrapping a [`TcpServer`](#tcpserver) instance which waits for plaintext TCP/IP connections and then performs a TLS handshake for each connection. -It thus requires valid [TLS context options](http://php.net/manual/en/context.ssl.php), +It thus requires valid [TLS context options](https://www.php.net/manual/en/context.ssl.php), which in its most basic form may look something like this if you're using a PEM encoded certificate file: @@ -637,7 +637,7 @@ $server = new React\Socket\SecureServer($server, $loop, array( )); ``` -> Note that available [TLS context options](http://php.net/manual/en/context.ssl.php), +> Note that available [TLS context options](https://www.php.net/manual/en/context.ssl.php), their defaults and effects of changing these may vary depending on your system and/or PHP version. Passing unknown context options has no effect. @@ -1048,8 +1048,8 @@ $connector = new React\Socket\Connector($loop, array( ``` > For more details about context options, please refer to the PHP documentation - about [socket context options](http://php.net/manual/en/context.socket.php) - and [SSL context options](http://php.net/manual/en/context.ssl.php). + about [socket context options](https://www.php.net/manual/en/context.socket.php) + and [SSL context options](https://www.php.net/manual/en/context.ssl.php). Advanced: By default, the `Connector` supports the `tcp://`, `tls://` and `unix://` URI schemes. @@ -1127,7 +1127,7 @@ resource, thus cancelling the pending TCP/IP connection, and reject the resulting promise. You can optionally pass additional -[socket context options](http://php.net/manual/en/context.socket.php) +[socket context options](https://www.php.net/manual/en/context.socket.php) to the constructor like this: ```php @@ -1239,7 +1239,7 @@ Calling `cancel()` on a pending promise will cancel the underlying TCP/IP connection and/or the SSL/TLS negotiation and reject the resulting promise. You can optionally pass additional -[SSL context options](http://php.net/manual/en/context.ssl.php) +[SSL context options](https://www.php.net/manual/en/context.ssl.php) to the constructor like this: ```php @@ -1354,7 +1354,7 @@ This project follows [SemVer](https://semver.org/). This will install the latest supported version: ```bash -$ composer require react/socket:^1.2.1 +$ composer require react/socket:^1.3 ``` See also the [CHANGELOG](CHANGELOG.md) for details about version upgrades. diff --git a/src/SecureServer.php b/src/SecureServer.php index ee722c8f..f091c341 100644 --- a/src/SecureServer.php +++ b/src/SecureServer.php @@ -113,7 +113,7 @@ final class SecureServer extends EventEmitter implements ServerInterface * @param array $context * @throws BadMethodCallException for legacy HHVM < 3.8 due to lack of support * @see TcpServer - * @link http://php.net/manual/en/context.ssl.php for TLS context options + * @link https://www.php.net/manual/en/context.ssl.php for TLS context options */ public function __construct(ServerInterface $tcp, LoopInterface $loop, array $context) { diff --git a/src/TcpServer.php b/src/TcpServer.php index 2166e92e..2c0a689e 100644 --- a/src/TcpServer.php +++ b/src/TcpServer.php @@ -98,7 +98,7 @@ final class TcpServer extends EventEmitter implements ServerInterface * See the exception message and code for more details about the actual error * condition. * - * Optionally, you can specify [socket context options](http://php.net/manual/en/context.socket.php) + * Optionally, you can specify [socket context options](https://www.php.net/manual/en/context.socket.php) * for the underlying stream socket resource like this: * * ```php @@ -109,7 +109,7 @@ final class TcpServer extends EventEmitter implements ServerInterface * )); * ``` * - * Note that available [socket context options](http://php.net/manual/en/context.socket.php), + * Note that available [socket context options](https://www.php.net/manual/en/context.socket.php), * their defaults and effects of changing these may vary depending on your system * and/or PHP version. * Passing unknown context options has no effect.