summaryrefslogtreecommitdiff
path: root/main
Commit message (Expand)AuthorAgeFilesLines
...
| | | * Clear FG(user_stream_current_filename) when bailing outSara Golemon2016-10-111-6/+11
| | | * Merge branch 'PHP-5.6.27' into PHP-5.6Stanislav Malyshev2016-10-111-7/+8
| | | |\
| | | | * Fix bug #73190: memcpy negative parameter _bc_new_num_exStanislav Malyshev2016-10-031-3/+3
| | | | * Fix bug #73189 - Memcpy negative size parameter php_resolve_pathStanislav Malyshev2016-09-281-7/+8
| | | * | 5.6.28 is nextFerenc Kovacs2016-09-291-3/+3
* | | | | Merge branch 'PHP-7.1'Nikita Popov2017-01-072-9/+16
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-01-072-9/+16
| |\ \ \ \ | | |/ / /
| | * | | Fixed bug #67583Nikita Popov2017-01-072-4/+11
| | * | | Rename fcgi_request.closed to .endedNikita Popov2017-01-072-7/+7
* | | | | Merge branch 'PHP-7.1'Anatol Belski2017-01-071-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-071-0/+6
| |\ \ \ \ | | |/ / /
| | * | | add 'e' flag for fopen() to enable CLOEXECEvgeniy Makhrov2017-01-071-0/+6
| * | | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-061-1/+1
| |\ \ \ \ | | |/ / /
* | | | | Merge branch 'PHP-7.1'Joe Watkins2017-01-061-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-061-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | updated default per proposalMarkus Staab2017-01-061-1/+1
| | * | | Increase realpath_cache_size default valueMarkus Staab2017-01-061-1/+1
| | * | | move dev to nextAnatol Belski2017-01-051-3/+3
| | * | | Update copyright headers to 2017Sammy Kaye Powers2017-01-0468-68/+68
| * | | | wrong versionJoe Watkins2017-01-051-1/+1
| * | | | bump version after releaseJoe Watkins2017-01-051-2/+2
| * | | | Update copyright headers to 2017Sammy Kaye Powers2017-01-0468-68/+68
* | | | | Update copyright header for new fileSammy Kaye Powers2017-01-031-1/+1
* | | | | Resolve conflictSammy Kaye Powers2017-01-034-28/+88
|\ \ \ \ \
| * \ \ \ \ Merge branch 'pull-request/2163'Joe Watkins2017-01-034-28/+88
| |\ \ \ \ \
| | * | | | | updating cvs revisions of strlcat/cpyDavid Carlier2016-10-202-4/+4
| | * | | | | let s use the macro insteadDavid Carlier2016-10-151-1/+1
| | * | | | | import explicit_bzero + strlc* functions updateDavid Carlier2016-10-154-24/+84
* | | | | | | Update copyright headers to 2017Sammy Kaye Powers2017-01-0266-68/+68
|/ / / / / /
* | | | | | Make printf_to_smart_str(ing) the primitive printf operationNikita Popov2017-01-013-60/+12
* | | | | | Export zend_s(tr)pprintfNikita Popov2017-01-012-29/+3
* | | | | | Sync smart_string implementation with smart_strNikita Popov2017-01-011-1/+0
* | | | | | Move smart_string to ZendNikita Popov2017-01-012-2/+2
* | | | | | Merge branch 'PHP-7.1'Nikita Popov2017-01-011-3/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-01-011-3/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Flush stderr on win32 in cli_log_messageNikita Popov2017-01-011-3/+1
| | * | | | move dev to nextAnatol Belski2016-11-221-3/+3
| | * | | | move dev to 7.0.14Anatol Belski2016-10-251-3/+3
* | | | | | Finish remaining replacement uint => uint32_tAnatol Belski2016-12-221-1/+1
* | | | | | Eliminate win95nt.hKalle Sommer Nielsen2016-12-223-82/+47
* | | | | | move the defs to the right placeAnatol Belski2016-12-221-8/+0
* | | | | | Merge branch 'PHP-7.1'Anatol Belski2016-12-141-0/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Care about intput and output encoding, as per default encoding RFCAnatol Belski2016-12-141-0/+6
| * | | | | Bump versions and NEWS for 7.1.1-devDavey Shafik2016-12-021-3/+3
| * | | | | Fix bug #73189 - Memcpy negative size parameter php_resolve_pathStanislav Malyshev2016-10-141-3/+4
| * | | | | Clear FG(user_stream_current_filename) when bailing outSara Golemon2016-10-141-6/+11
* | | | | | further normalizations, uint vs uint32_tAnatol Belski2016-11-266-19/+19
* | | | | | Remove these NetWare leftoversKalle Sommer Nielsen2016-11-191-100/+0
* | | | | | Merge branch 'master' of git.php.net:/php-srcJoe Watkins2016-11-1213-78/+22
|\ \ \ \ \ \
| * | | | | | Remove Netware supportKalle Sommer Nielsen2016-11-1213-78/+22