php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 09:28:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4'

Browse Source
This commit is contained in:
Nikita Popov
2019-02-19 15:55:40 +01:00
parent 8b7115df4e d9094d4d64
commit 3093a2809b
23 changed files with 43 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/sockets/tests/socket_import_stream-3.phpt
+4 -4
View File
@@ -6,9 +6,9 @@ if (!extension_loaded('sockets')) {
die('SKIP sockets extension not available.');
}
$s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
$br = socket_bind($s, '0.0.0.0', 58381);
$br = socket_bind($s, '0.0.0.0', 58379);
if ($br === false)
die("SKIP IPv4/port 58381 not available");
die("SKIP IPv4/port 58379 not available");
$so = socket_set_option($s, IPPROTO_IP, MCAST_JOIN_GROUP, array(
"group" => '224.0.0.23',
"interface" => "lo",
@@ -18,7 +18,7 @@ if ($so === false)
--FILE--
<?php
$stream = stream_socket_server("udp://0.0.0.0:58381", $errno, $errstr, STREAM_SERVER_BIND);
$stream = stream_socket_server("udp://0.0.0.0:58379", $errno, $errstr, STREAM_SERVER_BIND);
$sock = socket_import_stream($stream);
var_dump($sock);
$so = socket_set_option($sock, IPPROTO_IP, MCAST_JOIN_GROUP, array(
@@ -30,7 +30,7 @@ var_dump($so);
$sendsock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
var_dump($sendsock);
$br = socket_bind($sendsock, '127.0.0.1');
$so = socket_sendto($sendsock, $m = "my message", strlen($m), 0, "224.0.0.23", 58381);
$so = socket_sendto($sendsock, $m = "my message", strlen($m), 0, "224.0.0.23", 58379);
var_dump($so);
stream_set_blocking($stream, 0);
ext/sockets/tests/socket_import_stream-5.phpt
+2 -2
View File
@@ -10,11 +10,11 @@ if (!function_exists('zend_leak_variable'))
--FILE--
<?php
$stream0 = stream_socket_server("udp://0.0.0.0:58380", $errno, $errstr, STREAM_SERVER_BIND);
$stream0 = stream_socket_server("udp://0.0.0.0:58385", $errno, $errstr, STREAM_SERVER_BIND);
$sock0 = socket_import_stream($stream0);
zend_leak_variable($stream0);
$stream1 = stream_socket_server("udp://0.0.0.0:58381", $errno, $errstr, STREAM_SERVER_BIND);
$stream1 = stream_socket_server("udp://0.0.0.0:58386", $errno, $errstr, STREAM_SERVER_BIND);
$sock1 = socket_import_stream($stream1);
zend_leak_variable($sock1);
ext/standard/tests/general_functions/dl-full-path-not-supported.phpt
+1 -1
View File
@@ -1,6 +1,6 @@
--TEST--
dl() fails when trying to load full path to module
+--CREDITS--
--CREDITS--
Tom Van Herreweghe <tom@theanalogguy.be>
User Group: PHP-WVL & PHPGent #PHPTestFest
--SKIPIF--
ext/standard/tests/mail/bug66535.phpt
+2 -2
View File
@@ -1,7 +1,7 @@
--TEST--
Bug #66535: Extra newline if add_x_header and no additional headers are used
--INI--
sendmail_path=tee mailBasic.out >/dev/null
sendmail_path=tee mailBug66535.out >/dev/null
mail.add_x_header = On
--SKIPIF--
<?php
@@ -23,7 +23,7 @@ $to = 'user@company.com';
$subject = 'Test Subject';
$message = 'A Message';
$outFile = "mailBasic.out";
$outFile = "mailBug66535.out";
@unlink($outFile);
var_dump( mail($to, $subject, $message) );
ext/standard/tests/mail/bug69874.phpt
+2 -2
View File
@@ -1,7 +1,7 @@
--TEST--
Bug #69874: Null addtional_headers does not send mail
--INI--
sendmail_path=tee mailBasic.out >/dev/null
sendmail_path=tee mailBug69874.out >/dev/null
mail.add_x_header = Off
--SKIPIF--
<?php
@@ -23,7 +23,7 @@ $to = 'user@company.com';
$subject = 'Test Subject';
$message = 'A Message';
$outFile = "mailBasic.out";
$outFile = "mailBug69874.out";
@unlink($outFile);
var_dump( mail($to, $subject, $message) );
ext/standard/tests/mail/bug69874_2.phpt
+2 -2
View File
@@ -1,7 +1,7 @@
--TEST--
Bug #69874: Null addtional_headers does not send mail
--INI--
sendmail_path=tee mailBasic.out >/dev/null
sendmail_path=tee mailBug69874_2.out >/dev/null
mail.add_x_header = On
--SKIPIF--
<?php
@@ -23,7 +23,7 @@ $to = 'user@company.com';
$subject = 'Test Subject';
$message = 'A Message';
$outFile = "mailBasic.out";
$outFile = "mailBug69874_2.out";
@unlink($outFile);
var_dump( mail($to, $subject, $message, '') );
ext/standard/tests/mail/mail_basic6.phpt
+2 -2
View File
@@ -1,7 +1,7 @@
--TEST--
Test mail() function : basic functionality
--INI--
sendmail_path=tee mailBasic.out >/dev/null
sendmail_path=tee mailBasic6.out >/dev/null
mail.add_x_header = Off
--SKIPIF--
<?php
@@ -24,7 +24,7 @@ $to = 'user@example.com';
$subject = 'Test Subject';
$message = 'A Message';
$additional_headers = "HEAD1: a\r\nHEAD2: b\r\n";
$outFile = "mailBasic.out";
$outFile = "mailBasic6.out";
@unlink($outFile);
echo "-- Valid Header --\n";
ext/standard/tests/mail/mail_basic7.phpt
+5 -5
View File
@@ -1,7 +1,7 @@
--TEST--
Test mail() function : array extra header basic functionality
--INI--
sendmail_path=tee mailBasic.out >/dev/null
sendmail_path=tee mailBasic7.out >/dev/null
mail.add_x_header = Off
--SKIPIF--
<?php
@@ -35,7 +35,7 @@ $additional_headers = array(
"bar\r\n\t fuga",
),
);
$outFile = "mailBasic.out";
$outFile = "mailBasic7.out";
@unlink($outFile);
echo "-- All Mail Content Parameters --\n";
@@ -62,7 +62,7 @@ $additional_headers = array(
'message-id' => array('foo7'),
'in-reply-to'=> array('foo8'),
);
$outFile = "mailBasic.out";
$outFile = "mailBasic7.out";
@unlink($outFile);
echo "-- All Mail Content Parameters --\n";
@@ -87,7 +87,7 @@ $additional_headers = array(
'foo6' => array(NULL),
'foo7' => array(new StdClass),
);
$outFile = "mailBasic.out";
$outFile = "mailBasic7.out";
@unlink($outFile);
echo "-- All Mail Content Parameters --\n";
@@ -115,7 +115,7 @@ $additional_headers = array(
"foo9" => '%&$#!',
"foo10" => "abc\0\tdef",
);
$outFile = "mailBasic.out";
$outFile = "mailBasic7.out";
@unlink($outFile);
echo "-- All Mail Content Parameters --\n";
ext/standard/tests/streams/stream_socket_get_name.phpt
+2 -7
View File
@@ -4,17 +4,12 @@ string stream_socket_get_name ( resource $handle , bool $want_peer ) ;
marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
--FILE--
<?php
$serverUri = "tcp://127.0.0.1:31854";
$serverUri = "tcp://127.0.0.1:31855";
$sock = stream_socket_server($serverUri, $errno, $errstr);
var_dump(stream_socket_get_name($sock, false));
var_dump(stream_socket_get_name($sock, true));
?>
--CLEAN--
<?php
unset($serverUri);
unset($sock);
?>
--EXPECT--
string(15) "127.0.0.1:31854"
string(15) "127.0.0.1:31855"
bool(false)
ext/standard/tests/streams/stream_socket_recvfrom.phpt
+1 -11
View File
@@ -4,7 +4,7 @@ string stream_socket_recvfrom ( resource $socket , int $length [, int $flags = 0
marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
--FILE--
<?php
$serverUri = "tcp://127.0.0.1:31854";
$serverUri = "tcp://127.0.0.1:31856";
$sock = stream_socket_server($serverUri, $errno, $errstr);
$sockLen = 1500;
@@ -12,16 +12,6 @@ var_dump(stream_socket_recvfrom($sock, $sockLen));
var_dump(stream_socket_recvfrom($sock, $sockLen, STREAM_OOB));
var_dump(stream_socket_recvfrom($sock, $sockLen, STREAM_PEEK));
?>
--CLEAN--
<?php
fclose($sock);
unset($serverUri);
unset($clientFlags);
unset($sock);
unset($sockLen);
unset($errno);
unset($errstr);
?>
--EXPECT--
bool(false)
bool(false)
ext/standard/tests/streams/stream_socket_sendto.phpt
+1 -1
View File
@@ -8,7 +8,7 @@ if (getenv("SKIP_ONLINE_TESTS")) { die('skip: online test'); }
?>
--FILE--
<?php
$serverUri = "tcp://127.0.0.1:31854";
$serverUri = "tcp://127.0.0.1:31857";
$serverUrl = "http://php.net";
$stringSocket = "out of band data.";
$stringFWrite = "normal data to transmit";
ext/xmlwriter/tests/001.phpt
+1 -1
View File
@@ -15,7 +15,7 @@ xmlwriter_end_document($xw);
$output_bytes = xmlwriter_flush($xw, true);
echo file_get_contents($doc_dest);
unset($xw);
unlink('001.xml');
unlink($doc_dest);
?>
===DONE===
--EXPECT--
ext/xmlwriter/tests/002.phpt
+1 -1
View File
@@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, membuffer, flush
--FILE--
<?php
$doc_dest = '001.xml';
$doc_dest = '002.xml';
$xw = xmlwriter_open_memory($doc_dest);
xmlwriter_start_document($xw, '1.0', 'UTF-8');
xmlwriter_start_element($xw, "tag1");
ext/xmlwriter/tests/003.phpt
+1 -1
View File
@@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, membuffer, flush, attribute
--FILE--
<?php
$doc_dest = '001.xml';
$doc_dest = '003.xml';
$xw = xmlwriter_open_memory($doc_dest);
xmlwriter_start_document($xw, '1.0', 'UTF-8');
xmlwriter_start_element($xw, "tag1");
ext/xmlwriter/tests/004.phpt
+2 -2
View File
@@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, file buffer, flush
--FILE--
<?php
$doc_dest = '001.xml';
$doc_dest = '004.xml';
$xw = xmlwriter_open_uri($doc_dest);
xmlwriter_start_document($xw, '1.0', 'UTF-8');
xmlwriter_start_element($xw, "tag1");
@@ -22,7 +22,7 @@ $md5_res = md5('<?xml version="1.0" encoding="UTF-8"?>
<tag1><?PHP echo $a;?></tag1>
');
unset($xw);
unlink('001.xml');
unlink($doc_dest);
if ($md5_out != $md5_res) {
echo "failed: $md5_res != $md5_out\n";
} else {
ext/xmlwriter/tests/005-mb.phpt
+1 -1
View File
@@ -8,7 +8,7 @@ if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ requi
--FILE--
<?php
$doc_dest = '私はガラスを食べられます001.xml';
$doc_dest = '私はガラスを食べられます005.xml';
$xw = xmlwriter_open_uri($doc_dest);
xmlwriter_start_document($xw, '1.0', 'UTF-8');
xmlwriter_start_element($xw, "tag1");
ext/xmlwriter/tests/005.phpt
+2 -2
View File
@@ -8,7 +8,7 @@ if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ requi
--FILE--
<?php
$doc_dest = '001.xml';
$doc_dest = '005.xml';
$xw = xmlwriter_open_uri($doc_dest);
xmlwriter_start_document($xw, '1.0', 'UTF-8');
xmlwriter_start_element($xw, "tag1");
@@ -23,7 +23,7 @@ xmlwriter_end_document($xw);
$output_bytes = xmlwriter_flush($xw, true);
echo file_get_contents($doc_dest);
unset($xw);
unlink('001.xml');
unlink($doc_dest);
?>
===DONE===
--EXPECT--
ext/xmlwriter/tests/006.phpt
+2 -2
View File
@@ -7,7 +7,7 @@ if (!extension_loaded("xmlwriter")) die("skip");
--FILE--
<?php
$doc_dest = '001.xml';
$doc_dest = '006.xml';
$xw = xmlwriter_open_uri($doc_dest);
xmlwriter_start_dtd($xw, 'foo', NULL, 'urn:bar');
xmlwriter_end_dtd($xw);
@@ -19,7 +19,7 @@ xmlwriter_end_element($xw);
$output_bytes = xmlwriter_flush($xw, true);
echo file_get_contents($doc_dest);
unset($xw);
unlink('001.xml');
unlink($doc_dest);
?>
--EXPECT--
<!DOCTYPE foo SYSTEM "urn:bar"><foo><foo:bar xmlns:foo="urn:foo">dummy content</foo:bar></foo>
ext/xmlwriter/tests/OO_001.phpt
+2 -2
View File
@@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, file buffer, flush
--FILE--
<?php
$doc_dest = '001.xml';
$doc_dest = 'OO_001.xml';
$xw = new XMLWriter();
$xw->openUri($doc_dest);
$xw->startDocument('1.0', 'UTF-8', 'standalonearg');
@@ -16,7 +16,7 @@ $xw->endDocument();
$output_bytes = $xw->flush(true);
echo file_get_contents($doc_dest);
unset($xw);
unlink('001.xml');
unlink($doc_dest);
?>
===DONE===
--EXPECT--
ext/xmlwriter/tests/OO_004.phpt
+2 -2
View File
@@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, file buffer, flush
--FILE--
<?php
$doc_dest = '001.xml';
$doc_dest = 'OO_004.xml';
$xw = new XMLWriter();
$xw->openUri($doc_dest);
$xw->startDocument('1.0', 'UTF-8');
@@ -23,7 +23,7 @@ $md5_res = md5('<?xml version="1.0" encoding="UTF-8"?>
<tag1><?PHP echo $a;?></tag1>
');
unset($xw);
unlink('001.xml');
unlink($doc_dest);
if ($md5_out != $md5_res) {
echo "failed: $md5_res != $md5_out\n";
} else {
ext/xmlwriter/tests/OO_005.phpt
+2 -2
View File
@@ -8,7 +8,7 @@ if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ requi
--FILE--
<?php
$doc_dest = '001.xml';
$doc_dest = 'OO_005.xml';
$xw = new XMLWriter();
$xw->openUri($doc_dest);
$xw->startDocument('1.0', 'UTF-8');
@@ -23,7 +23,7 @@ $xw->endDocument();
$output_bytes = $xw->flush(true);
echo file_get_contents($doc_dest);
unset($xw);
unlink('001.xml');
unlink($doc_dest);
?>
===DONE===
--EXPECT--
ext/xmlwriter/tests/OO_006.phpt
+2 -2
View File
@@ -7,7 +7,7 @@ if (!extension_loaded("xmlwriter")) die("skip");
--FILE--
<?php
$doc_dest = '001.xml';
$doc_dest = 'OO_006.xml';
$xw = new XMLWriter();
$xw->openUri($doc_dest);
$xw->startDtd('foo', NULL, 'urn:bar');
@@ -20,7 +20,7 @@ $xw->endElement();
$output_bytes = $xw->flush(true);
echo file_get_contents($doc_dest);
unset($xw);
unlink('001.xml');
unlink($doc_dest);
?>
--EXPECT--
<!DOCTYPE foo SYSTEM "urn:bar"><foo><foo:bar xmlns:foo="urn:foo">dummy content</foo:bar></foo>
run-tests.php
+1 -6
View File
@@ -391,7 +391,6 @@ NO_PROC_OPEN_ERROR;
error("'$workers' is not a valid number of workers, try e.g. -j16 for 16 workers");
}
$workers = intval($workers, 10);
$environment['SKIP_IO_CAPTURE_TESTS'] = 1;
break;
case 'r':
case 'l':
@@ -1434,11 +1433,7 @@ NAME_AND_SHAME;
for ($i = 1; $i <= $workers; $i++) {
$proc = proc_open(
$thisPHP . ' ' . escapeshellarg($thisScript),
[
0 => ['pipe', 'r'],
1 => ['pipe', 'w'],
2 => ['pipe', 'w']
],
[], // Inherit our stdin, stdout and stderr
$pipes,
NULL,
$_ENV + [