Skip to content
This repository was archived by the owner on Mar 24, 2025. It is now read-only.

merge master back to develop #338

Merged
merged 13 commits into from
Sep 29, 2019
Merged

merge master back to develop #338

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
eafc1cf
Merge pull request #302 from swooletw/develop
albertcht Jul 4, 2019
a787442
Merge pull request #304 from swooletw/develop
albertcht Jul 5, 2019
6c73326
Update Websocket.php
tiamo Jul 26, 2019
719053d
Update Room.php
tiamo Jul 26, 2019
d529bb3
Merge pull request #314 from tiamo/master
albertcht Aug 5, 2019
0351741
fixes for working with websocket in jobs
mxp100 Aug 10, 2019
18b2023
test fixes
mxp100 Aug 11, 2019
61cb4d1
Set request for auth handler
netdown Aug 13, 2019
5e9e768
Merge pull request #319 from mxp100/bugfix/websocket-in-tasks
albertcht Aug 25, 2019
d7e47aa
add missing test for emitInTaskWorker
albertcht Aug 25, 2019
8e27944
Try to fix occasional non-array returned result in RedisRoom.
albertcht Aug 25, 2019
9b2d2c1
Merge pull request #322 from netdown/master
albertcht Aug 25, 2019
8b6ffc0
fix AuthenticateTest
albertcht Aug 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Merge pull request #302 from swooletw/develop 
1. improve onHandShake callback
2. make pid file compatible with older versions
  • Loading branch information
@albertcht
albertcht authored Jul 4, 2019
commit eafc1cfaa481ba6d855448c17de34f5108fd5e6d

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.