if (!FD_ISSET(phd->fd, &s->wfds))
goto out;
rq = make_request_msg();
- PARA_INFO_LOG("%s", "sending http request\n");
+ PARA_INFO_LOG("sending http request\n");
t->ret = send_va_buffer(phd->fd, "%s", rq);
free(rq);
if (t->ret > 0)
t->ret = recv_pattern(phd->fd, HTTP_OK_MSG, MAXLINE);
if (t->ret < 0)
goto out;
- PARA_INFO_LOG("%s", "received ok msg, streaming\n");
+ PARA_INFO_LOG("received ok msg, streaming\n");
t->ret = 1;
phd->status = HTTP_STREAMING;
goto out;
{
struct private_http_recv_data *phd;
struct http_recv_args_info *conf = rn->conf;
- int ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, conf->host_arg, conf->port_arg);
+ int fd, ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, conf->host_arg,
+ conf->port_arg);
if (ret < 0)
return ret;
-
+ fd = ret;
+ ret = mark_fd_nonblocking(fd);
+ if (ret < 0) {
+ close(fd);
+ return ret;
+ }
rn->buf = para_calloc(BUFSIZE);
rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data));
-
- phd->fd = ret;
- mark_fd_nonblocking(phd->fd);
+ phd->fd = fd;
phd->status = HTTP_CONNECTED;
return 1;
}