iliaa           Mon Jun  1 13:10:57 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/snmp   snmp.c 
    /php-src    NEWS 
  Log:
  
  Fixed bug #48273 (snmp*_real_walk() returns SNMP errors as values).
  
http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/snmp.c?r1=1.106.2.2.2.9&r2=1.106.2.2.2.10&diff_format=u
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.106.2.2.2.9 
php-src/ext/snmp/snmp.c:1.106.2.2.2.10
--- php-src/ext/snmp/snmp.c:1.106.2.2.2.9       Sun May 31 14:14:07 2009
+++ php-src/ext/snmp/snmp.c     Mon Jun  1 13:10:56 2009
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: snmp.c,v 1.106.2.2.2.9 2009/05/31 14:14:07 iliaa Exp $ */
+/* $Id: snmp.c,v 1.106.2.2.2.10 2009/06/01 13:10:56 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -479,7 +479,7 @@
                                                return;
                                        } else if (st == SNMP_CMD_WALK) {
                                                
add_next_index_zval(return_value,snmpval); /* Add to returned array */
-                                       } else if (st == SNMP_CMD_REALWALK)  {
+                                       } else if (st == SNMP_CMD_REALWALK && 
vars->type != SNMP_ENDOFMIBVIEW && vars->type != SNMP_NOSUCHOBJECT && 
vars->type != SNMP_NOSUCHINSTANCE) {
 #ifdef HAVE_NET_SNMP
                                                snprint_objid(buf2, 
sizeof(buf2), vars->name, vars->name_length);
 #else
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1537&r2=1.2027.2.547.2.1538&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1537 php-src/NEWS:1.2027.2.547.2.1538
--- php-src/NEWS:1.2027.2.547.2.1537    Mon Jun  1 09:00:54 2009
+++ php-src/NEWS        Mon Jun  1 13:10:57 2009
@@ -12,6 +12,8 @@
   files). (Pierre)
 - Fixed bug #48359 (Script hangs on snmprealwalk if OID is not
   increasing). (Ilia, simonov at gmail dot com)
+- Fixed bug #48273 (snmp*_real_walk() returns SNMP errors as values).
+  (Ilia, lytboris at gmail dot com)
 - Fixed bug #48247 (Crash on errors during startup). (Stas)
 - Fixed bug #42143 (The constant NAN is reported as 0 on Windows)
   (Kanwaljeet Singla, Venkat Raman Don)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to