Skip to content

Commit b370bfa

Browse files
committed
Merge pull request #18 from Textalk/license
Adding ISC license. Refs #13
2 parents 4a4cb3a + 2d3833f commit b370bfa

File tree

8 files changed

+69
-1
lines changed

8 files changed

+69
-1
lines changed

COPYING

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Websocket PHP is free software: Permission to use, copy, modify, and/or distribute this software
2+
for any purpose with or without fee is hereby granted, provided that the above copyright notice and
3+
this permission notice appear in all copies.
4+
5+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
6+
SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
7+
AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
8+
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
9+
NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
10+
THIS SOFTWARE.

README.md

+21
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,27 @@ Development depends on php, php-curl and php-xdebug.
5454
make test
5555
```
5656

57+
58+
License ([ISC](http://en.wikipedia.org/wiki/ISC_license))
59+
---------------------------------------------------------
60+
61+
Copyright (C) 2014, 2015 Textalk
62+
Copyright (C) 2015 Patrick McCarren - added payload fragmentation for huge payloads
63+
64+
Websocket PHP is free software: Permission to use, copy, modify, and/or distribute this software
65+
for any purpose with or without fee is hereby granted, provided that the above copyright notice and
66+
this permission notice appear in all copies.
67+
68+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
69+
SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
70+
AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
71+
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
72+
NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
73+
THIS SOFTWARE.
74+
75+
See COPYING.
76+
77+
5778
Changelog
5879
---------
5980

lib/Base.php

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
<?php
22

3+
/**
4+
* Copyright (C) 2014, 2015 Textalk
5+
* Copyright (C) 2015 Patrick McCarren - added payload fragmentation for huge payloads
6+
*
7+
* This file is part of Websocket PHP and is free software under the ISC License.
8+
* License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
9+
*/
10+
311
namespace WebSocket;
412

513
class Base {

lib/Client.php

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<?php
22

3+
/**
4+
* Copyright (C) 2014, 2015 Textalk
5+
*
6+
* This file is part of Websocket PHP and is free software under the ISC License.
7+
* License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
8+
*/
9+
310
namespace WebSocket;
411

512
class Client extends Base {

lib/Server.php

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<?php
22

3+
/**
4+
* Copyright (C) 2014, 2015 Textalk
5+
*
6+
* This file is part of Websocket PHP and is free software under the ISC License.
7+
* License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
8+
*/
9+
310
namespace WebSocket;
411

512
/**

phpunit.xml.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd"
44
backupGlobals="true"
55
backupStaticAttributes="false"
6-
bootstrap="vendor/autoload.php">
6+
bootstrap="vendor/autoload.php"
77
cacheTokens="false"
88
colors="true"
99
convertErrorsToExceptions="true"

tests/ClientTracker.php

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<?php
22

3+
/**
4+
* Copyright (C) 2015 Patrick McCarren
5+
*
6+
* This file is part of Websocket PHP and is free software under the ISC License.
7+
* License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
8+
*/
9+
310
namespace WebSocket\Tests;
411

512
use WebSocket\Client;

tests/unit/ClientTest.php

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
<?php
22

3+
/**
4+
* Copyright (C) 2014, 2015 Textalk
5+
* Copyright (C) 2015 Patrick McCarren - added testSetFragmentSize
6+
*
7+
* This file is part of Websocket PHP and is free software under the ISC License.
8+
* License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
9+
*/
10+
311
use WebSocket\Client;
412
use WebSocket\Tests\ClientTracker;
513

0 commit comments

Comments
 (0)