diff options
| author | Boris Lytochkin <lytboris@php.net> | 2013-05-03 12:19:10 +0400 |
|---|---|---|
| committer | Boris Lytochkin <lytboris@php.net> | 2013-05-03 12:19:10 +0400 |
| commit | 1ce836580d03b4468d88d614f5144fdf40a03c4a (patch) | |
| tree | 2ac79e837f944a904f3fd70390250014bc9d7ee2 /ext/snmp | |
| parent | 5f67584fd7038ed28087a384c2d76093430ac996 (diff) | |
| parent | a39282b64dad04a047f0ff8c230a5a64ad417a2f (diff) | |
| download | php-git-1ce836580d03b4468d88d614f5144fdf40a03c4a.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update NEWS
Fix bug #64765 (enclose IPv6 address into square brackets)
Diffstat (limited to 'ext/snmp')
| -rw-r--r-- | ext/snmp/snmp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 9789638c66..cd96be0d5d 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -1177,9 +1177,10 @@ static int netsnmp_session_init(php_snmp_session **session_p, int version, char continue; } if ((*res)->sa_family == AF_INET6) { - strcpy(session->peername, "udp6:"); + strcpy(session->peername, "udp6:["); pptr = session->peername + strlen(session->peername); inet_ntop((*res)->sa_family, &(((struct sockaddr_in6*)(*res))->sin6_addr), pptr, MAX_NAME_LEN); + strcat(pptr, "]"); } else if ((*res)->sa_family == AF_INET) { inet_ntop((*res)->sa_family, &(((struct sockaddr_in*)(*res))->sin_addr), pptr, MAX_NAME_LEN); } else { |