com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/snmp/snmp.c
| From: | Stanislav Malyshev | Date: | Sun, 18 Oct 2015 21:51:13 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/snmp/snmp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89436@lists.php.net to get a copy of this message | ||
Commit: 6a4803026d8877385436f3fa4152e674e6ecccc3
Author: Stanislav Malyshev <stas@php.net> Sun, 18 Oct 2015 14:51:13 -0700
Parents: f231ddddafa005576e90f9325d31eebc9ea690bf 718445b09634db2033d0ed0e1849cac6f85faf48
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6a4803026d8877385436f3fa4152e674e6ecccc3
Log:
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Remove wrong argument $session from SNMP::setSecurity()
Fix SNMP::setSecurity() arginfo (Fixes bug #70476)
Bugs:
https://bugs.php.net/70476
Changed paths:
MM ext/snmp/snmp.c
Diff:
diff --cc ext/snmp/snmp.c
index 92b7732,3206a06..05e2ba2
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@@ -2297,24 -2339,18 +2295,24 @@@ static int php_snmp_write_exceptions_en
}
/* }}} */
+static void free_php_snmp_properties(zval *el) /* {{{ */
+{
+ pefree(Z_PTR_P(el), 1);
+}
+/* }}} */
+
/* {{{ php_snmp_class_methods[] */
static zend_function_entry php_snmp_class_methods[] = {
- PHP_ME(snmp, __construct, arginfo_snmp_create, ZEND_ACC_PUBLIC)
- PHP_ME(snmp, close, arginfo_snmp_void, ZEND_ACC_PUBLIC)
- PHP_ME(snmp, setSecurity, arginfo_snmp_setSecurity, ZEND_ACC_PUBLIC)
-
- PHP_ME(snmp, get, arginfo_snmp_get, ZEND_ACC_PUBLIC)
- PHP_ME(snmp, getnext, arginfo_snmp_get, ZEND_ACC_PUBLIC)
- PHP_ME(snmp, walk, arginfo_snmp_walk, ZEND_ACC_PUBLIC)
- PHP_ME(snmp, set, arginfo_snmp_set, ZEND_ACC_PUBLIC)
- PHP_ME(snmp, getErrno, arginfo_snmp_void, ZEND_ACC_PUBLIC)
- PHP_ME(snmp, getError, arginfo_snmp_void, ZEND_ACC_PUBLIC)
+ PHP_ME(snmp, __construct, arginfo_snmp_create, ZEND_ACC_PUBLIC)
+ PHP_ME(snmp, close, arginfo_snmp_void, ZEND_ACC_PUBLIC)
+ PHP_ME(snmp, setSecurity, arginfo_snmp_setSecurity, ZEND_ACC_PUBLIC)
+
+ PHP_ME(snmp, get, arginfo_snmp_get, ZEND_ACC_PUBLIC)
+ PHP_ME(snmp, getnext, arginfo_snmp_get, ZEND_ACC_PUBLIC)
+ PHP_ME(snmp, walk, arginfo_snmp_walk, ZEND_ACC_PUBLIC)
+ PHP_ME(snmp, set, arginfo_snmp_set, ZEND_ACC_PUBLIC)
+ PHP_ME(snmp, getErrno, arginfo_snmp_void, ZEND_ACC_PUBLIC)
+ PHP_ME(snmp, getError, arginfo_snmp_void, ZEND_ACC_PUBLIC)
PHP_FE_END
};