mturk 2005/02/17 00:26:42
Modified: jk/native/common jk_connect.c
Log:
Remove the CRLFs. Again.
Revision Changes Path
1.42 +14 -14 jakarta-tomcat-connectors/jk/native/common/jk_connect.c
Index: jk_connect.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- jk_connect.c 17 Feb 2005 08:10:40 -0000 1.41
+++ jk_connect.c 17 Feb 2005 08:26:42 -0000 1.42
@@ -71,7 +71,7 @@
#ifdef HAVE_APR
apr_sockaddr_t *remote_sa, *temp_sa;
char *remote_ipaddr;
-
+
if (!jk_apr_pool) {
if (apr_pool_create(&jk_apr_pool, NULL) != APR_SUCCESS)
return JK_FALSE;
@@ -197,9 +197,9 @@
#ifdef WIN32
if (timeout > 0) {
timeout = timeout * 1000;
- setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
+ setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO,
(char *) &timeout, sizeof(int));
- setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO,
+ setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO,
(char *) &timeout, sizeof(int));
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
@@ -214,13 +214,13 @@
"trying to connect socket %d to %s", sock,
jk_dump_hinfo(addr, buf));
-/* Need more infos for BSD 4.4 and Unix 98 defines, for now only
+/* Need more infos for BSD 4.4 and Unix 98 defines, for now only
iSeries when Unix98 is required at compil time */
#if (_XOPEN_SOURCE >= 520) && defined(AS400)
((struct sockaddr *)addr)->sa_len = sizeof(struct sockaddr_in);
#endif
ret = connect(sock, (struct sockaddr *)addr,
- sizeof(struct sockaddr_in));
+ sizeof(struct sockaddr_in));
#if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
if (ret == SOCKET_ERROR) {
errno = WSAGetLastError() - WSABASEERR;
@@ -318,10 +318,10 @@
if (rd == SOCKET_ERROR)
errno = WSAGetLastError() - WSABASEERR;
#else
- rd = read(sd, (char *)b + rdlen, len - rdlen);
+ rd = read(sd, (char *)b + rdlen, len - rdlen);
#endif
} while (rd == -1 && errno == EINTR);
-
+
if (rd == -1)
return (errno > 0) ? -errno : errno;
else if (rd == 0)
@@ -403,7 +403,7 @@
}
#endif /* WIN32 */
return 0;
-}
+}
#if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
#define EWOULDBLOCK (WSAEWOULDBLOCK - WSABASEERR)
@@ -411,8 +411,8 @@
int jk_is_socket_connected(int sd, int timeout)
{
- unsigned char test_buffer[1];
- int rc;
+ unsigned char test_buffer[1];
+ int rc;
/* Set socket to nonblocking */
if ((rc = sononblock(sd)) != 0)
return (errno > 0) ? -errno : errno;
@@ -423,11 +423,11 @@
/* Reset socket timeouts if the new timeout differs from the old timeout
*/
if (timeout > 0) {
/* Timeouts are in msec, represented as int */
- setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO,
+ setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO,
(char *) &timeout, sizeof(int));
- setsockopt(sd, SOL_SOCKET, SO_SNDTIMEO,
+ setsockopt(sd, SOL_SOCKET, SO_SNDTIMEO,
(char *) &timeout, sizeof(int));
- }
+ }
#endif
if (rc == EWOULDBLOCK || rc == -1)
return 1;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
