Daniel wants upcoming release to be 1.7.0

10 files changed, 33 insertions, 29 deletions

diff --git a/ares/CHANGES b/ares/CHANGES
index 8d4d838dc..0782e04c2 100644
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -13,7 +13,7 @@
   necessary changes to code base and man pages.This change does not break
   ABI, there is no need to recompile existing applications. But existing
   applications using these structs with the old name will need source code
-  adjustments when recompiled using c-ares 1.6.1.
+  adjustments when recompiled using c-ares 1.7.0.
 
 * November 21, 2009 (Yang Tse)
 - Added manifest stuff to Makefile.msvc.
@@ -152,15 +152,15 @@
 - Introduced ares_library_init() and ares_library_cleanup() functions.
 
   This is an API and ABI break for Win32/64 systems. Non-Win32/64 build targets
-  using c-ares 1.6.1 can still survive without calling these functions. Read all
+  using c-ares 1.7.0 can still survive without calling these functions. Read all
   the details on ares_library_init(3) and ares_library_cleanup(3) man pages that
   are included.
 
-  curl/libcurl 7.19.5 is fully compatible with c-ares 1.6.1 on all systems.
+  curl/libcurl 7.19.5 is fully compatible with c-ares 1.7.0 on all systems.
 
-  In order to use c-ares 1.6.1 with curl/libcurl on Win32/64 systems it is
+  In order to use c-ares 1.7.0 with curl/libcurl on Win32/64 systems it is
   required that curl/libcurl is 7.19.5 or newer. In other words, it is not
-  possible on Win32/64 to use c-ares 1.6.1 with a curl/libcurl version less
+  possible on Win32/64 to use c-ares 1.7.0 with a curl/libcurl version less
   than 7.19.5
 
 * May 11 2009 (Daniel Stenberg)
diff --git a/ares/README.cares b/ares/README.cares
index 3f9b2fc0f..fd37461c8 100644
--- a/ares/README.cares
+++ b/ares/README.cares
@@ -27,7 +27,7 @@ You'll find all c-ares details and news here:
 
 NOTES FOR C-ARES HACKERS
 
-The following notes apply to c-ares version 1.6.1 and later.
+The following notes apply to c-ares version 1.7.0 and later.
 
 * The distributed ares_build.h file is only intended to be used on systems
   which can not run the also distributed configure script.
