summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-7.4'Nikita Popov2019-07-171-9/+6
|\
| * Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-07-171-9/+6
| |\
| | * Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-07-171-9/+6
| | |\
| | | * Fixed bug #69100Nikita Popov2019-07-171-9/+6
| | | * next is 7.2.22Remi Collet2019-07-161-3/+3
| | | * next is 7.2.21Remi Collet2019-06-111-3/+3
| | | * Bump for 7.2.20Sara Golemon2019-05-141-3/+3
| | | * next is 7.2.19Remi Collet2019-04-161-3/+3
| * | | Avoid duplicate fstat() for includesNikita Popov2019-07-171-1/+6
* | | | Avoid duplicate fstat() for includesNikita Popov2019-07-171-1/+6
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-07-171-0/+11
|\ \ \ \ | |/ / /
| * | | Revert "Avoid unused fstat() call"Nikita Popov2019-07-171-0/+11
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-07-171-11/+0
|\ \ \ \ | |/ / /
| * | | Avoid unused fstat() callNikita Popov2019-07-171-11/+0
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-07-171-0/+2
|\ \ \ \ | |/ / /
| * | | Avoid double buffering in Zend streamsNikita Popov2019-07-171-0/+2
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-07-161-4/+4
|\ \ \ \ | |/ / /
| * | | Remove ZEND_HANDLE_MAPPEDNikita Popov2019-07-161-3/+4
| * | | Drop free_filename field from zend_file_handleNikita Popov2019-07-161-1/+0
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-07-162-37/+28
|\ \ \ \ | |/ / /
| * | | Introduce zend_stream_init_filename()Nikita Popov2019-07-161-9/+3
| * | | Introduce zend_stream_init_fp() APINikita Popov2019-07-161-28/+25
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-07-161-50/+2
|\ \ \ \ | |/ / /
| * | | Fix bug #52752 by not using mmap() to lex filesNikita Popov2019-07-161-50/+2
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-07-151-1/+1
|\ \ \ \ | |/ / /
| * | | Small typo and proto name fixGeorge Peter Banyard2019-07-151-1/+1
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-07-151-6/+4
|\ \ \ \ | |/ / /
| * | | Move shebang handling into the lexerNikita Popov2019-07-151-6/+4
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-07-132-6/+4
|\ \ \ \ | |/ / /
| * | | Convert all php_error_docref0 to php_error_docrefGeorge Peter Banyard2019-07-132-6/+4
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-07-121-35/+0
|\ \ \ \ | |/ / /
| * | | Remove duplicate XtOffsetOf() definitions in php.hNikita Popov2019-07-121-35/+0
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-07-081-2/+0
|\ \ \ \ | |/ / /
| * | | Remove APACHE symbolPeter Kokot2019-07-081-2/+0
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-07-022-19/+0
|\ \ \ \ | |/ / /
| * | | Remove unused (module|request)_shutdown_for_execNikita Popov2019-07-022-19/+0
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-06-301-47/+0
|\ \ \ \ | |/ / /
| * | | Remove unused build specific symbolsPeter Kokot2019-06-301-47/+0
* | | | Merge branch 'PHP-7.4'Joe Watkins2019-06-281-4/+0
|\ \ \ \ | |/ / /
| * | | implement tsrm_is_shutdown APIJoe Watkins2019-06-281-4/+0
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-06-271-2/+0
|\ \ \ \ | |/ / /
| * | | Sync HAVE_HASH, HAVE_HASH_EXT, PHAR_HASH_OK symbolsPeter Kokot2019-06-271-2/+0
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-06-272-8/+17
|\ \ \ \ | |/ / /
| * | | Fix use-after-free in stream freeing during shutdownNikita Popov2019-06-272-8/+17
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-06-261-4/+0
|\ \ \ \ | |/ / /
| * | | Remove unused HAVE_DATE and HAVE_SPL symbolsPeter Kokot2019-06-261-4/+0
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-06-192-16/+8
|\ \ \ \ | |/ / /
| * | | Remove copy argument from php_glob_stream_get_path/patternNikita Popov2019-06-192-16/+8
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-06-191-1/+3
|\ \ \ \ | |/ / /
| * | | Avoid memcpy UB in streamsNikita Popov2019-06-191-1/+3