diff options
| author | Anatol Belski <ab@php.net> | 2014-12-15 13:57:43 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-15 13:57:43 +0100 |
| commit | f62ad3bc578eb7a5494b7816f31dc31227483aed (patch) | |
| tree | bd0302ba9597655058c1526cfed29cba1df83601 /main/php_streams.h | |
| parent | dba27372ec59af3f0ecc02b264b9c3a620b1a5bf (diff) | |
| parent | 178363cbff9cc2366b75eb11fd61473da238f7c6 (diff) | |
| download | php-git-f62ad3bc578eb7a5494b7816f31dc31227483aed.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
made the apache ini holders to be zend_bool
Removed useless local variable
Use simpler functions
Fixed test
small fixes to UPGRADING
Reorder to save alignment size (of course, only for common used structs)
Diffstat (limited to 'main/php_streams.h')
| -rw-r--r-- | main/php_streams.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/php_streams.h b/main/php_streams.h index c0f16b6126..29abb3ebd5 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -210,6 +210,8 @@ struct _php_stream { zend_resource *ctx; int flags; /* PHP_STREAM_FLAG_XXX */ + int eof; + /* buffer */ zend_off_t position; /* of underlying stream */ unsigned char *readbuf; @@ -220,8 +222,6 @@ struct _php_stream { /* how much data to read when filling buffer */ size_t chunk_size; - int eof; - #if ZEND_DEBUG const char *open_filename; uint open_lineno; |