Using latest version of discovery

.travis.yml

@@ -7,7 +7,6 @@ cache:
         - $HOME/.composer/cache
 
 php:
-    - 5.4
     - 5.5
     - 5.6
     - 7.0
@@ -26,7 +25,7 @@ matrix:
         - php: hhvm
     fast_finish: true
     include:
-        - php: 5.4
+        - php: 5.5
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
 
 before_install:

composer.json

@@ -9,19 +9,18 @@
         }
     ],
     "require": {
-        "php": ">=5.4",
-        "symfony/options-resolver": "^2.6|^3.0",
+        "php": "^5.5 || ^7.0",
+        "symfony/options-resolver": "^2.6 || ^3.0",
         "php-http/httplug": "^1.0",
         "php-http/message-factory": "^1.0.2",
-        "php-http/discovery": "^0.8"
+        "php-http/discovery": "^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8",
         "guzzlehttp/psr7": "^1.2",
-        "php-http/adapter-integration-tests": "~0.3.1",
+        "php-http/client-integration-tests": "^0.5.1",
         "php-http/message": "^1.0",
-        "php-http/client-common": "^1.0",
-        "puli/composer-plugin": "1.0.0-beta9"
+        "php-http/client-common": "^1.0"
     },
     "provide": {
         "php-http/client-implementation": "1.0"

tests/server/ssl/ca.pem

@@ -1,22 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIDkzCCAnugAwIBAgIJAIFMXeRYjY/HMA0GCSqGSIb3DQEBCwUAMGAxCzAJBgNV
-BAYTAkZSMRYwFAYDVQQIDA1JbGUtZGUtRnJhbmNlMQ4wDAYDVQQHDAVQYXJpczER
-MA8GA1UECgwIUEhQLUhUVFAxFjAUBgNVBAMMDXNvY2tldC1zZXJ2ZXIwHhcNMTYw
-MjE4MTYwMjQ5WhcNMTYwMzE5MTYwMjQ5WjBgMQswCQYDVQQGEwJGUjEWMBQGA1UE
-CAwNSWxlLWRlLUZyYW5jZTEOMAwGA1UEBwwFUGFyaXMxETAPBgNVBAoMCFBIUC1I
-VFRQMRYwFAYDVQQDDA1zb2NrZXQtc2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAorE47yvDuvdgBc71fakM82kA4v3tttDGWaWhzT8jK94WP18P
-pFFab7ptA+w3i73IfKxoBtIfYnBGsXx4ZuW38A1z0e6BoJa54B5gvgj3gDJwpes4
-4mqgQ2iTl3PDqVoXzlpsrCgZ9IhryJwpwa3gQm06BLCvuymuk8camPrK9D6ge+XZ
-MNowJNJ/v/2vVLmz3SrofnMzkYwB/AH/CR0Tk4lJc2jevRlRg4Z2yT9IJ9M3EKPW
-U+LAzvR3dn9RC9vOWXz5NoGfP7rGXLBJNx6o4lq2XSRDrHSL0bAN2SuFG3p5vvhJ
-Buy0hWJTuqJAJy4DkP1EONaQtUM3idf04QfI+wIDAQABo1AwTjAdBgNVHQ4EFgQU
-Pnxy4qgI5SXFhlt1lQvAKbAaCe4wHwYDVR0jBBgwFoAUPnxy4qgI5SXFhlt1lQvA
-KbAaCe4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAGMcqvoFExOUK
-nQ983/y9GMHSDNa5R6uWYrvbKlBPuR1TAozspwr1/vTTS2kOIuuHxxep99CwhJz9
-Tj17xWYfd2xIaFC6b4TFbWWKuTUMqgIUL4isRezvJm1LsEY2ibzYzCKkRtMBV0nn
-ycc4UtHM8vsHobSjFiKKD29cIsoiyDf56LItepuOqEqQgNakHic87RHK0HuR85MH
-k0jNwbNwqxTWuchuL5j1X5hpfvL32ctFlci0JrpQTyM99r7Nwk83qNkKmjLi5FlJ
-kgKOnFy+3n5nuTWPfKLD86xJEFAnE/uqNXNLKMSZhCTFKJc4ftGbtqxh36TT7eLE
-YIJ6np0kbw==
+MIIDBDCCAm2gAwIBAgIJAKf70F8G74WBMA0GCSqGSIb3DQEBBQUAMGAxCzAJBgNV
+BAYTAkZSMRYwFAYDVQQIEw1JbGUtZGUtRnJhbmNlMQ4wDAYDVQQHEwVQYXJpczER
+MA8GA1UEChMIUEhQLUhUVFAxFjAUBgNVBAMTDXNvY2tldC1zZXJ2ZXIwHhcNMTYw
+NzE4MTAwMDIzWhcNMTYwODE3MTAwMDIzWjBgMQswCQYDVQQGEwJGUjEWMBQGA1UE
+CBMNSWxlLWRlLUZyYW5jZTEOMAwGA1UEBxMFUGFyaXMxETAPBgNVBAoTCFBIUC1I
+VFRQMRYwFAYDVQQDEw1zb2NrZXQtc2VydmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDZbuJ4bebB+9mER7bHl2kizLWP0gWwv5l0Kvr2m0ajZ7MZpxH19Hmo
+I5XXIdnM3JSIajW8+FZ23z4s1FawRrn9EnJc/o0KP7NB0yREcO3XiuqAo5K8gkFA
+wQPeaxl1JDpAVjKPAfP35bnMoIz55MW/UJXH+QBv1/95T3r9xvX+PQIDAQABo4HF
+MIHCMB0GA1UdDgQWBBQpMG5EbNuv8sNLO/MbPbyp3DMLezCBkgYDVR0jBIGKMIGH
+gBQpMG5EbNuv8sNLO/MbPbyp3DMLe6FkpGIwYDELMAkGA1UEBhMCRlIxFjAUBgNV
+BAgTDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcTBVBhcmlzMREwDwYDVQQKEwhQSFAt
+SFRUUDEWMBQGA1UEAxMNc29ja2V0LXNlcnZlcoIJAKf70F8G74WBMAwGA1UdEwQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAFfJlrEhQ4o1sroNsq/gWBP9rg4jzU4Bm
+HcWieWQyWg5sXNCJgCr9ntZ4w29POtlIpHXCoH3UnEDEq7BXGiVRd7vAbxKn6Yt/
++oKTxvcmBNXkkOgEbH/3uD2sGkcfndYkJieRGcUr69wThhjSxfgUE1Gnynjl7SIF
+UlZlufPto3I=
 -----END CERTIFICATE-----

tests/server/ssl/client-and-key.pem

@@ -1,32 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIICuDCCAaACASYwDQYJKoZIhvcNAQELBQAwYDELMAkGA1UEBhMCRlIxFjAUBgNV
-BAgMDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcMBVBhcmlzMREwDwYDVQQKDAhQSFAt
-SFRUUDEWMBQGA1UEAwwNc29ja2V0LXNlcnZlcjAeFw0xNjAyMTgxNjAyNTFaFw0x
-NjAzMTkxNjAyNTFaMGgxCzAJBgNVBAYTAkZSMRYwFAYDVQQIDA1JbGUtZGUtRnJh
-bmNlMQ4wDAYDVQQHDAVQYXJpczERMA8GA1UECgwIUEhQLUhUVFAxHjAcBgNVBAMM
+MIICNzCCAaACASowDQYJKoZIhvcNAQEFBQAwYDELMAkGA1UEBhMCRlIxFjAUBgNV
+BAgTDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcTBVBhcmlzMREwDwYDVQQKEwhQSFAt
+SFRUUDEWMBQGA1UEAxMNc29ja2V0LXNlcnZlcjAeFw0xNjA3MTgxMDAwMzFaFw0x
+NjA4MTcxMDAwMzFaMGgxCzAJBgNVBAYTAkZSMRYwFAYDVQQIEw1JbGUtZGUtRnJh
+bmNlMQ4wDAYDVQQHEwVQYXJpczERMA8GA1UEChMIUEhQLUhUVFAxHjAcBgNVBAMT
 FXNvY2tldC1hZGFwdGVyLWNsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
-gYEAzheasRYNrmUmWb+JFZTNPykIQIJX0TObuaYLU8Q4LD3u8KIfUk31GivrzMeB
-aX1OiDMKThiulOnH7ylL5Nn8NtwMHY7y1cPuqnNGfBFnHUn+diOMwq6GuCLDhDKx
-76chTbKXYy5WzzuKm7yfYwYkIxUGumrUK5+aHiRLhfriSPkCAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAX0JHE4M9hjb5vomYDxYECLA/Ws/28f1tsQJzHLjiJj2nJ59/
-Z/yt7ltkMyo6mkNuCCECS4jbMD9/huws8XfPvCmxqF9KoMQ2gY1JM1XEUNfEGDpc
-4tKCMBUOIVUJQWK3Q1FJ7DVYQH7GOFLAw+c/6UC8Zqk0TCSUipMUQzNnWTrvYguS
-nZG6NjRN7HaXMWqEvnpj0IKRHBu0QYuhX5UIq+6xdwMXeuKPJKmt8WxclA/yEjhi
-JYIpl1NcqQQ4ZOwWdPQkTw/U8cG3bCNHkBLcIg2Ks8zljGPTHlr6P7/UFiNVms7X
-x/Aq8Klv/LvsoyBAMYxPMBspLv5vSSbhGiHZBw==
+gYEA4iXSjiZWYKmGfEluM0z+bY6r2AGaZgApvOehQMjom1mORllMVkfIanuenbQE
+ay9UIihRCO9gYZpFTSDt8Mgobl8x1i9gGd1bFf5Vy/9fubBD0k8Sss3GHNfTe5az
+mls7D8pqTD7KOdBe1000DmpNKbV4b5WZGI/dsliUqvEQJDcCAwEAATANBgkqhkiG
+9w0BAQUFAAOBgQDRjvy010S62JD20ZrK60svmqI6Z9a3jJ6dVmWS1YM1u8DRrUKf
+StsEbIuNMuLmdGQ9FDoLuURuzuqtYlsKyjnUq7oyjq8xeIKr2oAPxftwBBeEydQF
+7GBcdokMOMWl9bGLI7YMbRiqyshw8y/rqVCAF+5/65jhPMJuPEPVa2pCJQ==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDOF5qxFg2uZSZZv4kVlM0/KQhAglfRM5u5pgtTxDgsPe7woh9S
-TfUaK+vMx4FpfU6IMwpOGK6U6cfvKUvk2fw23AwdjvLVw+6qc0Z8EWcdSf52I4zC
-roa4IsOEMrHvpyFNspdjLlbPO4qbvJ9jBiQjFQa6atQrn5oeJEuF+uJI+QIDAQAB
-AoGBAM0MVR+99my+PNLsq4KqYy9lLs2oIaGGfHjQiNKWFuGF2VbXptwnriaU7m33
-TX3ca6c9SRJ8oi6NDxyX9OfELpfIQOR3i7QcTEUxJUDtvS+vCcd+4bApZ7u54VNh
-Rgo6TfyX3Tl4HK83hwkZ91ocR0Kc0FpEopQ0pV4ouYUEKCMBAkEA9vR4+P2scYLz
-zSD94TYCpGOSlo0FJHUxaRUeUo5Mxs8IO3SYKhEMVfqqclC0viedkrqiZnQ3kDBj
-eoPWLBJFWQJBANWj/VRDDF78lHeIx3z5RAbiNDmlyTAJONti7QhLInHrT3EvR9RQ
-mZTub9buDELeiNiJooFy0p3ycqGNXqo4jKECQC6SJeoWtJlnb6CkcxwwekkT+gXo
-LCsW6q19bQ12hmYLjurfbv6n3mKsdc4/CAbAI8gS6CNYEU5gwbHOAOqou2kCQQDP
-PqjmD7C1iEIh/v693jS+lLri3U9gmOGd+MZF0FUWu5UyEBKXBKUn03GMxxn/2E5Z
-+JI7Dv7/l4zZ6QDXEcphAkEAtOMK5OKJxvZhNQj8VwExvtozd1YSvc/GeuCU5O4y
-CAL4Er2CpO78VoSbmmSBLO0Svp7h1/1UA65Y5CGaCIKZAg==
+MIICXgIBAAKBgQDiJdKOJlZgqYZ8SW4zTP5tjqvYAZpmACm856FAyOibWY5GWUxW
+R8hqe56dtARrL1QiKFEI72BhmkVNIO3wyChuXzHWL2AZ3VsV/lXL/1+5sEPSTxKy
+zcYc19N7lrOaWzsPympMPso50F7XTTQOak0ptXhvlZkYj92yWJSq8RAkNwIDAQAB
+AoGBAKR3eU+kFgGqiIHvLVPl1Mt8jQFE+TLhP3mAw0dIVdJVKSGEY/4Dqn+2c76h
+Yu1IuFk3FOf4nxGcjnXvUtxf1PZB/t1xHMHuspYHkc9ElDQDfuYqgimAPzMHsUfm
+St47YNNLA6pzPUtpaw7qRA7v54y8qi3GdHf4pLW1/PSuuoLhAkEA9T62mody3EDG
+33jks1vCGoFtADlU3J2ShJiFG44HsWueJ933KRgP2NlAwtumO+Om4CaUUzIiOSzT
+uibjOEyl7wJBAOwQtfERZfvpVLoqVF9NADvy4KpGbv+lXq9gTia9hSMumH2h5+Jh
+nVXhN9m/TRQiQ74XB3tpC0I5H4fozCj17jkCQQDY/gNN2Vjc3wfYBTy+IgstrqTG
+VPPsPBO+9MCZr+LIrgMDHVeqaZrj8N5nSzfbt8MYg6orrqkvU6WHCQ906gTLAkAc
+6dMPCr1+BE8vWh3pakn8Dbx8vpG72Cpnupj338Cd1Ygx4xG+xYv6x9IKZobvT18S
+ukldUTlizBJTmCzhW3XpAkEA5tYfC72Ia761g6ild8HaILMK30+wYCWIu3Ieb+G1
+uaJWO+VDKKtWVntkPfnckVlfPQMmuMDaIGh9G2vWRYdtDQ==
 -----END RSA PRIVATE KEY-----

tests/server/ssl/client.key

@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDOF5qxFg2uZSZZv4kVlM0/KQhAglfRM5u5pgtTxDgsPe7woh9S
-TfUaK+vMx4FpfU6IMwpOGK6U6cfvKUvk2fw23AwdjvLVw+6qc0Z8EWcdSf52I4zC
-roa4IsOEMrHvpyFNspdjLlbPO4qbvJ9jBiQjFQa6atQrn5oeJEuF+uJI+QIDAQAB
-AoGBAM0MVR+99my+PNLsq4KqYy9lLs2oIaGGfHjQiNKWFuGF2VbXptwnriaU7m33
-TX3ca6c9SRJ8oi6NDxyX9OfELpfIQOR3i7QcTEUxJUDtvS+vCcd+4bApZ7u54VNh
-Rgo6TfyX3Tl4HK83hwkZ91ocR0Kc0FpEopQ0pV4ouYUEKCMBAkEA9vR4+P2scYLz
-zSD94TYCpGOSlo0FJHUxaRUeUo5Mxs8IO3SYKhEMVfqqclC0viedkrqiZnQ3kDBj
-eoPWLBJFWQJBANWj/VRDDF78lHeIx3z5RAbiNDmlyTAJONti7QhLInHrT3EvR9RQ
-mZTub9buDELeiNiJooFy0p3ycqGNXqo4jKECQC6SJeoWtJlnb6CkcxwwekkT+gXo
-LCsW6q19bQ12hmYLjurfbv6n3mKsdc4/CAbAI8gS6CNYEU5gwbHOAOqou2kCQQDP
-PqjmD7C1iEIh/v693jS+lLri3U9gmOGd+MZF0FUWu5UyEBKXBKUn03GMxxn/2E5Z
-+JI7Dv7/l4zZ6QDXEcphAkEAtOMK5OKJxvZhNQj8VwExvtozd1YSvc/GeuCU5O4y
-CAL4Er2CpO78VoSbmmSBLO0Svp7h1/1UA65Y5CGaCIKZAg==
+MIICXgIBAAKBgQDiJdKOJlZgqYZ8SW4zTP5tjqvYAZpmACm856FAyOibWY5GWUxW
+R8hqe56dtARrL1QiKFEI72BhmkVNIO3wyChuXzHWL2AZ3VsV/lXL/1+5sEPSTxKy
+zcYc19N7lrOaWzsPympMPso50F7XTTQOak0ptXhvlZkYj92yWJSq8RAkNwIDAQAB
+AoGBAKR3eU+kFgGqiIHvLVPl1Mt8jQFE+TLhP3mAw0dIVdJVKSGEY/4Dqn+2c76h
+Yu1IuFk3FOf4nxGcjnXvUtxf1PZB/t1xHMHuspYHkc9ElDQDfuYqgimAPzMHsUfm
+St47YNNLA6pzPUtpaw7qRA7v54y8qi3GdHf4pLW1/PSuuoLhAkEA9T62mody3EDG
+33jks1vCGoFtADlU3J2ShJiFG44HsWueJ933KRgP2NlAwtumO+Om4CaUUzIiOSzT
+uibjOEyl7wJBAOwQtfERZfvpVLoqVF9NADvy4KpGbv+lXq9gTia9hSMumH2h5+Jh
+nVXhN9m/TRQiQ74XB3tpC0I5H4fozCj17jkCQQDY/gNN2Vjc3wfYBTy+IgstrqTG
+VPPsPBO+9MCZr+LIrgMDHVeqaZrj8N5nSzfbt8MYg6orrqkvU6WHCQ906gTLAkAc
+6dMPCr1+BE8vWh3pakn8Dbx8vpG72Cpnupj338Cd1Ygx4xG+xYv6x9IKZobvT18S
+ukldUTlizBJTmCzhW3XpAkEA5tYfC72Ia761g6ild8HaILMK30+wYCWIu3Ieb+G1
+uaJWO+VDKKtWVntkPfnckVlfPQMmuMDaIGh9G2vWRYdtDQ==
 -----END RSA PRIVATE KEY-----

tests/server/ssl/client.pem

@@ -1,17 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICuDCCAaACASYwDQYJKoZIhvcNAQELBQAwYDELMAkGA1UEBhMCRlIxFjAUBgNV
-BAgMDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcMBVBhcmlzMREwDwYDVQQKDAhQSFAt
-SFRUUDEWMBQGA1UEAwwNc29ja2V0LXNlcnZlcjAeFw0xNjAyMTgxNjAyNTFaFw0x
-NjAzMTkxNjAyNTFaMGgxCzAJBgNVBAYTAkZSMRYwFAYDVQQIDA1JbGUtZGUtRnJh
-bmNlMQ4wDAYDVQQHDAVQYXJpczERMA8GA1UECgwIUEhQLUhUVFAxHjAcBgNVBAMM
+MIICNzCCAaACASowDQYJKoZIhvcNAQEFBQAwYDELMAkGA1UEBhMCRlIxFjAUBgNV
+BAgTDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcTBVBhcmlzMREwDwYDVQQKEwhQSFAt
+SFRUUDEWMBQGA1UEAxMNc29ja2V0LXNlcnZlcjAeFw0xNjA3MTgxMDAwMzFaFw0x
+NjA4MTcxMDAwMzFaMGgxCzAJBgNVBAYTAkZSMRYwFAYDVQQIEw1JbGUtZGUtRnJh
+bmNlMQ4wDAYDVQQHEwVQYXJpczERMA8GA1UEChMIUEhQLUhUVFAxHjAcBgNVBAMT
 FXNvY2tldC1hZGFwdGVyLWNsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkC
-gYEAzheasRYNrmUmWb+JFZTNPykIQIJX0TObuaYLU8Q4LD3u8KIfUk31GivrzMeB
-aX1OiDMKThiulOnH7ylL5Nn8NtwMHY7y1cPuqnNGfBFnHUn+diOMwq6GuCLDhDKx
-76chTbKXYy5WzzuKm7yfYwYkIxUGumrUK5+aHiRLhfriSPkCAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAX0JHE4M9hjb5vomYDxYECLA/Ws/28f1tsQJzHLjiJj2nJ59/
-Z/yt7ltkMyo6mkNuCCECS4jbMD9/huws8XfPvCmxqF9KoMQ2gY1JM1XEUNfEGDpc
-4tKCMBUOIVUJQWK3Q1FJ7DVYQH7GOFLAw+c/6UC8Zqk0TCSUipMUQzNnWTrvYguS
-nZG6NjRN7HaXMWqEvnpj0IKRHBu0QYuhX5UIq+6xdwMXeuKPJKmt8WxclA/yEjhi
-JYIpl1NcqQQ4ZOwWdPQkTw/U8cG3bCNHkBLcIg2Ks8zljGPTHlr6P7/UFiNVms7X
-x/Aq8Klv/LvsoyBAMYxPMBspLv5vSSbhGiHZBw==
+gYEA4iXSjiZWYKmGfEluM0z+bY6r2AGaZgApvOehQMjom1mORllMVkfIanuenbQE
+ay9UIihRCO9gYZpFTSDt8Mgobl8x1i9gGd1bFf5Vy/9fubBD0k8Sss3GHNfTe5az
+mls7D8pqTD7KOdBe1000DmpNKbV4b5WZGI/dsliUqvEQJDcCAwEAATANBgkqhkiG
+9w0BAQUFAAOBgQDRjvy010S62JD20ZrK60svmqI6Z9a3jJ6dVmWS1YM1u8DRrUKf
+StsEbIuNMuLmdGQ9FDoLuURuzuqtYlsKyjnUq7oyjq8xeIKr2oAPxftwBBeEydQF
+7GBcdokMOMWl9bGLI7YMbRiqyshw8y/rqVCAF+5/65jhPMJuPEPVa2pCJQ==
 -----END CERTIFICATE-----

tests/server/ssl/client.req

@@ -1,11 +1,11 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIIBqDCCARECAQAwaDELMAkGA1UEBhMCRlIxFjAUBgNVBAgMDUlsZS1kZS1GcmFu
-Y2UxDjAMBgNVBAcMBVBhcmlzMREwDwYDVQQKDAhQSFAtSFRUUDEeMBwGA1UEAwwV
+MIIBqDCCARECAQAwaDELMAkGA1UEBhMCRlIxFjAUBgNVBAgTDUlsZS1kZS1GcmFu
+Y2UxDjAMBgNVBAcTBVBhcmlzMREwDwYDVQQKEwhQSFAtSFRUUDEeMBwGA1UEAxMV
 c29ja2V0LWFkYXB0ZXItY2xpZW50MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQDOF5qxFg2uZSZZv4kVlM0/KQhAglfRM5u5pgtTxDgsPe7woh9STfUaK+vMx4Fp
-fU6IMwpOGK6U6cfvKUvk2fw23AwdjvLVw+6qc0Z8EWcdSf52I4zCroa4IsOEMrHv
-pyFNspdjLlbPO4qbvJ9jBiQjFQa6atQrn5oeJEuF+uJI+QIDAQABoAAwDQYJKoZI
-hvcNAQELBQADgYEAF+hbq7xyVrQTblJDIK76xx9FyWgZ52ny7y3UwZehL8aL8r8x
-KmUWHwOuG526OxMCHJukYpy9UHeN7T9kLGhX7WKX9U2lbeDjnjNeI98gnTC9nzX5
-xBjW67shih6vmtbSqnL6v2GHSmZqFmh6E0ZHUmVUVg9JdvUzuCbKHnfHfkI=
+gQDiJdKOJlZgqYZ8SW4zTP5tjqvYAZpmACm856FAyOibWY5GWUxWR8hqe56dtARr
+L1QiKFEI72BhmkVNIO3wyChuXzHWL2AZ3VsV/lXL/1+5sEPSTxKyzcYc19N7lrOa
+WzsPympMPso50F7XTTQOak0ptXhvlZkYj92yWJSq8RAkNwIDAQABoAAwDQYJKoZI
+hvcNAQEFBQADgYEA3G8c/4gB/eEme+1U99SKZlxHGzKhj28Qz9aiunfGRVnPDgnF
+wFrnah8KjBwAv2Eh58SwTomenSYtpuuuT6W3YQ4YGn5BtoTb2l4qpW8cncqQR5Bq
+g91l/fXtuZKU5hSOkI5vAKCsHY3Z+R8Raxxd0s6pzeca+qkkEmUmKedEnPM=
 -----END CERTIFICATE REQUEST-----

tests/server/ssl/file.srl

@@ -1 +1 @@
-26
+2A

tests/server/ssl/privkey.pem

@@ -1,30 +1,18 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIlsxucdU84L4CAggA
-MBQGCCqGSIb3DQMHBAieJXCR72SbbASCBMhO0T5rZZiK5T2RZBOQ3bvUUYNhjjKd
-np0ZATrzaqylxute6QqeJ8Ygw+W4oEf7kuxQuw8gJKlazS3LH8r6mVOv6ZAuTiCC
-AUibfQ/hbpdjNLdHv7G23K+I6JBeqLSEG7dphC1MjtA/sne814e0ydzoxXjuk84C
-Vawk9vDgit41T8fzNwhA6dEwqtCBidRtnQUlDp3f+QY2ANqcFb5FO0Th1++trX0s
-i+UcQ/W/oP+MmcWINlFCkCOiaCuCj9V9PPT0Yo8UugobDjN66Rp8//+tUpsT2b8O
-b2HUKjHN6kOZezfMMqB6FRUeuTEyN9ZW1+Spo93p48pZx+VgBLxCwcmsZqH1yR/2
-GhtuzaDfFdV6HEMuwNUw5QES7F7VcE+LiU+EaoaZo5whnsIzHawKYDkDbAfYvjz4
-geJ5zSeplCCRbvZPYMuLBOdd1q/hBbfIhQ7Q8cdxWzYERiuCWwt3QLYwiH8os4Ik
-g73aT7UsMImztygboRq0USjmHEVLd2AKmkx3rQzf/btgbTwOfq5OJPjxtHPKGtjC
-3QxxWyCJtY8+mr3B7WhtyKHrD4kE7Teq8P1c7ib2QydxRZeKHBnoogOut22asjgc
-vGqSCnkb3tDT2yQ5EgLo77JWIrxSSP088lXS1W/O52ycVBIwXcd21yoyHR3CGLfJ
-DEoLY+vYthVna0Z3f5+Ay+2CIawpLzfDuR2k7EAcRMDyduVb5rScLBJNobXpefjZ
-TvHKLWTSljiZuhFNafDKd9Z/DturXgMDkT0R0VLgLYiR/zgHhakNuRsJ6kkhT/V8
-hnTrg8KYr2KA21ogO6pd1fwBhibBe0hqnCRw7ilNpjePtjgdF/rJ+GA7mocn586o
-Eo4nb4XXqgGRF1mFcrMjYRbMvFWLwjjVa/iDECzqHdRtc1jgkxQOLsWHEdWZfftt
-hGn/Lqr9nEx3XHHnvTFTvOUpoJp2t45GHAkky2D3744qMLjkq9dYxLlnxtlS34KC
-3+1KQbu+RiRGPwcmGteVONf3Wr1nI5XFiJVQcK84Jwcn6rJvlOcjfFItMO0amhKK
-wdwc28xOlODnn08PnQxuyfTpZJUvyq/31Xk+Au3+pQD/+N7KVFnSI0qYLcF7hjjd
-LsvgEvR25YIhTZ5890TI8959KjLfnFeEVASpP8+kQMxZC0Ev43LXL/tdU4xyzLMx
-ygOanx6ucsqBblIwDsSb5893jXJnG56Iw0Nw5LmWQYpcFU9vKQ49DXlIpcztPf0H
-TNEPO7PD3HoC4XvNQUFZsaUnD4maHPqCbrLqbleLNNPp/f75vT6bdj9FZ48S/194
-ymLgVzSbKBLKFr9tDV1uSoB7FwiJFL7x69jRSiKDN/u0XgR0JS/dByH1bJkd87+B
-Jvtwg+v5H36wHusVBiMz0n46T6kXY1LCkWP5sNzHPgMJVruS1G99xWEF4LGiQ25J
-Y8j43/cWE0AdySaMgZ7gYxsEpt+O9T3KHIVvpbF1iyCPcpStOh+1NcBJsYIWq1/m
-qaUIAJi491y1uXteAXjnoLEIWtGMqPIHnLp21cHv7+vt2ejsxN5Sa1GE0KqwbRPc
-XMmR/mHhPH9PxWuONzGQ2le/x7DDn0e7VrYObgMS3lzZfEE1pTlIK516zOYi8jaf
-8xM=
------END ENCRYPTED PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,7BB9811913388905
+
+UHN46XyFU48x2IQAkYjrLDzcFLU6xZh1rPGYgIEy6Dacg6QqxO90Nlm2GD8phvY6
+UVj2E2S3GlviBegs/8AJtJ3Ly9LFGKoM5zFrQ24zPp1QAKqMhLBpbq/iFi6oyWv4
+cEB2d7fBZETtg1ZXhvjzS9muvc3uZfIALmoPxWlTYv0m4ErE4GBezKO+Y7Mexl6U
+K9Mg0fAXNW8GQsUpqjs+9IA/COS7GKsHRKV7Bk0Ar/Kd/xjFBv0Vf4mdyYe/fAu1
+ary20XZsYNsO/RdfUtWMzsTKfnMgG1csQcO7xgYHGKHC6U+35yjxwmQxw7F3xP4W
+8i5t2J3QfnX9PlnYOLTYucj74na+U6raE2S+ejO3YDF8nIpJaDvzpA4N35T4hDDL
+Z/SpFtol8Uf33GuH/uiz7x2ss7vyPe1hk96nirT14Bsx1ZEczua/CCTs+iQtoB5F
+breSVhlyMCq6rC47xd69IYVnyEe11EigHn/sQkdUae3kjqL4pgMGBdlONuV63gmX
+yNSFIaE+gh0mFnOVdCtiFxS8XP5BkJ11IcSLIG4ZygycX/IOTRQFh/TTJ4HYDcPZ
+j3zJvZm/OI8xiq5jhEqfkgJElQd/pFuLHESEa8+Q4wiOhYwQEBjKDIBboWXF8CDE
+QFIVBf/o+w3YN700p0xKjGqhaPnKQwCEfY5Lh44pPf7yQX7LiE8tG9kqAfEu25Dc
+kYl1Rw8SFP6OVLqCNMjRTKeyFubkoAFXz828dzZdGd6H8zPH51FqsxIqJepwH6sT
+NWHvnX5LwC5mblF4+VSc7TTgaE16Nq/g1oEXNBuZS6oJq2OnwtH4yQ==
+-----END RSA PRIVATE KEY-----

tests/server/ssl/server-and-key.pem

@@ -1,32 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIICsTCCAZkCASUwDQYJKoZIhvcNAQELBQAwYDELMAkGA1UEBhMCRlIxFjAUBgNV
-BAgMDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcMBVBhcmlzMREwDwYDVQQKDAhQSFAt
-SFRUUDEWMBQGA1UEAwwNc29ja2V0LXNlcnZlcjAeFw0xNjAyMTgxNjAyNTBaFw0x
-NjAzMTkxNjAyNTBaMGExCzAJBgNVBAYTAkZSMRYwFAYDVQQIDA1JbGUtZGUtRnJh
-bmNlMQ4wDAYDVQQHDAVQYXJpczERMA8GA1UECgwIUEhQLUhUVFAxFzAVBgNVBAMM
-DnNvY2tldC1hZGFwdGVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDVUd8x
-fag85B5rHzBCphbm/HDcLQvkMHnSm8PMqekO+7q6r8hz/Hrmky7ddVPrhZqea8Jt
-9rT2QfNxQBlGSJwXcUXiPuiKj6W7Aj3q7s24Z+60xnhbZMgwRbmR/QdKoZrzI+w3
-Lly9wOrTwdVFW21Cim6O3jAsh3xmuDN0YuhoTwIDAQABMA0GCSqGSIb3DQEBCwUA
-A4IBAQB1P30SDIBaziNUK1uyMXF38lEiS0jHi1m8w0bZfLSuuPSkJS6IRTsVbJGb
-wVUiM50SSdfGyLl5sCa01zYD5LBcCwuAScReuOq+dM9POZpW916uZVCKWaGwYOxA
-XtPxJ/lIi8n8ekeIdxtNIxWUEdVzgjmjk1B7OB5/Kweev/TN38kL2kL6MgJG+iRA
-INLLEIKV5FUyUGE67rlc1WxiFtMVHHtEpFYnfY089S+gr5pE/x1BHezr/CH4Qyeq
-bIrhIU7icdFmhHaCnd/ongFwyXUWTQ9clgJwjC1vQVWFSoFiTSoHBjIkJm9Ysg4A
-Ctxk8EVc8RAu7DNvvzMooxqm1Fsz
+MIICMDCCAZkCASkwDQYJKoZIhvcNAQEFBQAwYDELMAkGA1UEBhMCRlIxFjAUBgNV
+BAgTDUlsZS1kZS1GcmFuY2UxDjAMBgNVBAcTBVBhcmlzMREwDwYDVQQKEwhQSFAt
+SFRUUDEWMBQGA1UEAxMNc29ja2V0LXNlcnZlcjAeFw0xNjA3MTgxMDAwMjhaFw0x
+NjA4MTcxMDAwMjhaMGExCzAJBgNVBAYTAkZSMRYwFAYDVQQIEw1JbGUtZGUtRnJh
+bmNlMQ4wDAYDVQQHEwVQYXJpczERMA8GA1UEChMIUEhQLUhUVFAxFzAVBgNVBAMT
+DnNvY2tldC1hZGFwdGVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDZHYLV
+1mpoiG2AW5VebIB0nCaT8EIryeUk57swa5nqW9fj/KD4hIaoz19Ivt7/LrVTCOag
+jFiwEcm4kEC8h0DJvW2IKNDWIpObHBSFFFOlLxhJkq+US1CJjKgSDvU5X3ElXb99
+L1EHN/+M8ZA4Qw3fFAbO2ajENeoxHH9KKZCQLQIDAQABMA0GCSqGSIb3DQEBBQUA
+A4GBAM1TFIPTwbG0x//yMhPD9ZGWb2mYfA00Lri198YVmG61PtgDI5hG2dxaDVDa
+6Ig6DnrwTBMc51p+NiTgci3OqnJ4FuwBdY5d1moyQre0MHr+sg8STJr5tmAEithL
+GUGq3Uv3RuN3OetaPrlxaccJM1nB63caoH5Rl+VqAsJ4S4LI
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDVUd8xfag85B5rHzBCphbm/HDcLQvkMHnSm8PMqekO+7q6r8hz
-/Hrmky7ddVPrhZqea8Jt9rT2QfNxQBlGSJwXcUXiPuiKj6W7Aj3q7s24Z+60xnhb
-ZMgwRbmR/QdKoZrzI+w3Lly9wOrTwdVFW21Cim6O3jAsh3xmuDN0YuhoTwIDAQAB
-AoGAb2QXNlK1fUZpk+pvWv47y1Za4L4tDXU6x/1Kmx7GcmqEsWOFOvvGeYy11jKk
-JcJYYQ1IM/+1sznxE1wzVn4n8ymwfsyuFz8eNly8x8bAzJaueg2bPnOc9Ygm9vjc
-vHSpM9yAoYnKdxvNuiBsWqbsv412p0ofwcSlcA0CQtdbZBECQQDv+816Me0pUeQb
-5G46WAcx8iKobGb/YvEzX5VNXVcPk9drCMLblQ2KATjRGbrZn9gHhiCYefhRhAKl
-RbCHh12tAkEA446CfA4u0+/UAVS170wuFJXbaU503GaZaeZ+XuA8TQ86cIw3OAth
-eNcJ+xUD+126RIDk4N2oQucTXseGiLtlawJAB+b0tydZtdiaeEinUIiBhCWC+qTH
-J3Wsl5J4Khn+ueaWW1HoiK55yaeMpWYBfxUCWg0SmbK6eISuSZ7n1y6f6QJAdq3o
-l9K90YMPSvJnQLq2fb36hN2KTTilYnn4Bntkd7wtem1mjzBAUcm1RuIbBYpIj1m6
-BR0VmG7zx0bAf6dcqQJAZH/V/lS/3eSUdGV5dEQmsf6DJnK5J6m6FV8hHqCY5Z+o
-Yaz1aD/jUCcYRfFgJj24QsOaJdeWQhLxywAGNmTcUQ==
+MIICXQIBAAKBgQDZHYLV1mpoiG2AW5VebIB0nCaT8EIryeUk57swa5nqW9fj/KD4
+hIaoz19Ivt7/LrVTCOagjFiwEcm4kEC8h0DJvW2IKNDWIpObHBSFFFOlLxhJkq+U
+S1CJjKgSDvU5X3ElXb99L1EHN/+M8ZA4Qw3fFAbO2ajENeoxHH9KKZCQLQIDAQAB
+AoGAHcaqVuFdHpD3U4874QNIarWvpMJikNbTkkglp/JZ3YZTCXVwLiUewrAOBVAI
+DT8+pvClkIcu8pa97435EuIJxGB9C0Nudzpknm3xucc1pfYsq9fIa6F/+xTBIaTu
+3FcA1vJ/fodhcPPwp6CAQJV7pLfQ5m+DLuwp5ICyy5v2yRECQQD0YgkbGLyKIM0K
+qcNbDE3fNrRQ99ydQ1QXrB+4M8Lc/49XLvd5l9QwMN6BHvEpGf4qvBUYBFYroSVs
+wogOWfmvAkEA42+lxrETE7mIJ/h+QDAQ6JX9fUuda96YU7Xs7OaRWAc77RazxP2p
+XTV1U9l+FHpAvdauWgi7h+0zCEfbjEb24wJBALDJ4vB5OptqEyqtmKdbBVJ+zn7s
+b+pMdJ8TY3br6wHY1qcpUNnjnhqmn7Ak5CzpotbjbRcMvBGf5+T/7VEEgf0CQGlE
+/hgvUcMpdun5TIZtOQZOllvuKdkJ2Lu2Uwl71v5FqukcPu0I8+FeowXCf2b/BwRX
+X6/wpsxNb/d/OxF8rz0CQQDPPxYM5+FSFzun831QSfxWwGx2LLFPQKYmixKfwpQB
+3eIq3gPYN3A/qlVCZlGhyKLH2WiW/bY3HTQ4ZSCgTYzd
 -----END RSA PRIVATE KEY-----

tests/server/ssl/server.key

@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDVUd8xfag85B5rHzBCphbm/HDcLQvkMHnSm8PMqekO+7q6r8hz
-/Hrmky7ddVPrhZqea8Jt9rT2QfNxQBlGSJwXcUXiPuiKj6W7Aj3q7s24Z+60xnhb
-ZMgwRbmR/QdKoZrzI+w3Lly9wOrTwdVFW21Cim6O3jAsh3xmuDN0YuhoTwIDAQAB
-AoGAb2QXNlK1fUZpk+pvWv47y1Za4L4tDXU6x/1Kmx7GcmqEsWOFOvvGeYy11jKk
-JcJYYQ1IM/+1sznxE1wzVn4n8ymwfsyuFz8eNly8x8bAzJaueg2bPnOc9Ygm9vjc
-vHSpM9yAoYnKdxvNuiBsWqbsv412p0ofwcSlcA0CQtdbZBECQQDv+816Me0pUeQb
-5G46WAcx8iKobGb/YvEzX5VNXVcPk9drCMLblQ2KATjRGbrZn9gHhiCYefhRhAKl
-RbCHh12tAkEA446CfA4u0+/UAVS170wuFJXbaU503GaZaeZ+XuA8TQ86cIw3OAth
-eNcJ+xUD+126RIDk4N2oQucTXseGiLtlawJAB+b0tydZtdiaeEinUIiBhCWC+qTH
-J3Wsl5J4Khn+ueaWW1HoiK55yaeMpWYBfxUCWg0SmbK6eISuSZ7n1y6f6QJAdq3o
-l9K90YMPSvJnQLq2fb36hN2KTTilYnn4Bntkd7wtem1mjzBAUcm1RuIbBYpIj1m6
-BR0VmG7zx0bAf6dcqQJAZH/V/lS/3eSUdGV5dEQmsf6DJnK5J6m6FV8hHqCY5Z+o
-Yaz1aD/jUCcYRfFgJj24QsOaJdeWQhLxywAGNmTcUQ==
+MIICXQIBAAKBgQDZHYLV1mpoiG2AW5VebIB0nCaT8EIryeUk57swa5nqW9fj/KD4
+hIaoz19Ivt7/LrVTCOagjFiwEcm4kEC8h0DJvW2IKNDWIpObHBSFFFOlLxhJkq+U
+S1CJjKgSDvU5X3ElXb99L1EHN/+M8ZA4Qw3fFAbO2ajENeoxHH9KKZCQLQIDAQAB
+AoGAHcaqVuFdHpD3U4874QNIarWvpMJikNbTkkglp/JZ3YZTCXVwLiUewrAOBVAI
+DT8+pvClkIcu8pa97435EuIJxGB9C0Nudzpknm3xucc1pfYsq9fIa6F/+xTBIaTu
+3FcA1vJ/fodhcPPwp6CAQJV7pLfQ5m+DLuwp5ICyy5v2yRECQQD0YgkbGLyKIM0K
+qcNbDE3fNrRQ99ydQ1QXrB+4M8Lc/49XLvd5l9QwMN6BHvEpGf4qvBUYBFYroSVs
+wogOWfmvAkEA42+lxrETE7mIJ/h+QDAQ6JX9fUuda96YU7Xs7OaRWAc77RazxP2p
+XTV1U9l+FHpAvdauWgi7h+0zCEfbjEb24wJBALDJ4vB5OptqEyqtmKdbBVJ+zn7s
+b+pMdJ8TY3br6wHY1qcpUNnjnhqmn7Ak5CzpotbjbRcMvBGf5+T/7VEEgf0CQGlE
+/hgvUcMpdun5TIZtOQZOllvuKdkJ2Lu2Uwl71v5FqukcPu0I8+FeowXCf2b/BwRX
+X6/wpsxNb/d/OxF8rz0CQQDPPxYM5+FSFzun831QSfxWwGx2LLFPQKYmixKfwpQB
+3eIq3gPYN3A/qlVCZlGhyKLH2WiW/bY3HTQ4ZSCgTYzd
 -----END RSA PRIVATE KEY-----