Skip to content

Z
z-push
Commit d66bc608 authored by Sebastian Kummer's avatar Sebastian Kummer
Browse files
Options

Merge pull request #511 in ZP/z-push from... 

Merge pull request #511 in ZP/z-push from bugfix/ZP-1193-update-license-in-net-smtp.php-to to develop

* commit 'c3bf632a':
  ZP-1193 Update license in Net/SMTP.php to BSD-2-clause
parents 6caab05c c3bf632a
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 9 deletions
src/backend/imap/Net/SMTP.php
View file @ d66bc608
...@@ -3,15 +3,33 @@ ...@@ -3,15 +3,33 @@
// +----------------------------------------------------------------------+ // +----------------------------------------------------------------------+
// | PHP Version 5 and 7 | // | PHP Version 5 and 7 |
// +----------------------------------------------------------------------+ // +----------------------------------------------------------------------+
// | Copyright (c) 1997-2015 The PHP Group | // | Copyright (c) 1997-2017 Jon Parise and Chuck Hagenbuch |
// +----------------------------------------------------------------------+ // | All rights reserved. |
// | This source file is subject to version 3.01 of the PHP license, | // | |
// | that is bundled with this package in the file LICENSE, and is | // | Redistribution and use in source and binary forms, with or without |
// | available at through the world-wide-web at | // | modification, are permitted provided that the following conditions |
// | http://www.php.net/license/3_01.txt. | // | are met: |
// | If you did not receive a copy of the PHP license and are unable to | // | |
// | obtain it through the world-wide-web, please send a note to | // | 1. Redistributions of source code must retain the above copyright |
// | license@php.net so we can mail you a copy immediately. | // | notice, this list of conditions and the following disclaimer. |
// | |
// | 2. Redistributions in binary form must reproduce the above copyright |
// | notice, this list of conditions and the following disclaimer in |
// | the documentation and/or other materials provided with the |
// | distribution. |
// | |
// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS |
// | FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE |
// | COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
// | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
// | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
// | LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
// | CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
// | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
// | ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
// | POSSIBILITY OF SUCH DAMAGE. |
// +----------------------------------------------------------------------+ // +----------------------------------------------------------------------+
// | Authors: Chuck Hagenbuch <chuck@horde.org> | // | Authors: Chuck Hagenbuch <chuck@horde.org> |
// | Jon Parise <jon@php.net> | // | Jon Parise <jon@php.net> |
...@@ -42,6 +60,7 @@ ...@@ -42,6 +60,7 @@
* @author Chuck Hagenbuch <chuck@horde.org> * @author Chuck Hagenbuch <chuck@horde.org>
* @author Jon Parise <jon@php.net> * @author Jon Parise <jon@php.net>
* @author Damian Alejandro Fernandez Sosa <damlists@cnba.uba.ar> * @author Damian Alejandro Fernandez Sosa <damlists@cnba.uba.ar>
* @license http://opensource.org/licenses/bsd-license.php BSD-2-Clause
* *
* @example basic.php A basic implementation of the Net_SMTP package. * @example basic.php A basic implementation of the Net_SMTP package.
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment