From 6806a41e7fca8cce9826305a43578629257765ad Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Mon, 17 Oct 2016 16:53:04 +0100
Subject: [PATCH 1/9] Merge branch 'pull-request/1808'

---
 ext/standard/tests/network/dns_get_mx.phpt | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 ext/standard/tests/network/dns_get_mx.phpt

diff --git a/ext/standard/tests/network/dns_get_mx.phpt b/ext/standard/tests/network/dns_get_mx.phpt
new file mode 100644
index 00000000000..c5bf361b12f
--- /dev/null
+++ b/ext/standard/tests/network/dns_get_mx.phpt
@@ -0,0 +1,29 @@
+--TEST--
+bool dns_get_mx ( string $hostname , array &$mxhosts [, array &$weight ] );
+--CREDITS--
+marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
+--SKIPIF--
+<?php
+if (getenv("SKIP_SLOW_TESTS"))
+    die("skip slow test");
+if (getenv("SKIP_ONLINE_TESTS"))
+    die("skip test requiring internet connection");
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip: no Windows support');
+}
+?>
+--FILE--
+<?php
+$domains = array('yahoo.co.jp', 'yahoo.com', 'es.yahoo.com', 'fr.yahoo.com', 'it.yahoo.com');
+foreach ($domains as $domain) {
+    if (getmxrr($domain, $hosts, $weights)) {
+        echo "Hosts: " . count($hosts) . ", weights: " . count($weights) . "\n";
+    }
+}
+?>
+--EXPECTF--
+Hosts: %i, weights: %i
+Hosts: %i, weights: %i
+Hosts: %i, weights: %i
+Hosts: %i, weights: %i
+Hosts: %i, weights: %i

From 522e4f11741c539c9f3405d3e11feff5d18b540a Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Mon, 17 Oct 2016 16:50:53 +0100
Subject: [PATCH 2/9] Merge branch 'pull-request/1814'

---
 ext/openssl/tests/openssl_free_key.phpt | 77 +++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 ext/openssl/tests/openssl_free_key.phpt

diff --git a/ext/openssl/tests/openssl_free_key.phpt b/ext/openssl/tests/openssl_free_key.phpt
new file mode 100644
index 00000000000..18219a2a62e
--- /dev/null
+++ b/ext/openssl/tests/openssl_free_key.phpt
@@ -0,0 +1,77 @@
+--TEST--
+void openssl_free_key ( resource $key_identifier );
+--CREDITS--
+marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
+--SKIPIF--
+<?php
+if (!extension_loaded("openssl"))
+    die("skip");
+if (!@openssl_pkey_new())
+    die("skip cannot create private key");
+?>
+--FILE--
+<?php
+echo "Creating private key\n";
+
+/* stack up some entropy; performance is not critical,
+ * and being slow will most likely even help the test.
+ */
+for ($z = "", $i = 0; $i < 1024; $i++) {
+    $z .= $i * $i;
+    if (function_exists("usleep"))
+        usleep($i);
+}
+
+$privkey = openssl_pkey_new();
+
+if ($privkey === false)
+    die("failed to create private key");
+
+$passphrase = "banana";
+$key_file_name = tempnam("/tmp", "ssl");
+if ($key_file_name === false)
+    die("failed to get a temporary filename!");
+
+echo "Export key to file\n";
+
+openssl_pkey_export_to_file($privkey, $key_file_name, $passphrase) or die("failed to export to file $key_file_name");
+
+echo "Load key from file - array syntax\n";
+
+$loaded_key = openssl_pkey_get_private(array("file://$key_file_name", $passphrase));
+
+if ($loaded_key === false)
+    die("failed to load key using array syntax");
+
+openssl_free_key($loaded_key);
+
+echo "Load key using direct syntax\n";
+
+$loaded_key = openssl_pkey_get_private("file://$key_file_name", $passphrase);
+
+if ($loaded_key === false)
+    die("failed to load key using direct syntax");
+
+openssl_free_key($loaded_key);
+
+echo "Load key manually and use string syntax\n";
+
+$key_content = file_get_contents($key_file_name);
+$loaded_key = openssl_pkey_get_private($key_content, $passphrase);
+
+if ($loaded_key === false)
+    die("failed to load key using string syntax");
+
+openssl_free_key($loaded_key);
+
+echo "OK!\n";
+
+@unlink($key_file_name);
+?>
+--EXPECT--
+Creating private key
+Export key to file
+Load key from file - array syntax
+Load key using direct syntax
+Load key manually and use string syntax
+OK!

From 5eb84337a6b0a2ea0f6fa85c7ba610da117100fd Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Mon, 17 Oct 2016 16:50:12 +0100
Subject: [PATCH 3/9] Merge branch 'pull-request/1816'

---
 ext/hash/tests/hash_update_stream.phpt | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 ext/hash/tests/hash_update_stream.phpt

diff --git a/ext/hash/tests/hash_update_stream.phpt b/ext/hash/tests/hash_update_stream.phpt
new file mode 100644
index 00000000000..b628b9c9129
--- /dev/null
+++ b/ext/hash/tests/hash_update_stream.phpt
@@ -0,0 +1,23 @@
+--TEST--
+int hash_update_stream ( resource $context , resource $handle [, int $length = -1 ] );
+--CREDITS--
+marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
+--SKIPIF--
+<?php
+if (phpversion() < "5.3.0") {
+    die('SKIP php version so lower.');
+}
+require_once(dirname(__FILE__) . '/skip_mhash.inc'); ?>
+?>
+--FILE--
+<?php
+$fp = tmpfile();
+fwrite($fp, 'The quick brown fox jumped over the lazy dog.');
+rewind($fp);
+
+$ctx = hash_init('md5');
+hash_update_stream($ctx, $fp);
+echo hash_final($ctx);
+?>
+--EXPECT--
+5c6ffbdd40d9556b73a21e63c3e0e904

From 39ee3184ee42a0ad9314cbb7c75cb72a75b850f5 Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Mon, 17 Oct 2016 16:49:24 +0100
Subject: [PATCH 4/9] Merge branch 'pull-request/1817'

---
 ext/hash/tests/hash_update_file.phpt | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 ext/hash/tests/hash_update_file.phpt

diff --git a/ext/hash/tests/hash_update_file.phpt b/ext/hash/tests/hash_update_file.phpt
new file mode 100644
index 00000000000..32ce962bd0b
--- /dev/null
+++ b/ext/hash/tests/hash_update_file.phpt
@@ -0,0 +1,21 @@
+--TEST--
+bool hash_update_file ( resource $hcontext , string $filename [, resource $scontext = NULL ] );
+--CREDITS--
+marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
+--SKIPIF--
+<?php
+if (phpversion() < "5.3.0") {
+    die('SKIP php version so lower.');
+}
+require_once(dirname(__FILE__) . '/skip_mhash.inc'); ?>
+?>
+--FILE--
+<?php
+$ctx = hash_init('md5');
+$filePath = __DIR__ . DIRECTORY_SEPARATOR . 'sha1.phpt';
+fopen($filePath, "r");
+var_dump(hash_update_file($ctx, $filePath));
+hash_final($ctx);
+?>
+--EXPECT--
+bool(true)

From b274be5d9d34153663fb45cde401d5b37748cfdc Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Mon, 17 Oct 2016 16:53:04 +0100
Subject: [PATCH 5/9] Merge branch 'pull-request/1808'

---
 ext/standard/tests/network/dns_get_mx.phpt | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 ext/standard/tests/network/dns_get_mx.phpt

diff --git a/ext/standard/tests/network/dns_get_mx.phpt b/ext/standard/tests/network/dns_get_mx.phpt
new file mode 100644
index 00000000000..c5bf361b12f
--- /dev/null
+++ b/ext/standard/tests/network/dns_get_mx.phpt
@@ -0,0 +1,29 @@
+--TEST--
+bool dns_get_mx ( string $hostname , array &$mxhosts [, array &$weight ] );
+--CREDITS--
+marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
+--SKIPIF--
+<?php
+if (getenv("SKIP_SLOW_TESTS"))
+    die("skip slow test");
+if (getenv("SKIP_ONLINE_TESTS"))
+    die("skip test requiring internet connection");
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip: no Windows support');
+}
+?>
+--FILE--
+<?php
+$domains = array('yahoo.co.jp', 'yahoo.com', 'es.yahoo.com', 'fr.yahoo.com', 'it.yahoo.com');
+foreach ($domains as $domain) {
+    if (getmxrr($domain, $hosts, $weights)) {
+        echo "Hosts: " . count($hosts) . ", weights: " . count($weights) . "\n";
+    }
+}
+?>
+--EXPECTF--
+Hosts: %i, weights: %i
+Hosts: %i, weights: %i
+Hosts: %i, weights: %i
+Hosts: %i, weights: %i
+Hosts: %i, weights: %i

From d6fb5a1f1e690aca9b6a7508281c90414c5fed81 Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Mon, 17 Oct 2016 16:50:53 +0100
Subject: [PATCH 6/9] Merge branch 'pull-request/1814'

---
 ext/openssl/tests/openssl_free_key.phpt | 77 +++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 ext/openssl/tests/openssl_free_key.phpt

