Revert "Add test for bug 75577: issue where RFC3339_EXTENDED could not be used via DateTime::createFromFormat (#2945)"

This reverts commit ff385755a5.

Zend/zend.h

@@ -22,7 +22,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "3.2.0-dev"
+#define ZEND_VERSION "3.2.0"
 
 #define ZEND_ENGINE_3
 

ext/date/php_date.c

@@ -2290,8 +2290,8 @@ static HashTable *date_object_get_properties(zval *object) /* {{{ */
 
 				ZSTR_LEN(tmpstr) = snprintf(ZSTR_VAL(tmpstr), sizeof("+05:00"), "%c%02d:%02d",
 					utc_offset < 0 ? '-' : '+',
-					php_date_llabs(utc_offset / 3600),
-					php_date_llabs(((utc_offset % 3600) / 60)));
+					abs(utc_offset / 3600),
+					abs(((utc_offset % 3600) / 60)));
 
 				ZVAL_NEW_STR(&zv, tmpstr);
 				}
@@ -2382,8 +2382,8 @@ static HashTable *date_object_get_properties_timezone(zval *object) /* {{{ */
 
 			ZSTR_LEN(tmpstr) = snprintf(ZSTR_VAL(tmpstr), sizeof("+05:00"), "%c%02d:%02d",
 				tzobj->tzi.utc_offset < 0 ? '-' : '+',
-				php_date_llabs(tzobj->tzi.utc_offset / 3600),
-				php_date_llabs(((tzobj->tzi.utc_offset % 3600) / 60)));
+				abs(tzobj->tzi.utc_offset / 3600),
+				abs(((tzobj->tzi.utc_offset % 3600) / 60)));
 
 			ZVAL_NEW_STR(&zv, tmpstr);
 			}
@@ -3912,8 +3912,8 @@ PHP_FUNCTION(timezone_name_get)
 
 			ZSTR_LEN(tmpstr) = snprintf(ZSTR_VAL(tmpstr), sizeof("+05:00"), "%c%02d:%02d",
 				utc_offset < 0 ? '-' : '+',
-				php_date_llabs(utc_offset / 3600),
-				php_date_llabs(((utc_offset % 3600) / 60)));
+				abs(utc_offset / 3600),
+				abs(((utc_offset % 3600) / 60)));
 
 			RETURN_NEW_STR(tmpstr);
 			}

ext/standard/tests/streams/stream_set_chunk_size.phpt

@@ -39,7 +39,7 @@ var_dump(fwrite($f, str_repeat('b', 3)));
 
 echo "should return previous chunk size (1)\n";
 var_dump(stream_set_chunk_size($f, 100));
-echo "should elicit 3 reads of size 100 (chunk size)\n";
+echo "should elicit one read of size 100 (chunk size)\n";
 var_dump(strlen(fread($f, 250)));
 echo "should elicit one read of size 100 (chunk size)\n";
 var_dump(strlen(fread($f, 50)));
@@ -67,15 +67,13 @@ write with size: 1
 int(3)
 should return previous chunk size (1)
 int(1)
-should elicit 3 reads of size 100 (chunk size)
-read with size: 100
-read with size: 100
-read with size: 100
-int(250)
 should elicit one read of size 100 (chunk size)
+read with size: 100
+int(100)
+should elicit one read of size 100 (chunk size)
+read with size: 100
 int(50)
 should elicit no read because there is sufficient cached data
-read with size: 100
 int(50)
 should elicit 2 writes of size 100 and one of size 50
 write with size: 100

main/streams/streams.c

@@ -24,6 +24,7 @@
 #define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
+#include "php_memory_streams.h"
 #include "php_network.h"
 #include "php_open_temporary_file.h"
 #include "ext/standard/file.h"
@@ -709,8 +710,10 @@ PHPAPI size_t _php_stream_read(php_stream *stream, char *buf, size_t size)
 			break;
 		}
 
-		/* just break anyway, to avoid greedy read */
-		if (!stream->wrapper || stream->wrapper->is_url) {
+		/* just break anyway, to avoid greedy read for file://, php://memory, and php://temp */
+		if ((stream->wrapper != &php_plain_files_wrapper) &&
+			(stream->ops != &php_stream_memory_ops) &&
+			(stream->ops != &php_stream_temp_ops)) {
 			break;
 		}
 	}