X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-ares;a=blobdiff_plain;f=php_ares.c;h=ab25239a1ae2b617747287e2a5c37c73fc509d81;hp=1685d43069d20402e5ddb5054ce22bd991a0c73a;hb=57e649cefeedfc99ce6b0db0819f5517daac2836;hpb=b182d5ea363e30f87ad4f8483d0e6cef9e68b5d1

diff --git a/php_ares.c b/php_ares.c
index 1685d43..ab25239 100644
--- a/php_ares.c
+++ b/php_ares.c
@@ -68,10 +68,23 @@ static int le_ares_query;
 static const char *php_ares_C_names[] = {
 	"INVALID",
 	"IN",
+	"C2"
 	"CHAOS",
-	"HS",
-	"NONE",
-	"ANY",
+	"HS",		/* 4 */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","",										/*  9x */
+	"NONE",		/* 254 */
+	"ANY",		/* 255 */
 };
 
 static const char *php_ares_T_names[] = {
@@ -128,8 +141,6 @@ static const char *php_ares_T_names[] = {
 	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
 	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
 	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
-	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
-	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
 	"","","","","","",												/*  6x */
 	"TKEY",	/* 249 */
 	"TSIG",
@@ -1713,9 +1724,9 @@ static PHP_MINIT_FUNCTION(ares)
 #ifdef ARES_EADDRGETNETWORKPARAMS
 	REGISTER_LONG_CONSTANT("ARES_EADDRGETNETWORKPARAMS", ARES_EADDRGETNETWORKPARAMS, CONST_PERSISTENT|CONST_CS);
 #endif
-
-/* More error codes */
-#define ARES_ECANCELLED         24          /* introduced in 1.7.0 */
+#ifdef ARES_ECANCELLED
+	REGISTER_LONG_CONSTANT("ARES_ECANCELLED", ARES_ECANCELLED, CONST_PERSISTENT|CONST_CS);
+#endif
 
 	REGISTER_LONG_CONSTANT("ARES_FLAG_USEVC", ARES_FLAG_USEVC, CONST_PERSISTENT|CONST_CS);
 	REGISTER_LONG_CONSTANT("ARES_FLAG_PRIMARY", ARES_FLAG_PRIMARY, CONST_PERSISTENT|CONST_CS);
@@ -1990,10 +2001,12 @@ static PHP_MINIT_FUNCTION(ares)
 #ifdef T_OPT
 	/* (41)  EDNS0 option (meta-RR)  */
 	 REGISTER_LONG_CONSTANT("ARES_T_OPT", T_OPT, CONST_CS|CONST_PERSISTENT);
+#endif
 #ifdef T_TSIG
 	/* (250)  Transaction signature.  */
 	REGISTER_LONG_CONSTANT("ARES_T_TSIG", T_TSIG, CONST_CS|CONST_PERSISTENT);
-#endif T_IXFR
+#endif
+#ifdef T_IXFR
 	/* (251)  Incremental zone transfer.  */
 	REGISTER_LONG_CONSTANT("ARES_T_IXFR", T_IXFR, CONST_CS|CONST_PERSISTENT);
 #endif