You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2014/04/26 03:16:14 UTC
svn commit: r1590205 - in /subversion/branches/1.7.x: ./ STATUS
build/ac-macros/apache.m4
Author: breser
Date: Sat Apr 26 01:16:14 2014
New Revision: 1590205
URL: http://svn.apache.org/r1590205
Log:
Merge the r1545835 group from trunk:
* r1545835, r1545845
Prevent use with known buggy versions of httpd.
Justification:
Signal to our packagers that these versions have issues that they either
need to upgrade or patch around.
Votes:
+1: breser, danielsh, philip
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/build/ac-macros/apache.m4
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1545835,1545845
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1590205&r1=1590204&r2=1590205&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Apr 26 01:16:14 2014
@@ -118,14 +118,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1545835, r1545845
- Prevent use with known buggy versions of httpd.
- Justification:
- Signal to our packagers that these versions have issues that they either
- need to upgrade or patch around.
- Votes:
- +1: breser, danielsh, philip
-
* r1577739, r1577755, r1588772, r1588778
Resolve issue #4480: Mergeinfo overwritten on successive merges
Justification:
Modified: subversion/branches/1.7.x/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/build/ac-macros/apache.m4?rev=1590205&r1=1590204&r2=1590205&view=diff
==============================================================================
--- subversion/branches/1.7.x/build/ac-macros/apache.m4 (original)
+++ subversion/branches/1.7.x/build/ac-macros/apache.m4 Sat Apr 26 01:16:14 2014
@@ -118,6 +118,27 @@ apache_minor_version=AP_SERVER_MINORVERS
CPPFLAGS="$old_CPPFLAGS"
fi
+# check for some busted versions of mod_dav
+# in particular 2.2.25, 2.4.5, and 2.4.6 had the following bugs which are
+# troublesome for Subversion:
+# PR 55304: https://issues.apache.org/bugzilla/show_bug.cgi?id=55304
+# PR 55306: https://issues.apache.org/bugzilla/show_bug.cgi?id=55306
+# PR 55397: https://issues.apache.org/bugzilla/show_bug.cgi?id=55397
+if test -n "$APXS" && test "$APXS" != "no"; then
+ AC_MSG_CHECKING([mod_dav version])
+ old_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
+ blacklisted_versions_regex=["\"2\" \"\.\" (\"2\" \"\.\" \"25\"|\"4\" \"\.\" \"[56]\")"]
+ AC_EGREP_CPP([apache_version= *$blacklisted_versions_regex],
+ [
+#include "$APXS_INCLUDE/ap_release.h"
+apache_version=AP_SERVER_BASEREVISION],
+ [AC_MSG_RESULT([broken])
+ AC_MSG_ERROR([Apache httpd version includes a broken mod_dav; use a newer version of httpd])],
+ [AC_MSG_RESULT([acceptable])])
+ CPPFLAGS="$old_CPPFLAGS"
+fi
+
AC_ARG_WITH(apache-libexecdir,
[AS_HELP_STRING([[--with-apache-libexecdir[=PATH]]],
[Install Apache modules to PATH instead of Apache's