gmane.comp.web.curl.cvs

bagder: curl/docs INSTALL,1.103,1.104

2008-11-30T22:51:56

Update of /cvsroot/curl/curl/docs In directory labb:/tmp/cvs-serv2652 Modified Files: INSTALL Log Message: People have successfully ran libcurl on iphone Index: INSTALL =================================================================== RCS file: /cvsroot/curl/curl/docs/INSTALL,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 --- INSTALL17 Nov 2008 21:43:39 -00001.103 +++ INSTALL30 Nov 2008 22:51:54 -00001.104 < at >< at > -831,6 +831,7 < at >< at > - Alpha Tru64 v5.0 5.1 - AVR32 Linux - ARM INTEGRITY + - ARM iPhone OS - Cell Linux - Cell Cell OS - HP-PA HP-UX 9.X 10.X 11.X

yangtse: curl configure.ac,1.384,1.385

2008-11-29T17:45:18

Update of /cvsroot/curl/curl In directory labb:/tmp/cvs-serv17225 Modified Files: configure.ac Log Message: Further adjust a libssh2 preprocessor function-symbol definition check Index: configure.ac =================================================================== RCS file: /cvsroot/curl/curl/configure.ac,v retrieving revision 1.384 retrieving revision 1.385 diff -u -d -r1.384 -r1.385 --- configure.ac24 Nov 2008 13:59:52 -00001.384 +++ configure.ac29 Nov 2008 17:45:16 -00001.385 < at >< at > -1476,10 +1476,6 < at >< at > LIBSSH2_ENABLED=1 AC_DEFINE(USE_LIBSSH2, 1, [if libSSH2 is in use]) AC_SUBST(USE_LIBSSH2, [1]) - - dnl check for this function only present in libssh2 0.19+ - AC_CHECK_FUNCS( libssh2_session_block_directions ) - ) if test X"$OPT_LIBSSH2" != Xoff &&

yangtse: curl/lib ssh.h,1.13,1.14

2008-11-29T17:45:18

Update of /cvsroot/curl/curl/lib In directory labb:/tmp/cvs-serv17225/lib Modified Files: ssh.h Log Message: Further adjust a libssh2 preprocessor function-symbol definition check Index: ssh.h =================================================================== RCS file: /cvsroot/curl/curl/lib/ssh.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ssh.h29 Nov 2008 16:39:56 -00001.13 +++ ssh.h29 Nov 2008 17:45:16 -00001.14 < at >< at > -30,9 +30,9 < at >< at > #endif #if (LIBSSH2_VERSION_NUM >= 0x001300) -# ifndef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS -# define HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS 1 -# endif +# define HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS 1 +#else +# undef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS #endif extern const struct Curl_handler Curl_handler_scp;

yangtse: curl/lib ssh.c,1.119,1.120 ssh.h,1.12,1.13

2008-11-29T16:39:58

Update of /cvsroot/curl/curl/lib In directory labb:/tmp/cvs-serv3986/lib Modified Files: ssh.c ssh.h Log Message: Adjust some libssh2 preprocessor symbol definition checks Index: ssh.h =================================================================== RCS file: /cvsroot/curl/curl/lib/ssh.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ssh.h20 Jun 2008 10:45:26 -00001.12 +++ ssh.h29 Nov 2008 16:39:56 -00001.13 < at >< at > -1,6 +1,5 < at >< at > -#ifndef __SSH_H -#define __SSH_H - +#ifndef HEADER_CURL_SSH_H +#define HEADER_CURL_SSH_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | < at >< at > -25,6 +24,17 < at >< at > ***************************************************************************/ #ifdef USE_LIBSSH2 + +#if !defined(LIBSSH2_VERSION_NUM) || (LIBSSH2_VERSION_NUM < 0x001000) +# error "SCP/SFTP protocols require libssh2 0.16 or later" +#endif + +#if (LIBSSH2_VERSION_NUM >= 0x001300) +# ifndef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS +# define HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS 1 +# endif +#endif + extern const struct Curl_handler Curl_handler_scp; extern const struct Curl_handler Curl_handler_sftp; < at >< at > -49,4 +59,4 < at >< at > #endif /* USE_LIBSSH2 */ -#endif /* __SSH_H */ +#endif /* HEADER_CURL_SSH_H */ Index: ssh.c =================================================================== RCS file: /cvsroot/curl/curl/lib/ssh.c,v retrieving revision 1.119 retrieving revision 1.120 diff -u -d -r1.119 -r1.120 --- ssh.c24 Nov 2008 13:59:51 -00001.119 +++ ssh.c29 Nov 2008 16:39:56 -00001.120 < at >< at > -36,17 +36,6 < at >< at > #include #include -#if !defined(LIBSSH2_VERSION_NUM) || (LIBSSH2_VERSION_NUM < 0x001000) -#error "this requires libssh2 0.16 or later" -#endif - -#if !defined(HAVE_LIBSSH2_SESSION_BLOCK_DIRECTION) && \ - (LIBSSH2_VERSION_NUM >= 0x001300) -/* this is just a check for non-configure based systems to get this properly - setup if libssh2 0.19+ is used */ -#define HAVE_LIBSSH2_SESSION_BLOCK_DIRECTION 1 -#endif - #ifdef HAVE_UNISTD_H #include #endif < at >< at > -2070,7 +2059,7 < at >< at > bool block; result = ssh_statemach_act(conn, &block); -#ifdef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTION +#ifdef HAVE_LIBSSH2_SESSION_BLOCK_DIRECTIONS if((CURLE_OK == result) && block) { int dir = libssh2_session_block_directions(sshc->ssh_session); curl_socket_t sock = conn->sock[FIRSTSOCKET];

giva: curl/ares Makefile.dj,1.25,1.26

2008-11-29T15:19:48

