[PHP-CVS] svn: /php/php-src/trunk/ NEWS ext/snmp/php_snmp.h ext/snmp/snmp.c ext/snmp/tests/snmp_parse_oid.phpt
lytboris Tue, 01 Feb 2011 07:45:30 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307897
Log:
- Improved SNMP extension:
. Allow ~infinite OIDs in GET/GETNEXT/SET queries. Autochunk them to max_oids
upon request.
Changed paths:
U php/php-src/trunk/NEWS
U php/php-src/trunk/ext/snmp/php_snmp.h
U php/php-src/trunk/ext/snmp/snmp.c
D php/php-src/trunk/ext/snmp/tests/snmp_parse_oid.phpt
Modified: php/php-src/trunk/NEWS
===
--- php/php-src/trunk/NEWS 2011-02-01 06:04:38 UTC (rev 307896)
+++ php/php-src/trunk/NEWS 2011-02-01 07:45:30 UTC (rev 307897)
@@ -200,9 +200,11 @@
- Improved SNMP extension:
. Added OO API. FR #53594.
. Sanitized return values of existing functions. Now it returns FALSE on
-failure
- . Introducing unit tests for extension with ~full coverage
- . Fixed bugs #44193, #44193, #45893, #46065, #51336, #53862
+failure.
+ . Allow ~infinite OIDs in GET/GETNEXT/SET queries. Autochunk them to max_oids
+upon request.
+ . Introducing unit tests for extension with ~full coverage.
+ . Fixed bugs #44193, #44193, #45893, #46065, #51336, #53862.
## UNSORTED ##
Modified: php/php-src/trunk/ext/snmp/php_snmp.h
===
--- php/php-src/trunk/ext/snmp/php_snmp.h 2011-02-01 06:04:38 UTC (rev
307896)
+++ php/php-src/trunk/ext/snmp/php_snmp.h 2011-02-01 07:45:30 UTC (rev
307897)
@@ -83,6 +83,7 @@
typedef struct _php_snmp_object {
zend_object zo;
struct snmp_session *session;
+ int max_oids;
int valueretrieval;
int quick_print;
#ifdef HAVE_NET_SNMP
Modified: php/php-src/trunk/ext/snmp/snmp.c
===
--- php/php-src/trunk/ext/snmp/snmp.c 2011-02-01 06:04:38 UTC (rev 307896)
+++ php/php-src/trunk/ext/snmp/snmp.c 2011-02-01 07:45:30 UTC (rev 307897)
@@ -405,13 +405,12 @@
} snmpobjarg;
-#define SNMP_MAXOIDS_IN_PDU 64
struct objid_set {
int count;
int offset;
int step;
int array_output;
- snmpobjarg vars[SNMP_MAXOIDS_IN_PDU];
+ snmpobjarg *vars;
};
/* {{{ snmp_functions[]
@@ -548,7 +547,7 @@
buf = dbuf;
buflen = val_len;
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "malloc()
failed: %s, fallback to static array", strerror(errno));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "emalloc()
failed: %s, fallback to static array", strerror(errno));
}
}
@@ -931,6 +930,11 @@
objid_set->count = 0;
objid_set->array_output = ((st & SNMP_CMD_WALK) ? TRUE : FALSE);
if (Z_TYPE_PP(oid) == IS_STRING) {
+ objid_set->vars = (snmpobjarg *)emalloc(sizeof(snmpobjarg));
+ if (objid_set->vars == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "emalloc()
failed while parsing oid: %s", strerror(errno));
+ return FALSE;
+ }
objid_set->vars[objid_set->count].oid = Z_STRVAL_PP(oid);
if (st & SNMP_CMD_SET) {
if (Z_TYPE_PP(type) == IS_STRING && Z_TYPE_PP(value) ==
IS_STRING) {
@@ -952,6 +956,11 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Got empty
OID array");
return FALSE;
}
+ objid_set->vars = (snmpobjarg *)emalloc(sizeof(snmpobjarg) *
zend_hash_num_elements(Z_ARRVAL_PP(oid)));
+ if (objid_set->vars == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "emalloc()
failed while parsing oid array: %s", strerror(errno));
+ return FALSE;
+ }
objid_set->array_output = ( (st & SNMP_CMD_SET) ? FALSE : TRUE
);
for ( zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(oid),
&pos_oid);
zend_hash_get_current_data_ex(Z_ARRVAL_PP(oid), (void
**) &tmp_oid, &pos_oid) == SUCCESS;
@@ -992,11 +1001,7 @@
}
}
}
-
- if (objid_set->count++ >= SNMP_MAXOIDS_IN_PDU) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Could not process more than %u OIDs in singe GET/GETNEXT/SET query",
SNMP_MAXOIDS_IN_PDU);
- return FALSE;
- }
+ objid_set->count++;
}
}
@@ -1269,7 +1274,7 @@
long timeout = SNMP_DEFAULT_TIMEOUT;
long retries = SNMP_DEFAULT_RETRIES;
int non_repeaters = 0;
- int max_repetitions = 20;
+ int max_repetitions = -1;
int argc = ZEND_NUM_ARGS();
struc
[PHP-CVS] svn: /php/php-src/trunk/ext/snmp/ snmp.c
felipe Tue, 01 Feb 2011 01:02:00 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307894
Log:
- Fixed build
Changed paths:
U php/php-src/trunk/ext/snmp/snmp.c
Modified: php/php-src/trunk/ext/snmp/snmp.c
===
--- php/php-src/trunk/ext/snmp/snmp.c 2011-01-31 23:59:51 UTC (rev 307893)
+++ php/php-src/trunk/ext/snmp/snmp.c 2011-02-01 01:02:00 UTC (rev 307894)
@@ -507,7 +507,6 @@
static zend_object_value php_snmp_object_new(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
{
- zval *tmp;
zend_object_value retval;
php_snmp_object *intern;
@@ -516,9 +515,9 @@
memset(&intern->zo, 0, sizeof(php_snmp_object));
zend_object_std_init(&intern->zo, class_type TSRMLS_CC);
- zend_hash_copy(intern->zo.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &tmp, sizeof(zval *));
+ object_properties_init(&intern->zo, class_type);
- retval.handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t) php_snmp_object_free_storage, NULL TSRMLS_CC);
+ retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) php_snmp_object_free_storage, NULL TSRMLS_CC);
retval.handlers = (zend_object_handlers *) &php_snmp_object_handlers;
return retval;
@@ -894,7 +893,7 @@
* OID parser (and type, value for SNMP_SET command)
*/
-static int php_snmp_parse_oid(int st, struct objid_set *objid_set, zval **oid, zval **type, zval **value)
+static int php_snmp_parse_oid(int st, struct objid_set *objid_set, zval **oid, zval **type, zval **value TSRMLS_DC)
{
char *pptr;
HashPosition pos_oid, pos_type, pos_value;
@@ -1010,7 +1009,7 @@
/* {{{ netsnmp_session_init
allocates memory for session and session->peername, caller should free it manually using netsnmp_session_free() and efree()
*/
-static int netsnmp_session_init(php_snmp_session **session_p, int version, char *hostname, char *community, int timeout, int retries)
+static int netsnmp_session_init(php_snmp_session **session_p, int version, char *hostname, char *community, int timeout, int retries TSRMLS_DC)
{
int remote_port = SNMP_PORT;
php_snmp_session *session;
@@ -1064,7 +1063,7 @@
/* {{{ int netsnmp_session_set_sec_level(struct snmp_session *s, char *level)
Set the security level in the snmpv3 session */
-static int netsnmp_session_set_sec_level(struct snmp_session *s, char *level TSRMLS_DC)
+static int netsnmp_session_set_sec_level(struct snmp_session *s, char *level)
{
if (!strcasecmp(level, "noAuthNoPriv") || !strcasecmp(level, "nanp")) {
s->securityLevel = SNMP_SEC_LEVEL_NOAUTH;
@@ -1090,7 +1089,7 @@
s->securityAuthProto = usmHMACSHA1AuthProtocol;
s->securityAuthProtoLen = OIDSIZE(usmHMACSHA1AuthProtocol);
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown authentication protocol '%s'", prot TSRMLS_DC);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown authentication protocol '%s'", prot);
return (-1);
}
return (0);
@@ -1179,7 +1178,7 @@
/* {{{ in netsnmp_session_set_contextEngineID(struct snmp_session *s, u_char * contextEngineID)
Set context Engine Id in the snmpv3 session */
-static int netsnmp_session_set_contextEngineID(struct snmp_session *s, u_char * contextEngineID)
+static int netsnmp_session_set_contextEngineID(struct snmp_session *s, u_char * contextEngineID TSRMLS_DC)
{
size_t ebuf_len = 32, eout_len = 0;
u_char *ebuf = (u_char *) malloc(ebuf_len); /* memory freed by SNMP library, strdup NOT estrdup */
@@ -1201,7 +1200,7 @@
/* {{{ php_set_security(struct snmp_session *session, char *sec_level, char *auth_protocol, char *auth_passphrase, char *priv_protocol, char *priv_passphrase, char *contextName, char *contextEngineID)
Set all snmpv3-related security options */
-static int netsnmp_session_set_security(struct snmp_session *session, char *sec_level, char *auth_protocol, char *auth_passphrase, char *priv_protocol, char *priv_passphrase, char *contextName, char *contextEngineID)
+static int netsnmp_session_set_security(struct snmp_session *session, char *sec_level, char *auth_protocol, char *auth_passphrase, char *priv_protocol, char *priv_passphrase, char *contextName, char *contextEngineID TSRMLS_DC)
{
/* Setting the security level. */
@@ -1213,26 +1212,26 @@
if (session->securityLevel == SNMP_SEC_LEVEL_AUTHNOPRIV || session->securityLevel == SNMP_SEC_LEVEL_AUTHPRIV) {
/* Setting the authentication protocol. */
- if (netsnmp_session_set_auth_protocol(session, auth_protocol)) {
+ if (netsnmp_session_set_auth_protocol(session, auth_protocol TSRMLS_CC)) {
/* Warning message sent already, just bail out */
return (-1);
}
/* Setting the authentication passphrase. */
- if (netsnmp_session_gen_auth_key(session, auth_passphrase)) {
+ if (netsnmp_session_gen_auth_key(session, auth_passphrase TSRMLS_CC)) {
/*
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/run-tests.php trunk/run-tests.php
derick Mon, 31 Jan 2011 23:11:42 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307892
Log:
- Don't lower case setting names; some of them actually have upper case
characters.
Changed paths:
U php/php-src/branches/PHP_5_3/run-tests.php
U php/php-src/trunk/run-tests.php
Modified: php/php-src/branches/PHP_5_3/run-tests.php
===
--- php/php-src/branches/PHP_5_3/run-tests.php 2011-01-31 21:20:57 UTC (rev
307891)
+++ php/php-src/branches/PHP_5_3/run-tests.php 2011-01-31 23:11:42 UTC (rev
307892)
@@ -2143,7 +2143,7 @@
if (strpos($setting, '=') !== false) {
$setting = explode("=", $setting, 2);
- $name = trim(strtolower($setting[0]));
+ $name = trim($setting[0]);
$value = trim($setting[1]);
if ($name == 'extension') {
Modified: php/php-src/trunk/run-tests.php
===
--- php/php-src/trunk/run-tests.php 2011-01-31 21:20:57 UTC (rev 307891)
+++ php/php-src/trunk/run-tests.php 2011-01-31 23:11:42 UTC (rev 307892)
@@ -2143,7 +2143,7 @@
if (strpos($setting, '=') !== false) {
$setting = explode("=", $setting, 2);
- $name = trim(strtolower($setting[0]));
+ $name = trim($setting[0]);
$value = trim($setting[1]);
if ($name == 'extension') {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/ext/mysqlnd/ mysqlnd_auth.c
On 01/31/2011 01:32 PM, Kalle Sommer Nielsen wrote:
> kalleMon, 31 Jan 2011 12:32:32 +
>
> Revision: http://svn.php.net/viewvc?view=revision&revision=307878
>
> Log:
> Use our own zend_strndup() implementation of strndup() -- Fixes build on
> platforms without strndup(), like Windows
>
> Changed paths:
> U php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c
>
> Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c
> ===
> --- php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c 2011-01-31 11:41:33 UTC
> (rev 307877)
> +++ php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c 2011-01-31 12:32:32 UTC
> (rev 307878)
> @@ -428,7 +428,7 @@
>
> /* copy pass*/
> if (passwd && passwd_len) {
> - ret = (zend_uchar*) strndup(passwd, passwd_len);
> + ret = (zend_uchar*) zend_strndup(passwd, passwd_len);
> }
> *auth_data_len = passwd_len;
>
>
>
this will return emalloc-ed memory, right? Later this memory will be
freed with free() and guess what happens :)
Andrey
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h trunk/ext/mysqlnd/mysqlnd_enum_n_def.h
andrey Mon, 31 Jan 2011 13:52:21 + Revision: http://svn.php.net/viewvc?view=revision&revision=307883 Log: Add two new enums constants from the server Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h U php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h === --- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h 2011-01-31 13:29:18 UTC (rev 307882) +++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h 2011-01-31 13:52:21 UTC (rev 307883) @@ -157,6 +157,8 @@ MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, + MYSQL_PLUGIN_DIR, + MYSQL_DEFAULT_AUTH, #if MYSQLND_UNICODE MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE = 200, #endif Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h === --- php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h 2011-01-31 13:29:18 UTC (rev 307882) +++ php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h 2011-01-31 13:52:21 UTC (rev 307883) @@ -162,6 +162,8 @@ MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, + MYSQL_PLUGIN_DIR, + MYSQL_DEFAULT_AUTH, #if MYSQLND_UNICODE MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE = 200, #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/mysqlnd/ mysqlnd.c
andrey Mon, 31 Jan 2011 13:29:18 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307882
Log:
Don't lose this data anymore. It worked without the fix,
but it with it is just correct (trunk only).
Changed paths:
U php/php-src/trunk/ext/mysqlnd/mysqlnd.c
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-01-31 13:00:27 UTC (rev
307881)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2011-01-31 13:29:18 UTC (rev
307882)
@@ -588,10 +588,10 @@
free(scrambled_data);
DBG_INF_FMT("switch_to_auth_protocol=%s",
switch_to_auth_protocol? switch_to_auth_protocol:"n/a");
- if (requested_protocol) {
+ if (requested_protocol &&
switch_to_auth_protocol) {
mnd_efree(requested_protocol);
+ requested_protocol =
switch_to_auth_protocol;
}
- requested_protocol = switch_to_auth_protocol;
if (plugin_data) {
mnd_efree(plugin_data);
@@ -606,6 +606,7 @@
}
if (ret == PASS) {
+ DBG_INF_FMT("saving requested_protocol=%s",
requested_protocol);
conn->m->set_client_option(conn,
MYSQLND_OPT_AUTH_PROTOCOL, requested_protocol TSRMLS_CC);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/NEWS PHP_5_2/ext/snmp/snmp.c PHP_5_3/NEWS PHP_5_3/ext/snmp/snmp.c
Hi. On Mon, Jan 31, 2011 at 3:46 PM, Kalle Sommer Nielsen wrote: > The PHP_5_2 branch is dead, so please revert the changes in that > branch and keep it to 5.3/trunk. done, thanks. -- Boris -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS ext/snmp/snmp.c
lytboris Mon, 31 Jan 2011 13:00:27 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307881
Log:
revert commit 307876
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/snmp/snmp.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2011-01-31 12:47:28 UTC (rev 307880)
+++ php/php-src/branches/PHP_5_2/NEWS 2011-01-31 13:00:27 UTC (rev 307881)
@@ -8,9 +8,6 @@
- Fixed bug #53568 (swapped memset arguments in struct initialization).
(crrodriguez at opensuse dot org)
-- Fixed bug #51336 (snmprealwalk (snmp v1) does not handle end of OID tree
correctly)
- (Boris Lytochkin)
-
06 Jan 2010, PHP 5.2.17
- Fixed Bug #53632 (infinite loop with x87 fpu). (CVE-2010-4645) (Scott,
Rasmus)
Modified: php/php-src/branches/PHP_5_2/ext/snmp/snmp.c
===
--- php/php-src/branches/PHP_5_2/ext/snmp/snmp.c2011-01-31 12:47:28 UTC
(rev 307880)
+++ php/php-src/branches/PHP_5_2/ext/snmp/snmp.c2011-01-31 13:00:27 UTC
(rev 307881)
@@ -502,7 +502,7 @@
}
}
} else {
- if ((st != SNMP_CMD_WALK && st !=
SNMP_CMD_REALWALK) || response->errstat != SNMP_ERR_NOSUCHNAME) {
+ if (st != SNMP_CMD_WALK || response->errstat !=
SNMP_ERR_NOSUCHNAME) {
php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Error in packet: %s", snmp_errstring(response->errstat));
if (response->errstat ==
SNMP_ERR_NOSUCHNAME) {
for (count=1, vars =
response->variables; vars && count != response->errindex;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mysqlnd/config.w32 trunk/ext/mysqlnd/config.w32
kalleMon, 31 Jan 2011 12:47:28 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307880
Log:
Fixed bug #53795 (Connect Error from MySqli (mysqlnd) when using SSL)
Bug: http://bugs.php.net/53795 (Assigned) Connect Error from MySqli (mysqlnd)
when using SSL
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/mysqlnd/config.w32
U php/php-src/trunk/ext/mysqlnd/config.w32
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2011-01-31 12:44:39 UTC (rev 307879)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-01-31 12:47:28 UTC (rev 307880)
@@ -73,6 +73,8 @@
- MySQL Improved extension:
. Added 'db' and 'catalog' keys to the field fetching functions (FR #39847).
(Kalle)
+ . Fixed bug #53795 (Connect Error from MySqli (mysqlnd) when using SSL).
+(Kalle)
. Fixed bug #53503 (mysqli::query returns false after successful LOAD DATA
query). (Kalle, Andrey)
. Fixed bug #53425 (mysqli_real_connect() ignores client flags when built to
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/config.w32
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/config.w32 2011-01-31 12:44:39 UTC
(rev 307879)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/config.w32 2011-01-31 12:47:28 UTC
(rev 307880)
@@ -24,6 +24,7 @@
(PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "mysqlnd",
PHP_MYSQLND)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
{
AC_DEFINE("MYSQLND_COMPRESSION_ENABLED", 1,
"Compression support");
+ AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "SSL support");
}
PHP_INSTALL_HEADERS("", "ext/mysqlnd");
}
Modified: php/php-src/trunk/ext/mysqlnd/config.w32
===
--- php/php-src/trunk/ext/mysqlnd/config.w322011-01-31 12:44:39 UTC (rev
307879)
+++ php/php-src/trunk/ext/mysqlnd/config.w322011-01-31 12:47:28 UTC (rev
307880)
@@ -26,6 +26,7 @@
(PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "mysqlnd",
PHP_MYSQLND)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
{
AC_DEFINE("MYSQLND_COMPRESSION_ENABLED", 1,
"Compression support");
+ AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "SSL support");
}
PHP_INSTALL_HEADERS("", "ext/mysqlnd");
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/NEWS PHP_5_2/ext/snmp/snmp.c PHP_5_3/NEWS PHP_5_3/ext/snmp/snmp.c
Hi Boris 2011/1/31 Boris Lytochkin : > lytboris Mon, 31 Jan 2011 11:34:12 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=307876 > > Log: > Fixed bug #51336 > > Bug: http://bugs.php.net/51336 (Open) snmprealwalk (snmp v1) does not handle > end of OID tree correctly > > Changed paths: > U php/php-src/branches/PHP_5_2/NEWS > U php/php-src/branches/PHP_5_2/ext/snmp/snmp.c The PHP_5_2 branch is dead, so please revert the changes in that branch and keep it to 5.3/trunk. -- regards, Kalle Sommer Nielsen ka...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/mysqlnd/ mysqlnd_auth.c
kalleMon, 31 Jan 2011 12:32:32 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307878
Log:
Use our own zend_strndup() implementation of strndup() -- Fixes build on
platforms without strndup(), like Windows
Changed paths:
U php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c2011-01-31 11:41:33 UTC
(rev 307877)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_auth.c2011-01-31 12:32:32 UTC
(rev 307878)
@@ -428,7 +428,7 @@
/* copy pass*/
if (passwd && passwd_len) {
- ret = (zend_uchar*) strndup(passwd, passwd_len);
+ ret = (zend_uchar*) zend_strndup(passwd, passwd_len);
}
*auth_data_len = passwd_len;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/NEWS PHP_5_2/ext/snmp/snmp.c PHP_5_3/NEWS PHP_5_3/ext/snmp/snmp.c
lytboris Mon, 31 Jan 2011 11:34:12 +
Revision: http://svn.php.net/viewvc?view=revision&revision=307876
Log:
Fixed bug #51336
Bug: http://bugs.php.net/51336 (Open) snmprealwalk (snmp v1) does not handle
end of OID tree correctly
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
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2011-01-31 11:17:22 UTC (rev 307875)
+++ php/php-src/branches/PHP_5_2/NEWS 2011-01-31 11:34:12 UTC (rev 307876)
@@ -8,6 +8,9 @@
- Fixed bug #53568 (swapped memset arguments in struct initialization).
(crrodriguez at opensuse dot org)
+- Fixed bug #51336 (snmprealwalk (snmp v1) does not handle end of OID tree
correctly)
+ (Boris Lytochkin)
+
06 Jan 2010, PHP 5.2.17
- Fixed Bug #53632 (infinite loop with x87 fpu). (CVE-2010-4645) (Scott,
Rasmus)
Modified: php/php-src/branches/PHP_5_2/ext/snmp/snmp.c
===
--- php/php-src/branches/PHP_5_2/ext/snmp/snmp.c2011-01-31 11:17:22 UTC
(rev 307875)
+++ php/php-src/branches/PHP_5_2/ext/snmp/snmp.c2011-01-31 11:34:12 UTC
(rev 307876)
@@ -502,7 +502,7 @@
}
}
} else {
- if (st != SNMP_CMD_WALK || response->errstat !=
SNMP_ERR_NOSUCHNAME) {
+ if ((st != SNMP_CMD_WALK && st !=
SNMP_CMD_REALWALK) || response->errstat != SNMP_ERR_NOSUCHNAME) {
php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Error in packet: %s", snmp_errstring(response->errstat));
if (response->errstat ==
SNMP_ERR_NOSUCHNAME) {
for (count=1, vars =
response->variables; vars && count != response->errindex;
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2011-01-31 11:17:22 UTC (rev 307875)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-01-31 11:34:12 UTC (rev 307876)
@@ -157,6 +157,9 @@
. Fixed bug #53885 (ZipArchive segfault with FL_UNCHANGED on empty archive).
(Stas, Maksymilian Arciemowicz).
+- Fixed bug #51336 (snmprealwalk (snmp v1) does not handle end of OID tree
correctly)
+ (Boris Lytochkin)
+
06 Jan 2011, PHP 5.3.5
- Fixed Bug #53632 (infinite loop with x87 fpu). (CVE-2010-4645) (Scott,
Rasmus)
Modified: php/php-src/branches/PHP_5_3/ext/snmp/snmp.c
===
--- php/php-src/branches/PHP_5_3/ext/snmp/snmp.c2011-01-31 11:17:22 UTC
(rev 307875)
+++ php/php-src/branches/PHP_5_3/ext/snmp/snmp.c2011-01-31 11:34:12 UTC
(rev 307876)
@@ -689,7 +689,7 @@
}
}
} else {
- if (st != SNMP_CMD_WALK || response->errstat !=
SNMP_ERR_NOSUCHNAME) {
+ if ((st != SNMP_CMD_WALK && st !=
SNMP_CMD_REALWALK) || response->errstat != SNMP_ERR_NOSUCHNAME) {
php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Error in packet: %s", snmp_errstring(response->errstat));
if (response->errstat ==
SNMP_ERR_NOSUCHNAME) {
for (count=1, vars =
response->variables; vars && count != response->errindex;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
pajoye Mon, 31 Jan 2011 11:17:22 + Revision: http://svn.php.net/viewvc?view=revision&revision=307875 Log: - NEWS karma for Lytochkin Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2011-01-31 11:15:12 UTC (rev 307874) +++ SVNROOT/global_avail2011-01-31 11:17:22 UTC (rev 307875) @@ -163,7 +163,7 @@ avail|veebert,musone,askalski,chagenbu,rjs3|php/php-src/*/ext/imap avail|danny,nyenyon,borg73,nobbie|php/php-src/*/ext/informix avail|jah,aeschbacher,daniela,ludoo,abies|php/php-src/*/ext/interbase -avail|jamuel,thewitness,lytboris|php/php-src/*/ext/snmp,phpdoc +avail|jamuel,thewitness,lytboris|php/php-src/*/ext/snmp,phpdoc,php/php-src/*/NEWS avail|akilov,stoddard,wenz,tjw|php/php-src/*/ext/java avail|amitay,cardoe|php/php-src/*/ext/ldap avail|yohgaki,fujimoto,dets|php/php-src/*/ext/mbstring,php/php-src/*/ext/pgsql -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
