Skip to content
This repository has been archived by the owner on Oct 25, 2024. It is now read-only.

Commit

Permalink
Pick two changes to 5.0.x branch (#479)
Browse files Browse the repository at this point in the history
* Bump socket.io version to 3.1.2. (#471)

* Bump elliptic from 6.5.3 to 6.5.4 (#467)

Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](indutny/elliptic@v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jianjunz <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
jianjunz and dependabot[bot] authored Mar 29, 2021
1 parent 5b48a9f commit 840f18b
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 16 deletions.
30 changes: 18 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/samples/conference/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<video playsinline muted autoplay style="width:320px;height:240"></video>
</div>
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js" type="text/javascript"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/3.1.2/socket.io.js" type="text/javascript"></script>
<script src="../../../../dist/sdk-debug/owt.js" type="text/javascript"></script>
<script src="scripts/index.js" type="text/javascript"></script>
<script src="scripts/rest-sample.js" type="text/javascript"></script>
Expand Down
2 changes: 1 addition & 1 deletion src/samples/conference/public/quic.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ <h2>Sample of QuicTransport</h2>
<div id="conference-status"></div>
<div class="stats">
</div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js" type="text/javascript"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/3.1.2/socket.io.js" type="text/javascript"></script>
<script src="scripts/rest-sample.js" type="text/javascript"></script>
<script src="scripts/owt.js" type="text/javascript"></script>
<script src="scripts/quic.js" type="text/javascript"></script>
Expand Down
2 changes: 1 addition & 1 deletion src/samples/p2p/peercall.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<script src="https://code.jquery.com/jquery-3.5.1.min.js"
type="text/javascript"></script>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js"
src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/3.1.2/socket.io.js"
type="text/javascript"></script>
<script src="js/sc.websocket.js" type="text/javascript"></script>
<!-- SDK Starts -->
Expand Down
2 changes: 1 addition & 1 deletion test/p2ptest/fetch_dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

URLS = {'q.js': 'https://raw.githubusercontent.com/kriskowal/q/c2f5a6f35456389a806acca50bfd929cbe30c4cb/q.js',
'jquery.min.js': 'https://code.jquery.com/jquery-1.10.2.min.js',
'socket.io.min.js': 'https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js'
'socket.io.min.js': 'https://cdnjs.cloudflare.com/ajax/libs/socket.io/3.1.2/socket.io.js'
}

DEPS_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), 'dependencies'))
Expand Down

0 comments on commit 840f18b

Please sign in to comment.