You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ds...@apache.org on 2022/03/31 15:04:18 UTC

svn commit: r1899443 - in /subversion/branches/1.10.x: ./ INSTALL STATUS

Author: dsahlberg
Date: Thu Mar 31 15:04:17 2022
New Revision: 1899443

URL: http://svn.apache.org/viewvc?rev=1899443&view=rev
Log:
Merge the 1.10.x-r1894491 branch:

 * r1894491
   INSTALL: Document not to build ZLib with ASM optimizations
   Justification:
     Building ZLib that way causes SVN to segfault. User complained.
   Branch:
     1.10.x-r1894491
   Votes:
     +1: hartmannathan, dsahlberg

Modified:
    subversion/branches/1.10.x/   (props changed)
    subversion/branches/1.10.x/INSTALL
    subversion/branches/1.10.x/STATUS

Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1894491
  Merged /subversion/branches/1.10.x-r1894491:r1899403-1899442

Modified: subversion/branches/1.10.x/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/INSTALL?rev=1899443&r1=1899442&r2=1899443&view=diff
==============================================================================
--- subversion/branches/1.10.x/INSTALL (original)
+++ subversion/branches/1.10.x/INSTALL Thu Mar 31 15:04:17 2022
@@ -937,6 +937,12 @@ II.   INSTALLATION
       Note that you'd make sure to define ZLIB_WINAPI in the ZLib config
       header and move the lib-file into the zlib root-directory.
 
+      Please note that you MUST NOT build ZLib with the included assembler
+      optimized code. It is known to be buggy, see for example the discussion
+      https://svn.haxx.se/dev/archive-2013-10/0109.shtml.
+      This means that you must not define ASMV or ASMINF. Note that the VS
+      projects in contrib\visualstudio define these in the Debug configuration.
+
       Apache Serf
 
       ### Section about Apache Serf might be required/useful to add.

Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1899443&r1=1899442&r2=1899443&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Thu Mar 31 15:04:17 2022
@@ -27,12 +27,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1894491
-   INSTALL: Document not to build ZLib with ASM optimizations
-   Justification:
-     Building ZLib that way causes SVN to segfault. User complained.
-   Branch:
-     1.10.x-r1894491
-   Votes:
-     +1: hartmannathan, dsahlberg