r46882 - revert old meaning of this variable
hawkowl-TA+aISz0psMTMxyoc4vAAJOcrHinNvQL0E9HWUfgJXw@public.gmane.org
| Newsgroups | gmane.comp.python.twisted.commits |
|---|---|
| Message-ID | <[email protected]> |
Author: hawkowl
Date: Tue Mar 1 00:33:38 2016
New Revision: 46882
Modified:
branches/cert-chain-reg-8222/twisted/internet/endpoints.py
Log:
revert old meaning of this variable
Modified: branches/cert-chain-reg-8222/twisted/internet/endpoints.py
==============================================================================
--- branches/cert-chain-reg-8222/twisted/internet/endpoints.py (original)
+++ branches/cert-chain-reg-8222/twisted/internet/endpoints.py Tue Mar 1 00:33:38 2016
@@ -1137,10 +1137,9 @@
keyPEM = FilePath(privateKey).getContent()
privateCertificate = ssl.PrivateCertificate.loadPEM(certPEM + keyPEM)
if extraCertChain is not None:
- extraCertChain = FilePath(extraCertChain).getContent()
matches = re.findall(
r'(-----BEGIN CERTIFICATE-----\n.+?\n-----END CERTIFICATE-----)',
- nativeString(extraCertChain),
+ nativeString(FilePath(extraCertChain).getContent()),
flags=re.DOTALL
)
chainCertificates = [ssl.Certificate.loadPEM(chainCertPEM).original