Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: laravel/octane
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.0.4
Choose a base ref
...
head repository: laravel/octane
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.0.5
Choose a head ref
  • 3 commits
  • 2 files changed
  • 4 contributors

Commits on Aug 2, 2023

  1. Update CHANGELOG

    taylorotwell authored and github-actions[bot] committed Aug 2, 2023
    Copy the full SHA
    1ae420e View commit details

Commits on Aug 7, 2023

  1. Add IPv6 support for Swoole (#728)

    * Add IPv6 support
    
    Use the listen host address to determine whether Swoole should listen on an IPv4 or IPv6 socket.
    
    * Update createSwooleServer.php
    
    ---------
    
    Co-authored-by: Taylor Otwell <taylor@laravel.com>
    xorinzor and taylorotwell authored Aug 7, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f15a49f View commit details

Commits on Aug 8, 2023

  1. Update CHANGELOG.md

    driesvints authored Aug 8, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f42d7f1 View commit details
Showing with 12 additions and 4 deletions.
  1. +5 −1 CHANGELOG.md
  2. +7 −3 bin/createSwooleServer.php
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Release Notes

## [Unreleased](https://github.com/laravel/octane/compare/v2.0.3...2.x)
## [Unreleased](https://github.com/laravel/octane/compare/v2.0.4...2.x)

## [v2.0.4](https://github.com/laravel/octane/compare/v2.0.3...v2.0.4) - 2023-08-02

- [2.x] Fixes installation when using Herd by [@nunomaduro](https://github.com/nunomaduro) in https://github.com/laravel/octane/pull/726

## [v2.0.3](https://github.com/laravel/octane/compare/v2.0.2...v2.0.3) - 2023-07-20

10 changes: 7 additions & 3 deletions bin/createSwooleServer.php
Original file line number Diff line number Diff line change
@@ -3,13 +3,17 @@
$config = $serverState['octaneConfig'];

try {
$host = $serverState['host'] ?? '127.0.0.1';

$sock = filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) ? SWOOLE_SOCK_TCP : SWOOLE_SOCK_TCP6;

$server = new Swoole\Http\Server(
$serverState['host'] ?? '127.0.0.1',
$host,
$serverState['port'] ?? 8080,
$serverState['mode'] ?? SWOOLE_PROCESS,
($config['swoole']['ssl'] ?? false)
? SWOOLE_SOCK_TCP | SWOOLE_SSL
: SWOOLE_SOCK_TCP,
? $sock | SWOOLE_SSL
: $sock,
);
} catch (Throwable $e) {
Laravel\Octane\Stream::shutdown($e);