jani Sun, 25 Oct 2009 20:17:04 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=289918
Log: - Fixed bug #49990 (SNMP3 warning message about security level printed twice). Bug: http://bugs.php.net/49990 (Verified) SNMP3 warning message about security level printed twice Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/snmp/snmp.c U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/snmp/snmp.c U php/php-src/trunk/ext/snmp/snmp.c Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2009-10-25 19:08:26 UTC (rev 289917) +++ php/php-src/branches/PHP_5_2/NEWS 2009-10-25 20:17:04 UTC (rev 289918) @@ -12,6 +12,8 @@ - Fixed crash when instantiating PDORow and PDOStatement through Reflection. (Felipe) +- Fixed bug #49990 (SNMP3 warning message about security level printed twice). + (Jani) - Fixed bug #49972 (AppendIterator undefined function crash). (Johannes) - Fixed bug #49855 (import_request_variables() always returns NULL). (Ilia, sjoerd at php dot net) Modified: php/php-src/branches/PHP_5_2/ext/snmp/snmp.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/snmp/snmp.c 2009-10-25 19:08:26 UTC (rev 289917) +++ php/php-src/branches/PHP_5_2/ext/snmp/snmp.c 2009-10-25 20:17:04 UTC (rev 289918) @@ -817,7 +817,6 @@ s->securityLevel = SNMP_SEC_LEVEL_AUTHPRIV; return (0); } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid security level: %s", level); } return (-1); } @@ -836,8 +835,6 @@ s->securityAuthProto = usmHMACSHA1AuthProtocol; s->securityAuthProtoLen = OIDSIZE(usmHMACSHA1AuthProtocol); return (0); - } else if (strlen(prot)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid authentication protocol: %s", prot); } } return (-1); @@ -889,8 +886,6 @@ return (0); #endif #endif - } else if (strlen(prot)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid privacy protocol: %s", prot); } } return (-1); Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2009-10-25 19:08:26 UTC (rev 289917) +++ php/php-src/branches/PHP_5_3/NEWS 2009-10-25 20:17:04 UTC (rev 289918) @@ -11,6 +11,8 @@ - Fixed memory leak in extension loading when an error occurs on Windows. (Pierre) +- Fixed bug #49990 (SNMP3 warning message about security level printed twice). + (Jani) - Fixed bug #49855 (import_request_variables() always returns NULL). (Ilia, sjoerd at php dot net) - Fixed bug #49800 (SimpleXML allow (un)serialize() calls without warning). Modified: php/php-src/branches/PHP_5_3/ext/snmp/snmp.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/snmp/snmp.c 2009-10-25 19:08:26 UTC (rev 289917) +++ php/php-src/branches/PHP_5_3/ext/snmp/snmp.c 2009-10-25 20:17:04 UTC (rev 289918) @@ -981,7 +981,6 @@ s->securityLevel = SNMP_SEC_LEVEL_AUTHPRIV; return (0); } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid security level: %s", level); } return (-1); } @@ -1000,8 +999,6 @@ s->securityAuthProto = usmHMACSHA1AuthProtocol; s->securityAuthProtoLen = OIDSIZE(usmHMACSHA1AuthProtocol); return (0); - } else if (strlen(prot)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid authentication protocol: %s", prot); } } return (-1); @@ -1053,8 +1050,6 @@ return (0); #endif #endif - } else if (strlen(prot)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid privacy protocol: %s", prot); } } return (-1); Modified: php/php-src/trunk/ext/snmp/snmp.c =================================================================== --- php/php-src/trunk/ext/snmp/snmp.c 2009-10-25 19:08:26 UTC (rev 289917) +++ php/php-src/trunk/ext/snmp/snmp.c 2009-10-25 20:17:04 UTC (rev 289918) @@ -981,7 +981,6 @@ s->securityLevel = SNMP_SEC_LEVEL_AUTHPRIV; return (0); } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid security level: %s", level); } return (-1); } @@ -1000,8 +999,6 @@ s->securityAuthProto = usmHMACSHA1AuthProtocol; s->securityAuthProtoLen = OIDSIZE(usmHMACSHA1AuthProtocol); return (0); - } else if (strlen(prot)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid authentication protocol: %s", prot); } } return (-1); @@ -1053,8 +1050,6 @@ return (0); #endif #endif - } else if (strlen(prot)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid privacy protocol: %s", prot); } } return (-1);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
