Merge branch '5.4' into PHP-5.4

* 5.4:
  keep 'em sorted
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations

Author: Boris Lytochkin

NEWS

@@ -27,6 +27,9 @@ PHP                                                                        NEWS
   . Fixed bug #64405 (Use freetype-config for determining freetype2 dir(s)).
     (Adam)
 
+- SNMP:
+  . Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
+
 - XSL
   . Fixed bug #49634 (Segfault throwing an exception in a XSL registered
     function). (Mike)

ext/snmp/snmp.c

@@ -896,6 +896,12 @@ static void php_snmp_internal(INTERNAL_FUNCTION_PARAMETERS, int st,
 					keepwalking = 1;
 				}
 			} else {
+				if (st & SNMP_CMD_WALK && response->errstat == SNMP_ERR_TOOBIG && objid_query->max_repetitions > 1) { /* Answer will not fit into single packet */
+					objid_query->max_repetitions /= 2;
+					snmp_free_pdu(response);
+					keepwalking = 1;
+					continue;
+				}
 				if (!(st & SNMP_CMD_WALK) || response->errstat != SNMP_ERR_NOSUCHNAME || Z_TYPE_P(return_value) == IS_BOOL) {
 					for (	count=1, vars = response->variables;
 						vars && count != response->errindex;