Revision: 14774
Author: adrian.chadd
Date: Thu Sep 2 08:06:04 2010
Log: Make the HTTPS side of things compile again.
http://code.google.com/p/lusca-cache/source/detail?r=14774
Modified:
/playpen/LUSCA_HEAD_ipv6/src/client_side.c
=======================================
--- /playpen/LUSCA_HEAD_ipv6/src/client_side.c Tue Aug 31 18:24:09 2010
+++ /playpen/LUSCA_HEAD_ipv6/src/client_side.c Thu Sep 2 08:06:04 2010
@@ -2753,14 +2753,14 @@
connState->port = (http_port_list *) s;
cbdataLock(connState->port);
if (Config.onoff.log_fqdn)
- fqdncache_gethostbyaddr(connState->peer.sin_addr,
FQDN_LOOKUP_IF_MISS);
+ fqdncache_gethostbyaddr6(&connState->peer2, FQDN_LOOKUP_IF_MISS);
commSetTimeout(fd, Config.Timeout.request, requestTimeout, connState);
#if USE_IDENT
identChecklist.src_addr = sqinet_get_v4_inaddr(&peer,
SQADDR_ASSERT_IS_V4);
identChecklist.my_addr = sqinet_get_v4_inaddr(&me, SQADDR_ASSERT_IS_V4);
identChecklist.my_port = sqinet_get_port(&me);
if (aclCheckFast(Config.accessList.identLookup, &identChecklist))
- identStart4(&connState->me, &connState->peer, clientIdentDone,
connState);
+ identStart(&connState->me2, &connState->peer2, clientIdentDone,
connState);
#endif
if (s->http.tcp_keepalive.enabled) {
commSetTcpKeepalive(fd, s->http.tcp_keepalive.idle,
s->http.tcp_keepalive.interval, s->http.tcp_keepalive.timeout);
@@ -2966,6 +2966,8 @@
{
https_port_list *s;
int fd;
+ int comm_flags;
+
char cbuf[MAX_IPSTRLEN];
for (s = Config.Sockaddr.https; s; s = (https_port_list *)
s->http.next) {
if (MAXHTTPPORTS == NHttpSockets) {
@@ -2973,6 +2975,7 @@
debug(1, 1) (" The limit is %d\n", MAXHTTPPORTS);
continue;
}
+ comm_flags = COMM_NONBLOCKING;
if (!s->sslContext)
continue;
enter_suid();
@@ -2983,7 +2986,7 @@
comm_listen(fd);
commSetSelect(fd, COMM_SELECT_READ, httpsAccept, s, 0);
commSetDefer(fd, httpAcceptDefer, NULL);
- (void) sqinet_ntoa(&s->ss, cbuf, MAX_IPSTRLEN, SQADDR_NONE);
+ (void) sqinet_ntoa(&s->http.ss, cbuf, MAX_IPSTRLEN, SQADDR_NONE);
debug(1, 1) ("Accepting HTTPS connections at %s, port %d, FD %d.\n",
cbuf,
sqinet_get_port(&s->http.ss),
--
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en.
