diff options
| author | Anatol Belski <ab@php.net> | 2014-10-16 13:49:35 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-16 13:49:35 +0200 |
| commit | 69fa6523e89c4731b576a46921fd30f0aad7734e (patch) | |
| tree | a389c99a119b5cf1930682ab340266f07354d7bb /main/php_streams.h | |
| parent | 7f1107de9167ab1443a13491f5b70aa3f10fd323 (diff) | |
| parent | 53a8584123f359c2c32f1869d98e4dd9e0a7a6ab (diff) | |
| download | php-git-69fa6523e89c4731b576a46921fd30f0aad7734e.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
Fix allocator for 64bit zend_long with 32bit long
Use intptr_t for zend_intptr_t typedef
Fix format strings in zend_alloc
Drop zend_long64 in favor of int64_t
Removed deprecated fields
NEWS
cleanup NEWS
removing the NEWS entry as we had to revert this fix for now
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
Revert "fix TS build"
Revert "Merge branch 'PHP-5.4' into PHP-5.5"
Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"
Revert "Bug #41631: Fix regression from first attempt (6569db8)"
NEWS
Fixed Bug #65171 imagescale() fails
Fixed bug #68234
Fixed bug #68215 (Behavior of foreach has changed)
Revert "Bug #41631: Observe socket read timeouts in SSL streams"
PHP-5.6.3 is next
update NEWS, 5.6.2 will be a security-only release
Diffstat (limited to 'main/php_streams.h')
| -rw-r--r-- | main/php_streams.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/main/php_streams.h b/main/php_streams.h index 34d7676f09..77a2234d92 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -295,9 +295,6 @@ PHPAPI size_t _php_stream_write(php_stream *stream, const char *buf, size_t coun #define php_stream_write_string(stream, str) _php_stream_write(stream, str, strlen(str) TSRMLS_CC) #define php_stream_write(stream, buf, count) _php_stream_write(stream, (buf), (count) TSRMLS_CC) -PHPAPI void _php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_DC); -#define php_stream_fill_read_buffer(stream, size) _php_stream_fill_read_buffer((stream), (size) TSRMLS_CC) - #ifdef ZTS PHPAPI size_t _php_stream_printf(php_stream *stream TSRMLS_DC, const char *fmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 3, 4); #else |