Commit 60b02986 authored by Gisle Vanem's avatar Gisle Vanem
Browse files

Use getprotobyname() to retrieve protocol number for TCP 

(sorry, I don't know how to add this to the configure process).
parent f592ea6c

lib/config-win32.h

+3 −0
Original line number Diff line number Diff line
@@ -136,6 +136,9 @@ 
/* Define if you have the getservbyname function.  */

#define HAVE_GETSERVBYNAME 1



/* Define if you have the getprotobyname function.  */

#define HAVE_GETPROTOBYNAME



/* Define if you have the gettimeofday function.  */

/* #define HAVE_GETTIMEOFDAY 1 */

lib/config.dj

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#define HAVE_GETHOSTNAME       1

#define HAVE_GETPASS           1

#define HAVE_GETSERVBYNAME     1

#define HAVE_GETPROTOBYNAME    1

#define HAVE_GETTIMEOFDAY      1

#define HAVE_INET_ADDR         1

#define HAVE_INET_NTOA         1

lib/connect.c

+9 −1
Original line number Diff line number Diff line
@@ -619,7 +619,15 @@ static void tcpnodelay(struct connectdata *conn, 
#ifdef TCP_NODELAY

  struct SessionHandle *data= conn->data;

  socklen_t onoff = (socklen_t) data->set.tcp_nodelay;

  if(setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, (void *)&onoff,

  int proto = IPPROTO_TCP;



#ifdef HAVE_GETPROTOBYNAME

  struct protoent *pe = getprotobyname("tcp");

  if (pe)

    proto = p->p_proto;

#endif



  if(setsockopt(sockfd, proto, TCP_NODELAY, (void *)&onoff,

                sizeof(onoff)) < 0)

    infof(data, "Could not set TCP_NODELAY: %s\n",

          Curl_strerror(conn, Curl_ourerrno()));