Update of /cvsroot/curl/curl/ares In directory labb:/tmp/cvs-serv30582 Modified Files: Makefile.dj Log Message: Added '-DHAVE_GETHOSTNAME'. Index: Makefile.dj =================================================================== RCS file: /cvsroot/curl/curl/ares/Makefile.dj,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- Makefile.dj13 Nov 2008 18:56:56 -00001.25 +++ Makefile.dj29 Nov 2008 15:19:46 -00001.26 < at >< at > -30,7 +30,8 < at >< at > -DRECVFROM_TYPE_ARG6='int' -DRECVFROM_TYPE_RETV='int' \ -DRECVFROM_TYPE_ARG5='struct sockaddr' -DHAVE_RECVFROM \ -DRECVFROM_TYPE_ARG2_IS_VOID -DHAVE_STRDUP -DHAVE_NETDB_H \ - -DHAVE_ARPA_INET_H -DHAVE_STRCASECMP -DHAVE_STRNCASECMP + -DHAVE_ARPA_INET_H -DHAVE_STRCASECMP -DHAVE_STRNCASECMP \ + -DHAVE_GETHOSTNAME LDFLAGS = -s

danf: curl/ares ares.h, 1.42, 1.43 ares_expand_name.c, 1.16,1.17 ares_expand_string.c, 1.8, 1.9 ares_mkquery.c, 1.15,1.16 ares_query.c, 1.19, 1.20 ares_send.c, 1.19, 1.20

2008-11-29T00:26:09

Update of /cvsroot/curl/curl/ares In directory labb:/tmp/cvs-serv29138 Modified Files: ares.h ares_expand_name.c ares_expand_string.c ares_mkquery.c ares_query.c ares_send.c Log Message: Make sure sys/socket.h is included before netinet/in.h (required by OpenWatcom C) Index: ares_expand_string.c =================================================================== RCS file: /cvsroot/curl/curl/ares/ares_expand_string.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ares_expand_string.c17 Sep 2008 01:02:57 -00001.8 +++ ares_expand_string.c29 Nov 2008 00:26:07 -00001.9 < at >< at > -17,6 +17,9 < at >< at > #include "setup.h" +#ifdef HAVE_SYS_SOCKET_H +# include +#endif #ifdef HAVE_NETINET_IN_H # include #endif Index: ares_send.c =================================================================== RCS file: /cvsroot/curl/curl/ares/ares_send.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ares_send.c1 Nov 2008 18:35:19 -00001.19 +++ ares_send.c29 Nov 2008 00:26:07 -00001.20 < at >< at > -17,6 +17,9 < at >< at > #include "setup.h" +#ifdef HAVE_SYS_SOCKET_H +# include +#endif #ifdef HAVE_NETINET_IN_H # include #endif Index: ares_expand_name.c =================================================================== RCS file: /cvsroot/curl/curl/ares/ares_expand_name.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ares_expand_name.c17 Sep 2008 01:02:57 -00001.16 +++ ares_expand_name.c29 Nov 2008 00:26:07 -00001.17 < at >< at > -17,6 +17,9 < at >< at > #include "setup.h" +#ifdef HAVE_SYS_SOCKET_H +# include +#endif #ifdef HAVE_NETINET_IN_H # include #endif Index: ares_mkquery.c =================================================================== RCS file: /cvsroot/curl/curl/ares/ares_mkquery.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ares_mkquery.c17 Sep 2008 01:02:57 -00001.15 +++ ares_mkquery.c29 Nov 2008 00:26:07 -00001.16 < at >< at > -17,6 +17,9 < at >< at > #include "setup.h" +#ifdef HAVE_SYS_SOCKET_H +# include +#endif #ifdef HAVE_NETINET_IN_H # include #endif Index: ares_query.c =================================================================== RCS file: /cvsroot/curl/curl/ares/ares_query.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ares_query.c20 Nov 2008 07:50:48 -00001.19 +++ ares_query.c29 Nov 2008 00:26:07 -00001.20 < at >< at > -17,6 +17,9 < at >< at > #include "setup.h" +#ifdef HAVE_SYS_SOCKET_H +# include +#endif #ifdef HAVE_NETINET_IN_H # include #endif Index: ares.h =================================================================== RCS file: /cvsroot/curl/curl/ares/ares.h,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- ares.h19 Nov 2008 15:16:16 -00001.42 +++ ares.h29 Nov 2008 00:26:07 -00001.43 < at >< at > -51,8 +51,8 < at >< at > # include # include #else - #include #include + #include #endif #ifdef __cplusplus

danf: curl/ares Makefile.netware,1.53,1.54

2008-11-28T23:34:41

Update of /cvsroot/curl/curl/ares In directory labb:/tmp/cvs-serv6347 Modified Files: Makefile.netware Log Message: Netware has gethostname() Index: Makefile.netware =================================================================== RCS file: /cvsroot/curl/curl/ares/Makefile.netware,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- Makefile.netware13 Nov 2008 18:56:56 -00001.53 +++ Makefile.netware28 Nov 2008 23:34:39 -00001.54 < at >< at > -352,6 +352,7 < at >< at > < at >echo $(DL)#define HAVE_FCNTL_H 1$(DL) >> $< at > < at >echo $(DL)#define HAVE_GETHOSTBYADDR 1$(DL) >> $< at > < at >echo $(DL)#define HAVE_GETHOSTBYNAME 1$(DL) >> $< at > +< at >echo $(DL)#define HAVE_GETHOSTNAME 1$(DL) >> $< at > < at >echo $(DL)#define HAVE_GETPROTOBYNAME 1$(DL) >> $< at > < at >echo $(DL)#define HAVE_GMTIME_R 1$(DL) >> $< at > < at >echo $(DL)#define HAVE_INET_ADDR 1$(DL) >> $< at >

danf: curl/ares ares_init.3,1.4,1.5 README.cares,1.3,1.4

2008-11-28T23:24:08

