[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: OT: Serf and caching proxy? (was: svn commit: r33398 - trunk/notes)

From: Justin Erenkrantz <justin_at_erenkrantz.com>
Date: Thu, 2 Oct 2008 10:46:30 -0700

On Thu, Oct 2, 2008 at 10:12 AM, Mark Phippard <markphip_at_gmail.com> wrote:
> subversion/libsvn_ra_serf/util.c:558: (apr_err=47)
> svn: Error running context: Address family not supported by protocol family

I believe that Lieven largely tested the proxy stuff on Windows, but
I'm not 100% sure. But, I think below should fix it if you are on
another platform. Lieven, does this look right? -- justin

Index: context.c
===================================================================
--- context.c (revision 1195)
+++ context.c (working copy)
@@ -294,7 +294,13 @@
         apr_pool_clear(conn->skt_pool);
         apr_pool_cleanup_register(conn->skt_pool, conn, clean_skt, clean_skt);

- if ((status = apr_socket_create(&skt, conn->address->family,
+ /* Do we have to connect to a proxy server? */
+ if (ctx->proxy_address)
+ serv_addr = ctx->proxy_address;
+ else
+ serv_addr = conn->address;
+
+ if ((status = apr_socket_create(&skt, serv_addr->family,
                                         SOCK_STREAM,
 #if APR_MAJOR_VERSION > 0
                                         APR_PROTO_TCP,
@@ -314,12 +320,6 @@
         /* Configured. Store it into the connection now. */
         conn->skt = skt;

- /* Do we have to connect to a proxy server? */
- if (ctx->proxy_address)
- serv_addr = ctx->proxy_address;
- else
- serv_addr = conn->address;
-
         /* Now that the socket is set up, let's connect it. This should
          * return immediately.
          */

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-02 19:46:47 CEST

This is an archived mail posted to the Subversion Dev mailing list.