Skip to content

Commit

Permalink
Merge pull request #18 from Textalk/license
Browse files Browse the repository at this point in the history
Adding ISC license.  Refs #13
  • Loading branch information
fiddur committed May 8, 2015
2 parents 4a4cb3a + 2d3833f commit b370bfa
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 1 deletion.
10 changes: 10 additions & 0 deletions COPYING
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Websocket PHP is free software: Permission to use, copy, modify, and/or distribute this software
for any purpose with or without fee is hereby granted, provided that the above copyright notice and
this permission notice appear in all copies.

THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
THIS SOFTWARE.
21 changes: 21 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,27 @@ Development depends on php, php-curl and php-xdebug.
make test
```


License ([ISC](http://en.wikipedia.org/wiki/ISC_license))
---------------------------------------------------------

Copyright (C) 2014, 2015 Textalk
Copyright (C) 2015 Patrick McCarren - added payload fragmentation for huge payloads

Websocket PHP is free software: Permission to use, copy, modify, and/or distribute this software
for any purpose with or without fee is hereby granted, provided that the above copyright notice and
this permission notice appear in all copies.

THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
THIS SOFTWARE.

See COPYING.


Changelog
---------

Expand Down
8 changes: 8 additions & 0 deletions lib/Base.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
<?php

/**
* Copyright (C) 2014, 2015 Textalk
* Copyright (C) 2015 Patrick McCarren - added payload fragmentation for huge payloads
*
* This file is part of Websocket PHP and is free software under the ISC License.
* License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
*/

namespace WebSocket;

class Base {
Expand Down
7 changes: 7 additions & 0 deletions lib/Client.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
<?php

/**
* Copyright (C) 2014, 2015 Textalk
*
* This file is part of Websocket PHP and is free software under the ISC License.
* License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
*/

namespace WebSocket;

class Client extends Base {
Expand Down
7 changes: 7 additions & 0 deletions lib/Server.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
<?php

/**
* Copyright (C) 2014, 2015 Textalk
*
* This file is part of Websocket PHP and is free software under the ISC License.
* License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
*/

namespace WebSocket;

/**
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd"
backupGlobals="true"
backupStaticAttributes="false"
bootstrap="vendor/autoload.php">
bootstrap="vendor/autoload.php"
cacheTokens="false"
colors="true"
convertErrorsToExceptions="true"
Expand Down
7 changes: 7 additions & 0 deletions tests/ClientTracker.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
<?php

/**
* Copyright (C) 2015 Patrick McCarren
*
* This file is part of Websocket PHP and is free software under the ISC License.
* License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
*/

namespace WebSocket\Tests;

use WebSocket\Client;
Expand Down
8 changes: 8 additions & 0 deletions tests/unit/ClientTest.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
<?php

/**
* Copyright (C) 2014, 2015 Textalk
* Copyright (C) 2015 Patrick McCarren - added testSetFragmentSize
*
* This file is part of Websocket PHP and is free software under the ISC License.
* License text: https://raw.githubusercontent.com/Textalk/websocket-php/master/COPYING
*/

use WebSocket\Client;
use WebSocket\Tests\ClientTracker;

Expand Down

0 comments on commit b370bfa

Please sign in to comment.