Update of /cvsroot/curl/curl/ares In directory labb:/tmp/cvs-serv682 Modified Files: ares_init.3 README.cares Log Message: Fixed a couple of typos Index: ares_init.3 =================================================================== RCS file: /cvsroot/curl/curl/ares/ares_init.3,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ares_init.313 May 2008 20:48:48 -00001.4 +++ ares_init.328 Nov 2008 23:24:06 -00001.5 < at >< at > -154,7 +154,7 < at >< at > if \fIARES_FLAG_NORECURSE\fP is set. .TP 23 .B ARES_FLAG_STAYOPEN -Do not close communciations sockets when the number of active queries +Do not close communications sockets when the number of active queries drops to zero. .TP 23 .B ARES_FLAG_NOSEARCH Index: README.cares =================================================================== RCS file: /cvsroot/curl/curl/ares/README.cares,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- README.cares1 Apr 2004 08:25:23 -00001.3 +++ README.cares28 Nov 2008 23:24:06 -00001.4 < at >< at > -11,7 +11,7 < at >< at > the public. The full source code is available in the 'c-ares' release archives, and in the -'ares' subdir of the curl CVS source repostitory. +'ares' subdir of the curl CVS source repository. If you find bugs, correct flaws, have questions or have comments in general in regard to c-ares (or by all means the original ares too), get in touch with us

danf: curl/ares setup.h,1.34,1.35

2008-11-28T23:12:13

Update of /cvsroot/curl/curl/ares In directory labb:/tmp/cvs-serv15532 Modified Files: setup.h Log Message: Don't tweak the HAVE_* macros when using autoconf Index: setup.h =================================================================== RCS file: /cvsroot/curl/curl/ares/setup.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- setup.h15 Sep 2008 15:28:26 -00001.34 +++ setup.h28 Nov 2008 23:12:11 -00001.35 < at >< at > -107,6 +107,18 < at >< at > #define ssize_t int #endif +#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__) +#define HAVE_SYS_TIME_H +#endif + +#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER) +#define HAVE_UNISTD_H 1 +#endif + +#if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS) +#define HAVE_SYS_UIO_H +#endif + #endif /* HAVE_CONFIG_H */ /* < at >< at > -123,22 +135,6 < at >< at > #undef VERSION #undef PACKAGE -/* - * Assume a few thing unless they're set by configure - */ - -#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__) -#define HAVE_SYS_TIME_H -#endif - -#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER) -#define HAVE_UNISTD_H 1 -#endif - -#if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS) -#define HAVE_SYS_UIO_H -#endif - /* IPv6 compatibility */ #if !defined(HAVE_AF_INET6) #if defined(HAVE_PF_INET6)

danf: curl/ares ares_getnameinfo.c, 1.31, 1.32 ares_init.c, 1.82,1.83 config-win32.h, 1.26, 1.27

2008-11-28T22:41:16

Update of /cvsroot/curl/curl/ares In directory labb:/tmp/cvs-serv25028 Modified Files: ares_getnameinfo.c ares_init.c config-win32.h Log Message: Make use of gethostname() conditional on it being available Index: ares_init.c =================================================================== RCS file: /cvsroot/curl/curl/ares/ares_init.c,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 --- ares_init.c25 Nov 2008 16:26:58 -00001.82 +++ ares_init.c28 Nov 2008 22:41:14 -00001.83 < at >< at > -966,7 +966,9 < at >< at > */ size_t len = 64; int res; + channel->ndomains = 0; /* default to none */ +#ifdef HAVE_GETHOSTNAME hostname = malloc(len); if(!hostname) { rc = ARES_ENOMEM; < at >< at > -994,7 +996,6 < at >< at > } while(0); - channel->ndomains = 0; /* default to none */ if (strchr(hostname, '.')) { /* a dot was found */ < at >< at > -1010,6 +1011,7 < at >< at > } channel->ndomains = 1; } +#endif } if (channel->nsort == -1) { Index: ares_getnameinfo.c =================================================================== RCS file: /cvsroot/curl/curl/ares/ares_getnameinfo.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- ares_getnameinfo.c17 Sep 2008 11:31:37 -00001.31 +++ ares_getnameinfo.c28 Nov 2008 22:41:14 -00001.32 < at >< at > -225,6 +225,7 < at >< at > We do this by determining our own domain name, then searching the string for this domain name and removing it. */ +#ifdef HAVE_GETHOSTNAME if (niquery->flags & ARES_NI_NOFQDN) { char buf[255]; < at >< at > -237,6 +238,7 < at >< at > *end = 0; } } +#endif niquery->callback(niquery->arg, ARES_SUCCESS, niquery->timeouts, (char *)(host->h_name), service); return; Index: config-win32.h =================================================================== RCS file: /cvsroot/curl/curl/ares/config-win32.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- config-win32.h13 Nov 2008 18:56:56 -00001.26 +++ config-win32.h28 Nov 2008 22:41:14 -00001.27 < at >< at > -97,6 +97,9 < at >< at > /* Define if you have the strnicmp function. */ #define HAVE_STRNICMP 1 +/* Define if you have the gethostname function. */ +#define HAVE_GETHOSTNAME 1 + /* Define if you have the recv function. */ #define HAVE_RECV 1

danf: curl/ares ares_process.c,1.71,1.72

2008-11-28T22:07:42

Update of /cvsroot/curl/curl/ares In directory labb:/tmp/cvs-serv5300 Modified Files: ares_process.c Log Message: Only set TCP_NODELAY when it exists Index: ares_process.c =================================================================== RCS file: /cvsroot/curl/curl/ares/ares_process.c,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- ares_process.c13 Nov 2008 18:56:56 -00001.71 +++ ares_process.c28 Nov 2008 22:07:40 -00001.72 < at >< at > -897,6 +897,7 < at >< at > return -1; } +#ifdef TCP_NODELAY /* * Disable the Nagle algorithm (only relevant for TCP sockets, and thus not in * configure_socket). In general, in DNS lookups we're pretty much interested < at >< at > -910,6 +911,7 < at >< at > closesocket(s); return -1; } +#endif /* Connect to the server. */ memset(&sockin, 0, sizeof(sockin));

bagder: curl/ares RELEASE-NOTES,1.21,1.22

2008-11-28T15:44:03

