Ticket #6286: fix-concat-order-6286.patch

File fix-concat-order-6286.patch, 2.2 KB (added by Hynek Schlawack, 7 years ago)

Use a more natural concatenation order.

  • twisted/internet/endpoints.py

    # Bazaar merge directive format 2 (Bazaar 0.90)
    # revision_id: hs@ox.cx-20130307142016-vcd5rn617jrspyzp
    # target_branch: http://svn.twistedmatrix.com/bzr/Twisted/branches\
    #   /sslendpoint-certificateoptions-6286/
    # testament_sha1: 2b90d8e89286834f86d1a9d6c021c922c0fe9fe6
    # timestamp: 2013-03-07 15:20:26 +0100
    # base_revision_id: svn-v4:bbbe8e31-12d6-0310-92fd-\
    #   ac37d47ddeeb:branches/sslendpoint-certificateoptions-6286:37446
    # 
    # Begin patch
    === modified file 'twisted/internet/endpoints.py'
     
    771771    keyPEM = FilePath(privateKey).getContent()
    772772    cf = ssl.CertificateOptions(
    773773        privateKey=ssl.PrivateCertificate.loadPEM(
    774             keyPEM + certPEM).privateKey.original,
     774            certPEM + keyPEM).privateKey.original,
    775775        certificate=ssl.Certificate.loadPEM(certPEM).original, **kw)
    776776    return ((int(port), factory, cf),
    777777            {'interface': interface, 'backlog': int(backlog)})