php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 23:48:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5'

Browse Source 
* PHP-5.5:
  Fix bug #61981
This commit is contained in:
Boris Lytochkin
2013-03-17 20:18:17 +04:00
parent ada89863c3 5d0826e9c3
commit 719264d1af
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/snmp/snmp.c
+2 -2
View File
@@ -847,9 +847,9 @@ retry:
}
} else if (st & SNMP_USE_SUFFIX_AS_KEYS && st & SNMP_CMD_WALK) {
snprint_objid(buf2, sizeof(buf2), vars->name, vars->name_length);
if (objid_query->vars[0].name_length <= vars->name_length && snmp_oid_compare(objid_query->vars[0].name, objid_query->vars[0].name_length, vars->name, objid_query->vars[0].name_length) == 0) {
if (rootlen <= vars->name_length && snmp_oid_compare(root, rootlen, vars->name, rootlen) == 0) {
buf2[0] = '\0';
count = objid_query->vars[0].name_length;
count = rootlen;
while(count < vars->name_length){
sprintf(buf, "%lu.", vars->name[count]);
strcat(buf2, buf);
ext/snmp/tests/snmp-object.phpt
+20
View File
@@ -83,6 +83,19 @@ var_dump(gettype($z));
var_dump(count($z));
var_dump(key($z));
var_dump(array_shift($z));
var_dump(key($z));
array_shift($z);
var_dump(key($z));
array_shift($z);
var_dump(key($z));
array_shift($z);
var_dump(key($z));
array_shift($z);
var_dump(key($z));
array_shift($z);
var_dump(key($z));
array_shift($z);
var_dump(key($z));
var_dump($session->close());
echo "SNMPv3 (default security settings)\n";
@@ -194,6 +207,13 @@ string(5) "array"
int(%d)
string(3) "1.0"
string(%d) "%s"
string(3) "2.0"
string(3) "3.0"
string(3) "4.0"
string(3) "5.0"
string(3) "6.0"
string(3) "7.0"
string(3) "8.0"
bool(true)
SNMPv3 (default security settings)
string(%d) "%S"