]> granicus.if.org Git - php/commitdiff
Revert "Merge branch 'PHP-5.6' into PHP-7.0"
authorAnatol Belski <ab@php.net>
Tue, 30 Aug 2016 10:06:46 +0000 (12:06 +0200)
committerAnatol Belski <ab@php.net>
Tue, 30 Aug 2016 10:06:46 +0000 (12:06 +0200)
This reverts commit 65f0c163f929e48162efc3491fee918bb5c4c280, reversing
changes made to 4b45c0a9a7d48a69edba9e00270c49bbe17af4d1.

ext/standard/file.c
ext/standard/tests/file/bug71882.phpt [deleted file]

index e228ce6121db2971bf5cc21a219d18f66e75add6..5c90b305591a078e7e90eeca7512849bf71f64de 100644 (file)
@@ -1546,11 +1546,6 @@ PHP_NAMED_FUNCTION(php_if_ftruncate)
                RETURN_FALSE;
        }
 
-       if (size < 0) {
-               php_error_docref(NULL, E_WARNING, "Negative size is not supported");
-               RETURN_FALSE;
-       }
-
        PHP_STREAM_TO_ZVAL(stream, fp);
 
        if (!php_stream_truncate_supported(stream)) {
diff --git a/ext/standard/tests/file/bug71882.phpt b/ext/standard/tests/file/bug71882.phpt
deleted file mode 100644 (file)
index ae0137b..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---TEST--
-Bug #71882 (Negative ftruncate() on php://memory exhausts memory)
---FILE--
-<?php
-$fd = fopen("php://memory", "w+");
-ftruncate($fd, -1);
-?>
-==DONE==
---EXPECTF--
-Warning: ftruncate(): Negative size is not supported in %s%ebug71882.php on line %d
-==DONE==