cvs: php-src(PHP_5_2) / NEWS /ext/standard dns.c

felipe Mon Nov 3 11:39:34 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard dns.c /php-src NEWS Log: - MFH: Fixed bug #42855 (dns_get_record() doesn't return all text from TXT record) patch by: a dot u dot savchuk at gmail dot com http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.6&r2=1.70.2.7.2.7&diff_format=u Index: php-src/ext/standard/dns.c diff -u php-src/ext/standard/dns.c:1.70.2.7.2.6 php-src/ext/standard/dns.c:1.70.2.7.2.7 --- php-src/ext/standard/dns.c:1.70.2.7.2.6 Mon Dec 31 07:20:12 2007 +++ php-src/ext/standard/dns.c Mon Nov 3 11:39:34 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dns.c,v 1.70.2.7.2.6 2007/12/31 07:20:12 sebastian Exp $ */ +/* $Id: dns.c,v 1.70.2.7.2.7 2008/11/03 11:39:34 felipe Exp $ */ /* {{{ includes */ #include "php.h" @@ -472,14 +472,23 @@ add_assoc_stringl(*subarray, "os", cp, n, 1); cp += n; break; - case DNS_T_TXT: - add_assoc_string(*subarray, "type", "TXT", 1); - n = cp[0]; - tp = emalloc(n + 1); - memcpy(tp, cp + 1, n); - tp[n] = '\0'; - cp += dlen; - add_assoc_stringl(*subarray, "txt", tp, n, 0); + case DNS_T_TXT: + { + int ll = 0; + + add_assoc_string(*subarray, "type", "TXT", 1); + tp = emalloc(dlen + 1); + + while (ll < dlen) { + n = cp[ll]; + memcpy(tp + ll , cp + ll + 1, n); + ll = ll + n + 1; + } + tp[dlen] = '\0'; + cp += dlen; + + add_assoc_stringl(*subarray, "txt", tp, dlen, 0); + } break; case DNS_T_SOA: add_assoc_string(*subarray, "type", "SOA", 1); http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1292&r2=1.2027.2.547.2.1293&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1292 php-src/NEWS:1.2027.2.547.2.1293 --- php-src/NEWS:1.2027.2.547.2.1292 Sun Nov 2 22:04:40 2008 +++ php-src/NEWS Mon Nov 3 11:39:34 2008 @@ -26,6 +26,8 @@ - Fixed bug #43452 (strings containing a weekday, or a number plus weekday behaved incorrect of the current day-of-week was the same as the one in the phrase).(Derick) +- Fixed bug #42855 (dns_get_record() doesn't return all text from TXT record). + (a dot u dot savchuk at gmail dot com) - Fixed bug #42718 (FILTER_UNSAFE_RAW not applied when configured as default filter). (Arnaud) - Fixed bug #42294 (Unified solution for round() based on C99 round). (Ilia)