diff --git a/ares/ares.h b/ares/ares.h
index 3e45a90f2..8a9b1c0b2 100644
--- a/ares/ares.h
+++ b/ares/ares.h
@@ -119,14 +119,14 @@ extern "C" {
 #define ARES_EBADHINTS          20
 
 /* Uninitialized library error code */
-#define ARES_ENOTINITIALIZED    21          /* introduced in 1.6.1 */
+#define ARES_ENOTINITIALIZED    21          /* introduced in 1.7.0 */
 
 /* ares_library_init error codes */
-#define ARES_ELOADIPHLPAPI           22     /* introduced in 1.6.1 */
-#define ARES_EADDRGETNETWORKPARAMS   23     /* introduced in 1.6.1 */
+#define ARES_ELOADIPHLPAPI           22     /* introduced in 1.7.0 */
+#define ARES_EADDRGETNETWORKPARAMS   23     /* introduced in 1.7.0 */
 
 /* More error codes */
-#define ARES_ECANCELLED         24          /* introduced in 1.6.1 */
+#define ARES_ECANCELLED         24          /* introduced in 1.7.0 */
 
 /* Flag values */
 #define ARES_FLAG_USEVC         (1 << 0)
@@ -404,10 +404,10 @@ CARES_EXTERN int ares_expand_string(const unsigned char *encoded,
                                     long *enclen);
 
 /*
- * NOTE: before c-ares 1.6.1 we would most often use the system in6_addr
+ * NOTE: before c-ares 1.7.0 we would most often use the system in6_addr
  * struct below when ares itself was built, but many apps would use this
  * private version since the header checked a HAVE_* define for it. Starting
- * with 1.6.1 we always declare and use our own to stop relying on the
+ * with 1.7.0 we always declare and use our own to stop relying on the
  * system's one.
  */
 struct ares_in6_addr {
diff --git a/ares/ares_data.h b/ares/ares_data.h
index ffe2aebb0..f211dd733 100644
--- a/ares/ares_data.h
+++ b/ares/ares_data.h
@@ -16,16 +16,16 @@
  */
 
 typedef enum {
-  ARES_DATATYPE_UNKNOWN = 1,   /* unknown data type     */
+  ARES_DATATYPE_UNKNOWN = 1,  /* unknown data type     - introduced in 1.7.0 */
+  ARES_DATATYPE_SRV_REPLY,    /* struct ares_srv_reply - introduced in 1.7.0 */
+  ARES_DATATYPE_TXT_REPLY,    /* struct ares_txt_reply - introduced in 1.7.0 */
 #if 0
-  ARES_DATATYPE_ADDR6TTL,      /* struct ares_addrttl   */
-  ARES_DATATYPE_ADDRTTL,       /* struct ares_addr6ttl  */
-  ARES_DATATYPE_HOSTENT,       /* struct hostent        */
-  ARES_DATATYPE_OPTIONS,       /* struct ares_options   */
+  ARES_DATATYPE_ADDR6TTL,     /* struct ares_addrttl   */
+  ARES_DATATYPE_ADDRTTL,      /* struct ares_addr6ttl  */
+  ARES_DATATYPE_HOSTENT,      /* struct hostent        */
+  ARES_DATATYPE_OPTIONS,      /* struct ares_options   */
 #endif
-  ARES_DATATYPE_SRV_REPLY,     /* struct ares_srv_reply */
-  ARES_DATATYPE_TXT_REPLY,     /* struct ares_txt_reply */
-  ARES_DATATYPE_LAST           /* not used              */
+  ARES_DATATYPE_LAST          /* not used              - introduced in 1.7.0 */
 } ares_datatype;
 
 #define ARES_DATATYPE_MARK 0xbead
diff --git a/ares/ares_free_data.3 b/ares/ares_free_data.3
index 30dcef49a..f6c5e33b9 100644
--- a/ares/ares_free_data.3
+++ b/ares/ares_free_data.3
@@ -48,7 +48,7 @@ associated with those structures.
 .SH RETURN VALUE
 The ares_free_data() function does not return a value.
 .SH AVAILABILITY
-This function was first introduced in c-ares version 1.6.1.
+This function was first introduced in c-ares version 1.7.0.
 .SH SEE ALSO
 .BR ares_parse_srv_reply(3),
 .BR ares_parse_txt_reply(3)
diff --git a/ares/ares_library_cleanup.3 b/ares/ares_library_cleanup.3
index 09a1dcc48..3919dc3a6 100644
--- a/ares/ares_library_cleanup.3
+++ b/ares/ares_library_cleanup.3
@@ -53,14 +53,14 @@ conflict with any other thread that is already using these other libraries.
 Win32/64 application DLLs shall not call \fIares_library_cleanup(3)\fP from
 the DllMain function. Doing so will produce deadlocks and other problems.
 .SH AVAILABILITY
-This function was first introduced in c-ares version 1.6.1 along with the
+This function was first introduced in c-ares version 1.7.0 along with the
 definition of preprocessor symbol \fICARES_HAVE_ARES_LIBRARY_CLEANUP\fP as an
 indication of the availability of this function.
 .PP
 Since the introduction of this function, it is absolutely mandatory to call it
 for any Win32/64 program using c-ares.
 .PP
-Non-Win32/64 systems can still use c-ares version 1.6.1 without calling
+Non-Win32/64 systems can still use c-ares version 1.7.0 without calling
 \fIares_library_cleanup(3)\fP due to the fact that it is nearly a do-nothing
 function on non-Win32/64 platforms.
 .SH SEE ALSO
diff --git a/ares/ares_library_init.3 b/ares/ares_library_init.3
index 64d6c0b79..b7d0ec3eb 100644
--- a/ares/ares_library_init.3
+++ b/ares/ares_library_init.3
@@ -76,14 +76,14 @@ non-zero error number will be returned to indicate the error. Except for
 \fIares_strerror(3)\fP, you shall not call any other c-ares function upon
 \fIares_library_init(3)\fP failure.
 .SH AVAILABILITY
-This function was first introduced in c-ares version 1.6.1 along with the
+This function was first introduced in c-ares version 1.7.0 along with the
 definition of preprocessor symbol \fICARES_HAVE_ARES_LIBRARY_INIT\fP as an
 indication of the availability of this function.
 .PP
 Since the introduction of this function it is absolutely mandatory to
 call it for any Win32/64 program using c-ares.
 .PP
-Non-Win32/64 systems can still use c-ares version 1.6.1 without calling
+Non-Win32/64 systems can still use c-ares version 1.7.0 without calling
 \fIares_library_init(3)\fP due to the fact that it is nearly a do-nothing
 function on non-Win32/64 platforms at this point.
 .SH SEE ALSO
diff --git a/ares/ares_parse_srv_reply.3 b/ares/ares_parse_srv_reply.3
index 60662c1c5..9b561ffa3 100644
--- a/ares/ares_parse_srv_reply.3
+++ b/ares/ares_parse_srv_reply.3
@@ -72,6 +72,8 @@ The response did not contain an answer to the query.
 .TP 15
 .B ARES_ENOMEM
 Memory was exhausted.
+.SH AVAILABILITY
+This function was first introduced in c-ares version 1.7.0.
 .SH SEE ALSO
 .BR ares_query (3)
 .BR ares_free_data (3)
diff --git a/ares/ares_parse_txt_reply.3 b/ares/ares_parse_txt_reply.3
index c4ce8a641..c9926bc08 100644
--- a/ares/ares_parse_txt_reply.3
+++ b/ares/ares_parse_txt_reply.3
@@ -70,6 +70,8 @@ The response did not contain an answer to the query.
 .TP 15
 .B ARES_ENOMEM
 Memory was exhausted.
+.SH AVAILABILITY
+This function was first introduced in c-ares version 1.7.0.
 .SH SEE ALSO
 .BR ares_query (3)
 .BR ares_free_data (3)
diff --git a/ares/ares_version.h b/ares/ares_version.h
index 66d4bcc78..deb7fe126 100644
--- a/ares/ares_version.h
+++ b/ares/ares_version.h
@@ -4,14 +4,14 @@
 #define ARES__VERSION_H
 
 #define ARES_VERSION_MAJOR 1
-#define ARES_VERSION_MINOR 6
-#define ARES_VERSION_PATCH 1
+#define ARES_VERSION_MINOR 7
+#define ARES_VERSION_PATCH 0
 #define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
                        (ARES_VERSION_MINOR<<8)|\
                        (ARES_VERSION_PATCH))
-#define ARES_VERSION_STR "1.6.1-CVS"
+#define ARES_VERSION_STR "1.7.0-CVS"
 
-#if (ARES_VERSION >= 0x010601)
+#if (ARES_VERSION >= 0x010700)
 #  define CARES_HAVE_ARES_LIBRARY_INIT 1
 #  define CARES_HAVE_ARES_LIBRARY_CLEANUP 1
 #else