- Reverted my previous commit to avoid unnecessary BC.

[DOC] Added new entry to the array returned by dns_get_record(), 'entries', which contains the separated value from TXT value. (so 'txt' kept the concatenated version) (Pierre)

2 files changed, 26 insertions, 23 deletions

diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index 5bcc862140..b76fa15d69 100644
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -456,29 +456,26 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int
 			break;
 		case DNS_T_TXT:
 			{
-				zval *txtarray = NULL;
 				int ll = 0;
-				char *txt = NULL;
+				zval *entries = NULL;
 
 				add_assoc_string(*subarray, "type", "TXT", 1);
 				tp = emalloc(dlen + 1);
 				
-				MAKE_STD_ZVAL(txtarray);
-				array_init(txtarray);
+				MAKE_STD_ZVAL(entries);
+				array_init(entries);
 				
 				while (ll < dlen) {
-					txt = tp + ll;
 					n = cp[ll];
-					memcpy(txt, cp + ll + 1, n);
+					memcpy(tp + ll , cp + ll + 1, n);
+					add_next_index_stringl(entries, cp + ll + 1, n, 1);
 					ll = ll + n + 1;
-					tp[ll] = '\0';
-					add_next_index_stringl(txtarray, txt, n, 1);	
 				}
-
+				tp[dlen] = '\0';
 				cp += dlen;
 
-				add_assoc_zval(*subarray, "txt", txtarray);
-				efree(tp);
+				add_assoc_stringl(*subarray, "txt", tp, dlen - 1, 0);
+				add_assoc_zval(*subarray, "entries", entries);
 			}
 			break;
 		case DNS_T_SOA:
diff --git a/ext/standard/dns_win32.c b/ext/standard/dns_win32.c
index 33ad88da44..c58c1bee8b 100644
--- a/ext/standard/dns_win32.c
+++ b/ext/standard/dns_win32.c
@@ -194,24 +194,30 @@ static void php_parserr(PDNS_RECORD pRec, int type_to_fetch, int store, zval **s
 				int i = 0;
 				DNS_TXT_DATA *data_txt = &pRec->Data.TXT;
 				DWORD count = data_txt->dwStringCount;
-				char *txt;
-				long txt_len;
-				zval *txtarray;
-
-				MAKE_STD_ZVAL(txtarray);
-				array_init(txtarray);
+				char *txt, *txt_dst;
+				long txt_len = 0;
+				zval *entries;
 
 				add_assoc_string(*subarray, "type", "TXT", 1);
+				
+				ALLOC_INIT_ZVAL(entries);
+				array_init(entries);
+				
+				for (i = 0; i < count; i++) {
+					txt_len += strlen(data_txt->pStringArray[i]) + 1;
+				}
 
+				txt = ecalloc(txt_len * 2, 1);
+				txt_dst = txt;
 				for (i = 0; i < count; i++) {
-					txt_len = strlen(data_txt->pStringArray[i]);
-					txt = emalloc(txt_len + 1);
-					memcpy(txt, data_txt->pStringArray[i], txt_len);
-					txt[txt_len] = '\0';
-					add_next_index_stringl(txtarray, txt, txt_len, 0);
+					int len = strlen(data_txt->pStringArray[i]);
+					memcpy(txt_dst, data_txt->pStringArray[i], len);
+					add_next_index_stringl(entries, data_txt->pStringArray[i], len, 1);
+					txt_dst += len;
 				}
 
-				add_assoc_zval(*subarray, "txt", txtarray);
+				add_assoc_string(*subarray, "txt", txt, 0);
+				add_assoc_zval(*subarray, "entries", entries);
 			}
 			break;