diff options
| author | Nikita Popov <nikic@php.net> | 2012-08-13 16:51:41 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-08-13 16:54:53 +0200 |
| commit | f4ce3646285fbdd3354ca86ae67857b6ee8f7e3a (patch) | |
| tree | ad8597fe53119f9eb1daac0df4e554d3c7861c21 /Zend/zend_stream.c | |
| parent | 268740d9848d435054ce73a8cfe36b2b732cd1f7 (diff) | |
| parent | 80d5ae3cea4c6fdd85789edfde0e2da721a0741b (diff) | |
| download | php-git-f4ce3646285fbdd3354ca86ae67857b6ee8f7e3a.tar.gz | |
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
This is just an intial merge. It does not yet make generators and finally
work together.
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Zend/zend_vm_execute.skl
Zend/zend_vm_opcodes.h
Diffstat (limited to 'Zend/zend_stream.c')
| -rw-r--r-- | Zend/zend_stream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_stream.c b/Zend/zend_stream.c index 27df9537af..30cc3a5ba4 100644 --- a/Zend/zend_stream.c +++ b/Zend/zend_stream.c @@ -79,7 +79,7 @@ static size_t zend_stream_stdio_fsizer(void *handle TSRMLS_DC) /* {{{ */ static void zend_stream_unmap(zend_stream *stream TSRMLS_DC) { /* {{{ */ #if HAVE_MMAP if (stream->mmap.map) { - munmap(stream->mmap.map, stream->mmap.len); + munmap(stream->mmap.map, stream->mmap.len + ZEND_MMAP_AHEAD); } else #endif if (stream->mmap.buf) { |