Author: rhuijben
Date: Mon Nov 23 13:39:35 2015
New Revision: 1715807
URL: http://svn.apache.org/viewvc?rev=1715807&view=rev
Log:
* outgoing.c
(serf__conn_update_pollset): Use bool for variable.
(serf__open_connections): Initialize pump before doing
anything else, to avoid half initialized states.
(process_connection,
serf_connection_create): Handle variable as bool like on incoming.
* serf_private.h
(serf_connection_t): Use bool for variable.
Modified:
serf/trunk/outgoing.c
serf/trunk/serf_private.h
Modified: serf/trunk/outgoing.c
URL:
http://svn.apache.org/viewvc/serf/trunk/outgoing.c?rev=1715807&r1=1715806&r2=1715807&view=diff
==============================================================================
--- serf/trunk/outgoing.c (original)
+++ serf/trunk/outgoing.c Mon Nov 23 13:39:35 2015
@@ -119,7 +119,7 @@ apr_status_t serf__conn_update_pollset(s
serf_context_t *ctx = conn->ctx;
apr_status_t status;
apr_pollfd_t desc = { 0 };
- int data_waiting;
+ bool data_waiting;
if (!conn->skt) {
return APR_SUCCESS;
@@ -140,7 +140,7 @@ apr_status_t serf__conn_update_pollset(s
/* If we are not connected yet, we just want to know when we are */
if (conn->wait_for_connect) {
- data_waiting = TRUE;
+ data_waiting = true;
desc.reqevents |= APR_POLLOUT;
}
else {
@@ -429,9 +429,12 @@ apr_status_t serf__open_connections(serf
return status;
/* Keep track of when we really connect */
- conn->wait_for_connect = TRUE;
+ conn->wait_for_connect = true;
}
+ serf_pump__init(&conn->pump, &conn->io, skt, conn->config,
+ conn->allocator, conn->pool);
+
status = serf_config_set_string(conn->config,
SERF_CONFIG_CONN_PIPELINING,
(conn->max_outstanding_requests != 1 &&
@@ -439,9 +442,6 @@ apr_status_t serf__open_connections(serf
if (status)
return status;
- serf_pump__init(&conn->pump, &conn->io, skt, conn->config,
- conn->allocator, conn->pool);
-
/* Flag our pollset as dirty now that we have a new socket. */
serf_io__set_pollset_dirty(&conn->io);
@@ -1190,7 +1190,7 @@ static apr_status_t process_connection(s
}
if ((events & APR_POLLOUT) != 0) {
if (conn->wait_for_connect) {
- conn->wait_for_connect = FALSE;
+ conn->wait_for_connect = false;
/* We are now connected. Socket is now usable */
serf_io__set_pollset_dirty(&conn->io);
@@ -1275,7 +1275,7 @@ serf_connection_t *serf_connection_creat
conn->state = SERF_CONN_INIT;
conn->latency = -1; /* unknown */
conn->write_now = false;
- conn->wait_for_connect = 0;
+ conn->wait_for_connect = false;
conn->pipelining = 1;
conn->framing_type = SERF_CONNECTION_FRAMING_TYPE_HTTP1;
conn->perform_read = read_from_connection;
Modified: serf/trunk/serf_private.h
URL:
http://svn.apache.org/viewvc/serf/trunk/serf_private.h?rev=1715807&r1=1715806&r2=1715807&view=diff
==============================================================================
--- serf/trunk/serf_private.h (original)
+++ serf/trunk/serf_private.h Mon Nov 23 13:39:35 2015
@@ -556,7 +556,7 @@ struct serf_connection_t {
/* Wait for connect: connect() returned APR_EINPROGRESS.
Socket not usable yet */
- int wait_for_connect;
+ bool wait_for_connect;
/* Event callbacks, called from serf__process_connection() to do the actual
processing. */
