Commit 1b1f143c authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

hostname and large file support added

parent 31b8eea0

configure.in

+5 −2
Original line number Diff line number Diff line
@@ -13,12 +13,15 @@ AC_CANONICAL_TARGET 


dnl Checks for programs.

AC_PROG_CC



dnl Check for AIX weirdos

AC_AIX



AC_SYS_LARGEFILE

dnl The install stuff has already been taken care of by the automake stuff

dnl AC_PROG_INSTALL

AC_PROG_MAKE_SET



dnl Check for AIX weirdos

AC_AIX



dnl **********************************************************************

dnl Checks for libraries.

largefile.m4

0 → 100644
+75 −0
Original line number Diff line number Diff line 
#serial 12



dnl By default, many hosts won't let programs access large files;

dnl one must use special compiler options to get large-file access to work.

dnl For more details about this brain damage please see:

dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html



dnl Written by Paul Eggert <eggert@twinsun.com>.



dnl Internal subroutine of AC_SYS_LARGEFILE.

dnl AC_SYS_LARGEFILE_TEST_INCLUDES

AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,

  [[#include <sys/types.h>

    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];

  ]])



dnl Internal subroutine of AC_SYS_LARGEFILE.

dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY)

AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,

  [AC_CACHE_CHECK([for $1 value needed for large files], $3,

     [$3=no

      AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES

$5

        ,

	[$6], 

	,

	[AC_TRY_COMPILE([#define $1 $2]

AC_SYS_LARGEFILE_TEST_INCLUDES

$5

	   ,

	   [$6],

	   [$3=$2])])])

   if test "[$]$3" != no; then

     AC_DEFINE_UNQUOTED([$1], [$]$3, [$4])

   fi])



AC_DEFUN(AC_SYS_LARGEFILE,

  [AC_ARG_ENABLE(largefile,

     [  --disable-largefile     omit support for large files])

   if test "$enable_largefile" != no; then



     AC_CACHE_CHECK([for special C compiler options needed for large files],

       ac_cv_sys_largefile_CC,

       [ac_cv_sys_largefile_CC=no

        if test "$GCC" != yes; then

	  # IRIX 6.2 and later do not support large files by default,

	  # so use the C compiler's -n32 option if that helps.

	  AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , ,

	    [ac_save_CC="$CC"

	     CC="$CC -n32"

	     AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, ,

	       ac_cv_sys_largefile_CC=' -n32')

	     CC="$ac_save_CC"])

        fi])

     if test "$ac_cv_sys_largefile_CC" != no; then

       CC="$CC$ac_cv_sys_largefile_CC"

     fi



     AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,

       ac_cv_sys_file_offset_bits,

       [Number of bits in a file offset, on hosts where this is settable.])

     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,

       ac_cv_sys_largefile_source,

       [Define to make ftello visible on some hosts (e.g. HP-UX 10.20).],

       [#include <stdio.h>], [return !ftello;])

     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,

       ac_cv_sys_large_files,

       [Define for large files, on AIX-style hosts.])

dnl	lftp does not need ftello, and _XOPEN_SOURCE=500 makes resolv.h fail.

dnl     AC_SYS_LARGEFILE_MACRO_VALUE(_XOPEN_SOURCE, 500,

dnl       ac_cv_sys_xopen_source,

dnl       [Define to make ftello visible on some hosts (e.g. glibc 2.1.3).],

dnl       [#include <stdio.h>], [return !ftello;])

   fi

  ])

lib/hostip.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
#include "urldata.h"

#include "sendf.h"



#ifndef HAVE_INET_NTOA_R_DECL

#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL)

#include "inet_ntoa_r.h"

#endif

lib/http.c

+14 −8
Original line number Diff line number Diff line
@@ -38,12 +38,6 @@ 
 * ------------------------------------------------------------

 ****************************************************************************/



#ifdef NEED_REENTRANT

#define _REENTRANT /* Necessary to use in Solaris, since the silly guys at Sun

                      made the localtime_r() prototype dependent on it (or

                      _POSIX_C_SOURCE or _POSIX_PTHREAD_SEMANTICS). */

#endif



/* -- WIN32 approved -- */

#include <stdio.h>

#include <string.h>
@@ -57,6 +51,12 @@ 


#include "setup.h"



#ifdef NEED_REENTRANT

#define _REENTRANT /* Necessary to use in Solaris, since the silly guys at Sun

                      made the localtime_r() prototype dependent on it (or

                      _POSIX_C_SOURCE or _POSIX_PTHREAD_SEMANTICS). */

#endif



#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)

#include <winsock.h>

#include <time.h>
@@ -378,7 +378,7 @@ CURLcode http(struct connectdata *conn) 
#ifdef HAVE_LOCALTIME_R

      /* thread-safe version */

      struct tm keeptime;

      thistime = localtime_r(&data->timevalue, &keeptime);

      thistime = (struct tm *)localtime_r(&data->timevalue, &keeptime);

#else

      thistime = localtime(&data->timevalue);

#endif
@@ -492,13 +492,19 @@ CURLcode http(struct connectdata *conn) 
             actually set your own */

          sendf(data->firstsocket, data,

                "Content-Length: %d\r\n",

                strlen(data->postfields));

                (data->postfieldsize?data->postfieldsize:

                 strlen(data->postfields)) );



        if(!checkheaders(data, "Content-Type:"))

          sendf(data->firstsocket, data,

                "Content-Type: application/x-www-form-urlencoded\r\n");



        /* and here comes the actual data */

        if(data->postfieldsize) {

          ssend(data->firstsocket, data, "\r\n", 2);

          ssend(data->firstsocket, data, data->postfields, data->postfieldsize);

          ssend(data->firstsocket, data, "\r\n", 2);

        }

        sendf(data->firstsocket, data,

              "\r\n"

              "%s\r\n",

lib/if2ip.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 
#include <sys/sockio.h>

#endif



#ifndef HAVE_INET_NTOA_R_DECL

#if defined(HAVE_INET_NTOA_R) && !defined(HAVE_INET_NTOA_R_DECL) 

#include "inet_ntoa_r.h"

#endif