Update serf 1.2.1 -> 1.3.0 for svn

1 files changed, 4 insertions, 5 deletions

diff --git a/contrib/serf/ssltunnel.c b/contrib/serf/ssltunnel.c
index a038ae5..480c799 100644
--- a/contrib/serf/ssltunnel.c
+++ b/contrib/serf/ssltunnel.c
@@ -159,17 +159,16 @@ apr_status_t serf__ssltunnel_connect(serf_connection_t *conn)
 
     ctx = apr_palloc(ssltunnel_pool, sizeof(*ctx));
     ctx->pool = ssltunnel_pool;
-    ctx->uri = apr_psprintf(ctx->pool, "%s:%d", conn->host_info.hostinfo,
+    ctx->uri = apr_psprintf(ctx->pool, "%s:%d", conn->host_info.hostname,
                             conn->host_info.port);
 
     conn->ssltunnel_ostream = serf__bucket_stream_create(conn->allocator,
                                                          detect_eof,
                                                          conn);
 
-    /* TODO: should be the first request on the connection. */
-    serf_connection_priority_request_create(conn,
-                                            setup_request,
-                                            ctx);
+    serf__ssltunnel_request_create(conn,
+                                   setup_request,
+                                   ctx);
 
     conn->state = SERF_CONN_SETUP_SSLTUNNEL;
     serf__log(CONN_VERBOSE, __FILE__,