Skip to content

Commit c269b10

Browse files
smalyshevsgolemon
smalyshev
authored and
sgolemon
committed
Fix bug #74782: remove file name from output to avoid XSS
(cherry picked from commit 73ca9b3)
1 parent 3b50e23 commit c269b10

14 files changed

+48
-48
lines changed

‎ext/phar/shortarc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
$a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt);
7575
if (!$a || strlen(dirname($a)) < strlen(Extract_Phar::$temp)) {
7676
header('HTTP/1.0 404 Not Found');
77-
echo "<html>\n <head>\n <title>File Not Found<title>\n </head>\n <body>\n <h1>404 - File ", $pt, " Not Found</h1>\n </body>\n</html>";
77+
echo "<html>\n <head>\n <title>File Not Found<title>\n </head>\n <body>\n <h1>404 - File Not Found</h1>\n </body>\n</html>";
7878
exit;
7979
}
8080
$b = pathinfo($a);

‎ext/phar/stub.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ static inline zend_string* phar_get_stub(const char *index_php, const char *web,
2222
{
2323
static const char newstub0[] = "<?php\n\n$web = '";
2424
static const char newstub1_0[] = "';\n\nif (in_array('phar', stream_get_wrappers()) && class_exists('Phar', 0)) {\nPhar::interceptFileFuncs();\nset_include_path('phar://' . __FILE__ . PATH_SEPARATOR . get_include_path());\nPhar::webPhar(null, $web);\ninclude 'phar://' . __FILE__ . '/' . Extract_Phar::START;\nreturn;\n}\n\nif (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST'))) {\nExtract_Phar::go(true);\n$mimes = array(\n'phps' => 2,\n'c' => 'text/plain',\n'cc' => 'text/plain',\n'cpp' => 'text/plain',\n'c++' => 'text/plain',\n'dtd' => 'text/plain',\n'h' => 'text/plain',\n'log' => 'text/plain',\n'rng' => 'text/plain',\n'txt' => 'text/plain',\n'xsd' => 'text/plain',\n'php' => 1,\n'inc' => 1,\n'avi' => 'video/avi',\n'bmp' => 'image/bmp',\n'css' => 'text/css',\n'gif' => 'image/gif',\n'htm' => 'text/html',\n'html' => 'text/html',\n'htmls' => 'text/html',\n'ico' => 'image/x-ico',\n'jpe' => 'image/jpeg',\n'jpg' => 'image/jpeg',\n'jpeg' => 'image/jpeg',\n'js' => 'application/x-javascript',\n'midi' => 'audio/midi',\n'mid' => 'audio/midi',\n'mod' => 'audio/mod',\n'mov' => 'movie/quicktime',\n'mp3' => 'audio/mp3',\n'mpg' => 'video/mpeg',\n'mpeg' => 'video/mpeg',\n'pdf' => 'application/pdf',\n'png' => 'image/png',\n'swf' => 'application/shockwave-flash',\n'tif' => 'image/tiff',\n'tiff' => 'image/tiff',\n'wav' => 'audio/wav',\n'xbm' => 'image/xbm',\n'xml' => 'text/xml',\n);\n\nheader(\"Cache-Control: no-cache, must-revalidate\");\nheader(\"Pragma: no-cache\");\n\n$basename = basename(__FILE__);\nif (!strpos($_SERVER['REQUEST_URI'], $basename)) {\nchdir(Extract_Phar::$temp);\ninclude $web;\nreturn;\n}\n$pt = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], $basename) + strlen($basename));\nif (!$pt || $pt == '/') {\n$pt = $web;\nheader('HTTP/1.1 301 Moved Permanently');\nheader('Location: ' . $_SERVER['REQUEST_URI'] . '/' . $pt);\nexit;\n}\n$a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt);\nif (!$a || strlen(dirname($a)) < strlen(";
25-
static const char newstub1_1[] = "Extract_Phar::$temp)) {\nheader('HTTP/1.0 404 Not Found');\necho \"<html>\\n <head>\\n <title>File Not Found<title>\\n </head>\\n <body>\\n <h1>404 - File \", $pt, \" Not Found</h1>\\n </body>\\n</html>\";\nexit;\n}\n$b = pathinfo($a);\nif (!isset($b['extension'])) {\nheader('Content-Type: text/plain');\nheader('Content-Length: ' . filesize($a));\nreadfile($a);\nexit;\n}\nif (isset($mimes[$b['extension']])) {\nif ($mimes[$b['extension']] === 1) {\ninclude $a;\nexit;\n}\nif ($mimes[$b['extension']] === 2) {\nhighlight_file($a);\nexit;\n}\nheader('Content-Type: ' .$mimes[$b['extension']]);\nheader('Content-Length: ' . filesize($a));\nreadfile($a);\nexit;\n}\n}\n\nclass Extract_Phar\n{\nstatic $temp;\nstatic $origdir;\nconst GZ = 0x1000;\nconst BZ2 = 0x2000;\nconst MASK = 0x3000;\nconst START = '";
25+
static const char newstub1_1[] = "Extract_Phar::$temp)) {\nheader('HTTP/1.0 404 Not Found');\necho \"<html>\\n <head>\\n <title>File Not Found<title>\\n </head>\\n <body>\\n <h1>404 - File Not Found</h1>\\n </body>\\n</html>\";\nexit;\n}\n$b = pathinfo($a);\nif (!isset($b['extension'])) {\nheader('Content-Type: text/plain');\nheader('Content-Length: ' . filesize($a));\nreadfile($a);\nexit;\n}\nif (isset($mimes[$b['extension']])) {\nif ($mimes[$b['extension']] === 1) {\ninclude $a;\nexit;\n}\nif ($mimes[$b['extension']] === 2) {\nhighlight_file($a);\nexit;\n}\nheader('Content-Type: ' .$mimes[$b['extension']]);\nheader('Content-Length: ' . filesize($a));\nreadfile($a);\nexit;\n}\n}\n\nclass Extract_Phar\n{\nstatic $temp;\nstatic $origdir;\nconst GZ = 0x1000;\nconst BZ2 = 0x2000;\nconst MASK = 0x3000;\nconst START = '";
2626
static const char newstub2[] = "';\nconst LEN = ";
2727
static const char newstub3_0[] = ";\n\nstatic function go($return = false)\n{\n$fp = fopen(__FILE__, 'rb');\nfseek($fp, self::LEN);\n$L = unpack('V', $a = fread($fp, 4));\n$m = '';\n\ndo {\n$read = 8192;\nif ($L[1] - strlen($m) < 8192) {\n$read = $L[1] - strlen($m);\n}\n$last = fread($fp, $read);\n$m .= $last;\n} while (strlen($last) && strlen($m) < $L[1]);\n\nif (strlen($m) < $L[1]) {\ndie('ERROR: manifest length read was \"' .\nstrlen($m) .'\" should be \"' .\n$L[1] . '\"');\n}\n\n$info = self::_unpack($m);\n$f = $info['c'];\n\nif ($f & self::GZ) {\nif (!function_exists('gzinflate')) {\ndie('Error: zlib extension is not enabled -' .\n' gzinflate() function needed for zlib-compressed .phars');\n}\n}\n\nif ($f & self::BZ2) {\nif (!function_exists('bzdecompress')) {\ndie('Error: bzip2 extension is not enabled -' .\n' bzdecompress() function needed for bz2-compressed .phars');\n}\n}\n\n$temp = self::tmpdir();\n\nif (!$temp || !is_writable($temp)) {\n$sessionpath = session_save_path();\nif (strpos ($sessionpath, \";\") !== false)\n$sessionpath = substr ($sessionpath, strpos ($sessionpath, \";\")+1);\nif (!file_exists($sessionpath) || !is_dir($sessionpath)) {\ndie('Could not locate temporary directory to extract phar');\n}\n$temp = $sessionpath;\n}\n\n$temp .= '/pharextract/'.basename(__FILE__, '.phar');\nself::$temp = $temp;\nself::$origdir = getcwd();\n@mkdir($temp, 0777, true);\n$temp = realpath($temp);\n\nif (!file_exists($temp . DIRECTORY_SEPARATOR . md5_file(__FILE__))) {\nself::_removeTmpFiles($temp, getcwd());\n@mkdir($temp, 0777, true);\n@file_put_contents($temp . '/' . md5_file(__FILE__), '');\n\nforeach ($info['m'] as $path => $file) {\n$a = !file_exists(dirname($temp . '/' . $path));\n@mkdir(dirname($temp . '/' . $path), 0777, true);\nclearstatcache();\n\nif ($path[strlen($path) - 1] == '/') {\n@mkdir($temp . '/' . $path, 0777);\n} else {\nfile_put_contents($temp . '/' . $path, self::extractFile($path, $file, $fp));\n@chmod($temp . '/' . $path, 0666);\n}\n}\n}\n\nchdir($temp);\n\nif (!$return) {\ninclude self::START;\n}\n}\n\nstatic fun";
2828
static const char newstub3_1[] = "ction tmpdir()\n{\nif (strpos(PHP_OS, 'WIN') !== false) {\nif ($var = getenv('TMP') ? getenv('TMP') : getenv('TEMP')) {\nreturn $var;\n}\nif (is_dir('/temp') || mkdir('/temp')) {\nreturn realpath('/temp');\n}\nreturn false;\n}\nif ($var = getenv('TMPDIR')) {\nreturn $var;\n}\nreturn realpath('/tmp');\n}\n\nstatic function _unpack($m)\n{\n$info = unpack('V', substr($m, 0, 4));\n $l = unpack('V', substr($m, 10, 4));\n$m = substr($m, 14 + $l[1]);\n$s = unpack('V', substr($m, 0, 4));\n$o = 0;\n$start = 4 + $s[1];\n$ret['c'] = 0;\n\nfor ($i = 0; $i < $info[1]; $i++) {\n $len = unpack('V', substr($m, $start, 4));\n$start += 4;\n $savepath = substr($m, $start, $len[1]);\n$start += $len[1];\n $ret['m'][$savepath] = array_values(unpack('Va/Vb/Vc/Vd/Ve/Vf', substr($m, $start, 24)));\n$ret['m'][$savepath][3] = sprintf('%u', $ret['m'][$savepath][3]\n& 0xffffffff);\n$ret['m'][$savepath][7] = $o;\n$o += $ret['m'][$savepath][2];\n$start += 24 + $ret['m'][$savepath][5];\n$ret['c'] |= $ret['m'][$savepath][4] & self::MASK;\n}\nreturn $ret;\n}\n\nstatic function extractFile($path, $entry, $fp)\n{\n$data = '';\n$c = $entry[2];\n\nwhile ($c) {\nif ($c < 8192) {\n$data .= @fread($fp, $c);\n$c = 0;\n} else {\n$c -= 8192;\n$data .= @fread($fp, 8192);\n}\n}\n\nif ($entry[4] & self::GZ) {\n$data = gzinflate($data);\n} elseif ($entry[4] & self::BZ2) {\n$data = bzdecompress($data);\n}\n\nif (strlen($data) != $entry[0]) {\ndie(\"Invalid internal .phar file (size error \" . strlen($data) . \" != \" .\n$stat[7] . \")\");\n}\n\nif ($entry[3] != sprintf(\"%u\", crc32($data) & 0xffffffff)) {\ndie(\"Invalid internal .phar file (checksum error)\");\n}\n\nreturn $data;\n}\n\nstatic function _removeTmpFiles($temp, $origdir)\n{\nchdir($temp);\n\nforeach (glob('*') as $f) {\nif (file_exists($f)) {\nis_dir($f) ? @rmdir($f) : @unlink($f);\nif (file_exists($f) && is_dir($f)) {\nself::_removeTmpFiles($f, getcwd());\n}\n}\n}\n\n@rmdir($temp);\nclearstatcache();\nchdir($origdir);\n}\n}\n\nExtract_Phar::go();\n__HALT_COMPILER(); ?>";
2929

30-
static const int newstub_len = 6633;
30+
static const int newstub_len = 6623;
3131

3232
return strpprintf(name_len + web_len + newstub_len, "%s%s%s%s%s%s%d%s%s", newstub0, web, newstub1_0, newstub1_1, index_php, newstub2, name_len + web_len + newstub_len, newstub3_0, newstub3_1);
3333
}

‎ext/phar/tests/cache_list/copyonwrite11.phar.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ echo strlen($p2->getStub()),"\n";
1818
echo "ok\n";
1919
__HALT_COMPILER(); ?>
2020
"
21-
6653
22-
ok
21+
6643
22+
ok

‎ext/phar/tests/phar_commitwrite.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ unlink(dirname(__FILE__) . '/brandnewphar.phar');
2929
__HALT_COMPILER();
3030
?>
3131
--EXPECT--
32-
int(6651)
32+
int(6641)
3333
string(200) "<?php
3434
function __autoload($class)
3535
{
@@ -39,4 +39,4 @@ Phar::mapPhar('brandnewphar.phar');
3939
include 'phar://brandnewphar.phar/startup.php';
4040
__HALT_COMPILER(); ?>
4141
"
42-
===DONE===
42+
===DONE===

‎ext/phar/tests/phar_convert_repeated.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ NULL
123123
bool(true)
124124
bool(false)
125125
bool(false)
126-
int(6651)
126+
int(6641)
127127
NULL
128128
================= convertToZip() =====================
129129
bool(false)

‎ext/phar/tests/phar_create_in_cwd.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ __HALT_COMPILER();
3232
unlink(dirname(__FILE__) . '/brandnewphar.phar');
3333
?>
3434
--EXPECT--
35-
int(6651)
35+
int(6641)
3636
string(200) "<?php
3737
function __autoload($class)
3838
{
@@ -42,4 +42,4 @@ Phar::mapPhar('brandnewphar.phar');
4242
include 'phar://brandnewphar.phar/startup.php';
4343
__HALT_COMPILER(); ?>
4444
"
45-
===DONE===
45+
===DONE===

‎ext/phar/tests/phar_createdefaultstub.phpt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ echo $e->getMessage() . "\n";
3434
?>
3535
===DONE===
3636
--EXPECT--
37-
string(6651) "<?php
37+
string(6641) "<?php
3838

3939
$web = 'index.php';
4040

@@ -110,7 +110,7 @@ exit;
110110
$a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt);
111111
if (!$a || strlen(dirname($a)) < strlen(Extract_Phar::$temp)) {
112112
header('HTTP/1.0 404 Not Found');
113-
echo "<html>\n <head>\n <title>File Not Found<title>\n </head>\n <body>\n <h1>404 - File ", $pt, " Not Found</h1>\n </body>\n</html>";
113+
echo "<html>\n <head>\n <title>File Not Found<title>\n </head>\n <body>\n <h1>404 - File Not Found</h1>\n </body>\n</html>";
114114
exit;
115115
}
116116
$b = pathinfo($a);
@@ -144,7 +144,7 @@ const GZ = 0x1000;
144144
const BZ2 = 0x2000;
145145
const MASK = 0x3000;
146146
const START = 'index.php';
147-
const LEN = 6653;
147+
const LEN = 6643;
148148

149149
static function go($return = false)
150150
{
@@ -328,7 +328,7 @@ Extract_Phar::go();
328328
__HALT_COMPILER(); ?>"
329329
============================================================================
330330
============================================================================
331-
string(6662) "<?php
331+
string(6652) "<?php
332332

333333
$web = 'index.php';
334334

@@ -404,7 +404,7 @@ exit;
404404
$a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt);
405405
if (!$a || strlen(dirname($a)) < strlen(Extract_Phar::$temp)) {
406406
header('HTTP/1.0 404 Not Found');
407-
echo "<html>\n <head>\n <title>File Not Found<title>\n </head>\n <body>\n <h1>404 - File ", $pt, " Not Found</h1>\n </body>\n</html>";
407+
echo "<html>\n <head>\n <title>File Not Found<title>\n </head>\n <body>\n <h1>404 - File Not Found</h1>\n </body>\n</html>";
408408
exit;
409409
}
410410
$b = pathinfo($a);
@@ -438,7 +438,7 @@ const GZ = 0x1000;
438438
const BZ2 = 0x2000;
439439
const MASK = 0x3000;
440440
const START = 'my/custom/thingy.php';
441-
const LEN = 6664;
441+
const LEN = 6654;
442442

443443
static function go($return = false)
444444
{
@@ -622,15 +622,15 @@ Extract_Phar::go();
622622
__HALT_COMPILER(); ?>"
623623
============================================================================
624624
============================================================================
625-
int(7042)
625+
int(7032)
626626
============================================================================
627627
============================================================================
628628
Illegal filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed
629629
============================================================================
630630
============================================================================
631631
============================================================================
632632
============================================================================
633-
string(6664) "<?php
633+
string(6654) "<?php
634634

635635
$web = 'the/web.php';
636636

@@ -706,7 +706,7 @@ exit;
706706
$a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt);
707707
if (!$a || strlen(dirname($a)) < strlen(Extract_Phar::$temp)) {
708708
header('HTTP/1.0 404 Not Found');
709-
echo "<html>\n <head>\n <title>File Not Found<title>\n </head>\n <body>\n <h1>404 - File ", $pt, " Not Found</h1>\n </body>\n</html>";
709+
echo "<html>\n <head>\n <title>File Not Found<title>\n </head>\n <body>\n <h1>404 - File Not Found</h1>\n </body>\n</html>";
710710
exit;
711711
}
712712
$b = pathinfo($a);
@@ -740,7 +740,7 @@ const GZ = 0x1000;
740740
const BZ2 = 0x2000;
741741
const MASK = 0x3000;
742742
const START = 'my/custom/thingy.php';
743-
const LEN = 6666;
743+
const LEN = 6656;
744744

745745
static function go($return = false)
746746
{
@@ -924,6 +924,6 @@ Extract_Phar::go();
924924
__HALT_COMPILER(); ?>"
925925
============================================================================
926926
============================================================================
927-
int(7042)
927+
int(7032)
928928
Illegal web filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed
929929
===DONE===

‎ext/phar/tests/phar_offset_check.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ var_dump($phar->getAlias());
7070
Entry .phar/stub.php does not exist
7171
Entry .phar/alias.txt does not exist
7272
Cannot set stub ".phar/stub.php" directly in phar "%sphar_offset_check.phar.php", use setStub
73-
int(6653)
74-
int(6653)
73+
int(6643)
74+
int(6643)
7575
Cannot set alias ".phar/alias.txt" directly in phar "%sphar_offset_check.phar.php", use setAlias
7676
string(5) "susan"
7777
string(5) "susan"

‎ext/phar/tests/phar_setdefaultstub.phpt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ try {
5454
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
5555
?>
5656
--EXPECT--
57-
string(6653) "<?php
57+
string(6643) "<?php
5858

5959
$web = 'index.php';
6060

@@ -130,7 +130,7 @@ exit;
130130
$a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt);
131131
if (!$a || strlen(dirname($a)) < strlen(Extract_Phar::$temp)) {
132132
header('HTTP/1.0 404 Not Found');
133-
echo "<html>\n <head>\n <title>File Not Found<title>\n </head>\n <body>\n <h1>404 - File ", $pt, " Not Found</h1>\n </body>\n</html>";
133+
echo "<html>\n <head>\n <title>File Not Found<title>\n </head>\n <body>\n <h1>404 - File Not Found</h1>\n </body>\n</html>";
134134
exit;
135135
}
136136
$b = pathinfo($a);
@@ -164,7 +164,7 @@ const GZ = 0x1000;
164164
const BZ2 = 0x2000;
165165
const MASK = 0x3000;
166166
const START = 'index.php';
167-
const LEN = 6653;
167+
const LEN = 6643;
168168

169169
static function go($return = false)
170170
{
@@ -349,7 +349,7 @@ __HALT_COMPILER(); ?>
349349
"
350350
============================================================================
351351
============================================================================
352-
string(6664) "<?php
352+
string(6654) "<?php
353353

354354
$web = 'index.php';
355355

@@ -425,7 +425,7 @@ exit;
425425
$a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt);
426426
if (!$a || strlen(dirname($a)) < strlen(Extract_Phar::$temp)) {
427427
header('HTTP/1.0 404 Not Found');
428-
echo "<html>\n <head>\n <title>File Not Found<title>\n </head>\n <body>\n <h1>404 - File ", $pt, " Not Found</h1>\n </body>\n</html>";
428+
echo "<html>\n <head>\n <title>File Not Found<title>\n </head>\n <body>\n <h1>404 - File Not Found</h1>\n </body>\n</html>";
429429
exit;
430430
}
431431
$b = pathinfo($a);
@@ -459,7 +459,7 @@ const GZ = 0x1000;
459459
const BZ2 = 0x2000;
460460
const MASK = 0x3000;
461461
const START = 'my/custom/thingy.php';
462-
const LEN = 6664;
462+
const LEN = 6654;
463463

464464
static function go($return = false)
465465
{
@@ -644,7 +644,7 @@ __HALT_COMPILER(); ?>
644644
"
645645
============================================================================
646646
============================================================================
647-
string(6666) "<?php
647+
string(6656) "<?php
648648

649649
$web = 'the/web.php';
650650

@@ -720,7 +720,7 @@ exit;
720720
$a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt);
721721
if (!$a || strlen(dirname($a)) < strlen(Extract_Phar::$temp)) {
722722
header('HTTP/1.0 404 Not Found');
723-
echo "<html>\n <head>\n <title>File Not Found<title>\n </head>\n <body>\n <h1>404 - File ", $pt, " Not Found</h1>\n </body>\n</html>";
723+
echo "<html>\n <head>\n <title>File Not Found<title>\n </head>\n <body>\n <h1>404 - File Not Found</h1>\n </body>\n</html>";
724724
exit;
725725
}
726726
$b = pathinfo($a);
@@ -754,7 +754,7 @@ const GZ = 0x1000;
754754
const BZ2 = 0x2000;
755755
const MASK = 0x3000;
756756
const START = 'my/custom/thingy.php';
757-
const LEN = 6666;
757+
const LEN = 6656;
758758

759759
static function go($return = false)
760760
{
@@ -939,6 +939,6 @@ __HALT_COMPILER(); ?>
939939
"
940940
============================================================================
941941
============================================================================
942-
int(7044)
942+
int(7034)
943943
Illegal filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed
944944
===DONE===

‎ext/phar/tests/tar/phar_convert_phar.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ __HALT_COMPILER();
4747
?>
4848
--EXPECT--
4949
bool(false)
50-
int(6651)
50+
int(6641)
5151
bool(true)
5252
string(60) "<?php // tar-based phar archive stub file
5353
__HALT_COMPILER();"
5454
bool(true)
55-
int(6651)
55+
int(6641)
5656
bool(true)
57-
int(6651)
57+
int(6641)
5858
===DONE===

‎ext/phar/tests/tar/phar_convert_phar2.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ __HALT_COMPILER();
4949
?>
5050
--EXPECT--
5151
bool(false)
52-
int(6651)
52+
int(6641)
5353
bool(true)
5454
string(60) "<?php // tar-based phar archive stub file
5555
__HALT_COMPILER();"
5656
bool(true)
5757
int(4096)
58-
int(6651)
58+
int(6641)
5959
bool(true)
6060
bool(true)
61-
int(6651)
61+
int(6641)
6262
===DONE===

‎ext/phar/tests/tar/phar_convert_phar3.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ __HALT_COMPILER();
4949
?>
5050
--EXPECT--
5151
bool(false)
52-
int(6651)
52+
int(6641)
5353
bool(true)
5454
string(60) "<?php // tar-based phar archive stub file
5555
__HALT_COMPILER();"
5656
bool(true)
5757
int(8192)
58-
int(6651)
58+
int(6641)
5959
bool(true)
6060
bool(true)
61-
int(6651)
61+
int(6641)
6262
===DONE===

‎ext/phar/tests/tar/phar_convert_phar4.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@ __HALT_COMPILER();
5454
?>
5555
--EXPECT--
5656
bool(false)
57-
int(6651)
57+
int(6641)
5858
string(2) "hi"
5959
bool(true)
6060
string(60) "<?php // tar-based phar archive stub file
6161
__HALT_COMPILER();"
6262
string(2) "hi"
6363
bool(true)
6464
int(4096)
65-
int(6651)
65+
int(6641)
6666
string(2) "hi"
6767
bool(true)
6868
bool(true)
69-
int(6651)
69+
int(6641)
7070
string(2) "hi"
7171
===DONE===

‎ext/phar/tests/zip/phar_convert_phar.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ __HALT_COMPILER();
4646
?>
4747
--EXPECT--
4848
bool(false)
49-
int(6651)
49+
int(6641)
5050
bool(true)
5151
string(60) "<?php // zip-based phar archive stub file
5252
__HALT_COMPILER();"
5353
bool(true)
54-
int(6651)
54+
int(6641)
5555
bool(true)
56-
int(6651)
56+
int(6641)
5757
===DONE===

0 commit comments

Comments
 (0)