diff --git a/Changes b/Changes index ce2501118..d6bc0adf9 100644 --- a/Changes +++ b/Changes @@ -1623,3 +1623,5 @@ with away reason support and backported to Unreal3.2. Because away notification hasn't been used until now (due to it only being in Unreal3.3) we felt it was safe to break some numerics. +- Upgraded c-ares to 1.5.1, thanks to aegis for the partial patch (#0003671). + This also fixed a curl compile/run issue, reported by static-x (#0003545). diff --git a/autoconf/configure.in b/autoconf/configure.in index 19a451efe..d783697f4 100644 --- a/autoconf/configure.in +++ b/autoconf/configure.in @@ -459,7 +459,7 @@ cd $cur_dir dnl REMEMBER TO CHANGE WITH A NEW C-ARES RELEASE! -cares_version="1.4.0" +cares_version="1.5.1" AC_MSG_RESULT(extracting c-ares resolver library) cur_dir=`pwd` cd extras diff --git a/configure b/configure index 2e3dde722..d63967492 100755 --- a/configure +++ b/configure @@ -12701,7 +12701,7 @@ fi cd $cur_dir -cares_version="1.4.0" +cares_version="1.5.1" echo "$as_me:$LINENO: result: extracting c-ares resolver library" >&5 echo "${ECHO_T}extracting c-ares resolver library" >&6 cur_dir=`pwd` diff --git a/extras/c-ares.tar.gz b/extras/c-ares.tar.gz index a3d6563a3..f19ae192c 100644 Binary files a/extras/c-ares.tar.gz and b/extras/c-ares.tar.gz differ diff --git a/src/res.c b/src/res.c index a9ef3e5c7..e79c3cb1d 100644 --- a/src/res.c +++ b/src/res.c @@ -49,9 +49,9 @@ #include /* Forward declerations */ -void unrealdns_cb_iptoname(void *arg, int status, struct hostent *he); -void unrealdns_cb_nametoip_verify(void *arg, int status, struct hostent *he); -void unrealdns_cb_nametoip_link(void *arg, int status, struct hostent *he); +void unrealdns_cb_iptoname(void *arg, int status, int timeouts, struct hostent *he); +void unrealdns_cb_nametoip_verify(void *arg, int status, int timeouts, struct hostent *he); +void unrealdns_cb_nametoip_link(void *arg, int status, int timeouts, struct hostent *he); void unrealdns_delasyncconnects(void); static unsigned int unrealdns_haship(void *binaryip, int length); static void unrealdns_addtocache(char *name, void *binaryip, int length); @@ -240,7 +240,7 @@ char ipv4[4]; #endif } -void unrealdns_cb_iptoname(void *arg, int status, struct hostent *he) +void unrealdns_cb_iptoname(void *arg, int status, int timeouts, struct hostent *he) { DNSReq *r = (DNSReq *)arg; DNSReq *newr; @@ -290,7 +290,7 @@ char *p; } -void unrealdns_cb_nametoip_verify(void *arg, int status, struct hostent *he) +void unrealdns_cb_nametoip_verify(void *arg, int status, int timeouts, struct hostent *he) { DNSReq *r = (DNSReq *)arg; aClient *acptr = r->cptr; @@ -363,7 +363,7 @@ bad: unrealdns_freeandremovereq(r); } -void unrealdns_cb_nametoip_link(void *arg, int status, struct hostent *he) +void unrealdns_cb_nametoip_link(void *arg, int status, int timeouts, struct hostent *he) { DNSReq *r = (DNSReq *)arg; int n;