Update of /cvsroot/curl/curl/ares In directory labb:/tmp/cvs-serv755 Modified Files: RELEASE-NOTES Log Message: updated with changes, preparing for a release soon Index: RELEASE-NOTES =================================================================== RCS file: /cvsroot/curl/curl/ares/RELEASE-NOTES,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- RELEASE-NOTES17 Sep 2008 01:33:43 -00001.21 +++ RELEASE-NOTES28 Nov 2008 15:44:01 -00001.22 < at >< at > -2,10 +2,17 < at >< at > o improved configure detection of several functions o improved source code portability + o adig supports a regular numerical dotted IP address for the -s option + o handling of EINPROGRESS for UDP connects + o supports the glibc "rotate" resolv.conf option (or ARES_OPT_ROTATE) + o added the new function ares_gethostbyname_file() + o bugfix in ares_parse_ptr_reply() which would cause a buffer to shrink + instead of expand if a reply contained 8 or more records + o buildconf works on OS X Thanks go to these friendly people for their efforts and contributions: - + Yang Tse, Charles Hardin, Carlo Contavalli, Brad Spencer, Gerald Combs and obviously Daniel Stenberg Have fun!

yangtse: curl/ares CHANGES, 1.131, 1.132 ares_parse_ptr_reply.c, 1.18,1.19

2008-11-26T17:04:37

