aboutsummaryrefslogtreecommitdiffstats
path: root/outgoing.c
diff options
context:
space:
mode:
Diffstat (limited to 'outgoing.c')
-rw-r--r--outgoing.c36
1 files changed, 23 insertions, 13 deletions
diff --git a/outgoing.c b/outgoing.c
index 3fc726c038e4..5f5f6b51da45 100644
--- a/outgoing.c
+++ b/outgoing.c
@@ -1,16 +1,21 @@
-/* Copyright 2002-2004 Justin Erenkrantz and Greg Stein
+/* ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
*/
#include <apr_pools.h>
@@ -142,7 +147,7 @@ apr_status_t serf__conn_update_pollset(serf_connection_t *conn)
desc.reqevents = conn->reqevents;
status = ctx->pollset_rm(ctx->pollset_baton,
- &desc, conn);
+ &desc, &conn->baton);
if (status && !APR_STATUS_IS_NOTFOUND(status))
return status;
@@ -547,7 +552,7 @@ static apr_status_t remove_connection(serf_context_t *ctx,
desc.reqevents = conn->reqevents;
return ctx->pollset_rm(ctx->pollset_baton,
- &desc, conn);
+ &desc, &conn->baton);
}
/* A socket was closed, inform the application. */
@@ -623,6 +628,11 @@ static apr_status_t reset_connection(serf_connection_t *conn,
conn->ctx->dirty_pollset = 1;
conn->state = SERF_CONN_INIT;
+ conn->hit_eof = 0;
+ conn->connect_time = 0;
+ conn->latency = -1;
+ conn->stop_writing = 0;
+
serf__log(CONN_VERBOSE, __FILE__, "reset connection 0x%x\n", conn);
conn->status = APR_SUCCESS;