summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'PHP-7.4'Nikita Popov2019-06-173-0/+12
|\ \ | |/
| * Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-06-173-0/+12
| |\
| | * Add syslog.filter=rawErik Lundin2019-06-173-0/+12
| | * Next is 7.3.8Christoph M. Becker2019-06-111-3/+3
| | * Prepare 7.3.7-devChristoph M. Becker2019-05-141-3/+3
| | * Prepare main branch for PHP 7.3.6Christoph M. Becker2019-04-161-3/+3
* | | Merge branch 'PHP-7.4'Nikita Popov2019-06-121-3/+3
|\ \ \ | |/ /
| * | Fix unused value warnings in snprintf.cNikita Popov2019-06-121-3/+3
* | | Merge branch 'PHP-7.4'Nikita Popov2019-06-051-1/+4
|\ \ \ | |/ /
| * | Allow exceptions in __toString()Nikita Popov2019-06-051-1/+4
| * | Bump API numbersDerick Rethans2019-05-291-1/+1
* | | Finish func_info updates for ext/standardNikita Popov2019-06-031-3/+3
* | | Merge branch 'PHP-7.4'Dmitry Stogov2019-05-281-2/+2
|\ \ \ | |/ /
| * | Put phpinfo() related code into cold code segmentDmitry Stogov2019-05-281-2/+2
* | | Merge branch 'PHP-7.4'Peter Kokot2019-05-181-4/+4
|\ \ \ | |/ /
| * | [ci skip] Migrate Coding standards docs to MarkdownPeter Kokot2019-05-181-4/+4
* | | Merge branch 'PHP-7.4'Peter Kokot2019-05-121-1/+1
|\ \ \ | |/ /
| * | Use PKG_CHECK_MODULES to detect the iODBC libraryHugh McMaster2019-05-121-1/+1
* | | Merge branch 'PHP-7.4'Jakub Zelenka2019-04-281-7/+9
|\ \ \ | |/ /
| * | Enable TLS 1.3 by defaultJakub Zelenka2019-04-281-7/+7
| * | Added tls 1.3 support for PHPcodarrenvelvindron2019-04-281-0/+2
* | | Merge branch 'PHP-7.4'Nikita Popov2019-04-231-5/+0
|\ \ \ | |/ /
| * | Remove duplicate zend_unset_timeout()bugreportuser2019-04-231-5/+0
* | | Merge branch 'PHP-7.4'Nikita Popov2019-04-172-0/+46
|\ \ \ | |/ /
| * | Fix internal_encoding fallback in mbstringNikita Popov2019-04-172-0/+46
* | | Merge branch 'PHP-7.4'Nikita Popov2019-04-151-0/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-04-151-0/+2
| |\ \ | | |/
| | * Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-04-151-0/+2
| | |\
| | | * Zero sockaddr structNikita Popov2019-04-151-0/+2
| | | * Bump versions for 7.2.18Sara Golemon2019-03-191-3/+3
| | * | Prepare main branch for PHP 7.3.5Christoph M. Becker2019-03-191-3/+3
* | | | Merge branch 'PHP-7.4'Gabriel Caruso2019-04-141-4/+0
|\ \ \ \ | |/ / /