Update of /cvsroot/curl/curl/ares In directory labb:/tmp/cvs-serv15426/ares Modified Files: CHANGES ares_parse_ptr_reply.c Log Message: Gerald Combs fixed a bug in ares_parse_ptr_reply() which would cause a buffer to shrink instead of expand if a reply contained 8 or more records. Index: CHANGES =================================================================== RCS file: /cvsroot/curl/curl/ares/CHANGES,v retrieving revision 1.131 retrieving revision 1.132 diff -u -d -r1.131 -r1.132 --- CHANGES26 Nov 2008 16:51:51 -00001.131 +++ CHANGES26 Nov 2008 17:04:35 -00001.132 < at >< at > -3,6 +3,9 < at >< at > * Nov 26 2008 (Yang Tse) - Brad Spencer provided changes to allow buildconf to work on OS X. +- Gerald Combs fixed a bug in ares_parse_ptr_reply() which would cause a + buffer to shrink instead of expand if a reply contained 8 or more records. + * Nov 25 2008 (Yang Tse) - In preparation for the upcomming IPv6 nameservers patch, the internal ares_addr union is now changed into an internal struct which also holds Index: ares_parse_ptr_reply.c =================================================================== RCS file: /cvsroot/curl/curl/ares/ares_parse_ptr_reply.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ares_parse_ptr_reply.c15 Nov 2008 23:07:35 -00001.18 +++ ares_parse_ptr_reply.c26 Nov 2008 17:04:35 -00001.19 < at >< at > -55,6 +55,7 < at >< at > char *ptrname, *hostname, *rr_name, *rr_data; struct hostent *hostent; int aliascnt = 0; + int alias_alloc = 8; char ** aliases; /* Set *host to NULL for all failure cases. */ < at >< at > -84,7 +85,7 < at >< at > /* Examine each answer resource record (RR) in turn. */ hostname = NULL; - aliases = malloc(8 * sizeof(char *)); + aliases = malloc(alias_alloc * sizeof(char *)); if (!aliases) { free(ptrname); < at >< at > -125,9 +126,10 < at >< at > } strncpy(aliases[aliascnt], rr_data, strlen(rr_data)+1); aliascnt++; - if ((aliascnt%8)==0) { + if (aliascnt >= alias_alloc) { char **ptr; - ptr = realloc(aliases, (aliascnt/16+1) * sizeof(char *)); + alias_alloc *= 2; + ptr = realloc(aliases, alias_alloc * sizeof(char *)); if(!ptr) { status = ARES_ENOMEM; break;

yangtse: curl/ares CHANGES,1.130,1.131 buildconf,1.10,1.11

2008-11-26T16:51:53

Update of /cvsroot/curl/curl/ares In directory labb:/tmp/cvs-serv32156/ares Modified Files: CHANGES buildconf Log Message: Brad Spencer provided changes to allow buildconf to work on OS X. Index: buildconf =================================================================== RCS file: /cvsroot/curl/curl/ares/buildconf,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- buildconf30 Jul 2008 03:10:03 -00001.10 +++ buildconf26 Nov 2008 16:51:51 -00001.11 < at >< at > -1,6 +1,44 < at >< at > #!/bin/sh -${LIBTOOLIZE:-libtoolize} --copy --automake --force +# The logic for finding the right libtoolize is taken from libcurl's buildconf + +#-------------------------------------------------------------------------- +# findtool works as 'which' but we use a different name to make it more +# obvious we aren't using 'which'! ;-) +# +findtool(){ + file="$1" + + old_IFS=$IFS; IFS=':' + for path in $PATH + do + IFS=$old_IFS + # echo "checks for $file in $path" >&2 + if test -f "$path/$file"; then + echo "$path/$file" + return + fi + done + IFS=$old_IFS +} + +# this approach that tries 'glibtool' first is some kind of work-around for +# some BSD-systems I believe that use to provide the GNU libtool named +# glibtool, with 'libtool' being something completely different. +libtool=`findtool glibtool 2>/dev/null` +if test ! -x "$libtool"; then + libtool=`findtool ${LIBTOOL:-libtool}` +fi + +if test -z "$LIBTOOLIZE"; then + # set the LIBTOOLIZE here so that glibtoolize is used if glibtool was found + # $libtool is already the full path + libtoolize="${libtool}ize" +else + libtoolize=`findtool $LIBTOOLIZE` +fi + +${libtoolize} --copy --automake --force ${ACLOCAL:-aclocal} -I m4 $ACLOCAL_FLAGS ${AUTOHEADER:-autoheader} ${AUTOCONF:-autoconf} Index: CHANGES =================================================================== RCS file: /cvsroot/curl/curl/ares/CHANGES,v retrieving revision 1.130 retrieving revision 1.131 diff -u -d -r1.130 -r1.131 --- CHANGES25 Nov 2008 16:26:58 -00001.130 +++ CHANGES26 Nov 2008 16:51:51 -00001.131 < at >< at > -1,5 +1,8 < at >< at > Changelog for the c-ares project +* Nov 26 2008 (Yang Tse) +- Brad Spencer provided changes to allow buildconf to work on OS X. + * Nov 25 2008 (Yang Tse) - In preparation for the upcomming IPv6 nameservers patch, the internal ares_addr union is now changed into an internal struct which also holds

bagder: curl/lib http_digest.c,1.44,1.45

2008-11-26T12:35:26

Update of /cvsroot/curl/curl/lib In directory labb:/tmp/cvs-serv13008/lib Modified Files: http_digest.c Log Message: narrow the comment to < 80 columns Index: http_digest.c =================================================================== RCS file: /cvsroot/curl/curl/lib/http_digest.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- http_digest.c23 Oct 2008 11:49:19 -00001.44 +++ http_digest.c26 Nov 2008 12:35:24 -00001.45 < at >< at > -105,8 +105,8 < at >< at > (2 == sscanf(header, "%255[^=]=%1023[^\r\n,]", value, content)) ) { if(!strcmp("\"\"", content)) { - /* for the name="" case where we get only the "" in the content variable, - * simply clear the content then + /* for the name="" case where we get only the "" in the content + * variable, simply clear the content then */ content[0]=0; }

danf: curl/tests/data Makefile.am, 1.351, 1.352 test1087, NONE,1.1 test1088, NONE, 1.1 test234, 1.6, 1.7

2008-11-25T23:30:55

Update of /cvsroot/curl/curl/tests/data In directory labb:/tmp/cvs-serv14153/tests/data Modified Files: Makefile.am test234 Added Files: test1087 test1088 Log Message: Added tests 1087 and 1088 to test Basic authentication on a redirect with and without --location-trusted Index: test234 =================================================================== RCS file: /cvsroot/curl/curl/tests/data/test234,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- test23419 Nov 2008 22:00:15 -00001.6 +++ test23425 Nov 2008 23:30:53 -00001.7 < at >< at > -6,6 +6,7 < at >< at > HTTP proxy HTTP proxy Basic auth followlocation +--location-trusted --- NEW FILE: test1087 --- HTTP HTTP proxy HTTP Basic auth HTTP proxy Basic auth followlocation --anyauth # # Server-side HTTP/1.1 401 Authorization Required WWW-Authenticate: Basic Content-Type: text/plain Content-Length: 0 HTTP/1.1 302 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake swsclose Content-Type: text/plain Funny-head: yesyes Location: http://goto.second.host.now/10871002 Content-Length: 0 Connection: close HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake swsclose Content-Type: text/plain Funny-head: yesyes Content-Length: 9 contents HTTP/1.1 401 Authorization Required WWW-Authenticate: Basic Content-Type: text/plain Content-Length: 0 HTTP/1.1 302 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake swsclose Content-Type: text/plain Funny-head: yesyes Location: http://goto.second.host.now/10871002 Content-Length: 0 Connection: close HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake swsclose Content-Type: text/plain Funny-head: yesyes Content-Length: 9 contents # # Client-side http HTTP, proxy with --anyauth and Location: to new host http://first.host.it.is/we/want/that/page/10871000 -x %HOSTIP:%HTTPPORT --user iam:myself --location --anyauth # # Verify data after the test has been "shot" ^User-Agent:.* GET http://first.host.it.is/we/want/that/page/10871000 HTTP/1.1 Host: first.host.it.is Accept: */* Proxy-Connection: Keep-Alive GET http://first.host.it.is/we/want/that/page/10871000 HTTP/1.1 Authorization: Basic aWFtOm15c2VsZg== Host: first.host.it.is Accept: */* Proxy-Connection: Keep-Alive GET http://goto.second.host.now/10871002 HTTP/1.1 Host: goto.second.host.now Accept: */* Proxy-Connection: Keep-Alive Index: Makefile.am =================================================================== RCS file: /cvsroot/curl/curl/tests/data/Makefile.am,v retrieving revision 1.351 retrieving revision 1.352 diff -u -d -r1.351 -r1.352 --- Makefile.am6 Nov 2008 00:13:18 -00001.351 +++ Makefile.am25 Nov 2008 23:30:53 -00001.352 < at >< at > -59,7 +59,7 < at >< at > test1064 test1065 test1066 test1067 test1068 test1069 test1070 test1071 \ test1072 test1073 test1074 test1075 test1076 test1077 test1078 test1079 \ test1080 test1081 test1082 test1083 test1084 test1085 test633 test634 \ - test635 test636 test637 test558 test559 test1086 + test635 test636 test637 test558 test559 test1086 test1087 test1088 filecheck: < at >mkdir test-place; \ --- NEW FILE: test1088 --- HTTP HTTP proxy HTTP Basic auth HTTP proxy Basic auth followlocation --anyauth --location-trusted # # Server-side HTTP/1.1 401 Authorization Required WWW-Authenticate: Basic Content-Type: text/plain Content-Length: 0 HTTP/1.1 302 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake swsclose Content-Type: text/plain Funny-head: yesyes Location: http://goto.second.host.now/10881002 Content-Length: 0 Connection: close HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake swsclose Content-Type: text/plain Funny-head: yesyes Content-Length: 9 contents HTTP/1.1 401 Authorization Required WWW-Authenticate: Basic Content-Type: text/plain Content-Length: 0 HTTP/1.1 302 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake swsclose Content-Type: text/plain Funny-head: yesyes Location: http://goto.second.host.now/10881002 Content-Length: 0 Connection: close HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake swsclose Content-Type: text/plain Funny-head: yesyes Content-Length: 9 contents # # Client-side http HTTP, proxy with --anyauth and Location: to new host using location-trusted http://first.host.it.is/we/want/that/page/10881000 -x %HOSTIP:%HTTPPORT --user iam:myself --location-trusted --anyauth # # Verify data after the test has been "shot" ^User-Agent:.* GET http://first.host.it.is/we/want/that/page/10881000 HTTP/1.1 Host: first.host.it.is Accept: */* Proxy-Connection: Keep-Alive GET http://first.host.it.is/we/want/that/page/10881000 HTTP/1.1 Authorization: Basic aWFtOm15c2VsZg== Host: first.host.it.is Accept: */* Proxy-Connection: Keep-Alive GET http://goto.second.host.now/10881002 HTTP/1.1 Authorization: Basic aWFtOm15c2VsZg== Host: goto.second.host.now Accept: */* Proxy-Connection: Keep-Alive

danf: curl CHANGES,1.1541,1.1542

2008-11-25T23:30:55

Update of /cvsroot/curl/curl In directory labb:/tmp/cvs-serv14153 Modified Files: CHANGES Log Message: Added tests 1087 and 1088 to test Basic authentication on a redirect with and without --location-trusted Index: CHANGES =================================================================== RCS file: /cvsroot/curl/curl/CHANGES,v retrieving revision 1.1541 retrieving revision 1.1542 diff -u -d -r1.1541 -r1.1542 --- CHANGES24 Nov 2008 13:59:51 -00001.1541 +++ CHANGES25 Nov 2008 23:30:53 -00001.1542 < at >< at > -6,6 +6,15 < at >< at > Changelog +Daniel Fandrich (25 Nov 2008) +- If a HTTP request is Basic and num is already >=1000, the HTTP test + server adds 1 to num to get the data section to return. This allows + testing authentication negotiations using the Basic authentication + method. + +- Added tests 1087 and 1088 to test Basic authentication on a redirect + with and without --location-trusted + Daniel Stenberg (24 Nov 2008) - Based on a patch by Vlad Grachov, libcurl now uses a new libssh2 0.19 function when built to support SCP and SFTP that helps the library to know

danf: curl/tests FILEFORMAT,1.68,1.69

2008-11-25T23:23:49

Update of /cvsroot/curl/curl/tests In directory labb:/tmp/cvs-serv8811/tests Modified Files: FILEFORMAT Log Message: If a HTTP request is Basic and num is already >=1000, the HTTP test server adds 1 to num to get the data section to return. This allows testing authentication negotiations using the Basic authentication method. Index: FILEFORMAT =================================================================== RCS file: /cvsroot/curl/curl/tests/FILEFORMAT,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- FILEFORMAT30 Oct 2008 01:44:18 -00001.68 +++ FILEFORMAT25 Nov 2008 23:23:47 -00001.69 < at >< at > -67,6 +67,13 < at >< at > B) The request was HTTP and included digest details, which adds 1000 to NUM C) If a HTTP request is NTLM type-1, it adds 1001 to num D) If a HTTP request is NTLM type-3, it adds 1002 to num +E) If a HTTP request is Basic and num is already >=1000, it adds 1 to num + +Dynamically changing num in this way allows the test harness to be used to +test authentication negotiation where several different requests must be sent +to complete a transfer. The response to each request is found in its own data +section. Validating the entire negotiation sequence can be done by +specifying a datacheck section. if the data is sent but this is what should be checked afterwards. If