diff --git a/ext/openssl/tests/openssl_free_key.phpt b/ext/openssl/tests/openssl_free_key.phpt
new file mode 100644
index 00000000000..18219a2a62e
--- /dev/null
+++ b/ext/openssl/tests/openssl_free_key.phpt
@@ -0,0 +1,77 @@
+--TEST--
+void openssl_free_key ( resource $key_identifier );
+--CREDITS--
+marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
+--SKIPIF--
+<?php
+if (!extension_loaded("openssl"))
+    die("skip");
+if (!@openssl_pkey_new())
+    die("skip cannot create private key");
+?>
+--FILE--
+<?php
+echo "Creating private key\n";
+
+/* stack up some entropy; performance is not critical,
+ * and being slow will most likely even help the test.
+ */
+for ($z = "", $i = 0; $i < 1024; $i++) {
+    $z .= $i * $i;
+    if (function_exists("usleep"))
+        usleep($i);
+}
+
+$privkey = openssl_pkey_new();
+
+if ($privkey === false)
+    die("failed to create private key");
+
+$passphrase = "banana";
+$key_file_name = tempnam("/tmp", "ssl");
+if ($key_file_name === false)
+    die("failed to get a temporary filename!");
+
+echo "Export key to file\n";
+
+openssl_pkey_export_to_file($privkey, $key_file_name, $passphrase) or die("failed to export to file $key_file_name");
+
+echo "Load key from file - array syntax\n";
+
+$loaded_key = openssl_pkey_get_private(array("file://$key_file_name", $passphrase));
+
+if ($loaded_key === false)
+    die("failed to load key using array syntax");
+
+openssl_free_key($loaded_key);
+
+echo "Load key using direct syntax\n";
+
+$loaded_key = openssl_pkey_get_private("file://$key_file_name", $passphrase);
+
+if ($loaded_key === false)
+    die("failed to load key using direct syntax");
+
+openssl_free_key($loaded_key);
+
+echo "Load key manually and use string syntax\n";
+
+$key_content = file_get_contents($key_file_name);
+$loaded_key = openssl_pkey_get_private($key_content, $passphrase);
+
+if ($loaded_key === false)
+    die("failed to load key using string syntax");
+
+openssl_free_key($loaded_key);
+
+echo "OK!\n";
+
+@unlink($key_file_name);
+?>
+--EXPECT--
+Creating private key
+Export key to file
+Load key from file - array syntax
+Load key using direct syntax
+Load key manually and use string syntax
+OK!

From 4dfd5f4403be85d467992bf8a6bae4de40d4a06e Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Mon, 17 Oct 2016 16:50:12 +0100
Subject: [PATCH 7/9] Merge branch 'pull-request/1816'

---
 ext/hash/tests/hash_update_stream.phpt | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 ext/hash/tests/hash_update_stream.phpt

diff --git a/ext/hash/tests/hash_update_stream.phpt b/ext/hash/tests/hash_update_stream.phpt
new file mode 100644
index 00000000000..b628b9c9129
--- /dev/null
+++ b/ext/hash/tests/hash_update_stream.phpt
@@ -0,0 +1,23 @@
+--TEST--
+int hash_update_stream ( resource $context , resource $handle [, int $length = -1 ] );
+--CREDITS--
+marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
+--SKIPIF--
+<?php
+if (phpversion() < "5.3.0") {
+    die('SKIP php version so lower.');
+}
+require_once(dirname(__FILE__) . '/skip_mhash.inc'); ?>
+?>
+--FILE--
+<?php
+$fp = tmpfile();
+fwrite($fp, 'The quick brown fox jumped over the lazy dog.');
+rewind($fp);
+
+$ctx = hash_init('md5');
+hash_update_stream($ctx, $fp);
+echo hash_final($ctx);
+?>
+--EXPECT--
+5c6ffbdd40d9556b73a21e63c3e0e904

From dcae3ce1e618ef3fbbf74f1e80f2a589ac711895 Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Mon, 17 Oct 2016 16:49:24 +0100
Subject: [PATCH 8/9] Merge branch 'pull-request/1817'

---
 ext/hash/tests/hash_update_file.phpt | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 ext/hash/tests/hash_update_file.phpt

diff --git a/ext/hash/tests/hash_update_file.phpt b/ext/hash/tests/hash_update_file.phpt
new file mode 100644
index 00000000000..32ce962bd0b
--- /dev/null
+++ b/ext/hash/tests/hash_update_file.phpt
@@ -0,0 +1,21 @@
+--TEST--
+bool hash_update_file ( resource $hcontext , string $filename [, resource $scontext = NULL ] );
+--CREDITS--
+marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
+--SKIPIF--
+<?php
+if (phpversion() < "5.3.0") {
+    die('SKIP php version so lower.');
+}
+require_once(dirname(__FILE__) . '/skip_mhash.inc'); ?>
+?>
+--FILE--
+<?php
+$ctx = hash_init('md5');
+$filePath = __DIR__ . DIRECTORY_SEPARATOR . 'sha1.phpt';
+fopen($filePath, "r");
+var_dump(hash_update_file($ctx, $filePath));
+hash_final($ctx);
+?>
+--EXPECT--
+bool(true)

From f85cc6aead25f6b44d0843487cf2aeb63c51a8a0 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Mon, 17 Oct 2016 21:26:34 +0200
Subject: [PATCH 9/9] sync NEWS

---
 NEWS | 2 --
 1 file changed, 2 deletions(-)

diff --git a/NEWS b/NEWS
index d3a002880d7..c9c8543df37 100644
--- a/NEWS
+++ b/NEWS
@@ -8,8 +8,6 @@ PHP                                                                        NEWS
   . Fixed bug #66773 (Autoload with Opcache allows importing conflicting class
     name to namespace). (Nikita)
   . Fixed bug #66862 ((Sub-)Namespaces unexpected behaviour). (Nikita)
-  . Fixed bug #73067 (__debugInfo crashes when throwing an exception).
-    (Laruence)
   . Fix pthreads detection when cross-compiling (ffontaine)
 
 - GD: