Author: ivan
Date: Fri Apr 21 15:21:46 2023
New Revision: 1909328
URL: http://svn.apache.org/viewvc?rev=1909328&view=rev
Log:
On the '1.3.x-r1901937' branch: Merge changes from the 1.3.x branch.
Modified:
serf/branches/1.3.x-r1901937/ (props changed)
serf/branches/1.3.x-r1901937/.github/workflows/linux.yml
serf/branches/1.3.x-r1901937/SConstruct
serf/branches/1.3.x-r1901937/STATUS
Propchange: serf/branches/1.3.x-r1901937/
------------------------------------------------------------------------------
Merged /serf/branches/1.3.x-r1814714:r1814716-1909313
Merged /serf/trunk:r1814714,1909318
Merged /serf/branches/1.3.x:r1909313-1909327
Modified: serf/branches/1.3.x-r1901937/.github/workflows/linux.yml
URL:
http://svn.apache.org/viewvc/serf/branches/1.3.x-r1901937/.github/workflows/linux.yml?rev=1909328&r1=1909327&r2=1909328&view=diff
==============================================================================
--- serf/branches/1.3.x-r1901937/.github/workflows/linux.yml (original)
+++ serf/branches/1.3.x-r1901937/.github/workflows/linux.yml Fri Apr 21
15:21:46 2023
@@ -14,6 +14,7 @@ jobs:
strategy:
matrix:
os: [ "ubuntu-20.04", "ubuntu-22.04" ]
+ fail-fast: false
runs-on: ${{ matrix.os }}
steps:
Modified: serf/branches/1.3.x-r1901937/SConstruct
URL:
http://svn.apache.org/viewvc/serf/branches/1.3.x-r1901937/SConstruct?rev=1909328&r1=1909327&r2=1909328&view=diff
==============================================================================
--- serf/branches/1.3.x-r1901937/SConstruct (original)
+++ serf/branches/1.3.x-r1901937/SConstruct Fri Apr 21 15:21:46 2023
@@ -335,7 +335,6 @@ if sys.platform == 'win32':
LIBPATH=['$ZLIB'])
# openssl
- env.Append(LIBS=['libeay32.lib', 'ssleay32.lib'])
if not env.get('SOURCE_LAYOUT', None):
env.Append(CPPPATH=['$OPENSSL/include/openssl'],
LIBPATH=['$OPENSSL/lib'])
@@ -345,6 +344,14 @@ if sys.platform == 'win32':
else:
env.Append(CPPPATH=['$OPENSSL/inc32'],
LIBPATH=['$OPENSSL/out32dll'])
+ conf = Configure(env)
+ if conf.CheckLib('libcrypto'):
+ # OpenSSL 1.1.0+
+ env.Append(LIBS=['libcrypto.lib', 'libssl.lib'])
+ else:
+ # Legacy OpenSSL
+ env.Append(LIBS=['libeay32.lib', 'ssleay32.lib'])
+ conf.Finish()
else:
if os.path.isdir(apr):
apr = os.path.join(apr, 'bin', 'apr-1-config')
Modified: serf/branches/1.3.x-r1901937/STATUS
URL:
http://svn.apache.org/viewvc/serf/branches/1.3.x-r1901937/STATUS?rev=1909328&r1=1909327&r2=1909328&view=diff
==============================================================================
--- serf/branches/1.3.x-r1901937/STATUS (original)
+++ serf/branches/1.3.x-r1901937/STATUS Fri Apr 21 15:21:46 2023
@@ -27,22 +27,15 @@ Candidate changes:
Votes:
+1: stsp, astieger
- * r1712131,1807594,1811088
- Add support for building with VS2017, assuming a new enough scons.
+ * r1712131, r1807594, r1811088, r1861036, r1909315, r1909316
+ Add support for building with VS2017-VS2022, assuming a new enough scons.
Votes:
- +1: rhuijben, astieger
+ +1: kotkov
+ +1: rhuijben (without r1861036, r1909315, r1909316)
+ +1: astieger (without r1861036, r1909315, r1909316)
Veto-blocked changes:
=====================
Approved changes:
=================
-
- * r1814714
- Support building against OpenSSL 1.1.0 on Windows
- Justification:
- We already support building against 1.1.0 on other platforms
- Branch:
- ^/serf/branches/1.3.x-r1814714
- Votes:
- +1: rhuijben, astieger, ivan
