Fix CRLF line-endings in tests

Also fix a single instance of CRLF in ibase_query.c.

3 files changed, 134 insertions, 134 deletions

diff --git a/tests/basic/bug53180.phpt b/tests/basic/bug53180.phpt
index 5c2eb76952..16783de8a7 100644
--- a/tests/basic/bug53180.phpt
+++ b/tests/basic/bug53180.phpt
@@ -1,19 +1,19 @@
---TEST--

-Bug #53180 (post_max_size=0 partly not working)

---INI--

-post_max_size=0

---POST--

-email=foo&password=bar&submit=Log+on

---FILE--

-<?php

-var_dump($_POST);

-?>

---EXPECT--

-array(3) {

-  ["email"]=>

-  string(3) "foo"

-  ["password"]=>

-  string(3) "bar"

-  ["submit"]=>

-  string(6) "Log on"

-}

+--TEST--
+Bug #53180 (post_max_size=0 partly not working)
+--INI--
+post_max_size=0
+--POST--
+email=foo&password=bar&submit=Log+on
+--FILE--
+<?php
+var_dump($_POST);
+?>
+--EXPECT--
+array(3) {
+  ["email"]=>
+  string(3) "foo"
+  ["password"]=>
+  string(3) "bar"
+  ["submit"]=>
+  string(6) "Log on"
+}
diff --git a/tests/basic/req44164.phpt b/tests/basic/req44164.phpt
index d0082861f2..7a142f5fb9 100644
--- a/tests/basic/req44164.phpt
+++ b/tests/basic/req44164.phpt
@@ -1,17 +1,17 @@
---TEST--

-Req #44164 (Handle "Content-Length" HTTP header when zlib.output_compression active)

---SKIPIF--

-<?php

-if (!function_exists('gzdeflate'))

-    die("skip zlib extension required");

-?>

---INI--

-zlib.output_compression=On

---ENV--

-HTTP_ACCEPT_ENCODING=gzip

---FILE--

-<?php

-header("Content-length: 200");

-echo str_repeat("a", 200);

---EXPECT--

-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

+--TEST--
+Req #44164 (Handle "Content-Length" HTTP header when zlib.output_compression active)
+--SKIPIF--
+<?php
+if (!function_exists('gzdeflate'))
+    die("skip zlib extension required");
+?>
+--INI--
+zlib.output_compression=On
+--ENV--
+HTTP_ACCEPT_ENCODING=gzip
+--FILE--
+<?php
+header("Content-length: 200");
+echo str_repeat("a", 200);
+--EXPECT--
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/tests/basic/rfc1867_max_file_uploads_empty_files.phpt b/tests/basic/rfc1867_max_file_uploads_empty_files.phpt
index 4da55f2597..6ea7915c25 100644
--- a/tests/basic/rfc1867_max_file_uploads_empty_files.phpt
+++ b/tests/basic/rfc1867_max_file_uploads_empty_files.phpt
@@ -1,98 +1,98 @@
---TEST--

-rfc1867 max_file_uploads - empty files shouldn't count

---INI--

-file_uploads=1

-max_file_uploads=2

---POST_RAW--

-Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737

------------------------------20896060251896012921717172737

-Content-Disposition: form-data; name="file2"; filename=""

-Content-Type: text/plain-file

-

-

------------------------------20896060251896012921717172737

-Content-Disposition: form-data; name="file3"; filename=""

-Content-Type: text/plain-file

-

-33

------------------------------20896060251896012921717172737

-Content-Disposition: form-data; name="file4"; filename="file4.txt"

-Content-Type: text/plain-file

-

-

------------------------------20896060251896012921717172737

-Content-Disposition: form-data; name="file1"; filename="file1.txt"

-Content-Type: text/plain-file

-

-1

------------------------------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["file4"]["tmp_name"])) {

-	var_dump(file_get_contents($_FILES["file4"]["tmp_name"]));

-}

-?>

---EXPECTF--

-array(4) {

-  ["file2"]=>

-  array(5) {

-    ["name"]=>

-    string(0) ""

-    ["type"]=>

-    string(0) ""

-    ["tmp_name"]=>

-    string(0) ""

-    ["error"]=>

-    int(4)

-    ["size"]=>

-    int(0)

-  }

-  ["file3"]=>

-  array(5) {

-    ["name"]=>

-    string(0) ""

-    ["type"]=>

-    string(0) ""

-    ["tmp_name"]=>

-    string(0) ""

-    ["error"]=>

-    int(4)

-    ["size"]=>

-    int(0)

-  }

-  ["file4"]=>

-  array(5) {

-    ["name"]=>

-    string(9) "file4.txt"

-    ["type"]=>

-    string(15) "text/plain-file"

-    ["tmp_name"]=>

-    string(%d) "%s"

-    ["error"]=>

-    int(0)

-    ["size"]=>

-    int(0)

-  }

-  ["file1"]=>

-  array(5) {

-    ["name"]=>

-    string(9) "file1.txt"

-    ["type"]=>

-    string(15) "text/plain-file"

-    ["tmp_name"]=>

-    string(%d) "%s"

-    ["error"]=>

-    int(0)

-    ["size"]=>

-    int(1)

-  }

-}

-array(0) {

-}

-string(1) "1"

-string(0) ""

+--TEST--
+rfc1867 max_file_uploads - empty files shouldn't count
+--INI--
+file_uploads=1
+max_file_uploads=2
+--POST_RAW--
+Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
+-----------------------------20896060251896012921717172737
+Content-Disposition: form-data; name="file2"; filename=""
+Content-Type: text/plain-file
+
+
+-----------------------------20896060251896012921717172737
+Content-Disposition: form-data; name="file3"; filename=""
+Content-Type: text/plain-file
+
+33
+-----------------------------20896060251896012921717172737
+Content-Disposition: form-data; name="file4"; filename="file4.txt"
+Content-Type: text/plain-file
+
+
+-----------------------------20896060251896012921717172737
+Content-Disposition: form-data; name="file1"; filename="file1.txt"
+Content-Type: text/plain-file
+
+1
+-----------------------------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["file4"]["tmp_name"])) {
+	var_dump(file_get_contents($_FILES["file4"]["tmp_name"]));
+}
+?>
+--EXPECTF--
+array(4) {
+  ["file2"]=>
+  array(5) {
+    ["name"]=>
+    string(0) ""
+    ["type"]=>
+    string(0) ""
+    ["tmp_name"]=>
+    string(0) ""
+    ["error"]=>
+    int(4)
+    ["size"]=>
+    int(0)
+  }
+  ["file3"]=>
+  array(5) {
+    ["name"]=>
+    string(0) ""
+    ["type"]=>
+    string(0) ""
+    ["tmp_name"]=>
+    string(0) ""
+    ["error"]=>
+    int(4)
+    ["size"]=>
+    int(0)
+  }
+  ["file4"]=>
+  array(5) {
+    ["name"]=>
+    string(9) "file4.txt"
+    ["type"]=>
+    string(15) "text/plain-file"
+    ["tmp_name"]=>
+    string(%d) "%s"
+    ["error"]=>
+    int(0)
+    ["size"]=>
+    int(0)
+  }
+  ["file1"]=>
+  array(5) {
+    ["name"]=>
+    string(9) "file1.txt"
+    ["type"]=>
+    string(15) "text/plain-file"
+    ["tmp_name"]=>
+    string(%d) "%s"
+    ["error"]=>
+    int(0)
+    ["size"]=>
+    int(1)
+  }
+}
+array(0) {
+}
+string(1) "1"
+string(0) ""