You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/06/05 06:00:26 UTC
svn commit: r1489698 - in /subversion/branches/1.8.x: ./ INSTALL STATUS
build/generator/gen_win.py configure.ac get-deps.sh
subversion/libsvn_ra_serf/ra_serf.h
Author: svn-role
Date: Wed Jun 5 04:00:25 2013
New Revision: 1489698
URL: http://svn.apache.org/r1489698
Log:
Merge the r1489114 group from trunk:
* r1489114, r1489116
Require Serf 1.2.1.
Justification:
Serf 1.2.0 doesn't work where Digest authentication is in use.
See http://subversion.tigris.org/issues/show_bug.cgi?id=4371 and
https://code.google.com/p/serf/issues/detail?id=102 for details.
Notes:
This is a blocking issue.
Votes:
+1: cmpilato, gstein, ivan
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/INSTALL
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/build/generator/gen_win.py
subversion/branches/1.8.x/configure.ac
subversion/branches/1.8.x/get-deps.sh
subversion/branches/1.8.x/subversion/libsvn_ra_serf/ra_serf.h
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1489114,1489116
Modified: subversion/branches/1.8.x/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/INSTALL?rev=1489698&r1=1489697&r2=1489698&view=diff
==============================================================================
--- subversion/branches/1.8.x/INSTALL (original)
+++ subversion/branches/1.8.x/INSTALL Wed Jun 5 04:00:25 2013
@@ -306,7 +306,7 @@ I. INTRODUCTION
newer. The autogen.sh script knows about that.
- 5. Serf library 1.2 or newer (http://code.google.com/p/serf/) (OPTIONAL)
+ 5. Serf library 1.2.1 or newer (OPTIONAL)
If you want your client to be able to speak to an Apache
server (via a http:// or https:// URL), you must link against
@@ -320,6 +320,9 @@ I. INTRODUCTION
instead.
+ Serf can be obtained via your system's package distribution
+ system or directly from http://code.google.com/p/serf/.
+
For more information on serf and Subversion's ra_serf, see the file
subversion/libsvn_ra_serf/README.
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1489698&r1=1489697&r2=1489698&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Jun 5 04:00:25 2013
@@ -57,17 +57,6 @@ Approved for 1.8.1 or if soak is restart
Approved changes:
=================
- * r1489114, r1489116
- Require Serf 1.2.1.
- Justification:
- Serf 1.2.0 doesn't work where Digest authentication is in use.
- See http://subversion.tigris.org/issues/show_bug.cgi?id=4371 and
- https://code.google.com/p/serf/issues/detail?id=102 for details.
- Notes:
- This is a blocking issue.
- Votes:
- +1: cmpilato, gstein, ivan
-
* r1489203
Fix a crash when the automatic merge API is called with unrelated source
and target branches, other than by 'svn' which does an ancestry check
Modified: subversion/branches/1.8.x/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/build/generator/gen_win.py?rev=1489698&r1=1489697&r2=1489698&view=diff
==============================================================================
--- subversion/branches/1.8.x/build/generator/gen_win.py (original)
+++ subversion/branches/1.8.x/build/generator/gen_win.py Wed Jun 5 04:00:25 2013
@@ -1443,7 +1443,7 @@ class WinGeneratorBase(GeneratorBase):
def _find_serf(self):
"Check if serf and its dependencies are available"
- minimal_serf_version = (1, 2, 0)
+ minimal_serf_version = (1, 2, 1)
self.serf_lib = None
if self.serf_path and os.path.exists(self.serf_path):
if self.openssl_path and os.path.exists(self.openssl_path):
Modified: subversion/branches/1.8.x/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/configure.ac?rev=1489698&r1=1489697&r2=1489698&view=diff
==============================================================================
--- subversion/branches/1.8.x/configure.ac (original)
+++ subversion/branches/1.8.x/configure.ac Wed Jun 5 04:00:25 2013
@@ -125,7 +125,7 @@ dnl Search for pkg-config
AC_PATH_PROG(PKG_CONFIG, pkg-config)
dnl Search for serf
-SVN_LIB_SERF(1,2,0)
+SVN_LIB_SERF(1,2,1)
if test "$svn_lib_serf" = "yes"; then
AC_DEFINE([SVN_HAVE_SERF], 1,
Modified: subversion/branches/1.8.x/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/get-deps.sh?rev=1489698&r1=1489697&r2=1489698&view=diff
==============================================================================
--- subversion/branches/1.8.x/get-deps.sh (original)
+++ subversion/branches/1.8.x/get-deps.sh Wed Jun 5 04:00:25 2013
@@ -33,7 +33,7 @@
APR_VERSION=${APR_VERSION:-"1.4.6"}
APU_VERSION=${APU_VERSION:-"1.5.1"}
-SERF_VERSION=${SERF_VERSION:-"1.2.0"}
+SERF_VERSION=${SERF_VERSION:-"1.2.1"}
ZLIB_VERSION=${ZLIB_VERSION:-"1.2.8"}
SQLITE_VERSION=${SQLITE_VERSION:-"3.7.15.1"}
GTEST_VERSION=${GTEST_VERSION:-"1.6.0"}
Modified: subversion/branches/1.8.x/subversion/libsvn_ra_serf/ra_serf.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_ra_serf/ra_serf.h?rev=1489698&r1=1489697&r2=1489698&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/branches/1.8.x/subversion/libsvn_ra_serf/ra_serf.h Wed Jun 5 04:00:25 2013
@@ -50,8 +50,8 @@ extern "C" {
/* Enforce the minimum version of serf. */
-#if !SERF_VERSION_AT_LEAST(0, 7, 1)
-#error Please update your version of serf to at least 0.7.1.
+#if !SERF_VERSION_AT_LEAST(1, 2, 1)
+#error Please update your version of serf to at least 1.2.1.
#endif
/** Use this to silence compiler warnings about unused parameters. */