From: Michael Wallner Date: Tue, 6 Dec 2011 10:01:14 +0000 (+0100) Subject: merge X-Git-Tag: RELEASE_0_1_1~1 X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-ircclient;a=commitdiff_plain;h=880673d5ee0de8e1632d9c99a2cd1a99f9588899;hp=452e4e1559e86fa4afd613150a9c4f574f631bc7 merge --- diff --git a/.hgtags b/.hgtags new file mode 100644 index 0000000..7a4c129 --- /dev/null +++ b/.hgtags @@ -0,0 +1 @@ +5a59078a92fab9f4dc352c2be0466eef4e10ef4a RELEASE_0_1_0 diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0da09a2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,22 @@ +Copyright (c) 2011, Michael Wallner . +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * 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 OWNER 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. diff --git a/package.xml b/package.xml new file mode 100644 index 0000000..27c89d0 --- /dev/null +++ b/package.xml @@ -0,0 +1,61 @@ + + + ircclient + pecl.php.net + IRC Client + + Binding for the ircclient library. + + + Michael Wallner + mike + mike@php.net + yes + + 2011-12-06 + + 0.1.0 + 0.1.0 + + + beta + beta + + BSD, revised + + + + + + + + + + + + + + + 5.3 + + + 1.4.1 + + + + ircclient + + + + diff --git a/php_ircclient.c b/php_ircclient.c index e088d81..d4cdbbc 100644 --- a/php_ircclient.c +++ b/php_ircclient.c @@ -1,22 +1,3 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | - +----------------------------------------------------------------------+ - | 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 | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | 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 | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: | - +----------------------------------------------------------------------+ -*/ - -/* $Id: header 310447 2011-04-23 21:14:10Z bjori $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -161,10 +142,10 @@ zend_object_value php_ircclient_session_object_create(zend_class_entry *ce TSRML zend_object_std_init((zend_object *) obj, ce TSRMLS_CC); object_properties_init((zend_object *) obj, ce); #else - obj->zo.ce = ce; - ALLOC_HASHTABLE(obj->zo.properties); - zend_hash_init(obj->zo.properties, zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0); - zend_hash_copy(obj->zo.properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + obj->zo.ce = ce; + ALLOC_HASHTABLE(obj->zo.properties); + zend_hash_init(obj->zo.properties, zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0); + zend_hash_copy(obj->zo.properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); #endif obj->sess = irc_create_session(&php_ircclient_callbacks); diff --git a/php_ircclient.h b/php_ircclient.h index 4c26e4e..b7c665e 100644 --- a/php_ircclient.h +++ b/php_ircclient.h @@ -1,22 +1,3 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | - +----------------------------------------------------------------------+ - | 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 | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | 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 | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: | - +----------------------------------------------------------------------+ -*/ - -/* $Id: header 310447 2011-04-23 21:14:10Z bjori $ */ #ifndef PHP_IRCCLIENT_H #define PHP_IRCCLIENT_H