danf: curl/tests/server sws.c,1.129,1.130

2008-11-25T23:23:49

Update of /cvsroot/curl/curl/tests/server In directory labb:/tmp/cvs-serv8811/tests/server Modified Files: sws.c Log Message: If a HTTP request is Basic and num is already >=1000, the HTTP test server adds 1 to num to get the data section to return. This allows testing authentication negotiations using the Basic authentication method. Index: sws.c =================================================================== RCS file: /cvsroot/curl/curl/tests/server/sws.c,v retrieving revision 1.129 retrieving revision 1.130 diff -u -d -r1.129 -r1.130 --- sws.c1 Oct 2008 17:34:25 -00001.129 +++ sws.c25 Nov 2008 23:23:47 -00001.130 < at >< at > -442,6 +442,13 < at >< at > req->ntlm = TRUE; /* NTLM found */ logmsg("Received NTLM type-1, sending back data %ld", req->partno); } + else if((req->partno >= 1000) && strstr(req->reqbuf, "Authorization: Basic")) { + /* If the client is passing this Basic-header and the part number is already + >=1000, we add 1 to the part number. This allows simple Basic authentication + negotiation to work in the test suite. */ + req->partno += 1; + logmsg("Received Basic request, sending back data %ld", req->partno); + } if(strstr(req->reqbuf, "Connection: close")) req->open = FALSE; /* close connection after this request */

yangtse: curl/ares CHANGES, 1.129, 1.130 ares_gethostbyaddr.c, 1.30,1.31 ares_gethostbyname.c, 1.43, 1.44 ares_init.c, 1.81,1.82 ares_private.h, 1.39, 1.40

2008-11-25T16:27:00

