Update Apache Serf to 1.3.9 to support OpenSSL 1.1.1.

Approved by:	re (rgrimes)

1 files changed, 20 insertions, 15 deletions

diff --git a/contrib/serf/context.c b/contrib/serf/context.c
index b53b0a08a1c7..9b521381f715 100644
--- a/contrib/serf/context.c
+++ b/contrib/serf/context.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>
@@ -212,7 +217,7 @@ apr_status_t serf_event_trigger(
             tdesc.desc.s = conn->skt;
             tdesc.reqevents = conn->reqevents;
             ctx->pollset_rm(ctx->pollset_baton,
-                            &tdesc, conn);
+                            &tdesc, &conn->baton);
             return conn->status;
         }
         /* apr_pollset_poll() can return a conn multiple times... */
@@ -233,7 +238,7 @@ apr_status_t serf_event_trigger(
                 tdesc.desc.s = conn->skt;
                 tdesc.reqevents = conn->reqevents;
                 ctx->pollset_rm(ctx->pollset_baton,
-                                &tdesc, conn);
+                                &tdesc, &conn->baton);
             }
             return conn->status;
         }
@@ -295,9 +300,9 @@ apr_status_t serf_context_run(
     }
 
     while (num--) {
-        serf_connection_t *conn = desc->client_data;
+        serf_io_baton_t *io  = desc->client_data;
 
-        status = serf_event_trigger(ctx, conn, desc);
+        status = serf_event_trigger(ctx, io, desc);
         if (status) {
             return status;
         }