This commit was manufactured by cvs2svn to create tag 'php_5_3_0alpha2'.php-5.3.0alpha2

17 files changed, 1 insertions, 801 deletions

diff --git a/tests/basic/bug20539.phpt b/tests/basic/bug20539.phpt
index 67cef3a4f6..2cfc00a356 100644
--- a/tests/basic/bug20539.phpt
+++ b/tests/basic/bug20539.phpt
@@ -1,8 +1,5 @@
 --TEST--
 Bug #20539 (PHP CLI Segmentation Fault)
---SKIPIF--
-<?php if (!extension_loaded("session")) die("skip session extension not available"); ?>
-<?php unlink(__DIR__. '/sess_' .session_id()); ?>
 --INI--
 session.auto_start=1
 session.save_handler=files
@@ -10,10 +7,7 @@ session.save_path=./tests/basic/
 --FILE--
 <?php
 	print "good :)\n";
-	$filename = __DIR__ . '/sess_' . session_id();
-	var_dump(unlink($filename));
+	unlink(dirname(__FILE__) . '/sess_' . session_id());
 ?>
 --EXPECT--
 good :)
-bool(true)
-
diff --git a/tests/basic/bug46313-win.phpt b/tests/basic/bug46313-win.phpt
deleted file mode 100644
index 276efe196f..0000000000
--- a/tests/basic/bug46313-win.phpt
+++ /dev/null
@@ -1,62 +0,0 @@
---TEST--
-Bug #46313 (Magic quotes broke $_FILES)
---SKIPIF--
-<?php if(substr(PHP_OS, 0, 3) != "WIN") die("skip Windows-only test"); ?>
---INI--
-magic_quotes_gpc=1
-file_uploads=1
-register_globals=1
---POST_RAW--
-Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="o1'file"; filename="o1'file.png"
-Content-Type: text/plain-file1
-
-1
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="o2'file"; filename="o2'file2.txt"
-Content-Type: text/plain-file2
-
-2
------------------------------20896060251896012921717172737--
---FILE--
-<?php
-var_dump($_FILES);
-var_dump($GLOBALS["o1\'file_name"]);
-var_dump($GLOBALS["o1\'file_name"] === $_FILES["o1\'file"]["name"]);
-var_dump($GLOBALS["o1\'file"]);
-var_dump($GLOBALS["o1\'file"] === $_FILES["o1\'file"]["tmp_name"]);
-?>
---EXPECTF--
-array(2) {
-  ["o1\'file"]=>
-  array(5) {
-    ["name"]=>
-    string(12) "o1"
-    ["type"]=>
-    string(16) "text/plain-file1"
-    ["tmp_name"]=>
-    string(14) "%s"
-    ["error"]=>
-    int(0)
-    ["size"]=>
-    int(1)
-  }
-  ["o2\'file"]=>
-  array(5) {
-    ["name"]=>
-    string(13) "o2"
-    ["type"]=>
-    string(16) "text/plain-file2"
-    ["tmp_name"]=>
-    string(14) "%s"
-    ["error"]=>
-    int(0)
-    ["size"]=>
-    int(1)
-  }
-}
-string(12) "o1"
-bool(true)
-string(%d) "%s"
-bool(true)
diff --git a/tests/basic/bug46313.phpt b/tests/basic/bug46313.phpt
deleted file mode 100644
index 275b267962..0000000000
--- a/tests/basic/bug46313.phpt
+++ /dev/null
@@ -1,62 +0,0 @@
---TEST--
-Bug #46313 (Magic quotes broke $_FILES)
---SKIPIF--
-<?php if(substr(PHP_OS, 0, 3) == "WIN") die("skip non-Windows test"); ?>
---INI--
-magic_quotes_gpc=1
-file_uploads=1
-register_globals=1
---POST_RAW--
-Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="o1'file"; filename="o1'file.png"
-Content-Type: text/plain-file1
-
-1
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="o2'file"; filename="o2'file2.txt"
-Content-Type: text/plain-file2
-
-2
------------------------------20896060251896012921717172737--
---FILE--
-<?php
-var_dump($_FILES);
-var_dump($GLOBALS["o1\'file_name"]);
-var_dump($GLOBALS["o1\'file_name"] === $_FILES["o1\'file"]["name"]);
-var_dump($GLOBALS["o1\'file"]);
-var_dump($GLOBALS["o1\'file"] === $_FILES["o1\'file"]["tmp_name"]);
-?>
---EXPECTF--
-array(2) {
-  ["o1\'file"]=>
-  array(5) {
-    ["name"]=>
-    string(12) "o1\'file.png"
-    ["type"]=>
-    string(16) "text/plain-file1"
-    ["tmp_name"]=>
-    string(%d) "%s"
-    ["error"]=>
-    int(0)
-    ["size"]=>
-    int(1)
-  }
-  ["o2\'file"]=>
-  array(5) {
-    ["name"]=>
-    string(13) "o2\'file2.txt"
-    ["type"]=>
-    string(16) "text/plain-file2"
-    ["tmp_name"]=>
-    string(%d) "%s"
-    ["error"]=>
-    int(0)
-    ["size"]=>
-    int(1)
-  }
-}
-string(12) "o1\'file.png"
-bool(true)
-string(%d) "%s"
-bool(true)
diff --git a/tests/basic/rfc1867_anonymous_upload.phpt b/tests/basic/rfc1867_anonymous_upload.phpt
deleted file mode 100644
index 0f58014a44..0000000000
--- a/tests/basic/rfc1867_anonymous_upload.phpt
+++ /dev/null
@@ -1,58 +0,0 @@
---TEST--
-rfc1867 anonymous upload
---INI--
-file_uploads=1
-error_reporting=E_ALL&~E_NOTICE
-comment=debug builds show some additional E_NOTICE errors
-upload_max_filesize=1024
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
---POST_RAW--
-Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; filename="file1.txt"
-Content-Type: text/plain-file1
-
-1
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; filename="file2.txt"
-Content-Type: text/plain-file2
-
-2
------------------------------20896060251896012921717172737--
---FILE--
-<?php
-var_dump($_FILES);
-var_dump($_POST);
-?>
---EXPECTF--
-array(2) {
-  [%d]=>
-  array(5) {
-    [%u|b%"name"]=>
-    %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
-    %string|unicode%(16) "text/plain-file1"
-    [%u|b%"tmp_name"]=>
-    %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
-    int(0)
-    [%u|b%"size"]=>
-    int(1)
-  }
-  [%d]=>
-  array(5) {
-    [%u|b%"name"]=>
-    %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
-    %string|unicode%(16) "text/plain-file2"
-    [%u|b%"tmp_name"]=>
-    %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
-    int(0)
-    [%u|b%"size"]=>
-    int(1)
-  }
-}
-array(0) {
-}
diff --git a/tests/basic/rfc1867_array_upload.phpt b/tests/basic/rfc1867_array_upload.phpt
deleted file mode 100644
index 7af6700060..0000000000
--- a/tests/basic/rfc1867_array_upload.phpt
+++ /dev/null
@@ -1,85 +0,0 @@
---TEST--
-rfc1867 array upload
---INI--
-file_uploads=1
-error_reporting=E_ALL&~E_NOTICE
-comment=debug builds show some additional E_NOTICE errors
-upload_max_filesize=1024
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
---POST_RAW--
-Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="file[]"; filename="file1.txt"
-Content-Type: text/plain-file1
-
-1
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="file[2]"; filename="file2.txt"
-Content-Type: text/plain-file2
-
-2
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="file[]"; filename="file3.txt"
-Content-Type: text/plain-file3
-
-3
------------------------------20896060251896012921717172737--
---FILE--
-<?php
-var_dump($_FILES);
-var_dump($_POST);
-?>
---EXPECTF--
-array(1) {
-  [%u|b%"file"]=>
-  array(5) {
-    [%u|b%"name"]=>
-    array(3) {
-      [0]=>
-      %unicode|string%(9) "file1.txt"
-      [2]=>
-      %unicode|string%(9) "file2.txt"
-      [3]=>
-      %unicode|string%(9) "file3.txt"
-    }
-    [%u|b%"type"]=>
-    array(3) {
-      [0]=>
-      %unicode|string%(16) "text/plain-file1"
-      [2]=>
-      %unicode|string%(16) "text/plain-file2"
-      [3]=>
-      %unicode|string%(16) "text/plain-file3"
-    }
-    [%u|b%"tmp_name"]=>
-    array(3) {
-      [0]=>
-      %unicode|string%(%d) "%s"
-      [2]=>
-      %unicode|string%(%d) "%s"
-      [3]=>
-      %unicode|string%(%d) "%s"
-    }
-    [%u|b%"error"]=>
-    array(3) {
-      [0]=>
-      int(0)
-      [2]=>
-      int(0)
-      [3]=>
-      int(0)
-    }
-    [%u|b%"size"]=>
-    array(3) {
-      [0]=>
-      int(1)
-      [2]=>
-      int(1)
-      [3]=>
-      int(1)
-    }
-  }
-}
-array(0) {
-}
diff --git a/tests/basic/rfc1867_boundary_1.phpt b/tests/basic/rfc1867_boundary_1.phpt
deleted file mode 100644
index 35fe3a3f6e..0000000000
--- a/tests/basic/rfc1867_boundary_1.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-rfc1867 boundary 1
---INI--
-post_max_size=1024
-error_reporting=E_ALL&~E_NOTICE
-comment=debug builds show some additional E_NOTICE errors
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
---POST_RAW--
-Content-Type: multipart/form-data; boundary="------------------------------------foobar"
---------------------------------------foobar
-Content-Disposition: form-data; name="foobar"
-
-1
---------------------------------------foobar--
---FILE--
-<?php
-var_dump($_FILES);
-var_dump($_POST);
-?>
---EXPECTF--
-array(0) {
-}
-array(1) {
-  [%u|b%"foobar"]=>
-  %unicode|string%(1) "1"
-}
diff --git a/tests/basic/rfc1867_boundary_2.phpt b/tests/basic/rfc1867_boundary_2.phpt
deleted file mode 100644
index 575853bb66..0000000000
--- a/tests/basic/rfc1867_boundary_2.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-rfc1867 boundary 2
---INI--
-post_max_size=1024
-error_reporting=E_ALL&~E_NOTICE
-comment=debug builds show some additional E_NOTICE errors
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
---POST_RAW--
-Content-Type: multipart/form-data; boundary=------------------------------------foo, bar
---------------------------------------foo
-Content-Disposition: form-data; name="foobar"
-
-1
---------------------------------------foo--
---FILE--
-<?php
-var_dump($_FILES);
-var_dump($_POST);
-?>
---EXPECTF--
-array(0) {
-}
-array(1) {
-  [%u|b%"foobar"]=>
-  %unicode|string%(1) "1"
-}
diff --git a/tests/basic/rfc1867_empty_upload.phpt b/tests/basic/rfc1867_empty_upload.phpt
deleted file mode 100644
index 10ed419d4d..0000000000
--- a/tests/basic/rfc1867_empty_upload.phpt
+++ /dev/null
@@ -1,90 +0,0 @@
---TEST--
-rfc1867 empty upload
---INI--
-file_uploads=1
-error_reporting=E_ALL&~E_NOTICE
-comment=debug builds show some additional E_NOTICE errors
-upload_max_filesize=1024
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
---POST_RAW--
-Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="foo"
-
-
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="file1"; filename="file1.txt"
-Content-Type: text/plain-file1
-
-1
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="file2"; filename=""
-Content-Type: text/plain-file2
-
-
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="file3"; filename="file3.txt"
-Content-Type: text/plain-file3
-
-3
------------------------------20896060251896012921717172737--
---FILE--
-<?php
-var_dump($_FILES);
-var_dump($_POST);
-if (is_uploaded_file($_FILES["file1"]["tmp_name"])) {
-	var_dump(file_get_contents($_FILES["file1"]["tmp_name"]));
-}
-if (is_uploaded_file($_FILES["file3"]["tmp_name"])) {
-	var_dump(file_get_contents($_FILES["file3"]["tmp_name"]));
-}
-?>
---EXPECTF--
-array(3) {
-  [%u|b%"file1"]=>
-  array(5) {
-    [%u|b%"name"]=>
-    %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
-    %string|unicode%(16) "text/plain-file1"
-    [%u|b%"tmp_name"]=>
-    %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
-    int(0)
-    [%u|b%"size"]=>
-    int(1)
-  }
-  [%u|b%"file2"]=>
-  array(5) {
-    [%u|b%"name"]=>
-    %string|unicode%(0) ""
-    [%u|b%"type"]=>
-    %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
-    %string|unicode%(0) ""
-    [%u|b%"error"]=>
-    int(4)
-    [%u|b%"size"]=>
-    int(0)
-  }
-  [%u|b%"file3"]=>
-  array(5) {
-    [%u|b%"name"]=>
-    %string|unicode%(9) "file3.txt"
-    [%u|b%"type"]=>
-    %string|unicode%(16) "text/plain-file3"
-    [%u|b%"tmp_name"]=>
-    %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
-    int(0)
-    [%u|b%"size"]=>
-    int(1)
-  }
-}
-array(1) {
-  [%u|b%"foo"]=>
-  %unicode|string%(0) ""
-}
-string(1) "1"
-string(1) "3"
diff --git a/tests/basic/rfc1867_file_upload_disabled.phpt b/tests/basic/rfc1867_file_upload_disabled.phpt
deleted file mode 100644
index a0d5271d9c..0000000000
--- a/tests/basic/rfc1867_file_upload_disabled.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-rfc1867 file_upload disabled
---INI--
-file_uploads=0
-error_reporting=E_ALL&~E_NOTICE
-comment=debug builds show some additional E_NOTICE errors
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
---POST_RAW--
-Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="foo"
-
-bar
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="file1"; filename="file1.txt"
-Content-Type: text/plain-file1
-
-1
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="bar"
-
-foo
------------------------------20896060251896012921717172737--
---FILE--
-<?php
-var_dump($_FILES);
-var_dump($_POST);
-?>
---EXPECTF--
-array(0) {
-}
-array(2) {
-  [%u|b%"foo"]=>
-  %unicode|string%(3) "bar"
-  [%u|b%"bar"]=>
-  %unicode|string%(3) "foo"
-}
diff --git a/tests/basic/rfc1867_garbled_mime_headers.phpt b/tests/basic/rfc1867_garbled_mime_headers.phpt
deleted file mode 100644
index 9bee926d9b..0000000000
--- a/tests/basic/rfc1867_garbled_mime_headers.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-rfc1867 garbled mime headers
---INI--
-file_uploads=1
-error_reporting=E_ALL&~E_NOTICE
-comment=debug builds show some additional E_NOTICE errors
-upload_max_filesize=1024
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
---POST_RAW--
-Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
------------------------------20896060251896012921717172737
-Content-Disposition: form-data
-
-
------------------------------20896060251896012921717172737--
---FILE--
-<?php
-var_dump($_FILES);
-var_dump($_POST);
-?>
---EXPECTF--
-Warning: File Upload Mime headers garbled in %s
-array(0) {
-}
-array(0) {
-}
diff --git a/tests/basic/rfc1867_invalid_boundary.phpt b/tests/basic/rfc1867_invalid_boundary.phpt
deleted file mode 100644
index 3c66390162..0000000000
--- a/tests/basic/rfc1867_invalid_boundary.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-rfc1867 invalid boundary
---INI--
-post_max_size=1024
-error_reporting=E_ALL&~E_NOTICE
-comment=debug builds show some additional E_NOTICE errors
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
---POST_RAW--
-Content-Type: multipart/form-data; boundary="foobar
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="foobar"
-
-1
------------------------------20896060251896012921717172737--
---FILE--
-<?php
-var_dump($_FILES);
-var_dump($_POST);
-?>
---EXPECTF--
-Warning: Invalid boundary in multipart/form-data POST data in %s
-array(0) {
-}
-array(0) {
-}
diff --git a/tests/basic/rfc1867_malicious_input.phpt b/tests/basic/rfc1867_malicious_input.phpt
deleted file mode 100644
index 74c7ad0f7e..0000000000
--- a/tests/basic/rfc1867_malicious_input.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-rfc1867 malicious input
---INI--
-file_uploads=1
-error_reporting=E_ALL&~E_NOTICE
-comment=debug builds show some additional E_NOTICE errors
-upload_max_filesize=1024
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
---POST_RAW--
-Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="foo[]bar"; filename="file1.txt"
-Content-Type: text/plain-file1
-
-1
------------------------------20896060251896012921717172737--
---FILE--
-<?php
-var_dump($_FILES);
-var_dump($_POST);
-?>
---EXPECTF--
-array(0) {
-}
-array(0) {
-}
diff --git a/tests/basic/rfc1867_max_file_size.phpt b/tests/basic/rfc1867_max_file_size.phpt
deleted file mode 100644
index 0671dc5f04..0000000000
--- a/tests/basic/rfc1867_max_file_size.phpt
+++ /dev/null
@@ -1,90 +0,0 @@
---TEST--
-rfc1867 MAX_FILE_SIZE
---INI--
-file_uploads=1
-error_reporting=E_ALL&~E_NOTICE
-comment=debug builds show some additional E_NOTICE errors
-upload_max_filesize=1024
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
---POST_RAW--
-Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="MAX_FILE_SIZE"
-
-1
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="file1"; filename="file1.txt"
-Content-Type: text/plain-file1
-
-1
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="file2"; filename="file2.txt"
-Content-Type: text/plain-file2
-
-22
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="file3"; filename="C:\foo\bar/file3.txt"
-Content-Type: text/plain-file3;
-
-3
------------------------------20896060251896012921717172737--
---FILE--
-<?php
-var_dump($_FILES);
-var_dump($_POST);
-if (is_uploaded_file($_FILES["file1"]["tmp_name"])) {
-	var_dump(file_get_contents($_FILES["file1"]["tmp_name"]));
-}
-if (is_uploaded_file($_FILES["file3"]["tmp_name"])) {
-	var_dump(file_get_contents($_FILES["file3"]["tmp_name"]));
-}
-?>
---EXPECTF--
-array(3) {
-  [%u|b%"file1"]=>
-  array(5) {
-    [%u|b%"name"]=>
-    %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
-    %string|unicode%(16) "text/plain-file1"
-    [%u|b%"tmp_name"]=>
-    %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
-    int(0)
-    [%u|b%"size"]=>
-    int(1)
-  }
-  [%u|b%"file2"]=>
-  array(5) {
-    [%u|b%"name"]=>
-    %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
-    %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
-    %string|unicode%(0) ""
-    [%u|b%"error"]=>
-    int(2)
-    [%u|b%"size"]=>
-    int(0)
-  }
-  [%u|b%"file3"]=>
-  array(5) {
-    [%u|b%"name"]=>
-    %string|unicode%(9) "file3.txt"
-    [%u|b%"type"]=>
-    %string|unicode%(16) "text/plain-file3"
-    [%u|b%"tmp_name"]=>
-    %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
-    int(0)
-    [%u|b%"size"]=>
-    int(1)
-  }
-}
-array(1) {
-  [%u|b%"MAX_FILE_SIZE"]=>
-  %string|unicode%(1) "1"
-}
-string(1) "1"
-string(1) "3"
diff --git a/tests/basic/rfc1867_missing_boundary.phpt b/tests/basic/rfc1867_missing_boundary.phpt
deleted file mode 100644
index 9c8726cd67..0000000000
--- a/tests/basic/rfc1867_missing_boundary.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-rfc1867 missing boundary
---INI--
-post_max_size=1024
-error_reporting=E_ALL&~E_NOTICE
-comment=debug builds show some additional E_NOTICE errors
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
---POST_RAW--
-Content-Type: multipart/form-data
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="foobar"
-
-1
------------------------------20896060251896012921717172737--
---FILE--
-<?php
-var_dump($_FILES);
-var_dump($_POST);
-?>
---EXPECTF--
-Warning: Missing boundary in multipart/form-data POST data in %s
-array(0) {
-}
-array(0) {
-}
diff --git a/tests/basic/rfc1867_missing_boundary_2.phpt b/tests/basic/rfc1867_missing_boundary_2.phpt
deleted file mode 100644
index cace44383b..0000000000
--- a/tests/basic/rfc1867_missing_boundary_2.phpt
+++ /dev/null
@@ -1,39 +0,0 @@
---TEST--
-rfc1867 missing boundary 2
---INI--
-file_uploads=1
-error_reporting=E_ALL&~E_NOTICE
-comment=debug builds show some additional E_NOTICE errors
-upload_max_filesize=1024
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
---POST_RAW--
-Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="file1"; filename="file1.txt"
-Content-Type: text/plain-file1
-
-1
---FILE--
-<?php
-var_dump($_FILES);
-var_dump($_POST);
-?>
---EXPECTF--
-array(1) {
-  [%u|b%"file1"]=>
-  array(5) {
-    [%u|b%"name"]=>
-    %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
-    %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
-    %string|unicode%(0) ""
-    [%u|b%"error"]=>
-    int(3)
-    [%u|b%"size"]=>
-    int(0)
-  }
-}
-array(0) {
-}
diff --git a/tests/basic/rfc1867_post_max_filesize.phpt b/tests/basic/rfc1867_post_max_filesize.phpt
deleted file mode 100644
index 4276d496ba..0000000000
--- a/tests/basic/rfc1867_post_max_filesize.phpt
+++ /dev/null
@@ -1,84 +0,0 @@
---TEST--
-rfc1867 post_max_filesize
---INI--
-file_uploads=1
-error_reporting=E_ALL&~E_NOTICE
-comment=debug builds show some additional E_NOTICE errors
-upload_max_filesize=1
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
---POST_RAW--
-Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="file1"; filename="file1.txt"
-Content-Type: text/plain-file1
-
-1
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="file2"; filename="file2.txt"
-Content-Type: text/plain-file2
-
-22
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="file3"; filename="file3.txt"
-Content-Type: text/plain-file3
-
-3
------------------------------20896060251896012921717172737--
---FILE--
-<?php
-var_dump($_FILES);
-var_dump($_POST);
-if (is_uploaded_file($_FILES["file1"]["tmp_name"])) {
-	var_dump(file_get_contents($_FILES["file1"]["tmp_name"]));
-}
-if (is_uploaded_file($_FILES["file3"]["tmp_name"])) {
-	var_dump(file_get_contents($_FILES["file3"]["tmp_name"]));
-}
-?>
---EXPECTF--
-array(3) {
-  [%u|b%"file1"]=>
-  array(5) {
-    [%u|b%"name"]=>
-    %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
-    %string|unicode%(16) "text/plain-file1"
-    [%u|b%"tmp_name"]=>
-    %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
-    int(0)
-    [%u|b%"size"]=>
-    int(1)
-  }
-  [%u|b%"file2"]=>
-  array(5) {
-    [%u|b%"name"]=>
-    %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
-    %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
-    %string|unicode%(0) ""
-    [%u|b%"error"]=>
-    int(1)
-    [%u|b%"size"]=>
-    int(0)
-  }
-  [%u|b%"file3"]=>
-  array(5) {
-    [%u|b%"name"]=>
-    %string|unicode%(9) "file3.txt"
-    [%u|b%"type"]=>
-    %string|unicode%(16) "text/plain-file3"
-    [%u|b%"tmp_name"]=>
-    %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
-    int(0)
-    [%u|b%"size"]=>
-    int(1)
-  }
-}
-array(0) {
-}
-string(1) "1"
-string(1) "3"
diff --git a/tests/basic/rfc1867_post_max_size.phpt b/tests/basic/rfc1867_post_max_size.phpt
deleted file mode 100644
index 5e40ccaf45..0000000000
--- a/tests/basic/rfc1867_post_max_size.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-rfc1867 post_max_size
---INI--
-post_max_size=1
-error_reporting=E_ALL&~E_NOTICE
-comment=debug builds show some additional E_NOTICE errors
---SKIPIF--
-<?php if (php_sapi_name()=='cli') die('skip'); ?>
---POST_RAW--
-Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
------------------------------20896060251896012921717172737
-Content-Disposition: form-data; name="foobar"
-
-1
------------------------------20896060251896012921717172737--
---FILE--
-<?php
-var_dump($_FILES);
-var_dump($_POST);
-?>
---EXPECTF--
-Warning: POST Content-Length of %d bytes exceeds the limit of 1 bytes in %s
-array(0) {
-}
-array(0) {
-}