Update of /cvsroot/curl/curl/ares In directory labb:/tmp/cvs-serv31523/ares Modified Files: CHANGES ares_gethostbyaddr.c ares_gethostbyname.c ares_init.c ares_private.h Log Message: In preparation for the upcomming IPv6 nameservers patch, the internal ares_addr union is now changed into an internal struct which also holds the address family. Index: ares_init.c =================================================================== RCS file: /cvsroot/curl/curl/ares/ares_init.c,v retrieving revision 1.81 retrieving revision 1.82 diff -u -d -r1.81 -r1.82 --- ares_init.c20 Nov 2008 07:50:48 -00001.81 +++ ares_init.c25 Nov 2008 16:26:58 -00001.82 < at >< at > -1179,8 +1179,8 < at >< at > /* Lets see if it is CIDR */ /* First we'll try IPv6 */ if ((bits = ares_inet_net_pton(AF_INET6, ipbufpfx[0] ? ipbufpfx : ipbuf, - &pat.addr.addr6, - sizeof(pat.addr.addr6))) > 0) + &pat.addrV6, + sizeof(pat.addrV6))) > 0) { pat.type = PATTERN_CIDR; pat.mask.bits = (unsigned short)bits; < at >< at > -1189,8 +1189,8 < at >< at > return ARES_ENOMEM; } if (ipbufpfx[0] && - (bits = ares_inet_net_pton(AF_INET, ipbufpfx, &pat.addr.addr4, - sizeof(pat.addr.addr4))) > 0) + (bits = ares_inet_net_pton(AF_INET, ipbufpfx, &pat.addrV4, + sizeof(pat.addrV4))) > 0) { pat.type = PATTERN_CIDR; pat.mask.bits = (unsigned short)bits; < at >< at > -1199,13 +1199,13 < at >< at > return ARES_ENOMEM; } /* See if it is just a regular IP */ - else if (ip_addr(ipbuf, (int)(q-str), &pat.addr.addr4) == 0) + else if (ip_addr(ipbuf, (int)(q-str), &pat.addrV4) == 0) { if (ipbufpfx[0]) { memcpy(ipbuf, str, (int)(q-str)); ipbuf[(int)(q-str)] = '\0'; - if (ip_addr(ipbuf, (int)(q - str), &pat.mask.addr.addr4) != 0) + if (ip_addr(ipbuf, (int)(q - str), &pat.mask.addr4) != 0) natural_mask(&pat); } else < at >< at > -1420,17 +1420,17 < at >< at > /* Store a host-byte-order copy of pat in a struct in_addr. Icky, * but portable. */ - addr.s_addr = ntohl(pat->addr.addr4.s_addr); + addr.s_addr = ntohl(pat->addrV4.s_addr); /* This is out of date in the CIDR world, but some people might * still rely on it. */ if (IN_CLASSA(addr.s_addr)) - pat->mask.addr.addr4.s_addr = htonl(IN_CLASSA_NET); + pat->mask.addr4.s_addr = htonl(IN_CLASSA_NET); else if (IN_CLASSB(addr.s_addr)) - pat->mask.addr.addr4.s_addr = htonl(IN_CLASSB_NET); + pat->mask.addr4.s_addr = htonl(IN_CLASSB_NET); else - pat->mask.addr.addr4.s_addr = htonl(IN_CLASSC_NET); + pat->mask.addr4.s_addr = htonl(IN_CLASSC_NET); } #endif /* initialize an rc4 key. If possible a cryptographically secure random key Index: ares_gethostbyaddr.c =================================================================== RCS file: /cvsroot/curl/curl/ares/ares_gethostbyaddr.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- ares_gethostbyaddr.c17 Sep 2008 01:02:57 -00001.30 +++ ares_gethostbyaddr.c25 Nov 2008 16:26:58 -00001.31 < at >< at > -52,8 +52,7 < at >< at > struct addr_query { /* Arguments passed to ares_gethostbyaddr() */ ares_channel channel; - union ares_addr addr; - int family; + struct ares_addr addr; ares_host_callback callback; void *arg; < at >< at > -66,8 +65,8 < at >< at > unsigned char *abuf, int alen); static void end_aquery(struct addr_query *aquery, int status, struct hostent *host); -static int file_lookup(union ares_addr *addr, int family, struct hostent **host); -static void ptr_rr_name(char *name, int family, union ares_addr *addr); +static int file_lookup(struct ares_addr *addr, struct hostent **host); +static void ptr_rr_name(char *name, struct ares_addr *addr); void ares_gethostbyaddr(ares_channel channel, const void *addr, int addrlen, int family, ares_host_callback callback, void *arg) < at >< at > -95,10 +94,10 < at >< at > } aquery->channel = channel; if (family == AF_INET) - memcpy(&aquery->addr.addr4, addr, sizeof(struct in_addr)); + memcpy(&aquery->addr.addrV4, addr, sizeof(struct in_addr)); else - memcpy(&aquery->addr.addr6, addr, sizeof(struct in6_addr)); - aquery->family = family; + memcpy(&aquery->addr.addrV6, addr, sizeof(struct in6_addr)); + aquery->addr.family = family; aquery->callback = callback; aquery->arg = arg; aquery->remaining_lookups = channel->lookups; < at >< at > -119,13 +118,13 < at >< at > switch (*p) { case 'b': - ptr_rr_name(name, aquery->family, &aquery->addr); + ptr_rr_name(name, &aquery->addr); aquery->remaining_lookups = p + 1; ares_query(aquery->channel, name, C_IN, T_PTR, addr_callback, aquery); return; case 'f': - status = file_lookup(&aquery->addr, aquery->family, &host); + status = file_lookup(&aquery->addr, &host); /* this status check below previously checked for !ARES_ENOTFOUND, but we should not assume that this single error code is the one < at >< at > -150,11 +149,11 < at >< at > aquery->timeouts += timeouts; if (status == ARES_SUCCESS) { - if (aquery->family == AF_INET) - status = ares_parse_ptr_reply(abuf, alen, &aquery->addr.addr4, + if (aquery->addr.family == AF_INET) + status = ares_parse_ptr_reply(abuf, alen, &aquery->addr.addrV4, sizeof(struct in_addr), AF_INET, &host); else - status = ares_parse_ptr_reply(abuf, alen, &aquery->addr.addr6, + status = ares_parse_ptr_reply(abuf, alen, &aquery->addr.addrV6, sizeof(struct in6_addr), AF_INET6, &host); end_aquery(aquery, status, host); } < at >< at > -173,7 +172,7 < at >< at > free(aquery); } -static int file_lookup(union ares_addr *addr, int family, struct hostent **host) +static int file_lookup(struct ares_addr *addr, struct hostent **host) { FILE *fp; int status; < at >< at > -226,21 +225,21 < at >< at > return ARES_EFILE; } } - while ((status = ares__get_hostent(fp, family, host)) == ARES_SUCCESS) + while ((status = ares__get_hostent(fp, addr->family, host)) == ARES_SUCCESS) { - if (family != (*host)->h_addrtype) + if (addr->family != (*host)->h_addrtype) { ares_free_hostent(*host); continue; } - if (family == AF_INET) + if (addr->family == AF_INET) { - if (memcmp((*host)->h_addr, &addr->addr4, sizeof(struct in_addr)) == 0) + if (memcmp((*host)->h_addr, &addr->addrV4, sizeof(struct in_addr)) == 0) break; } - else if (family == AF_INET6) + else if (addr->family == AF_INET6) { - if (memcmp((*host)->h_addr, &addr->addr6, sizeof(struct in6_addr)) == 0) + if (memcmp((*host)->h_addr, &addr->addrV6, sizeof(struct in6_addr)) == 0) break; } ares_free_hostent(*host); < at >< at > -253,11 +252,11 < at >< at > return status; } -static void ptr_rr_name(char *name, int family, union ares_addr *addr) +static void ptr_rr_name(char *name, struct ares_addr *addr) { - if (family == AF_INET) + if (addr->family == AF_INET) { - unsigned long laddr = ntohl(addr->addr4.s_addr); + unsigned long laddr = ntohl(addr->addrV4.s_addr); int a1 = (int)((laddr >> 24) & 0xff); int a2 = (int)((laddr >> 16) & 0xff); int a3 = (int)((laddr >> 8) & 0xff); < at >< at > -266,7 +265,7 < at >< at > } else { - unsigned char *bytes = (unsigned char *)&addr->addr6.s6_addr; + unsigned char *bytes = (unsigned char *)&addr->addrV6.s6_addr; sprintf(name, "%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x." "%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.%x.ip6.arpa", Index: CHANGES =================================================================== RCS file: /cvsroot/curl/curl/ares/CHANGES,v retrieving revision 1.129 retrieving revision 1.130 diff -u -d -r1.129 -r1.130 --- CHANGES19 Nov 2008 15:16:16 -00001.129 +++ CHANGES25 Nov 2008 16:26:58 -00001.130 < at >< at > -1,5 +1,10 < at >< at > Changelog for the c-ares project +* Nov 25 2008 (Yang Tse) +- In preparation for the upcomming IPv6 nameservers patch, the internal + ares_addr union is now changed into an internal struct which also holds + the address family. + * Nov 19 2008 (Daniel Stenberg) - Brad Spencer brought the new function ares_gethostbyname_file() which simply resolves a host name from the given file, using the regular hosts syntax. Index: ares_private.h =================================================================== RCS file: /cvsroot/curl/curl/ares/ares_private.h,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- ares_private.h20 Nov 2008 07:50:48 -00001.39 +++ ares_private.h25 Nov 2008 16:26:58 -00001.40 < at >< at > -115,6 +115,16 < at >< at > # define writev(s,ptr,cnt) ares_writev(s,ptr,cnt) #endif +struct ares_addr { + int family; + union { + struct in_addr addr4; + struct in6_addr addr6; + } addr; +}; +#define addrV4 addr.addr4 +#define addrV6 addr.addr6 + struct query; struct send_request { < at >< at > -213,17 +223,17 < at >< at > #define PATTERN_MASK 0x1 #define PATTERN_CIDR 0x2 -union ares_addr { - struct in_addr addr4; - struct in6_addr addr6; -}; - struct apattern { - union ares_addr addr; union { - union ares_addr addr; - unsigned short bits; + struct in_addr addr4; + struct in6_addr addr6; + } addr; + union + { + struct in_addr addr4; + struct in6_addr addr6; + unsigned short bits; } mask; int family; unsigned short type; Index: ares_gethostbyname.c =================================================================== RCS file: /cvsroot/curl/curl/ares/ares_gethostbyname.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- ares_gethostbyname.c20 Nov 2008 07:50:48 -00001.43 +++ ares_gethostbyname.c25 Nov 2008 16:26:58 -00001.44 < at >< at > -432,13 +432,13 < at >< at > continue; if (sortlist[i].type == PATTERN_MASK) { - if ((addr->s_addr & sortlist[i].mask.addr.addr4.s_addr) - == sortlist[i].addr.addr4.s_addr) + if ((addr->s_addr & sortlist[i].mask.addr4.s_addr) + == sortlist[i].addrV4.s_addr) break; } else { - if (!ares_bitncmp(&addr->s_addr, &sortlist[i].addr.addr4.s_addr, + if (!ares_bitncmp(&addr->s_addr, &sortlist[i].addrV4.s_addr, sortlist[i].mask.bits)) break; } < at >< at > -485,7 +485,7 < at >< at > { if (sortlist[i].family != AF_INET6) continue; - if (!ares_bitncmp(&addr->s6_addr, &sortlist[i].addr.addr6.s6_addr, sortlist[i].mask.bits)) + if (!ares_bitncmp(&addr->s6_addr, &sortlist[i].addrV6.s6_addr, sortlist[i].mask.bits)) break; } return i;

danf: curl/tests/data test608,1.1,1.2

2008-11-24T22:06:45

Update of /cvsroot/curl/curl/tests/data In directory labb:/tmp/cvs-serv16961 Modified Files: test608 Log Message: Fully clean up after test 608 so that it can be run twice in succession. Index: test608 =================================================================== RCS file: /cvsroot/curl/curl/tests/data/test608,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- test6084 Apr 2007 00:48:37 -00001.1 +++ test60824 Nov 2008 22:06:43 -00001.2 < at >< at > -26,6 +26,11 < at >< at > --key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rename %PWD/log/file608.txt %PWD/log/file608-renamed.txt" sftp://%HOSTIP:%SSHPORT%PWD/log/file608.txt +# Verify that the file was renamed properly, then rename the file back to what +# it was so the verify section works and the file can be cleaned up. + +perl %SRCDIR/libtest/test610.pl gone %PWD/log/file608.txt move %PWD/log/file608-renamed.txt %PWD/log/file608.txt + Test file for rename test < at >< at > -34,7 +39,7 < at >< at > # # Verify data after the test has been "shot" - + Test file for rename test