subversion/subversion-neon-systemproxy.patch

39 lines
1.5 KiB
Diff
Raw Normal View History

Index: subversion/libsvn_ra_neon/session.c
===================================================================
--- subversion/libsvn_ra_neon/session.c.orig 2011-12-21 17:36:12.000000000 +0000
+++ subversion/libsvn_ra_neon/session.c 2011-12-21 17:36:17.000000000 +0000
@@ -910,6 +910,17 @@ svn_ra_neon__open(svn_ra_session_t *sess
}
#endif
}
+#ifdef SVN_NEON_0_29
+ else
+ {
+ /* If we do not have any proxy specified for this host and
+ we're running a new enough neon implementation, we use
+ neon's session proxy autodetection (via libproxy). */
+ ne_session_system_proxy(sess, 0);
+ ne_session_system_proxy(sess2, 0);
+ }
+#endif
+
if (!timeout)
timeout = DEFAULT_HTTP_TIMEOUT;
Index: build/ac-macros/neon.m4
===================================================================
--- build/ac-macros/neon.m4.orig 2011-12-21 17:36:12.000000000 +0000
+++ build/ac-macros/neon.m4 2011-12-21 17:38:02.000000000 +0000
@@ -100,6 +100,11 @@ AC_DEFUN(SVN_NEON_CONFIG,
[Define to 1 if you have Neon 0.28 or later.])
fi
+ if test -n ["`echo "$NEON_VERSION" | $EGREP '^0\.(29|3[0-9])\.'`"] ; then
+ AC_DEFINE_UNQUOTED([SVN_NEON_0_29], [1],
+ [Define to 1 if you have Neon 0.29 or later.])
+ fi
+
for svn_allowed_neon in $NEON_ALLOWED_LIST; do
if test -n "`echo "$NEON_VERSION" | grep "^$svn_allowed_neon"`" ||
test "$svn_allowed_neon" = "any"; then