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)

diff --cc ext/snmp/snmp.c
index 92b7732e67679ec319382d8ee391c63f038acd65,3206a0692bb9456db2df1dc5b5733dc52c3ac2fe..05e2ba24fd984c35947b9c7cbdd781708ed35cfb
--- 1/ext/snmp/snmp.c
--- 2/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
  };